From bdwalton at users.sourceforge.net Fri Jun 1 04:27:08 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 01 Jun 2012 02:27:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[18184] csw/mgar/pkg/apache2/trunk Message-ID: Revision: 18184 http://gar.svn.sourceforge.net/gar/?rev=18184&view=rev Author: bdwalton Date: 2012-06-01 02:27:08 +0000 (Fri, 01 Jun 2012) Log Message: ----------- apache2/trunk: move envvars to etc/ so we can make it a preservable config file Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/apache2/trunk/files/0004-Move-the-envvars-files-to-sysconfdir.patch Modified: csw/mgar/pkg/apache2/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache2/trunk/Makefile 2012-05-31 11:49:31 UTC (rev 18183) +++ csw/mgar/pkg/apache2/trunk/Makefile 2012-06-01 02:27:08 UTC (rev 18184) @@ -49,9 +49,9 @@ 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 += 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 +PATCHFILES += 0004-Move-the-envvars-files-to-sysconfdir.patch # The PACKAGES variable tell GAR which packages to build PACKAGES = CSWapache2 CSWapache2-dev CSWapache2-manual CSWap2suexec @@ -349,5 +349,8 @@ @echo Fixing usr/local reference in the cgi-bin scripts @(cd $(PKGROOT)/$(prefix)/apache2/share/cgi-bin; \ perl -pi -e 's@/usr/local/bin@/opt/csw/bin at g' *) + @echo Adding link from original envvars location + @(cd $(PKGROOT)/$(prefix)/apache2/sbin; \ + ln -s ../etc/envvars envvars ) @$(MAKECOOKIE) Added: csw/mgar/pkg/apache2/trunk/files/0004-Move-the-envvars-files-to-sysconfdir.patch =================================================================== --- csw/mgar/pkg/apache2/trunk/files/0004-Move-the-envvars-files-to-sysconfdir.patch (rev 0) +++ csw/mgar/pkg/apache2/trunk/files/0004-Move-the-envvars-files-to-sysconfdir.patch 2012-06-01 02:27:08 UTC (rev 18184) @@ -0,0 +1,89 @@ +From b92c24bc2546043669e45d818606e36fff61ec83 Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Fri, 1 Jun 2012 03:11:50 +0200 +Subject: [PATCH] Move the envvars files to sysconfdir + +We want to treat the envvars files as configuration so we need to +ensure they live in etc/. + +Signed-off-by: Ben Walton +--- + Makefile.in | 6 +++--- + support/Makefile.in | 7 ++++--- + support/apachectl.in | 4 ++-- + support/apxs.in | 2 +- + 4 files changed, 10 insertions(+), 9 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index c2346c3..9d14234 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -82,9 +82,9 @@ install-conf: + done ; \ + done ; \ + if test -f "$(builddir)/envvars-std"; then \ +- cp -p envvars-std $(DESTDIR)$(sbindir); \ +- if test ! -f $(DESTDIR)$(sbindir)/envvars; then \ +- cp -p envvars-std $(DESTDIR)$(sbindir)/envvars ; \ ++ cp -p envvars-std $(DESTDIR)$(sysconfdir); \ ++ if test ! -f $(DESTDIR)$(sysconfdir)/envvars; then \ ++ cp -p envvars-std $(DESTDIR)$(sysconfdir)/envvars ; \ + fi ; \ + fi + +diff --git a/support/Makefile.in b/support/Makefile.in +index 85aff34..d2b00f9 100644 +--- a/support/Makefile.in ++++ b/support/Makefile.in +@@ -15,6 +15,7 @@ install: + @test -d $(DESTDIR)$(bindir) || $(MKINSTALLDIRS) $(DESTDIR)$(bindir) + @test -d $(DESTDIR)$(sbindir) || $(MKINSTALLDIRS) $(DESTDIR)$(sbindir) + @test -d $(DESTDIR)$(libexecdir) || $(MKINSTALLDIRS) $(DESTDIR)$(libexecdir) ++ @test -d $(DESTDIR)$(sysconfdir) || $(MKINSTALLDIRS) $(DESTDIR)$(sysconfdir) + @cp -p $(top_builddir)/server/httpd.exp $(DESTDIR)$(libexecdir) + @for i in apxs apachectl dbmmanage; do \ + if test -f "$(builddir)/$$i"; then \ +@@ -23,9 +24,9 @@ install: + fi ; \ + done + @if test -f "$(builddir)/envvars-std"; then \ +- cp -p envvars-std $(DESTDIR)$(sbindir); \ +- if test ! -f $(DESTDIR)$(sbindir)/envvars; then \ +- cp -p envvars-std $(DESTDIR)$(sbindir)/envvars ; \ ++ cp -p envvars-std $(DESTDIR)$(sysconfdir); \ ++ if test ! -f $(DESTDIR)$(sysconfdir)/envvars; then \ ++ cp -p envvars-std $(DESTDIR)$(sysconfdir)/envvars ; \ + fi ; \ + fi + +diff --git a/support/apachectl.in b/support/apachectl.in +index d4dff38..2589779 100644 +--- a/support/apachectl.in ++++ b/support/apachectl.in +@@ -44,8 +44,8 @@ ARGV="$@" + HTTPD='@exp_sbindir@/@progname@' + # + # pick up any necessary environment variables +-if test -f @exp_sbindir@/envvars; then +- . @exp_sbindir@/envvars ++if test -f @exp_sysconfdir@/envvars; then ++ . @exp_sysconfdir@/envvars + fi + # + # a command that outputs a formatted text version of the HTML at the +diff --git a/support/apxs.in b/support/apxs.in +index 1900a78..5442dc0 100644 +--- a/support/apxs.in ++++ b/support/apxs.in +@@ -189,7 +189,7 @@ if (@opt_S) { + my $httpd = get_vars("sbindir") . "/" . get_vars("progname"); + $httpd = eval qq("$httpd"); + $httpd = eval qq("$httpd"); +-my $envvars = get_vars("sbindir") . "/envvars"; ++my $envvars = get_vars("sysconfdir") . "/envvars"; + $envvars = eval qq("$envvars"); + $envvars = eval qq("$envvars"); + +-- +1.7.10 + 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 1 04:30:46 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 01 Jun 2012 02:30:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[18185] csw/mgar/pkg/apache2/trunk Message-ID: Revision: 18185 http://gar.svn.sourceforge.net/gar/?rev=18185&view=rev Author: bdwalton Date: 2012-06-01 02:30:46 +0000 (Fri, 01 Jun 2012) Log Message: ----------- apache2/trunk: setup preservation for the envvars files now that they live in etc/ Modified Paths: -------------- csw/mgar/pkg/apache2/trunk/Makefile csw/mgar/pkg/apache2/trunk/files/CSWapache2.postinstall Modified: csw/mgar/pkg/apache2/trunk/Makefile =================================================================== --- csw/mgar/pkg/apache2/trunk/Makefile 2012-06-01 02:27:08 UTC (rev 18184) +++ csw/mgar/pkg/apache2/trunk/Makefile 2012-06-01 02:30:46 UTC (rev 18185) @@ -311,6 +311,7 @@ template_list += etc/extra/httpd-mpm.conf template_list += etc/magic template_list += etc/mime.types +template_list += etc/envvars etc/envvars-std create-templates: @echo " => Creating template files" Modified: csw/mgar/pkg/apache2/trunk/files/CSWapache2.postinstall =================================================================== --- csw/mgar/pkg/apache2/trunk/files/CSWapache2.postinstall 2012-06-01 02:27:08 UTC (rev 18184) +++ csw/mgar/pkg/apache2/trunk/files/CSWapache2.postinstall 2012-06-01 02:30:46 UTC (rev 18185) @@ -62,7 +62,9 @@ etc/extra/httpd-userdir.conf \ etc/extra/httpd-vhosts.conf \ etc/magic \ - etc/mime.types" + etc/mime.types \ + etc/envvars \ + etc/envvars-std" echo Copying CSW templates: for file in $template_list This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Fri Jun 1 09:03:33 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Fri, 01 Jun 2012 07:03:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[18186] csw/mgar/pkg/qt4-gcc/trunk/Makefile Message-ID: Revision: 18186 http://gar.svn.sourceforge.net/gar/?rev=18186&view=rev Author: cgrzemba Date: 2012-06-01 07:03:33 +0000 (Fri, 01 Jun 2012) Log Message: ----------- qt4-gcc/trunk: refine runtime dependencies Modified Paths: -------------- csw/mgar/pkg/qt4-gcc/trunk/Makefile Modified: csw/mgar/pkg/qt4-gcc/trunk/Makefile =================================================================== --- csw/mgar/pkg/qt4-gcc/trunk/Makefile 2012-06-01 02:30:46 UTC (rev 18185) +++ csw/mgar/pkg/qt4-gcc/trunk/Makefile 2012-06-01 07:03:33 UTC (rev 18186) @@ -61,11 +61,8 @@ PKGFILES_CSWlibqtgui4-gxx += $(call baseisadirs,$(libdir),libQtGui\.so\.4(\.\d+)*) SPKG_DESC_CSWlibqtgui4-gxx += $(DESCRIPTION), libQtGui.so.4 RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx += CSWlibgthread2-0-0 -RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx += CSWlibfontconfig1 RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx += CSWlibxrender -RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx += CSWlibfreetype6 -RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx += CSWlibstdc++6 RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx += CSWlibgcc-s1 @@ -105,13 +102,11 @@ RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibintl8 RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWgstreamer RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibxrender -RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibfreetype6 RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWmesa RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibstdc++6 RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibxml2-2 -RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibfontconfig1 RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWgstplugins RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibsybdb5 @@ -163,9 +158,7 @@ RUNTIME_DEP_PKGS_CSWlibqtopengl4-gxx += CSWmesa RUNTIME_DEP_PKGS_CSWlibqtopengl4-gxx += CSWlibstdc++6 RUNTIME_DEP_PKGS_CSWlibqtopengl4-gxx += CSWlibqtgui4-gxx -RUNTIME_DEP_PKGS_CSWlibqtopengl4-gxx += CSWlibfreetype6 RUNTIME_DEP_PKGS_CSWlibqtopengl4-gxx += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWlibqtopengl4-gxx += CSWlibfontconfig1 PACKAGES += CSWlibqtscript4-gxx PKGFILES_CSWlibqtscript4-gxx += $(call baseisadirs,$(libdir),libQtScript\.so\.4(\.\d+)*) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Fri Jun 1 10:24:24 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Fri, 01 Jun 2012 08:24:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[18187] csw/mgar/pkg Message-ID: Revision: 18187 http://gar.svn.sourceforge.net/gar/?rev=18187&view=rev Author: pfelecan Date: 2012-06-01 08:24:23 +0000 (Fri, 01 Jun 2012) Log Message: ----------- - migrated from a prive recipe to a GAR based one - version bump Added Paths: ----------- csw/mgar/pkg/auctex/ csw/mgar/pkg/auctex/Makefile csw/mgar/pkg/auctex/branches/ csw/mgar/pkg/auctex/tags/ csw/mgar/pkg/auctex/trunk/ csw/mgar/pkg/auctex/trunk/Makefile csw/mgar/pkg/auctex/trunk/checksums csw/mgar/pkg/auctex/trunk/files/ csw/mgar/pkg/auctex/trunk/files/CSWauctex.postinstall csw/mgar/pkg/auctex/trunk/files/README.CSW Added: csw/mgar/pkg/auctex/Makefile =================================================================== --- csw/mgar/pkg/auctex/Makefile (rev 0) +++ csw/mgar/pkg/auctex/Makefile 2012-06-01 08:24:23 UTC (rev 18187) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/auctex/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/auctex/trunk/Makefile =================================================================== --- csw/mgar/pkg/auctex/trunk/Makefile (rev 0) +++ csw/mgar/pkg/auctex/trunk/Makefile 2012-06-01 08:24:23 UTC (rev 18187) @@ -0,0 +1,80 @@ +# $Id$ +# +NAME = auctex +VERSION = 11.86 +GARTYPE = v2 +CATEGORIES = apps + +DESCRIPTION = A much enhanced TeX/LaTeX mode for Emacs +define BLURB + AUCTeX is an integrated environment for editing LaTeX, ConTeXt, + docTeX, Texinfo, and TeX files. +endef + +MASTER_SITES = http://ftp.gnu.org/pub/gnu/auctex/ +DISTFILES = $(DISTNAME).tar.gz +DISTFILES += README.CSW +DISTFILES += CSWauctex.postinstall + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-texmf-dir=/opt/csw/share/texmf-local + +BUILD_SCRIPTS = nominal +BUILD_SCRIPTS += extradist +BUILD_SCRIPTS += html-docs +BUILD_SCRIPTS += preview-latex.dvi +BUILD_SCRIPTS += preview-latex.ps +BUILD_SCRIPTS += preview-latex.pdf + +SKIPTEST = 1 +ARCHALL = 1 + +BUILD_DEP_PKGS = CSWemacs +BUILD_DEP_PKGS += CSWtetex +BUILD_DEP_PKGS += CSWtexinfo + +RUNTIME_DEP_PKGS = CSWemacs +RUNTIME_DEP_PKGS += CSWtetex +RUNTIME_DEP_PKGS += CSWgs + +include gar/category.mk + +build-nominal: + $(MAKE) -C $(WORKSRC) + $(MAKECOOKIE) + +build-extradist: + $(MAKE) -C $(WORKSRC)/doc $(subst build-,,$@) + $(MAKECOOKIE) + +build-html-docs: + $(MAKE) -C $(WORKSRC)/doc $(subst build-,,$@) + $(MAKECOOKIE) + +build-preview-latex.dvi: + $(MAKE) -C $(WORKSRC)/doc $(subst build-,,$@) + $(MAKECOOKIE) + +build-preview-latex.ps: + $(MAKE) -C $(WORKSRC)/doc $(subst build-,,$@) + $(MAKECOOKIE) + +build-preview-latex.pdf: + $(MAKE) -C $(WORKSRC)/doc $(subst build-,,$@) + $(MAKECOOKIE) + +post-install-modulated: + @echo "executing $@" + : miscelaneous formats for all the generated documentation + ginstall $(WORKSRC)/doc/auctex.dvi $(DESTDIR)$(docdir)/auctex + ginstall $(WORKSRC)/doc/auctex.ps $(DESTDIR)$(docdir)/auctex + ginstall $(WORKSRC)/doc/auctex.pdf $(DESTDIR)$(docdir)/auctex + ginstall $(WORKSRC)/doc/preview-latex.dvi $(DESTDIR)$(docdir)/auctex + ginstall $(WORKSRC)/doc/preview-latex.ps $(DESTDIR)$(docdir)/auctex + ginstall $(WORKSRC)/doc/preview-latex.pdf $(DESTDIR)$(docdir)/auctex + ginstall $(WORKSRC)/doc/tex-ref.dvi $(DESTDIR)$(docdir)/auctex + ginstall $(WORKSRC)/doc/tex-ref.ps $(DESTDIR)$(docdir)/auctex + gtar --directory=$(WORKSRC)/doc --create --file=- html | gtar --directory=$(DESTDIR)/$(docdir)/auctex --extract --file=- + ginstall -d $(DESTDIR)$(docdir)/auctex/examples + ginstall $(WORKSRC)/preview/circ.tex $(DESTDIR)$(docdir)/auctex/examples + $(MAKECOOKIE) Property changes on: csw/mgar/pkg/auctex/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/auctex/trunk/checksums =================================================================== --- csw/mgar/pkg/auctex/trunk/checksums (rev 0) +++ csw/mgar/pkg/auctex/trunk/checksums 2012-06-01 08:24:23 UTC (rev 18187) @@ -0,0 +1 @@ +6bc33a67b6ac59db1aa238f3693b36d2 auctex-11.86.tar.gz Added: csw/mgar/pkg/auctex/trunk/files/CSWauctex.postinstall =================================================================== --- csw/mgar/pkg/auctex/trunk/files/CSWauctex.postinstall (rev 0) +++ csw/mgar/pkg/auctex/trunk/files/CSWauctex.postinstall 2012-06-01 08:24:23 UTC (rev 18187) @@ -0,0 +1,32 @@ +# $Id$ + +Error() +{ + echo "postinstall: anomaly : $1" >&2 + exit 1 +} + +Warning() +{ + echo "warning:" "$1" >&2 +} + +if [ -x /opt/csw/bin/mktexlsr ] +then +{ + echo "Running mktexlsr. This may take some time..." + bash /opt/csw/bin/mktexlsr || + Warning "mktexlsr failed! You need to run mktexlsr again" +} +else +{ + Warning "cannot update TeX hash: /opt/csw/bin/mktexlsr is not an executable!" +} +fi + +exit 0 + +# Local Variables: +# mode: shell-script +# mode: font-lock +# End: Property changes on: csw/mgar/pkg/auctex/trunk/files/CSWauctex.postinstall ___________________________________________________________________ Added: svn:keywords + Author Date HeadURL Id Revision Added: csw/mgar/pkg/auctex/trunk/files/README.CSW =================================================================== --- csw/mgar/pkg/auctex/trunk/files/README.CSW (rev 0) +++ csw/mgar/pkg/auctex/trunk/files/README.CSW 2012-06-01 08:24:23 UTC (rev 18187) @@ -0,0 +1,30 @@ +$Id$ + +To use the AucTeX packaged by CSW you need to: + +1. Add or modify your ~/.emacs file to contain the following line: + + (require 'tex-site) + (load "auctex.el" nil t t) + (load "preview-latex.el" nil t t) + +2. Restart your Emacs session. + +3. The documentation is available in info, DVI, PostScript, PDF and + HTML format. + +4. If you wish to test the package, move + /opt/csw/share/doc/auctex/examples/circ.tex --- it's a German language + document --- to a directory where you have write rights --- the + file must also have the write rights set --- and ask for + a preview. You'll see the beauty of previewing even if you don't + read German... + +5. Enjoy! + +CSW Team + +# Local Variables: +# mode: text +# mode: font-lock +# End: Property changes on: csw/mgar/pkg/auctex/trunk/files/README.CSW ___________________________________________________________________ Added: svn:keywords + Author Date HeadURL Id Revision This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From aironskin at users.sourceforge.net Fri Jun 1 10:32:05 2012 From: aironskin at users.sourceforge.net (aironskin at users.sourceforge.net) Date: Fri, 01 Jun 2012 08:32:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[18188] csw/mgar/pkg/iozone/trunk/files/patch_makefile.diff Message-ID: Revision: 18188 http://gar.svn.sourceforge.net/gar/?rev=18188&view=rev Author: aironskin Date: 2012-06-01 08:32:05 +0000 (Fri, 01 Jun 2012) Log Message: ----------- iozone/trunk: Escape fix in patch Modified Paths: -------------- csw/mgar/pkg/iozone/trunk/files/patch_makefile.diff Modified: csw/mgar/pkg/iozone/trunk/files/patch_makefile.diff =================================================================== --- csw/mgar/pkg/iozone/trunk/files/patch_makefile.diff 2012-06-01 08:24:23 UTC (rev 18187) +++ csw/mgar/pkg/iozone/trunk/files/patch_makefile.diff 2012-06-01 08:32:05 UTC (rev 18188) @@ -28,7 +28,7 @@ # Solaris8-64-VXFS: iozone_solaris8-64-VXFS.o libasync.o libbif.o - $(CC) $(LDFLAGS) -fast -xtarget=generic64 -v -I/opt/VRTSvxfs/include/ -+ $(CC) $(LDFLAGS) -fast -m64 -v -I/opt/VRTSvxfs/include/ ++ $(CC) $(LDFLAGS) -fast -m64 -v -I/opt/VRTSvxfs/include/ \ iozone_solaris8-64-VXFS.o libasync.o libbif.o \ -lthread -lpthread -lposix4 -lnsl -laio \ -lsocket -o iozone 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 1 10:33:08 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 01 Jun 2012 08:33:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[18189] csw/mgar/pkg/gcc4/trunk/Makefile Message-ID: Revision: 18189 http://gar.svn.sourceforge.net/gar/?rev=18189&view=rev Author: wahwah Date: 2012-06-01 08:33:07 +0000 (Fri, 01 Jun 2012) Log Message: ----------- gcc4/trunk: add an alternative for gccgo, bump prio to 470 Modified Paths: -------------- csw/mgar/pkg/gcc4/trunk/Makefile Modified: csw/mgar/pkg/gcc4/trunk/Makefile =================================================================== --- csw/mgar/pkg/gcc4/trunk/Makefile 2012-06-01 08:32:05 UTC (rev 18188) +++ csw/mgar/pkg/gcc4/trunk/Makefile 2012-06-01 08:33:07 UTC (rev 18189) @@ -11,8 +11,8 @@ DESCRIPTION = The GNU Compiler Collection define BLURB - The GNU Compiler Collection includes front ends for C, C++, - Objective-C, Fortran, Java, and Ada, as well as libraries + The GNU Compiler Collection includes front ends for C, C++, + Objective-C, Fortran, Java, and Ada, as well as libraries for these languages (libstdc++, libgcj,...). endef @@ -67,7 +67,7 @@ CONFIGURE_ARGS += --enable-libada CONFIGURE_ARGS += --enable-libssp CONFIGURE_ARGS += --enable-objc-gc -CONFIGURE_ARGS += --enable-threads=posix +CONFIGURE_ARGS += --enable-threads=posix CONFIGURE_ARGS += --enable-languages=ada,c,c++,fortran,go,java,objc CONFIGURE_ARGS += --with-system-zlib=$(BUILD_PREFIX) @@ -117,7 +117,7 @@ # Used multiple times in package definitions JAVA_LIB_VERSION = 13 -ALTERNATIVES_PRIO = 460 +ALTERNATIVES_PRIO = 470 PACKAGES = $(PKG_BASENAME)core SPKG_DESC_$(PKG_BASENAME)core = GNU C compiler @@ -152,6 +152,7 @@ ALTERNATIVE_$(PKG_VERSION_TOKEN)core += $(bindir)/cpp gcc_core $(bindir)/cpp$(PROGRAM_SUFFIX) $(ALTERNATIVES_PRIO) ALTERNATIVE_$(PKG_VERSION_TOKEN)core += $(bindir)/gcc gcc_core $(bindir)/gcc$(PROGRAM_SUFFIX) ALTERNATIVE_$(PKG_VERSION_TOKEN)core += $(bindir)/gcov gcc_core $(bindir)/gcov$(PROGRAM_SUFFIX) +ALTERNATIVE_$(PKG_VERSION_TOKEN)core += $(bindir)/gccgo gcc_core $(bindir)/gccgo$(PROGRAM_SUFFIX) # Because I can. CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += file-with-bad-content This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Fri Jun 1 11:37:23 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Fri, 01 Jun 2012 09:37:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[18190] csw/mgar/pkg/qt4-gcc/trunk/Makefile Message-ID: Revision: 18190 http://gar.svn.sourceforge.net/gar/?rev=18190&view=rev Author: cgrzemba Date: 2012-06-01 09:37:22 +0000 (Fri, 01 Jun 2012) Log Message: ----------- qt4-gcc/trunk: relocate mkspecs from doc to dev package Modified Paths: -------------- csw/mgar/pkg/qt4-gcc/trunk/Makefile Modified: csw/mgar/pkg/qt4-gcc/trunk/Makefile =================================================================== --- csw/mgar/pkg/qt4-gcc/trunk/Makefile 2012-06-01 08:33:07 UTC (rev 18189) +++ csw/mgar/pkg/qt4-gcc/trunk/Makefile 2012-06-01 09:37:22 UTC (rev 18190) @@ -78,6 +78,7 @@ PKGFILES_CSWqt4-gxx-dev += $(prefix)/plugins/.* PKGFILES_CSWqt4-gxx-dev += $(prefix)/demos/.* PKGFILES_CSWqt4-gxx-dev += $(prefix)/imports/.* +PKGFILES_CSWqt4-gxx-dev += $(prefix)/mkspecs/.* RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibqtscript4-gxx RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibqtdesignercomponents4-gxx RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibqtdesigner4-gxx This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Fri Jun 1 11:42:40 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Fri, 01 Jun 2012 09:42:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[18191] csw/mgar/pkg/auctex/trunk/Makefile Message-ID: Revision: 18191 http://gar.svn.sourceforge.net/gar/?rev=18191&view=rev Author: pfelecan Date: 2012-06-01 09:42:40 +0000 (Fri, 01 Jun 2012) Log Message: ----------- configuration fine tuning Modified Paths: -------------- csw/mgar/pkg/auctex/trunk/Makefile Modified: csw/mgar/pkg/auctex/trunk/Makefile =================================================================== --- csw/mgar/pkg/auctex/trunk/Makefile 2012-06-01 09:37:22 UTC (rev 18190) +++ csw/mgar/pkg/auctex/trunk/Makefile 2012-06-01 09:42:40 UTC (rev 18191) @@ -18,6 +18,9 @@ CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-texmf-dir=/opt/csw/share/texmf-local +# this is needed to avoid incorrect interaction with CSWemacssitestart +# installed during the packaging: +CONFIGURE_ARGS += --with-auctexstartfile=/opt/csw/share/emacs/site-lisp/auctex.el BUILD_SCRIPTS = nominal BUILD_SCRIPTS += extradist This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Fri Jun 1 13:15:09 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Fri, 01 Jun 2012 11:15:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[18192] csw/mgar/pkg/auctex/trunk/Makefile Message-ID: Revision: 18192 http://gar.svn.sourceforge.net/gar/?rev=18192&view=rev Author: pfelecan Date: 2012-06-01 11:15:08 +0000 (Fri, 01 Jun 2012) Log Message: ----------- configuration fine tuning for preview sub-directory Modified Paths: -------------- csw/mgar/pkg/auctex/trunk/Makefile Modified: csw/mgar/pkg/auctex/trunk/Makefile =================================================================== --- csw/mgar/pkg/auctex/trunk/Makefile 2012-06-01 09:42:40 UTC (rev 18191) +++ csw/mgar/pkg/auctex/trunk/Makefile 2012-06-01 11:15:08 UTC (rev 18192) @@ -21,6 +21,7 @@ # this is needed to avoid incorrect interaction with CSWemacssitestart # installed during the packaging: CONFIGURE_ARGS += --with-auctexstartfile=/opt/csw/share/emacs/site-lisp/auctex.el +CONFIGURE_ARGS += --with-previewstartfile=/opt/csw/share/emacs/site-lisp/preview-latex.el BUILD_SCRIPTS = nominal BUILD_SCRIPTS += extradist This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Fri Jun 1 13:42:45 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Fri, 01 Jun 2012 11:42:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[18193] csw/mgar/pkg/auctex/trunk/Makefile Message-ID: Revision: 18193 http://gar.svn.sourceforge.net/gar/?rev=18193&view=rev Author: pfelecan Date: 2012-06-01 11:42:45 +0000 (Fri, 01 Jun 2012) Log Message: ----------- verified overrides for the checker Modified Paths: -------------- csw/mgar/pkg/auctex/trunk/Makefile Modified: csw/mgar/pkg/auctex/trunk/Makefile =================================================================== --- csw/mgar/pkg/auctex/trunk/Makefile 2012-06-01 11:15:08 UTC (rev 18192) +++ csw/mgar/pkg/auctex/trunk/Makefile 2012-06-01 11:42:45 UTC (rev 18193) @@ -41,6 +41,25 @@ RUNTIME_DEP_PKGS += CSWtetex RUNTIME_DEP_PKGS += CSWgs +# all the "bad content"s are innocuous: +CHECKPKG_OVERRIDES_CSWauctex += file-with-bad-content|/usr/local|root/opt/csw/share/info/auctex.info-1 +CHECKPKG_OVERRIDES_CSWauctex += file-with-bad-content|/usr/local|root/opt/csw/share/doc/auctex/auctex.dvi +CHECKPKG_OVERRIDES_CSWauctex += file-with-bad-content|/usr/local|root/opt/csw/share/doc/auctex/auctex.ps +CHECKPKG_OVERRIDES_CSWauctex += file-with-bad-content|/usr/local|root/opt/csw/share/doc/auctex/html/auctex_4.html +CHECKPKG_OVERRIDES_CSWauctex += file-with-bad-content|/usr/share|root/opt/csw/share/info/preview-latex.info +CHECKPKG_OVERRIDES_CSWauctex += file-with-bad-content|/usr/share|root/opt/csw/share/emacs/site-lisp/auctex/tex.el +CHECKPKG_OVERRIDES_CSWauctex += file-with-bad-content|/usr/share|root/opt/csw/share/emacs/site-lisp/auctex/tex-jp.el +CHECKPKG_OVERRIDES_CSWauctex += file-with-bad-content|/usr/share|root/opt/csw/share/emacs/site-lisp/auctex/tex.elc +CHECKPKG_OVERRIDES_CSWauctex += file-with-bad-content|/usr/share|root/opt/csw/share/emacs/site-lisp/auctex/tex-jp.elc +CHECKPKG_OVERRIDES_CSWauctex += file-with-bad-content|/usr/share|root/opt/csw/share/doc/auctex/preview-latex.ps +CHECKPKG_OVERRIDES_CSWauctex += file-with-bad-content|/usr/share|root/opt/csw/share/doc/auctex/preview-latex.dvi +# depends on CSWemacs wich depends on CSWemacscommon: +CHECKPKG_OVERRIDES_CSWauctex += missing-dependency|CSWemacscommon +# preview-latex depends on the existence at run-time: +CHECKPKG_OVERRIDES_CSWauctex += surplus-dependency|CSWgs +# the preview-latex can be used only with a graphical Emacs: +CHECKPKG_OVERRIDES_CSWauctex += surplus-dependency|CSWemacs + include gar/category.mk build-nominal: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Fri Jun 1 15:46:28 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Fri, 01 Jun 2012 13:46:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[18194] csw/mgar/pkg/emacs/trunk/Makefile Message-ID: Revision: 18194 http://gar.svn.sourceforge.net/gar/?rev=18194&view=rev Author: pfelecan Date: 2012-06-01 13:46:28 +0000 (Fri, 01 Jun 2012) Log Message: ----------- emacs is now a meta-package used for dependencies on emacs; the old content is now in a specific emacs_athena package which is a dependency of the former. Modified Paths: -------------- csw/mgar/pkg/emacs/trunk/Makefile Modified: csw/mgar/pkg/emacs/trunk/Makefile =================================================================== --- csw/mgar/pkg/emacs/trunk/Makefile 2012-06-01 11:42:45 UTC (rev 18193) +++ csw/mgar/pkg/emacs/trunk/Makefile 2012-06-01 13:46:28 UTC (rev 18194) @@ -103,7 +103,7 @@ MERGE_DIRS_isa-default-features-nox = $(bindir) MERGE_SCRIPTS_isa-default-features-nox = copy-only -ALTERNATIVES_CSWemacs = athena +ALTERNATIVES_CSWemacs-athena= athena ALTERNATIVES_CSWemacs-gtk = gtk ALTERNATIVES_CSWemacs-nox = nox @@ -227,71 +227,77 @@ PKGFILES_CSWemacs-bin-common += /opt/csw/libexec/emacs/$(VERSION)/[^/]*solaris[^/]*/sorted-doc PKGFILES_CSWemacs-bin-common += /opt/csw/libexec/emacs/$(VERSION)/[^/]*solaris[^/]*/update-game-score -PACKAGES += CSWemacs -SPKG_DESC_CSWemacs = $(DESCRIPTION) - based on the Athena toolkit +PACKAGES = CSWemacs +SPKG_DESC_CSWemacs = $(DESCRIPTION) - metapackage for generic dependencies CATALOGNAME_CSWemacs = emacs -RUNTIME_DEP_PKGS_CSWemacs = CSWemacs-common -RUNTIME_DEP_PKGS_CSWemacs += CSWemacs-bin-common -RUNTIME_DEP_PKGS_CSWemacs += CSWfconfig -RUNTIME_DEP_PKGS_CSWemacs += CSWlibbz2-1-0 -RUNTIME_DEP_PKGS_CSWemacs += CSWlibcairo2 -RUNTIME_DEP_PKGS_CSWemacs += CSWlibcroco -RUNTIME_DEP_PKGS_CSWemacs += CSWlibdatrie1 -RUNTIME_DEP_PKGS_CSWemacs += CSWlibexpat1 -RUNTIME_DEP_PKGS_CSWemacs += CSWlibfontconfig1 -RUNTIME_DEP_PKGS_CSWemacs += CSWlibfreetype6 -RUNTIME_DEP_PKGS_CSWemacs += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWemacs += CSWlibgdk-pixbuf2-0-0 -RUNTIME_DEP_PKGS_CSWemacs += CSWlibgif4 -RUNTIME_DEP_PKGS_CSWemacs += CSWlibgio2-0-0 -RUNTIME_DEP_PKGS_CSWemacs += CSWlibglib2-0-0 -RUNTIME_DEP_PKGS_CSWemacs += CSWlibgmodule2-0-0 -RUNTIME_DEP_PKGS_CSWemacs += CSWlibgobject2-0-0 -RUNTIME_DEP_PKGS_CSWemacs += CSWlibgthread2-0-0 -RUNTIME_DEP_PKGS_CSWemacs += CSWlibiconv2 -RUNTIME_DEP_PKGS_CSWemacs += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWemacs += CSWlibjbig2 -RUNTIME_DEP_PKGS_CSWemacs += CSWlibjpeg7 -RUNTIME_DEP_PKGS_CSWemacs += CSWlibm17n0 -RUNTIME_DEP_PKGS_CSWemacs += CSWlibm17n-utils -RUNTIME_DEP_PKGS_CSWemacs += CSWlibotf0 -RUNTIME_DEP_PKGS_CSWemacs += CSWlibotf-utils -RUNTIME_DEP_PKGS_CSWemacs += CSWlibpixman1-0 -RUNTIME_DEP_PKGS_CSWemacs += CSWlibpng12-0 -RUNTIME_DEP_PKGS_CSWemacs += CSWlibrsvg2-2 -RUNTIME_DEP_PKGS_CSWemacs += CSWlibthai0 -RUNTIME_DEP_PKGS_CSWemacs += CSWlibtiff3 -RUNTIME_DEP_PKGS_CSWemacs += CSWlibxft2 -RUNTIME_DEP_PKGS_CSWemacs += CSWlibxml2-2 -RUNTIME_DEP_PKGS_CSWemacs += CSWlibxrender -RUNTIME_DEP_PKGS_CSWemacs += CSWlibz1 -RUNTIME_DEP_PKGS_CSWemacs += CSWpango -RUNTIME_DEP_PKGS_CSWemacs += CSWxpm -CHECKPKG_OVERRIDES_CSWemacs += file-with-bad-content|/usr/local|root/opt/csw/bin/emacs-athena -CHECKPKG_OVERRIDES_CSWemacs += file-with-bad-content|/usr/share|root/opt/csw/bin/emacs-athena -CHECKPKG_OVERRIDES_CSWemacs += file-with-bad-content|/usr/local|root/opt/csw/bin/emacs-$(VERSION)-athena -CHECKPKG_OVERRIDES_CSWemacs += file-with-bad-content|/usr/share|root/opt/csw/bin/emacs-$(VERSION)-athena -CHECKPKG_OVERRIDES_CSWemacs += missing-dependency|CSWlibm17n-utils -CHECKPKG_OVERRIDES_CSWemacs += missing-dependency|CSWlibotf-utils -CHECKPKG_OVERRIDES_CSWemacs += missing-dependency|CSWlibfontconfig1 -CHECKPKG_OVERRIDES_CSWemacs += surplus-dependency|CSWlibcroco -CHECKPKG_OVERRIDES_CSWemacs += surplus-dependency|CSWemacs-common -CHECKPKG_OVERRIDES_CSWemacs += surplus-dependency|CSWlibiconv2 -CHECKPKG_OVERRIDES_CSWemacs += surplus-dependency|CSWlibotf0 -CHECKPKG_OVERRIDES_CSWemacs += surplus-dependency|CSWlibdatrie1 -CHECKPKG_OVERRIDES_CSWemacs += surplus-dependency|CSWlibthai0 -CHECKPKG_OVERRIDES_CSWemacs += surplus-dependency|CSWlibgcc-s1 -CHECKPKG_OVERRIDES_CSWemacs += surplus-dependency|CSWlibm17n0 -CHECKPKG_OVERRIDES_CSWemacs += surplus-dependency|CSWlibjbig2 -CHECKPKG_OVERRIDES_CSWemacs += surplus-dependency|CSWpango -CHECKPKG_OVERRIDES_CSWemacs += surplus-dependency|CSWemacs-bin-common -CHECKPKG_OVERRIDES_CSWemacs += surplus-dependency|CSWlibxml2-2 -CHECKPKG_OVERRIDES_CSWemacs += surplus-dependency|CSWlibexpat1 -CHECKPKG_OVERRIDES_CSWemacs += surplus-dependency|CSWlibpixman1-0 -CHECKPKG_OVERRIDES_CSWemacs += surplus-dependency|CSWfconfig -PKGFILES_CSWemacs = /opt/csw/bin/emacs-athena -PKGFILES_CSWemacs += /opt/csw/bin/emacs-$(VERSION)-athena +PKGFILES_CSWemacs = NOFILES +RUNTIME_DEP_PKGS_CSWemacs = CSWemacs-athena +PACKAGES += CSWemacs-athena +SPKG_DESC_CSWemacs-athena = $(DESCRIPTION) - based on the Athena toolkit +CATALOGNAME_CSWemacs-athena = emacs_athena +RUNTIME_DEP_PKGS_CSWemacs-athena = CSWemacs-common +RUNTIME_DEP_PKGS_CSWemacs-athena += CSWemacs-bin-common +RUNTIME_DEP_PKGS_CSWemacs-athena += CSWfconfig +RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibbz2-1-0 +RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibcroco +RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibdatrie1 +RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibexpat1 +RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibfontconfig1 +RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibgdk-pixbuf2-0-0 +RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibgif4 +RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibjbig2 +RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibjpeg7 +RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibm17n0 +RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibm17n-utils +RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibotf0 +RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibotf-utils +RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibpixman1-0 +RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibpng12-0 +RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibrsvg2-2 +RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibthai0 +RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibtiff3 +RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibxft2 +RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibxrender +RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibz1 +RUNTIME_DEP_PKGS_CSWemacs-athena += CSWpango +RUNTIME_DEP_PKGS_CSWemacs-athena += CSWxpm +CHECKPKG_OVERRIDES_CSWemacs-athena += file-with-bad-content|/usr/local|root/opt/csw/bin/emacs-athena +CHECKPKG_OVERRIDES_CSWemacs-athena += file-with-bad-content|/usr/share|root/opt/csw/bin/emacs-athena +CHECKPKG_OVERRIDES_CSWemacs-athena += file-with-bad-content|/usr/local|root/opt/csw/bin/emacs-$(VERSION)-athena +CHECKPKG_OVERRIDES_CSWemacs-athena += file-with-bad-content|/usr/share|root/opt/csw/bin/emacs-$(VERSION)-athena +CHECKPKG_OVERRIDES_CSWemacs-athena += missing-dependency|CSWlibm17n-utils +CHECKPKG_OVERRIDES_CSWemacs-athena += missing-dependency|CSWlibotf-utils +CHECKPKG_OVERRIDES_CSWemacs-athena += missing-dependency|CSWlibfontconfig1 +CHECKPKG_OVERRIDES_CSWemacs-athena += surplus-dependency|CSWlibcroco +CHECKPKG_OVERRIDES_CSWemacs-athena += surplus-dependency|CSWemacs-athena-common +CHECKPKG_OVERRIDES_CSWemacs-athena += surplus-dependency|CSWlibiconv2 +CHECKPKG_OVERRIDES_CSWemacs-athena += surplus-dependency|CSWlibotf0 +CHECKPKG_OVERRIDES_CSWemacs-athena += surplus-dependency|CSWlibdatrie1 +CHECKPKG_OVERRIDES_CSWemacs-athena += surplus-dependency|CSWlibthai0 +CHECKPKG_OVERRIDES_CSWemacs-athena += surplus-dependency|CSWlibgcc-s1 +CHECKPKG_OVERRIDES_CSWemacs-athena += surplus-dependency|CSWlibm17n0 +CHECKPKG_OVERRIDES_CSWemacs-athena += surplus-dependency|CSWlibjbig2 +CHECKPKG_OVERRIDES_CSWemacs-athena += surplus-dependency|CSWpango +CHECKPKG_OVERRIDES_CSWemacs-athena += surplus-dependency|CSWemacs-athena-bin-common +CHECKPKG_OVERRIDES_CSWemacs-athena += surplus-dependency|CSWlibxml2-2 +CHECKPKG_OVERRIDES_CSWemacs-athena += surplus-dependency|CSWlibexpat1 +CHECKPKG_OVERRIDES_CSWemacs-athena += surplus-dependency|CSWlibpixman1-0 +CHECKPKG_OVERRIDES_CSWemacs-athena += surplus-dependency|CSWfconfig +PKGFILES_CSWemacs-athena = /opt/csw/bin/emacs-athena +PKGFILES_CSWemacs-athena += /opt/csw/bin/emacs-$(VERSION)-athena + PACKAGES += CSWemacs-gtk SPKG_DESC_CSWemacs-gtk = $(DESCRIPTION) - based on the GTK toolkit CATALOGNAME_CSWemacs-gtk = emacs_gtk 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 1 16:28:54 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 01 Jun 2012 14:28:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[18195] csw/mgar/pkg/mutt/trunk/Makefile Message-ID: Revision: 18195 http://gar.svn.sourceforge.net/gar/?rev=18195&view=rev Author: dmichelsen Date: 2012-06-01 14:28:54 +0000 (Fri, 01 Jun 2012) Log Message: ----------- mutt/trunk: Enable external dotlock, general restructuring to latest standards Modified Paths: -------------- csw/mgar/pkg/mutt/trunk/Makefile Modified: csw/mgar/pkg/mutt/trunk/Makefile =================================================================== --- csw/mgar/pkg/mutt/trunk/Makefile 2012-06-01 13:46:28 UTC (rev 18194) +++ csw/mgar/pkg/mutt/trunk/Makefile 2012-06-01 14:28:54 UTC (rev 18195) @@ -21,34 +21,83 @@ DISTFILES += CSWmutt.postmsg UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +POSTMSG = $(docdir)/mutt/CSWmutt.postmsg + LICENSE = COPYRIGHT -PACKAGES = CSWmutt CSWmutt-base CSWmutt-ncurses CSWmutt-slang +PACKAGES += CSWmutt +SPKG_DESC_CSWmutt = Metapackage for mutt with ncurses- and slang-interface +RUNTIME_DEP_PKGS_CSWmutt += CSWmutt-ncurses +RUNTIME_DEP_PKGS_CSWmutt += CSWmutt-slang +PKGFILES_CSWmutt += $(POSTMSG) +ARCHALL_CSWmutt = 1 -RUNTIME_DEP_PKGS_core = CSWgdbm -RUNTIME_DEP_PKGS_core += CSWggettextrt -RUNTIME_DEP_PKGS_core += CSWgpgerr -RUNTIME_DEP_PKGS_core += CSWgpgme -RUNTIME_DEP_PKGS_core += CSWiconv -RUNTIME_DEP_PKGS_core += CSWlibidn -RUNTIME_DEP_PKGS_core += CSWosslrt -RUNTIME_DEP_PKGS_core += CSWsasl -RUNTIME_DEP_PKGS_core += CSWzlib -RUNTIME_DEP_PKGS_CSWmutt-ncurses = $(RUNTIME_DEP_PKGS_core) CSWmutt-base CSWncurses -RUNTIME_DEP_PKGS_CSWmutt-slang = $(RUNTIME_DEP_PKGS_core) CSWmutt-base CSWslang -RUNTIME_DEP_PKGS_CSWmutt-base = CSWggettextrt CSWiconv CSWlibidn -RUNTIME_DEP_PKGS_CSWmutt = CSWmutt-ncurses CSWmutt-slang +# These overrides are specific to the structure of the package +CHECKPKG_OVERRIDES_CSWmutt += surplus-dependency|CSWmutt-ncurses +CHECKPKG_OVERRIDES_CSWmutt += surplus-dependency|CSWmutt-slang -CATALOGNAME_CSWmutt-base = mutt_base -CATALOGNAME_CSWmutt-ncurses = mutt_ncurses -CATALOGNAME_CSWmutt-slang = mutt_slang -CATALOGNAME_CSWmutt = mutt +PACKAGES += CSWmutt-base +SPKG_DESC_CSWmutt-base = $(DESCRIPTION) +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWmutt-base += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWmutt-base += CSWlibidn11 +RUNTIME_DEP_PKGS_CSWmutt-base += CSWlibiconv2 -SPKG_DESC_CSWmutt-base = $(DESCRIPTION) +# This warning from checkpkg is obviously wrong... +CHECKPKG_OVERRIDES_CSWmutt-base = missing-dependency|CSWperl + +PACKAGES += CSWmutt-ncurses SPKG_DESC_CSWmutt-ncurses = Mutt mail client with ncurses interface +PKGFILES_CSWmutt-ncurses = $(bindir)/mutt-ncurses +RUNTIME_DEP_PKGS_CSWmutt-ncurses += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWmutt-ncurses += CSWlibncursesw5 +RUNTIME_DEP_PKGS_CSWmutt-ncurses += CSWlibssl1-0-0 +RUNTIME_DEP_PKGS_CSWmutt-ncurses += CSWlibz1 +RUNTIME_DEP_PKGS_CSWmutt-ncurses += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWmutt-ncurses += CSWlibgpg-error0 +RUNTIME_DEP_PKGS_CSWmutt-ncurses += CSWlibsasl2-2 +RUNTIME_DEP_PKGS_CSWmutt-ncurses += CSWlibgdbm4 +RUNTIME_DEP_PKGS_CSWmutt-ncurses += CSWlibidn11 +RUNTIME_DEP_PKGS_CSWmutt-ncurses += CSWgpgme +RUNTIME_DEP_PKGS_CSWmutt-ncurses += CSWmutt-base +CHECKPKG_OVERRIDES_CSWmutt-ncurses += surplus-dependency|CSWmutt-base + +PACKAGES += CSWmutt-slang SPKG_DESC_CSWmutt-slang = Mutt mail client with slang interface -SPKG_DESC_CSWmutt = Metapackage for mutt with ncurses- and slang-interface +PKGFILES_CSWmutt-slang = $(bindir)/mutt-slang +RUNTIME_DEP_PKGS_CSWmutt-slang += CSWlibslang2 +RUNTIME_DEP_PKGS_CSWmutt-slang += CSWlibssl1-0-0 +RUNTIME_DEP_PKGS_CSWmutt-slang += CSWlibz1 +RUNTIME_DEP_PKGS_CSWmutt-slang += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWmutt-slang += CSWlibgpg-error0 +RUNTIME_DEP_PKGS_CSWmutt-slang += CSWlibsasl2-2 +RUNTIME_DEP_PKGS_CSWmutt-slang += CSWgpgme +RUNTIME_DEP_PKGS_CSWmutt-slang += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWmutt-slang += CSWlibgdbm4 +RUNTIME_DEP_PKGS_CSWmutt-slang += CSWlibidn11 +RUNTIME_DEP_PKGS_CSWmutt-slang += CSWmutt-base +CHECKPKG_OVERRIDES_CSWmutt-slang += surplus-dependency|CSWmutt-base +CHECKPKG_OVERRIDES_CSWmutt-base += file-with-bad-content|/usr/local|root/etc/opt/csw/Muttrc.CSW +CHECKPKG_OVERRIDES_CSWmutt-base += file-with-bad-content|/usr/local|root/opt/csw/share/doc/mutt/reference.html +CHECKPKG_OVERRIDES_CSWmutt-base += file-with-bad-content|/usr/local|root/opt/csw/share/doc/mutt/ChangeLog +CHECKPKG_OVERRIDES_CSWmutt-base += file-with-bad-content|/usr/local|root/opt/csw/share/doc/mutt/INSTALL +CHECKPKG_OVERRIDES_CSWmutt-base += file-with-bad-content|/usr/local|root/opt/csw/share/doc/mutt/configuration.html +CHECKPKG_OVERRIDES_CSWmutt-base += file-with-bad-content|/usr/local|root/opt/csw/share/doc/mutt/samples/sample.muttrc +CHECKPKG_OVERRIDES_CSWmutt-base += file-with-bad-content|/usr/share|root/opt/csw/share/doc/mutt/devel-notes.txt +CHECKPKG_OVERRIDES_CSWmutt-base += file-with-bad-content|/usr/local|root/opt/csw/share/doc/mutt/mimesupport.html +CHECKPKG_OVERRIDES_CSWmutt-base += file-with-bad-content|/usr/local|root/opt/csw/share/doc/mutt/manual.txt +CHECKPKG_OVERRIDES_CSWmutt-base += file-with-bad-content|/usr/local|root/opt/csw/share/doc/mutt/manual.html +CHECKPKG_OVERRIDES_CSWmutt-base += file-with-bad-content|/usr/local|root/opt/csw/share/man/man5/muttrc.5 +CHECKPKG_OVERRIDES_CSWmutt-base += pkginfo-opencsw-repository-uncommitted + +REINPLACEMENTS += mailcap +REINPLACE_MATCH_mailcap = /usr/local/etc/mailcap +REINPLACE_WITH_mailcap = /opt/csw/etc/mailcap +REINPLACE_FILES_mailcap += init.c +REINPLACE_FILES_mailcap += doc/manual.xml +REINPLACE_FILES_mailcap += doc/mimesupport.html + # Raise optimizer level unless this bug has been fixed: # http://dev.mutt.org/trac/ticket/3347 OPT_FLAGS_SOS = -xO4 @@ -65,6 +114,7 @@ CONFIGURE_ARGS += --enable-hcache CONFIGURE_ARGS += --with-sasl CONFIGURE_ARGS += --with-ssl +CONFIGURE_ARGS += --enable-external-dotlock CONFIGURE_ARGS_SLANG-no = CONFIGURE_ARGS_SLANG-yes = --with-slang=$(prefix) @@ -83,34 +133,14 @@ MERGE_SCRIPTS_isa-default-slang-yes = copy-all EXTRA_PAX_ARGS_slang-no = -s ",\.$(bindir)/mutt$$,.$(bindir)/mutt-ncurses,p" -EXTRA_PAX_ARGS_slang-yes = -s ",\.$(bindir)/mutt$$,.$(bindir)/mutt-slang,p" -s ",.*,," +EXTRA_PAX_ARGS_slang-yes = -s ",\.$(bindir)/mutt$$,.$(bindir)/mutt-slang,p" -m EXTRA_PAX_ARGS = $(EXTRA_PAX_ARGS_slang-$(SLANG)) -POSTMSG = $(docdir)/mutt/CSWmutt.postmsg - -# CSWmutt-base gets all the rest -PKGFILES_CSWmutt-ncurses = $(bindir)/mutt-ncurses -PKGFILES_CSWmutt-slang = $(bindir)/mutt-slang -PKGFILES_CSWmutt = $(POSTMSG) - -ARCHALL_CSWmutt = 1 - ALTERNATIVES_CSWmutt-ncurses = ncurses ALTERNATIVES_CSWmutt-slang = slang ALTERNATIVE_ncurses = $(bindir)/mutt mutt $(bindir)/mutt-ncurses 100 ALTERNATIVE_slang = $(bindir)/mutt mutt $(bindir)/mutt-slang 200 -# This warning from checkpkg is obviously wrong... -CHECKPKG_OVERRIDES_CSWmutt-base = missing-dependency|CSWperl - -# These overrides are specific to the structure of the package -CHECKPKG_OVERRIDES_CSWmutt += surplus-dependency|CSWmutt-ncurses -CHECKPKG_OVERRIDES_CSWmutt += surplus-dependency|CSWmutt-slang -CHECKPKG_OVERRIDES_CSWmutt-ncurses += surplus-dependency|CSWalternatives -CHECKPKG_OVERRIDES_CSWmutt-ncurses += surplus-dependency|CSWmutt-base -CHECKPKG_OVERRIDES_CSWmutt-slang += surplus-dependency|CSWalternatives -CHECKPKG_OVERRIDES_CSWmutt-slang += surplus-dependency|CSWmutt-base - 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 dmichelsen at users.sourceforge.net Fri Jun 1 22:16:59 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 01 Jun 2012 20:16:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[18196] csw/mgar/pkg/figlet/trunk Message-ID: Revision: 18196 http://gar.svn.sourceforge.net/gar/?rev=18196&view=rev Author: dmichelsen Date: 2012-06-01 20:16:59 +0000 (Fri, 01 Jun 2012) Log Message: ----------- figlet/trunk: Update to 2.2.5 Modified Paths: -------------- csw/mgar/pkg/figlet/trunk/Makefile csw/mgar/pkg/figlet/trunk/checksums Added Paths: ----------- csw/mgar/pkg/figlet/trunk/files/0001-Include-alloca.h.patch Modified: csw/mgar/pkg/figlet/trunk/Makefile =================================================================== --- csw/mgar/pkg/figlet/trunk/Makefile 2012-06-01 14:28:54 UTC (rev 18195) +++ csw/mgar/pkg/figlet/trunk/Makefile 2012-06-01 20:16:59 UTC (rev 18196) @@ -1,6 +1,5 @@ NAME = figlet -VERSION = 2.2.2 -RELEASE = 222 +VERSION = 2.2.5 CATEGORIES = apps GARTYPE = v2 @@ -14,30 +13,32 @@ endef MASTER_SITES = ftp://ftp.figlet.org/pub/figlet/program/unix/ -DISTFILES = $(NAME)$(RELEASE).tar.gz +DISTFILES = $(DISTNAME).tar.gz MASTER_SITES += ftp://ftp.figlet.org/pub/figlet/fonts/ # ours.tar.gz is already in the figlet distribution -DISTFILES += contributed.tar.gz international.tar.gz ms-dos.tar.gz +DISTFILES += contributed.tar.gz +DISTFILES += international.tar.gz +DISTFILES += ms-dos.tar.gz -SPKG_SOURCEURL = http://www.figlet.org +PATCHFILES += 0001-Include-alloca.h.patch +VENDOR_URL = http://www.figlet.org + LICENSE = LICENSE -DISTNAME = $(NAME)$(RELEASE) - -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)(\d+(?:\.\d+)*).tar.gz - # We don't have this modern autoconfig-doodle-crap CONFIGURE_SCRIPTS = APPDIR = $(sharedstatedir)/$(NAME) DEFAULTFONTDIR = $(APPDIR)/fonts +EXTRA_CFLAGS += -D__BEGIN_DECLS= +EXTRA_CFLAGS += -D__END_DECLS= + BUILD_OVERRIDE_DIRS = CC CFLAGS DEFAULTFONTDIR # FIGlet doesn't have tests -TEST_SCRIPTS = +# TEST_SCRIPTS = INSTALL_SCRIPTS = custom Modified: csw/mgar/pkg/figlet/trunk/checksums =================================================================== --- csw/mgar/pkg/figlet/trunk/checksums 2012-06-01 14:28:54 UTC (rev 18195) +++ csw/mgar/pkg/figlet/trunk/checksums 2012-06-01 20:16:59 UTC (rev 18196) @@ -1,4 +1,4 @@ -6e2dec4499f7a7fe178522e02e0b6cd1 download/contributed.tar.gz -9fcf4f1651b8e6d3f56f1ef665285b2e download/figlet222.tar.gz -b2d53f7e251014adcdb4d407c47f90ef download/international.tar.gz -49aa57ab989e8d952be037414b0bbbe4 download/ms-dos.tar.gz +6e2dec4499f7a7fe178522e02e0b6cd1 contributed.tar.gz +d88cb33a14f1469fff975d021ae2858e figlet-2.2.5.tar.gz +b2d53f7e251014adcdb4d407c47f90ef international.tar.gz +49aa57ab989e8d952be037414b0bbbe4 ms-dos.tar.gz Added: csw/mgar/pkg/figlet/trunk/files/0001-Include-alloca.h.patch =================================================================== --- csw/mgar/pkg/figlet/trunk/files/0001-Include-alloca.h.patch (rev 0) +++ csw/mgar/pkg/figlet/trunk/files/0001-Include-alloca.h.patch 2012-06-01 20:16:59 UTC (rev 18196) @@ -0,0 +1,27 @@ +From e78edada0f6c198ba7418c39cd5832ee0d16b6db Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Fri, 1 Jun 2012 22:12:46 +0200 +Subject: [PATCH] Include alloca.h + +--- + figlet.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/figlet.c b/figlet.c +index 3de795a..87e8d35 100644 +--- a/figlet.c ++++ b/figlet.c +@@ -71,6 +71,10 @@ + #include /* Needed for get_columns */ + #endif + ++#ifdef __sun ++#include ++#endif ++ + #ifdef TLF_FONTS + #include + #include +-- +1.7.10 + 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 2 09:41:17 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 02 Jun 2012 07:41:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[18197] csw/mgar/pkg/r/trunk/Makefile Message-ID: Revision: 18197 http://gar.svn.sourceforge.net/gar/?rev=18197&view=rev Author: wahwah Date: 2012-06-02 07:41:17 +0000 (Sat, 02 Jun 2012) Log Message: ----------- r/trunk: dependency updates, 64-bit build (no integration though) Modified Paths: -------------- csw/mgar/pkg/r/trunk/Makefile Property Changed: ---------------- csw/mgar/pkg/r/trunk/Makefile Modified: csw/mgar/pkg/r/trunk/Makefile =================================================================== --- csw/mgar/pkg/r/trunk/Makefile 2012-06-01 20:16:59 UTC (rev 18196) +++ csw/mgar/pkg/r/trunk/Makefile 2012-06-02 07:41:17 UTC (rev 18197) @@ -1,3 +1,4 @@ +# $Id$ # Only builds on Solaris 10 NAME = R @@ -15,22 +16,20 @@ PACKAGES = CSWr-base VENDOR_URL = http://www.r-project.org/ -RUNTIME_DEP_PKGS_CSWr-base += CSWsunmath -RUNTIME_DEP_PKGS_CSWr-base += CSWjpeg RUNTIME_DEP_PKGS_CSWr-base += CSWlibiconv2 -RUNTIME_DEP_PKGS_CSWr-base += CSWtcl -RUNTIME_DEP_PKGS_CSWr-base += CSWlibpng12-0 -RUNTIME_DEP_PKGS_CSWr-base += CSWlibz1 +RUNTIME_DEP_PKGS_CSWr-base += CSWlibicui18n48 +RUNTIME_DEP_PKGS_CSWr-base += CSWlibicuuc48 RUNTIME_DEP_PKGS_CSWr-base += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWr-base += CSWtiff +RUNTIME_DEP_PKGS_CSWr-base += CSWlibjpeg7 RUNTIME_DEP_PKGS_CSWr-base += CSWliblzma5 -RUNTIME_DEP_PKGS_CSWr-base += CSWlibcairo2 -RUNTIME_DEP_PKGS_CSWr-base += CSWlibicu46 -RUNTIME_DEP_PKGS_CSWr-base += CSWtk -RUNTIME_DEP_PKGS_CSWr-base += CSWpango +RUNTIME_DEP_PKGS_CSWr-base += CSWlibpng12-0 RUNTIME_DEP_PKGS_CSWr-base += CSWlibreadline6 +RUNTIME_DEP_PKGS_CSWr-base += CSWlibtiff3 +RUNTIME_DEP_PKGS_CSWr-base += CSWlibz1 RUNTIME_DEP_PKGS_CSWr-base += CSWss12f95rt -RUNTIME_DEP_PKGS_CSWr-base += CSWglib2 +RUNTIME_DEP_PKGS_CSWr-base += CSWsunmath +RUNTIME_DEP_PKGS_CSWr-base += CSWtcl +RUNTIME_DEP_PKGS_CSWr-base += CSWtk # Temporary overrides CHECKPKG_OVERRIDES_CSWr-base += file-with-bad-content @@ -47,7 +46,29 @@ CHECKPKG_OVERRIDES_CSWr-base += soname-not-found|libRlapack.so|is|needed|by|opt/csw/lib/R/library/Matrix/libs/Matrix.so CHECKPKG_OVERRIDES_CSWr-base += soname-not-found|libRlapack.so|is|needed|by|opt/csw/lib/R/library/mgcv/libs/mgcv.so CHECKPKG_OVERRIDES_CSWr-base += soname-not-found|libRlapack.so|is|needed|by|opt/csw/lib/R/modules/lapack.so +CHECKPKG_OVERRIDES_CSWr-base += soname-not-found|libRblas.so|is|needed|by|opt/csw/lib/sparcv9/R/bin/exec/R +CHECKPKG_OVERRIDES_CSWr-base += soname-not-found|libRblas.so|is|needed|by|opt/csw/lib/sparcv9/R/library/Matrix/libs/Matrix.so +CHECKPKG_OVERRIDES_CSWr-base += soname-not-found|libRblas.so|is|needed|by|opt/csw/lib/sparcv9/R/library/stats/libs/stats.so +CHECKPKG_OVERRIDES_CSWr-base += soname-not-found|libRlapack.so|is|needed|by|opt/csw/lib/sparcv9/R/library/Matrix/libs/Matrix.so +CHECKPKG_OVERRIDES_CSWr-base += soname-not-found|libRlapack.so|is|needed|by|opt/csw/lib/sparcv9/R/library/mgcv/libs/mgcv.so +CHECKPKG_OVERRIDES_CSWr-base += soname-not-found|libRblas.so|is|needed|by|opt/csw/lib/sparcv9/R/modules/lapack.so +CHECKPKG_OVERRIDES_CSWr-base += soname-not-found|libRlapack.so|is|needed|by|opt/csw/lib/sparcv9/R/modules/lapack.so +CHECKPKG_OVERRIDES_CSWr-base += soname-not-found|libRblas.so|is|needed|by|opt/csw/lib/sparcv9/R/lib/libRlapack.so +CHECKPKG_OVERRIDES_CSWr-base += soname-not-found|libRblas.so|is|needed|by|opt/csw/lib/sparcv9/R/library/mgcv/libs/mgcv.so +CHECKPKG_OVERRIDES_CSWr-base += soname-not-found|libRblas.so|is|needed|by|opt/csw/lib/sparcv9/R/library/KernSmooth/libs/KernSmooth.so +CHECKPKG_OVERRIDES_CSWr-base += soname-not-found|libRblas.so|is|needed|by|opt/csw/lib/amd64/R/bin/exec/R +CHECKPKG_OVERRIDES_CSWr-base += soname-not-found|libRblas.so|is|needed|by|opt/csw/lib/amd64/R/library/Matrix/libs/Matrix.so +CHECKPKG_OVERRIDES_CSWr-base += soname-not-found|libRblas.so|is|needed|by|opt/csw/lib/amd64/R/library/stats/libs/stats.so +CHECKPKG_OVERRIDES_CSWr-base += soname-not-found|libRlapack.so|is|needed|by|opt/csw/lib/amd64/R/library/Matrix/libs/Matrix.so +CHECKPKG_OVERRIDES_CSWr-base += soname-not-found|libRlapack.so|is|needed|by|opt/csw/lib/amd64/R/library/mgcv/libs/mgcv.so +CHECKPKG_OVERRIDES_CSWr-base += soname-not-found|libRblas.so|is|needed|by|opt/csw/lib/amd64/R/modules/lapack.so +CHECKPKG_OVERRIDES_CSWr-base += soname-not-found|libRlapack.so|is|needed|by|opt/csw/lib/amd64/R/modules/lapack.so +CHECKPKG_OVERRIDES_CSWr-base += soname-not-found|libRblas.so|is|needed|by|opt/csw/lib/amd64/R/lib/libRlapack.so +CHECKPKG_OVERRIDES_CSWr-base += soname-not-found|libRblas.so|is|needed|by|opt/csw/lib/amd64/R/library/mgcv/libs/mgcv.so +CHECKPKG_OVERRIDES_CSWr-base += soname-not-found|libRblas.so|is|needed|by|opt/csw/lib/amd64/R/library/KernSmooth/libs/KernSmooth.so +BUILD64 = 1 + CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check-recommended Property changes on: csw/mgar/pkg/r/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 wilbury at users.sourceforge.net Sat Jun 2 14:11:37 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Sat, 02 Jun 2012 12:11:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[18198] csw/mgar/pkg Message-ID: Revision: 18198 http://gar.svn.sourceforge.net/gar/?rev=18198&view=rev Author: wilbury Date: 2012-06-02 12:11:37 +0000 (Sat, 02 Jun 2012) Log Message: ----------- c-icap/trunk: C-ICAP, initial working commit. Added Paths: ----------- csw/mgar/pkg/c-icap/ csw/mgar/pkg/c-icap/Makefile csw/mgar/pkg/c-icap/branches/ csw/mgar/pkg/c-icap/tags/ csw/mgar/pkg/c-icap/trunk/ csw/mgar/pkg/c-icap/trunk/Makefile csw/mgar/pkg/c-icap/trunk/checksums csw/mgar/pkg/c-icap/trunk/files/ Added: csw/mgar/pkg/c-icap/Makefile =================================================================== --- csw/mgar/pkg/c-icap/Makefile (rev 0) +++ csw/mgar/pkg/c-icap/Makefile 2012-06-02 12:11:37 UTC (rev 18198) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/c-icap/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/c-icap/trunk/Makefile =================================================================== --- csw/mgar/pkg/c-icap/trunk/Makefile (rev 0) +++ csw/mgar/pkg/c-icap/trunk/Makefile 2012-06-02 12:11:37 UTC (rev 18198) @@ -0,0 +1,72 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = c-icap +VERSION = 0.1.7 +GARTYPE = v2 +CATEGORIES = apps + +DESCRIPTION = Brief description +define BLURB + C-ICAP is an implementation of an ICAP server. It can be used with HTTP proxies that support the ICAP protocol to implement content adaptation and filtering services. +endef + +SF_PROJ = c-icap +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = c_icap-$(VERSION).tar.gz +WORKSRC = $(WORKDIR)/c_icap-$(VERSION) +LICENSE_TEXT = Licensed under LGPL2 + +GARCOMPILER = GNU + +sysconfdir = /etc$(prefix)/$(NAME) +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --sysconfdir=$(sysconfdir) +CONFIGURE_ARGS += --localstatedir=/var$(prefix)/$(NAME) +CONFIGURE_ARGS += --libexecdir=$(prefix)/libexec/$(NAME) +CONFIGURE_ARGS += --libdir=$(prefix)/lib + +REINPLACEMENTS = sockdir +REINPLACE_MATCH_sockdir = /var/run/c-icap +REINPLACE_WITH_sockdir = /var$(prefix)/$(NAME)/run +REINPLACE_FILES_sockdir += Makefile.in +REINPLACE_FILES_sockdir += c-icap.conf.in +REINPLACE_FILES_sockdir += c-icap-config +REINPLACE_FILES_sockdir += c-icap-libicapapi-config +REINPLACE_FILES_sockdir += cfg_param.c +REINPLACE_FILES_sockdir += docs/man/Makefile.in +REINPLACE_FILES_sockdir += docs/man/c-icap.8.in +REINPLACE_FILES_sockdir += docs/man/Makefile.am +REINPLACE_FILES_sockdir += utils/Makefile.in + +REINPLACEMENTS += usrlocal +REINPLACE_MATCH_usrlocal = /usr/local/c-icap/etc +REINPLACE_WITH_usrlocal = $(sysconfdir) +REINPLACE_FILES_usrlocal += c-icap.conf +REINPLACE_FILES_usrlocal += c-icap.conf.in + +PACKAGES = CSWc-icap +CATALOGNAME_CSWc-icap = c_icap +SPKG_DESC_CSWc-icap = C-ICAP library +RUNTIME_DEP_PKGS_CSWc-icap += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWc-icap += CSWlibldap2-4-2 +RUNTIME_DEP_PKGS_CSWc-icap += CSWlibz1 + +PACKAGES += CSWlibicapapi0 +CATALOGNAME_CSWlibicapapi0 = libicapapi0 +PKGFILES_CSWlibicapapi0 += $(call baseisadirs,$(libdir),libicapapi\.so\.0\.0\.7) +PKGFILES_CSWlibicapapi0 += $(call baseisadirs,$(libdir),libicapapi\.so\.0(\.\d+)*) +SPKG_DESC_CSWlibicapapi0 += $(DESCRIPTION), libicapapi.so.0 +RUNTIME_DEP_PKGS_CSWc-icap += CSWlibicapapi0 +RUNTIME_DEP_PKGS_CSWlibicapapi0 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibicapapi0 += CSWlibz1 + +PACKAGES += CSWc-icap-dev +CATALOGNAME_CSWc-icap-dev = c_icap_dev +SPKG_DESC_CSWc-icap-dev += $(DESCRIPTION), development files +PKGFILES_CSWc-icap-dev += /opt/csw/lib/libicapapi.so +PKGFILES_CSWc-icap-dev += $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWc-icap-dev += CSWlibicapapi0 + +include gar/category.mk + Property changes on: csw/mgar/pkg/c-icap/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/c-icap/trunk/checksums =================================================================== --- csw/mgar/pkg/c-icap/trunk/checksums (rev 0) +++ csw/mgar/pkg/c-icap/trunk/checksums 2012-06-02 12:11:37 UTC (rev 18198) @@ -0,0 +1 @@ +ed49a92264938d4a1eecf3aaa0511a79 c_icap-0.1.7.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sat Jun 2 17:34:00 2012 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 02 Jun 2012 15:34:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[18199] csw/mgar/pkg/mercurial/trunk Message-ID: Revision: 18199 http://gar.svn.sourceforge.net/gar/?rev=18199&view=rev Author: rthurner Date: 2012-06-02 15:34:00 +0000 (Sat, 02 Jun 2012) Log Message: ----------- mercurial, upgrade to hg-2.2.2 Modified Paths: -------------- csw/mgar/pkg/mercurial/trunk/Makefile csw/mgar/pkg/mercurial/trunk/checksums Modified: csw/mgar/pkg/mercurial/trunk/Makefile =================================================================== --- csw/mgar/pkg/mercurial/trunk/Makefile 2012-06-02 12:11:37 UTC (rev 18198) +++ csw/mgar/pkg/mercurial/trunk/Makefile 2012-06-02 15:34:00 UTC (rev 18199) @@ -1,5 +1,5 @@ NAME = mercurial -VERSION = 2.2.1 +VERSION = 2.2.2 CATEGORIES = python GARTYPE = v2 Modified: csw/mgar/pkg/mercurial/trunk/checksums =================================================================== --- csw/mgar/pkg/mercurial/trunk/checksums 2012-06-02 12:11:37 UTC (rev 18198) +++ csw/mgar/pkg/mercurial/trunk/checksums 2012-06-02 15:34:00 UTC (rev 18199) @@ -1 +1 @@ -0ff7c7f7c50e506d494ff84baa10a77d mercurial-2.2.1.tar.gz +9f59b5d71969cbb2671702cd2a7a5a11 mercurial-2.2.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sat Jun 2 17:35:00 2012 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 02 Jun 2012 15:35:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[18200] csw/mgar/pkg/libserf/trunk Message-ID: Revision: 18200 http://gar.svn.sourceforge.net/gar/?rev=18200&view=rev Author: rthurner Date: 2012-06-02 15:35:00 +0000 (Sat, 02 Jun 2012) Log Message: ----------- libserf, upgrade to serf-1.0.3 Modified Paths: -------------- csw/mgar/pkg/libserf/trunk/Makefile csw/mgar/pkg/libserf/trunk/checksums Modified: csw/mgar/pkg/libserf/trunk/Makefile =================================================================== --- csw/mgar/pkg/libserf/trunk/Makefile 2012-06-02 15:34:00 UTC (rev 18199) +++ csw/mgar/pkg/libserf/trunk/Makefile 2012-06-02 15:35:00 UTC (rev 18200) @@ -1,5 +1,5 @@ NAME = libserf -VERSION = 1.0.1 +VERSION = 1.0.3 DISTNAME = serf-$(VERSION) CATEGORIES = lib GARTYPE = v2 Modified: csw/mgar/pkg/libserf/trunk/checksums =================================================================== --- csw/mgar/pkg/libserf/trunk/checksums 2012-06-02 15:34:00 UTC (rev 18199) +++ csw/mgar/pkg/libserf/trunk/checksums 2012-06-02 15:35:00 UTC (rev 18200) @@ -1 +1 @@ -01ade77ba0502687aa42551db31316f1 serf-1.0.1.tar.bz2 +d612ef59c89c19957e5c2a16c68fd4d3 serf-1.0.3.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sat Jun 2 17:49:36 2012 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 02 Jun 2012 15:49:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[18201] csw/mgar/pkg/libserf/trunk/Makefile Message-ID: Revision: 18201 http://gar.svn.sourceforge.net/gar/?rev=18201&view=rev Author: rthurner Date: 2012-06-02 15:49:36 +0000 (Sat, 02 Jun 2012) Log Message: ----------- libserf, upgrade dependency to libssl-1.0.0 Modified Paths: -------------- csw/mgar/pkg/libserf/trunk/Makefile Modified: csw/mgar/pkg/libserf/trunk/Makefile =================================================================== --- csw/mgar/pkg/libserf/trunk/Makefile 2012-06-02 15:35:00 UTC (rev 18200) +++ csw/mgar/pkg/libserf/trunk/Makefile 2012-06-02 15:49:36 UTC (rev 18201) @@ -28,7 +28,7 @@ RUNTIME_DEP_PKGS_CSWlibserf1-0 += CSWlibiconv2 RUNTIME_DEP_PKGS_CSWlibserf1-0 += CSWliblber2-4-2 RUNTIME_DEP_PKGS_CSWlibserf1-0 += CSWlibldap2-4-2 -RUNTIME_DEP_PKGS_CSWlibserf1-0 += CSWlibssl0-9-8 +RUNTIME_DEP_PKGS_CSWlibserf1-0 += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWlibserf1-0 += CSWlibz1 PACKAGES += CSWlibserf-dev 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 2 20:27:23 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 02 Jun 2012 18:27:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[18202] csw/mgar/pkg Message-ID: Revision: 18202 http://gar.svn.sourceforge.net/gar/?rev=18202&view=rev Author: bdwalton Date: 2012-06-02 18:27:23 +0000 (Sat, 02 Jun 2012) Log Message: ----------- initial commit of util-linux Added Paths: ----------- csw/mgar/pkg/util-linux/ csw/mgar/pkg/util-linux/Makefile csw/mgar/pkg/util-linux/branches/ csw/mgar/pkg/util-linux/tags/ csw/mgar/pkg/util-linux/trunk/ csw/mgar/pkg/util-linux/trunk/Makefile csw/mgar/pkg/util-linux/trunk/checksums csw/mgar/pkg/util-linux/trunk/files/ Copied: csw/mgar/pkg/util-linux/Makefile (from rev 15145, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/util-linux/Makefile (rev 0) +++ csw/mgar/pkg/util-linux/Makefile 2012-06-02 18:27:23 UTC (rev 18202) @@ -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/util-linux/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/util-linux/trunk/Makefile =================================================================== --- csw/mgar/pkg/util-linux/trunk/Makefile (rev 0) +++ csw/mgar/pkg/util-linux/trunk/Makefile 2012-06-02 18:27:23 UTC (rev 18202) @@ -0,0 +1,25 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = util-linux +VERSION = 2.21 +PATCHLEVEL = .2 +GARTYPE = v2 +CATEGORIES = utils +DISTNAME = $(NAME)-$(VERSION)$(PATCHLEVEL) + +DESCRIPTION = A collection of basic utilities +define BLURB +The util-linux package contains a large variety of low-level system +utilities that are necessary for a Linux system to function. Among +others, Util-linux contains the fdisk configuration tool and the login +program. +endef + +MASTER_SITES = http://www.kernel.org/pub/linux/utils/$(NAME)/v$(VERSION)/ +DISTFILES = $(DISTNAME).tar.gz + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Property changes on: csw/mgar/pkg/util-linux/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/util-linux/trunk/checksums =================================================================== --- csw/mgar/pkg/util-linux/trunk/checksums (rev 0) +++ csw/mgar/pkg/util-linux/trunk/checksums 2012-06-02 18:27:23 UTC (rev 18202) @@ -0,0 +1 @@ +b228170ecdfce9ced77313d57b21b37c util-linux-2.21.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sat Jun 2 20:38:13 2012 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 02 Jun 2012 18:38:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[18203] csw/mgar/pkg/subversion/trunk/Makefile Message-ID: Revision: 18203 http://gar.svn.sourceforge.net/gar/?rev=18203&view=rev Author: rthurner Date: 2012-06-02 18:38:12 +0000 (Sat, 02 Jun 2012) Log Message: ----------- subversion, remove now obsolete (empty) packages, with 1.7.x Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2012-06-02 18:27:23 UTC (rev 18202) +++ csw/mgar/pkg/subversion/trunk/Makefile 2012-06-02 18:38:12 UTC (rev 18203) @@ -74,22 +74,6 @@ # package. We made the real package have matching names. CATALOGNAME_CSWsvn-devel = subversion_devel -PACKAGES += CSWsvn-contrib -SPKG_DESC_CSWsvn-contrib = Contributed subversion scripts -CATALOGNAME_CSWsvn-contrib = subversion_contrib -PKGFILES_CSWsvn-contrib = $(docdir)/subversion/contrib.* -ARCHALL_CSWsvn-contrib = 1 -CHECKPKG_OVERRIDES_CSWsvn-contrib += catalogname-does-not-match-pkgname|pkgname=CSWsvn-contrib|catalogname=subversion_contrib|expected-catalogname=svn_contrib - - -PACKAGES += CSWsvn-tools -SPKG_DESC_CSWsvn-tools = Additional subversion tools -CATALOGNAME_CSWsvn-tools = subversion_tools -PKGFILES_CSWsvn-tools = $(docdir)/subversion/tools.* -ARCHALL_CSWsvn-tools = 1 -CHECKPKG_OVERRIDES_CSWsvn-tools += catalogname-does-not-match-pkgname|pkgname=CSWsvn-tools|catalogname=subversion_tools|expected-catalogname=svn_tools - - PACKAGES += CSWap2svn SPKG_DESC_CSWap2svn = Subversion Modules for Apache 2.2 CATALOGNAME_CSWap2svn = ap2_subversion @@ -282,8 +266,6 @@ PI_DEPENDS += copy-templates PI_DEPENDS += create-ra_dav-symlinks -# TBD: There is no contrib/ in 1.7.0 any more, how to proceed? Other tarball? Or just drop in the future? -# PI_DEPENDS += install-extras PI_DEPENDS += $(BINDING_TARGETS) post-install-modulated: $(PI_DEPENDS) @@ -319,7 +301,6 @@ @$(MAKECOOKIE) PI_DEPENDS = $(BINDING_TARGETS) -PI_DEPENDS += contrib PI_DEPENDS += rbsvn-prototype PI_DEPENDS += copy-templates PI_DEPENDS += install-man @@ -332,21 +313,6 @@ ln -s libsvn_ra_neon-1.so.0.0.0 libsvn_ra_dav-1.so; ) @$(MAKECOOKIE) -install-extras: - @echo "~~~ patching contributions with csw paths ~~~" - gfind $(WORKSRC)/contrib -type f -print0 | gxargs -0 gsed -i -e 's,/usr/bin/svn,/opt/csw/bin/svn,' - gsed -i -e 's,/usr/bin/perl,/opt/csw/bin/perl,' $(WORKSRC)/contrib/*/*.pl - gsed -i -e 's,/usr/bin/perl,/opt/csw/bin/perl,' $(WORKSRC)/contrib/*/*.cgi - gsed -i -e 's,/usr/bin/,/opt/csw/bin/,' $(WORKSRC)/contrib/*/svnmirror.sh - @echo "~~~ install tools and contrib ~~~" - ginstall -d $(DESTDIR)$(docdir)/subversion/tools - ginstall -d $(DESTDIR)$(docdir)/subversion/contrib - gcp -R $(WORKSRC)/tools/* $(DESTDIR)$(docdir)/subversion/tools/ - gcp -R $(WORKSRC)/contrib/* $(DESTDIR)$(docdir)/subversion/contrib/ - $(BUILD_ENV) $(INSTALL_ENV) gmake -C $(WORKSRC) install-tools - $(BUILD_ENV) $(INSTALL_ENV) gmake -C $(WORKSRC) install-contrib - @$(MAKECOOKIE) - svn-python: @echo " ==> Building Python bindings" touch \ @@ -393,11 +359,6 @@ ginstall svn-book.pdf $(DESTDIR)$(docdir) ) @$(MAKECOOKIE) -contrib: $(DESTDIR)$(docdir) - @echo " ==> Installing contrib scripts" - @gcp -vr $(WORKSRC)/contrib $(DESTDIR)$(docdir) - @$(MAKECOOKIE) - copy-templates: ginstall -d $(DESTDIR)$(prefix)/apache2/etc/extra ginstall -m 0644 \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sat Jun 2 20:41:03 2012 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 02 Jun 2012 18:41:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[18204] csw/mgar/pkg/subversion/trunk/Makefile Message-ID: Revision: 18204 http://gar.svn.sourceforge.net/gar/?rev=18204&view=rev Author: rthurner Date: 2012-06-02 18:41:03 +0000 (Sat, 02 Jun 2012) Log Message: ----------- subversion, remove devel transition package Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2012-06-02 18:38:12 UTC (rev 18203) +++ csw/mgar/pkg/subversion/trunk/Makefile 2012-06-02 18:41:03 UTC (rev 18204) @@ -66,14 +66,9 @@ PACKAGES += CSWsvn-dev SPKG_DESC_CSWsvn-dev = Subversion Development Support -OBSOLETED_BY_CSWsvn-dev = CSWsvn-devel PKGFILES_CSWsvn-dev = $(PKGFILES_DEVEL) PKGFILES_CSWsvn-dev += $(docdir)/$(CATALOGNAME_CSWsvn-dev)/changelog.CSW -# Note: This is just to prevent a catalog name change for a stub -# package. We made the real package have matching names. -CATALOGNAME_CSWsvn-devel = subversion_devel - PACKAGES += CSWap2svn SPKG_DESC_CSWap2svn = Subversion Modules for Apache 2.2 CATALOGNAME_CSWap2svn = ap2_subversion This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sat Jun 2 20:50:10 2012 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 02 Jun 2012 18:50:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[18205] csw/mgar/pkg/libserf/trunk/Makefile Message-ID: Revision: 18205 http://gar.svn.sourceforge.net/gar/?rev=18205&view=rev Author: rthurner Date: 2012-06-02 18:50:09 +0000 (Sat, 02 Jun 2012) Log Message: ----------- libserf, drop already released devel package Modified Paths: -------------- csw/mgar/pkg/libserf/trunk/Makefile Modified: csw/mgar/pkg/libserf/trunk/Makefile =================================================================== --- csw/mgar/pkg/libserf/trunk/Makefile 2012-06-02 18:41:03 UTC (rev 18204) +++ csw/mgar/pkg/libserf/trunk/Makefile 2012-06-02 18:50:09 UTC (rev 18205) @@ -36,7 +36,6 @@ SPKG_DESC_CSWlibserf-dev = Development files for libserf.so.1 PKGFILES_CSWlibserf-dev += $(PKGFILES_DEVEL) RUNTIME_DEP_PKGS_CSWlibserf-dev = CSWlibserf1-0 -OBSOLETED_BY_CSWlibserf-dev += CSWlibserf-devel EXTRA_LIB = $(prefix)/bdb48/lib This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sat Jun 2 20:54:57 2012 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 02 Jun 2012 18:54:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[18206] csw/mgar/pkg/openldap/trunk/Makefile Message-ID: Revision: 18206 http://gar.svn.sourceforge.net/gar/?rev=18206&view=rev Author: rthurner Date: 2012-06-02 18:54:57 +0000 (Sat, 02 Jun 2012) Log Message: ----------- openldap: upgrade to 2.4.31 Modified Paths: -------------- csw/mgar/pkg/openldap/trunk/Makefile Modified: csw/mgar/pkg/openldap/trunk/Makefile =================================================================== --- csw/mgar/pkg/openldap/trunk/Makefile 2012-06-02 18:50:09 UTC (rev 18205) +++ csw/mgar/pkg/openldap/trunk/Makefile 2012-06-02 18:54:57 UTC (rev 18206) @@ -1,7 +1,7 @@ # $Id$ NAME = openldap -VERSION = 2.4.28 +VERSION = 2.4.31 GARTYPE = v2 CATEGORIES = server @@ -52,8 +52,8 @@ RUNTIME_DEP_PKGS_CSWopenldap += CSWbdb48 RUNTIME_DEP_PKGS_CSWopenldap += CSWlibicudata48 RUNTIME_DEP_PKGS_CSWopenldap += CSWlibicuuc48 -RUNTIME_DEP_PKGS_CSWopenldap += CSWliblber2-4-2 -RUNTIME_DEP_PKGS_CSWopenldap += CSWlibldap-r2-4-2 +RUNTIME_DEP_PKGS_CSWopenldap += CSWliblber2-4-3 +RUNTIME_DEP_PKGS_CSWopenldap += CSWlibldap-r2-4-3 RUNTIME_DEP_PKGS_CSWopenldap += CSWlibltdl7 # We do not want that dependency. # RUNTIME_DEP_PKGS_CSWopenldap += CSWlibnet @@ -74,49 +74,49 @@ SPKG_DESC_CSWopenldap-client = OpenLDAP client executables PKGFILES_CSWopenldap-client += $(bindir)/.* PKGFILES_CSWopenldap-client += $(mandir)/man1/.* -RUNTIME_DEP_PKGS_CSWopenldap-client += CSWliblber2-4-2 -RUNTIME_DEP_PKGS_CSWopenldap-client += CSWlibldap2-4-2 +RUNTIME_DEP_PKGS_CSWopenldap-client += CSWliblber2-4-3 +RUNTIME_DEP_PKGS_CSWopenldap-client += CSWlibldap2-4-3 RUNTIME_DEP_PKGS_CSWopenldap-client += CSWlibsasl2-2 RUNTIME_DEP_PKGS_CSWopenldap-client += CSWlibssl0-9-8 OBSOLETED_BY_CSWopenldap-client += CSWoldapclient CATALOGNAME_CSWoldapclient = openldap_client_stub PACKAGES += CSWopenldap-dev -SPKG_DESC_CSWopenldap-dev = OpenLDAP development files for libldap-2.4.so.2, libldap_r-2.4.so.2 and liblber-2.4.so.2 +SPKG_DESC_CSWopenldap-dev = OpenLDAP development files for libldap-2.4.so.3, libldap_r-2.4.so.3 and liblber-2.4.so.3 PKGFILES_CSWopenldap-dev += $(PKGFILES_DEVEL) PKGFILES_CSWopenldap-dev += $(mandir)/man3/.* -RUNTIME_DEP_PKGS_CSWopenldap-dev += CSWliblber2-4-2 -RUNTIME_DEP_PKGS_CSWopenldap-dev += CSWlibldap-r2-4-2 -RUNTIME_DEP_PKGS_CSWopenldap-dev += CSWlibldap2-4-2 +RUNTIME_DEP_PKGS_CSWopenldap-dev += CSWliblber2-4-3 +RUNTIME_DEP_PKGS_CSWopenldap-dev += CSWlibldap-r2-4-3 +RUNTIME_DEP_PKGS_CSWopenldap-dev += CSWlibldap2-4-3 OBSOLETED_BY_CSWopenldap-dev += CSWoldapdevel CATALOGNAME_CSWoldapdevel = openldap_devel_stub -PACKAGES += CSWliblber2-4-2 -SPKG_DESC_CSWliblber2-4-2 = OpenLDAP ASN.1 BER library, liblber-2.4.so.2 -PKGFILES_CSWliblber2-4-2 += $(call pkgfiles_lib,liblber-2.4.so.2) -RUNTIME_DEP_PKGS_CSWlibldap2-4-2 += CSWlibsasl2-2 -RUNTIME_DEP_PKGS_CSWlibldap2-4-2 += CSWlibssl0-9-8 -OBSOLETED_BY_CSWliblber2-4-2 += CSWoldaprt +PACKAGES += CSWliblber2-4-3 +SPKG_DESC_CSWliblber2-4-3 = OpenLDAP ASN.1 BER library, liblber-2.4.so.3 +PKGFILES_CSWliblber2-4-3 += $(call pkgfiles_lib,liblber-2.4.so.3) +RUNTIME_DEP_PKGS_CSWlibldap2-4-3 += CSWlibsasl2-2 +RUNTIME_DEP_PKGS_CSWlibldap2-4-3 += CSWlibssl0-9-8 +OBSOLETED_BY_CSWliblber2-4-3 += CSWoldaprt CATALOGNAME_CSWoldaprt = openldap_rt_stub -PACKAGES += CSWlibldap2-4-2 -SPKG_DESC_CSWlibldap2-4-2 = OpenLDAP LDAP library, libldap-2.4.so.2 -PKGFILES_CSWlibldap2-4-2 += $(call pkgfiles_lib,libldap-2.4.so.2) -PKGFILES_CSWlibldap2-4-2 += $(sysconfdir)/ldap.conf -PKGFILES_CSWlibldap2-4-2 += $(mandir)/man5/ldap.conf.5 -RUNTIME_DEP_PKGS_CSWlibldap2-4-2 += CSWliblber2-4-2 -OBSOLETED_BY_CSWlibldap2-4-2 += CSWoldaprt +PACKAGES += CSWlibldap2-4-3 +SPKG_DESC_CSWlibldap2-4-3 = OpenLDAP LDAP library, libldap-2.4.so.3 +PKGFILES_CSWlibldap2-4-3 += $(call pkgfiles_lib,libldap-2.4.so.3) +PKGFILES_CSWlibldap2-4-3 += $(sysconfdir)/ldap.conf +PKGFILES_CSWlibldap2-4-3 += $(mandir)/man5/ldap.conf.5 +RUNTIME_DEP_PKGS_CSWlibldap2-4-3 += CSWliblber2-4-3 +OBSOLETED_BY_CSWlibldap2-4-3 += CSWoldaprt # Evaluate later -CHECKPKG_OVERRIDES_CSWlibldap2-4-2 += file-with-bad-content|/usr/local|root/opt/csw/share/man/man5/ldap.conf.5 +CHECKPKG_OVERRIDES_CSWlibldap2-4-3 += file-with-bad-content|/usr/local|root/opt/csw/share/man/man5/ldap.conf.5 -PACKAGES += CSWlibldap-r2-4-2 -SPKG_DESC_CSWlibldap-r2-4-2 = OpenLDAP reentrant LDAP library, libldap_r-2.4.so.2 -PKGFILES_CSWlibldap-r2-4-2 += $(call pkgfiles_lib,libldap_r-2.4.so.2) -RUNTIME_DEP_PKGS_CSWlibldap-r2-4-2 += CSWliblber2-4-2 -RUNTIME_DEP_PKGS_CSWlibldap-r2-4-2 += CSWlibsasl2-2 -RUNTIME_DEP_PKGS_CSWlibldap-r2-4-2 += CSWlibssl0-9-8 -OBSOLETED_BY_CSWlibldap-r2-4-2 += CSWoldaprt +PACKAGES += CSWlibldap-r2-4-3 +SPKG_DESC_CSWlibldap-r2-4-3 = OpenLDAP reentrant LDAP library, libldap_r-2.4.so.3 +PKGFILES_CSWlibldap-r2-4-3 += $(call pkgfiles_lib,libldap_r-2.4.so.3) +RUNTIME_DEP_PKGS_CSWlibldap-r2-4-3 += CSWliblber2-4-3 +RUNTIME_DEP_PKGS_CSWlibldap-r2-4-3 += CSWlibsasl2-2 +RUNTIME_DEP_PKGS_CSWlibldap-r2-4-3 += CSWlibssl0-9-8 +OBSOLETED_BY_CSWlibldap-r2-4-3 += CSWoldaprt FOREIGN_PACKAGES += CSWliblber2-3-0 OBSOLETED_BY_CSWliblber2-3-0 += CSWoldaprt This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sat Jun 2 20:57:30 2012 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 02 Jun 2012 18:57:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[18207] csw/mgar/pkg/openldap/trunk/checksums Message-ID: Revision: 18207 http://gar.svn.sourceforge.net/gar/?rev=18207&view=rev Author: rthurner Date: 2012-06-02 18:57:29 +0000 (Sat, 02 Jun 2012) Log Message: ----------- openldap: upgrade to 2.4.31 Modified Paths: -------------- csw/mgar/pkg/openldap/trunk/checksums Modified: csw/mgar/pkg/openldap/trunk/checksums =================================================================== --- csw/mgar/pkg/openldap/trunk/checksums 2012-06-02 18:54:57 UTC (rev 18206) +++ csw/mgar/pkg/openldap/trunk/checksums 2012-06-02 18:57:29 UTC (rev 18207) @@ -1 +1 @@ -196023e552eeb259e048edcd61a9645b openldap-2.4.28.tgz +804c6cb5698db30b75ad0ff1c25baefd openldap-2.4.31.tgz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dam at opencsw.org Sat Jun 2 20:58:11 2012 From: dam at opencsw.org (Dagobert Michelsen) Date: Sat, 2 Jun 2012 20:58:11 +0200 Subject: [csw-devel] SF.net SVN: gar:[18206] csw/mgar/pkg/openldap/trunk/Makefile In-Reply-To: References: Message-ID: Hi Rupert, Am 02.06.2012 um 20:54 schrieb rthurner at users.sourceforge.net: > Revision: 18206 > http://gar.svn.sourceforge.net/gar/?rev=18206&view=rev > Author: rthurner > Date: 2012-06-02 18:54:57 +0000 (Sat, 02 Jun 2012) > Log Message: > ----------- > openldap: upgrade to 2.4.31 > > Modified Paths: > -------------- > csw/mgar/pkg/openldap/trunk/Makefile > > Modified: csw/mgar/pkg/openldap/trunk/Makefile > =================================================================== > --- csw/mgar/pkg/openldap/trunk/Makefile 2012-06-02 18:50:09 UTC (rev 18205) > +++ csw/mgar/pkg/openldap/trunk/Makefile 2012-06-02 18:54:57 UTC (rev 18206) > @@ -1,7 +1,7 @@ > # $Id$ > > NAME = openldap > -VERSION = 2.4.28 > +VERSION = 2.4.31 > GARTYPE = v2 > CATEGORIES = server > > @@ -52,8 +52,8 @@ > RUNTIME_DEP_PKGS_CSWopenldap += CSWbdb48 > RUNTIME_DEP_PKGS_CSWopenldap += CSWlibicudata48 > RUNTIME_DEP_PKGS_CSWopenldap += CSWlibicuuc48 > -RUNTIME_DEP_PKGS_CSWopenldap += CSWliblber2-4-2 > -RUNTIME_DEP_PKGS_CSWopenldap += CSWlibldap-r2-4-2 > +RUNTIME_DEP_PKGS_CSWopenldap += CSWliblber2-4-3 > +RUNTIME_DEP_PKGS_CSWopenldap += CSWlibldap-r2-4-3 > RUNTIME_DEP_PKGS_CSWopenldap += CSWlibltdl7 > # We do not want that dependency. > # RUNTIME_DEP_PKGS_CSWopenldap += CSWlibnet > @@ -74,49 +74,49 @@ > SPKG_DESC_CSWopenldap-client = OpenLDAP client executables > PKGFILES_CSWopenldap-client += $(bindir)/.* > PKGFILES_CSWopenldap-client += $(mandir)/man1/.* > -RUNTIME_DEP_PKGS_CSWopenldap-client += CSWliblber2-4-2 > -RUNTIME_DEP_PKGS_CSWopenldap-client += CSWlibldap2-4-2 > +RUNTIME_DEP_PKGS_CSWopenldap-client += CSWliblber2-4-3 > +RUNTIME_DEP_PKGS_CSWopenldap-client += CSWlibldap2-4-3 > RUNTIME_DEP_PKGS_CSWopenldap-client += CSWlibsasl2-2 > RUNTIME_DEP_PKGS_CSWopenldap-client += CSWlibssl0-9-8 > OBSOLETED_BY_CSWopenldap-client += CSWoldapclient > CATALOGNAME_CSWoldapclient = openldap_client_stub > > PACKAGES += CSWopenldap-dev > -SPKG_DESC_CSWopenldap-dev = OpenLDAP development files for libldap-2.4.so.2, libldap_r-2.4.so.2 and liblber-2.4.so.2 > +SPKG_DESC_CSWopenldap-dev = OpenLDAP development files for libldap-2.4.so.3, libldap_r-2.4.so.3 and liblber-2.4.so.3 > PKGFILES_CSWopenldap-dev += $(PKGFILES_DEVEL) > PKGFILES_CSWopenldap-dev += $(mandir)/man3/.* > -RUNTIME_DEP_PKGS_CSWopenldap-dev += CSWliblber2-4-2 > -RUNTIME_DEP_PKGS_CSWopenldap-dev += CSWlibldap-r2-4-2 > -RUNTIME_DEP_PKGS_CSWopenldap-dev += CSWlibldap2-4-2 > +RUNTIME_DEP_PKGS_CSWopenldap-dev += CSWliblber2-4-3 > +RUNTIME_DEP_PKGS_CSWopenldap-dev += CSWlibldap-r2-4-3 > +RUNTIME_DEP_PKGS_CSWopenldap-dev += CSWlibldap2-4-3 > OBSOLETED_BY_CSWopenldap-dev += CSWoldapdevel > CATALOGNAME_CSWoldapdevel = openldap_devel_stub > > -PACKAGES += CSWliblber2-4-2 > -SPKG_DESC_CSWliblber2-4-2 = OpenLDAP ASN.1 BER library, liblber-2.4.so.2 > -PKGFILES_CSWliblber2-4-2 += $(call pkgfiles_lib,liblber-2.4.so.2) > -RUNTIME_DEP_PKGS_CSWlibldap2-4-2 += CSWlibsasl2-2 > -RUNTIME_DEP_PKGS_CSWlibldap2-4-2 += CSWlibssl0-9-8 > -OBSOLETED_BY_CSWliblber2-4-2 += CSWoldaprt > +PACKAGES += CSWliblber2-4-3 > +SPKG_DESC_CSWliblber2-4-3 = OpenLDAP ASN.1 BER library, liblber-2.4.so.3 > +PKGFILES_CSWliblber2-4-3 += $(call pkgfiles_lib,liblber-2.4.so.3) > +RUNTIME_DEP_PKGS_CSWlibldap2-4-3 += CSWlibsasl2-2 > +RUNTIME_DEP_PKGS_CSWlibldap2-4-3 += CSWlibssl0-9-8 > +OBSOLETED_BY_CSWliblber2-4-3 += CSWoldaprt This is probably wrong as the SONAMES of the packages depending on CSWoldaprt contained the old library versions and not the new ones. If you push CSWoldaprt with the new dependencies but leaving out the old ones the existing packages depending on CSWoldaprt will break. Best regards -- Dago > CATALOGNAME_CSWoldaprt = openldap_rt_stub > > -PACKAGES += CSWlibldap2-4-2 > -SPKG_DESC_CSWlibldap2-4-2 = OpenLDAP LDAP library, libldap-2.4.so.2 > -PKGFILES_CSWlibldap2-4-2 += $(call pkgfiles_lib,libldap-2.4.so.2) > -PKGFILES_CSWlibldap2-4-2 += $(sysconfdir)/ldap.conf > -PKGFILES_CSWlibldap2-4-2 += $(mandir)/man5/ldap.conf.5 > -RUNTIME_DEP_PKGS_CSWlibldap2-4-2 += CSWliblber2-4-2 > -OBSOLETED_BY_CSWlibldap2-4-2 += CSWoldaprt > +PACKAGES += CSWlibldap2-4-3 > +SPKG_DESC_CSWlibldap2-4-3 = OpenLDAP LDAP library, libldap-2.4.so.3 > +PKGFILES_CSWlibldap2-4-3 += $(call pkgfiles_lib,libldap-2.4.so.3) > +PKGFILES_CSWlibldap2-4-3 += $(sysconfdir)/ldap.conf > +PKGFILES_CSWlibldap2-4-3 += $(mandir)/man5/ldap.conf.5 > +RUNTIME_DEP_PKGS_CSWlibldap2-4-3 += CSWliblber2-4-3 > +OBSOLETED_BY_CSWlibldap2-4-3 += CSWoldaprt > > # Evaluate later > -CHECKPKG_OVERRIDES_CSWlibldap2-4-2 += file-with-bad-content|/usr/local|root/opt/csw/share/man/man5/ldap.conf.5 > +CHECKPKG_OVERRIDES_CSWlibldap2-4-3 += file-with-bad-content|/usr/local|root/opt/csw/share/man/man5/ldap.conf.5 > > -PACKAGES += CSWlibldap-r2-4-2 > -SPKG_DESC_CSWlibldap-r2-4-2 = OpenLDAP reentrant LDAP library, libldap_r-2.4.so.2 > -PKGFILES_CSWlibldap-r2-4-2 += $(call pkgfiles_lib,libldap_r-2.4.so.2) > -RUNTIME_DEP_PKGS_CSWlibldap-r2-4-2 += CSWliblber2-4-2 > -RUNTIME_DEP_PKGS_CSWlibldap-r2-4-2 += CSWlibsasl2-2 > -RUNTIME_DEP_PKGS_CSWlibldap-r2-4-2 += CSWlibssl0-9-8 > -OBSOLETED_BY_CSWlibldap-r2-4-2 += CSWoldaprt > +PACKAGES += CSWlibldap-r2-4-3 > +SPKG_DESC_CSWlibldap-r2-4-3 = OpenLDAP reentrant LDAP library, libldap_r-2.4.so.3 > +PKGFILES_CSWlibldap-r2-4-3 += $(call pkgfiles_lib,libldap_r-2.4.so.3) > +RUNTIME_DEP_PKGS_CSWlibldap-r2-4-3 += CSWliblber2-4-3 > +RUNTIME_DEP_PKGS_CSWlibldap-r2-4-3 += CSWlibsasl2-2 > +RUNTIME_DEP_PKGS_CSWlibldap-r2-4-3 += CSWlibssl0-9-8 > +OBSOLETED_BY_CSWlibldap-r2-4-3 += CSWoldaprt > > FOREIGN_PACKAGES += CSWliblber2-3-0 > OBSOLETED_BY_CSWliblber2-3-0 += CSWoldaprt > > 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 From rthurner at users.sourceforge.net Sat Jun 2 21:26:16 2012 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sat, 02 Jun 2012 19:26:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[18208] csw/mgar/pkg/openldap/trunk/Makefile Message-ID: Revision: 18208 http://gar.svn.sourceforge.net/gar/?rev=18208&view=rev Author: rthurner Date: 2012-06-02 19:26:15 +0000 (Sat, 02 Jun 2012) Log Message: ----------- openldap, remove OBSOLETE, as they are there with the earlier version. as well upgrade dependency to openssl-1.0.0 Modified Paths: -------------- csw/mgar/pkg/openldap/trunk/Makefile Modified: csw/mgar/pkg/openldap/trunk/Makefile =================================================================== --- csw/mgar/pkg/openldap/trunk/Makefile 2012-06-02 18:57:29 UTC (rev 18207) +++ csw/mgar/pkg/openldap/trunk/Makefile 2012-06-02 19:26:15 UTC (rev 18208) @@ -61,11 +61,9 @@ RUNTIME_DEP_PKGS_CSWopenldap += CSWlibodbc2 RUNTIME_DEP_PKGS_CSWopenldap += CSWlibsasl2-2 RUNTIME_DEP_PKGS_CSWopenldap += CSWlibslp1 -RUNTIME_DEP_PKGS_CSWopenldap += CSWlibssl0-9-8 +RUNTIME_DEP_PKGS_CSWopenldap += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWopenldap += CSWlibwrap1 RUNTIME_DEP_PKGS_CSWopenldap += CSWperl -OBSOLETED_BY_CSWopenldap += CSWoldap -CATALOGNAME_CSWoldap = openldap_stub # Evaluate later CHECKPKG_OVERRIDES_CSWopenldap += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/slapd.8 @@ -77,9 +75,7 @@ RUNTIME_DEP_PKGS_CSWopenldap-client += CSWliblber2-4-3 RUNTIME_DEP_PKGS_CSWopenldap-client += CSWlibldap2-4-3 RUNTIME_DEP_PKGS_CSWopenldap-client += CSWlibsasl2-2 -RUNTIME_DEP_PKGS_CSWopenldap-client += CSWlibssl0-9-8 -OBSOLETED_BY_CSWopenldap-client += CSWoldapclient -CATALOGNAME_CSWoldapclient = openldap_client_stub +RUNTIME_DEP_PKGS_CSWopenldap-client += CSWlibssl1-0-0 PACKAGES += CSWopenldap-dev SPKG_DESC_CSWopenldap-dev = OpenLDAP development files for libldap-2.4.so.3, libldap_r-2.4.so.3 and liblber-2.4.so.3 @@ -88,16 +84,12 @@ RUNTIME_DEP_PKGS_CSWopenldap-dev += CSWliblber2-4-3 RUNTIME_DEP_PKGS_CSWopenldap-dev += CSWlibldap-r2-4-3 RUNTIME_DEP_PKGS_CSWopenldap-dev += CSWlibldap2-4-3 -OBSOLETED_BY_CSWopenldap-dev += CSWoldapdevel -CATALOGNAME_CSWoldapdevel = openldap_devel_stub PACKAGES += CSWliblber2-4-3 SPKG_DESC_CSWliblber2-4-3 = OpenLDAP ASN.1 BER library, liblber-2.4.so.3 PKGFILES_CSWliblber2-4-3 += $(call pkgfiles_lib,liblber-2.4.so.3) RUNTIME_DEP_PKGS_CSWlibldap2-4-3 += CSWlibsasl2-2 -RUNTIME_DEP_PKGS_CSWlibldap2-4-3 += CSWlibssl0-9-8 -OBSOLETED_BY_CSWliblber2-4-3 += CSWoldaprt -CATALOGNAME_CSWoldaprt = openldap_rt_stub +RUNTIME_DEP_PKGS_CSWlibldap2-4-3 += CSWlibssl1-0-0 PACKAGES += CSWlibldap2-4-3 SPKG_DESC_CSWlibldap2-4-3 = OpenLDAP LDAP library, libldap-2.4.so.3 @@ -105,7 +97,6 @@ PKGFILES_CSWlibldap2-4-3 += $(sysconfdir)/ldap.conf PKGFILES_CSWlibldap2-4-3 += $(mandir)/man5/ldap.conf.5 RUNTIME_DEP_PKGS_CSWlibldap2-4-3 += CSWliblber2-4-3 -OBSOLETED_BY_CSWlibldap2-4-3 += CSWoldaprt # Evaluate later CHECKPKG_OVERRIDES_CSWlibldap2-4-3 += file-with-bad-content|/usr/local|root/opt/csw/share/man/man5/ldap.conf.5 @@ -115,17 +106,13 @@ PKGFILES_CSWlibldap-r2-4-3 += $(call pkgfiles_lib,libldap_r-2.4.so.3) RUNTIME_DEP_PKGS_CSWlibldap-r2-4-3 += CSWliblber2-4-3 RUNTIME_DEP_PKGS_CSWlibldap-r2-4-3 += CSWlibsasl2-2 -RUNTIME_DEP_PKGS_CSWlibldap-r2-4-3 += CSWlibssl0-9-8 -OBSOLETED_BY_CSWlibldap-r2-4-3 += CSWoldaprt +RUNTIME_DEP_PKGS_CSWlibldap-r2-4-3 += CSWlibssl1-0-0 FOREIGN_PACKAGES += CSWliblber2-3-0 -OBSOLETED_BY_CSWliblber2-3-0 += CSWoldaprt FOREIGN_PACKAGES += CSWlibldap2-3-0 -OBSOLETED_BY_CSWlibldap2-3-0 += CSWoldaprt FOREIGN_PACKAGES += CSWlibldap-r2-3-0 -OBSOLETED_BY_CSWlibldap-r2-3-0 += CSWoldaprt EXTRA_DOCS = README.CSW $(PATCHFILES) openldaprc This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Sun Jun 3 13:00:43 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Sun, 03 Jun 2012 11:00:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[18209] csw/mgar/pkg/squid/branches/squid3/Makefile Message-ID: Revision: 18209 http://gar.svn.sourceforge.net/gar/?rev=18209&view=rev Author: wilbury Date: 2012-06-03 11:00:42 +0000 (Sun, 03 Jun 2012) Log Message: ----------- squid/branches/squid3: Enable ICAP client. Modified Paths: -------------- csw/mgar/pkg/squid/branches/squid3/Makefile Modified: csw/mgar/pkg/squid/branches/squid3/Makefile =================================================================== --- csw/mgar/pkg/squid/branches/squid3/Makefile 2012-06-02 19:26:15 UTC (rev 18208) +++ csw/mgar/pkg/squid/branches/squid3/Makefile 2012-06-03 11:00:42 UTC (rev 18209) @@ -77,6 +77,7 @@ CONFIGURE_ARGS += --enable-ssl CONFIGURE_ARGS += --enable-useragent-log CONFIGURE_ARGS += --enable-ipf-transparent +CONFIGURE_ARGS += --enable-icap-client CONFIGURE_ARGS += --disable-ident-lookups CONFIGURE_ARGS += --disable-icmp CONFIGURE_ARGS += --with-dl 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 3 17:45:47 2012 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Sun, 03 Jun 2012 15:45:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[18210] csw/mgar/pkg/nrpe/trunk Message-ID: Revision: 18210 http://gar.svn.sourceforge.net/gar/?rev=18210&view=rev Author: j_arndt Date: 2012-06-03 15:45:46 +0000 (Sun, 03 Jun 2012) Log Message: ----------- nrpe: finalizing 2.13 Modified Paths: -------------- csw/mgar/pkg/nrpe/trunk/Makefile csw/mgar/pkg/nrpe/trunk/files/cswnrpe Removed Paths: ------------- csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.postinstall Modified: csw/mgar/pkg/nrpe/trunk/Makefile =================================================================== --- csw/mgar/pkg/nrpe/trunk/Makefile 2012-06-03 11:00:42 UTC (rev 18209) +++ csw/mgar/pkg/nrpe/trunk/Makefile 2012-06-03 15:45:46 UTC (rev 18210) @@ -4,7 +4,7 @@ GARTYPE = v2 SPKG_DESC_CSWnrpe = Nagios remote plugin executor -SPKG_DESC_CSWnrpeplugin = Nagios plugin that connects to nrpe demon +SPKG_DESC_CSWnrpe-plugin = Nagios plugin that connects to nrpe demon define BLURB NRPE allows you to remotely execute Nagios plugins on other Linux/Unix machines. This allows you to monitor remote machine metrics (disk usage, CPU load, etc.). NRPE can also communicate with some of the Windows agent addons, so you can execute scripts and check metrics on remote Windows machines as well. @@ -21,30 +21,33 @@ EXTRA_MODULATORS = SIZE MODULATIONS_SIZE = 1k 8k -# Distfiles for CSWnrpe - DISTFILES += CSWnrpe.preinstall -#DISTFILES += CSWnrpe.prototype DISTFILES += cswnrpe cswusergroup DISTFILES += README_8k -# Distfiles for nrpe_plugin - -#DISTFILES += CSWnrpeplugin.prototype - -#PATCHFILES = patch.diff - PATCHFILES_isa-sparcv8plus-size-8k = 0002-changing-packetbuffer-length-to-8k.patch PATCHFILES_isa-pentium_pro-size-8k = 0002-changing-packetbuffer-length-to-8k.patch PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 -PACKAGES = CSWnrpe CSWnrpeplugin +# +# +# + +PACKAGES = CSWnrpe CSWnrpe-plugin CATALOGNAME_CSWnrpe = nrpe -CATALOGNAME_CSWnrpeplugin = nrpe_plugin +CATALOGNAME_CSWnrpe-plugin = nrpe_plugin +OBSOLETED_BY_CSWnrpe-plugin = CSWnrpeplugin +SPKG_CATALOG_NAME_CSWnrpeplugin = nrpe_plugin_stub + +# +# files for CSWnrpe +# + PKGFILES_CSWnrpe = /opt/csw/bin/nrpe_1k PKGFILES_CSWnrpe += /opt/csw/bin/nrpe_8k +PKGFILES_CSWnrpe += /opt/csw/bin/nrpe PKGFILES_CSWnrpe += /etc/opt/csw/nrpe.cfg.CSW PKGFILES_CSWnrpe += /opt/csw/share/doc/nrpe PKGFILES_CSWnrpe += /opt/csw/share/doc/nrpe/NRPE.pdf @@ -56,23 +59,40 @@ PKGFILES_CSWnrpe += /opt/csw/share/doc/nrpe/SECURITY PKGFILES_CSWnrpe += /opt/csw/nagios PKGFILES_CSWnrpe += /etc/opt/csw/init.d/cswnrpe +PKGFILES_CSWnrpe += /etc/opt/csw/init.d/cswusergroup PKGFILES_CSWnrpe += /opt/csw/etc/templates/CSWnrpe$(CFGDIR) PKGFILES_CSWnrpe += /opt/csw/etc/templates/CSWnrpe$(CFGDIR)/nrpe.cfg -PKGFILES_CSWnrpeplugin = /opt/csw/libexec/nagios-plugins -PKGFILES_CSWnrpeplugin += /opt/csw/libexec/nagios-plugins/check_nrpe -PKGFILES_CSWnrpeplugin += /opt/csw/libexec/nagios-plugins/check_nrpe_8k -PKGFILES_CSWnrpeplugin += /opt/csw/share/doc/nrpe -PKGFILES_CSWnrpeplugin += /opt/csw/share/doc/nrpe/README_8k -PKGFILES_CSWnrpeplugin += /opt/csw/share/doc/nrpe_plugin -PKGFILES_CSWnrpeplugin += /opt/csw/share/doc/nrpe_plugin/license +# +# files for CSWnrpe-plugin +# +PKGFILES_CSWnrpe-plugin = /opt/csw/libexec/nagios-plugins +PKGFILES_CSWnrpe-plugin += /opt/csw/libexec/nagios-plugins/check_nrpe +PKGFILES_CSWnrpe-plugin += /opt/csw/libexec/nagios-plugins/check_nrpe_1k +PKGFILES_CSWnrpe-plugin += /opt/csw/libexec/nagios-plugins/check_nrpe_8k +PKGFILES_CSWnrpe-plugin += /opt/csw/share/doc/nrpe +PKGFILES_CSWnrpe-plugin += /opt/csw/share/doc/nrpe/README_8k +PKGFILES_CSWnrpe-plugin += /opt/csw/share/doc/nrpe_plugin +PKGFILES_CSWnrpe-plugin += /opt/csw/share/doc/nrpe_plugin/license -RUNTIME_DEP_PKGS_CSWnrpe = CSWosslrt CSWtcpwrap -RUNTIME_DEP_PKGS_CSWnrpeplugin = CSWosslrt -#SPKG_CLASSES_CSWnrpe = none cswusergroup cswpreserveconf cswinitsmf +# +# migrate configuration +# +MIGRATE_FILES_CSWnrpe = nrpe.cfg +MIGRATE_SOURCE_DIR = /opt/csw/etc +MIGRATE_DEST_DIR = /etc/opt/csw + +# +# +# + +RUNTIME_DEP_PKGS_CSWnrpe-plugin += CSWlibssl1-0-0 +RUNTIME_DEP_PKGS_CSWnrpe += CSWlibwrap1 +RUNTIME_DEP_PKGS_CSWnrpe += CSWlibssl1-0-0 + LICENSE = LEGAL NOISALIST = 1 @@ -110,6 +130,25 @@ USERGROUP = /etc/opt/csw/pkg/CSWnrpe/cswusergroup #POSTMSG = /opt/csw/share/doc/nrpe/README.CSW +# +# overrides +# + +# Bad content only in READMEs and as examples in config files + +CHECKPKG_OVERRIDES_CSWnrpe += file-with-bad-content|/usr/local|root/opt/csw/share/doc/nrpe/SECURITY +CHECKPKG_OVERRIDES_CSWnrpe += file-with-bad-content|/usr/local|root/opt/csw/share/doc/nrpe/README +CHECKPKG_OVERRIDES_CSWnrpe += file-with-bad-content|/usr/local|root/opt/csw/etc/templates/CSWnrpe/etc/opt/csw/nrpe.cfg + +# README_8k should be in every package + +CHECKPKG_OVERRIDES_CSWnrpe += file-collision|/opt/csw/share/doc/nrpe/README_8k|CSWnrpe|CSWnrpe-plugin +CHECKPKG_OVERRIDES_CSWnrpe-plugin += file-collision|/opt/csw/share/doc/nrpe/README_8k|CSWnrpe|CSWnrpe-plugin + +# +# +# + include gar/category.mk DOCDIR=$(datadir)/doc/nrpe @@ -123,8 +162,10 @@ @ginstall -m 755 -d $(DESTDIR)$(LIBEXECDIR) @ginstall -m 755 -d $(DESTDIR)$(BINDIR) @ginstall -m 755 -d $(DESTDIR)/nagios - @ginstall -m 755 $(WORKSRC)/src/check_nrpe $(DESTDIR)$(LIBEXECDIR) + @ginstall -m 755 $(WORKSRC)/src/check_nrpe $(DESTDIR)$(LIBEXECDIR)/check_nrpe_1k + @ln -s $(LIBEXECDIR)/check_nrpe_1k $(DESTDIR)$(LIBEXECDIR)/check_nrpe @ginstall -m 755 $(WORKSRC)/src/nrpe $(DESTDIR)$(BINDIR)/nrpe_1k + @ln -s $(BINDIR)/nrpe_1k $(DESTDIR)$(BINDIR)/nrpe @ginstall -m 644 $(WORKSRC)/docs/NRPE.pdf $(DESTDIR)$(DOCDIR) @ginstall -m 644 $(FILEDIR)/README_8k $(DESTDIR)$(DOCDIR) @ginstall -m 644 $(WORKSRC)/LEGAL $(DESTDIR)$(DOCDIR) @@ -150,6 +191,6 @@ merge-copy-nrpe-only: cp $(INSTALLISADIR)$(bindir)/nrpe_1k $(PKGROOT)$(bindir)/nrpe_8k - cp $(INSTALLISADIR)$(LIBEXECDIR)/check_nrpe $(PKGROOT)$(LIBEXECDIR)/check_nrpe_8k + cp $(INSTALLISADIR)$(LIBEXECDIR)/check_nrpe_1k $(PKGROOT)$(LIBEXECDIR)/check_nrpe_8k @$(MAKECOOKIE) Deleted: csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.postinstall =================================================================== --- csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.postinstall 2012-06-03 11:00:42 UTC (rev 18209) +++ csw/mgar/pkg/nrpe/trunk/files/CSWnrpe.postinstall 2012-06-03 15:45:46 UTC (rev 18210) @@ -1,70 +0,0 @@ -# postinstall for nrpe package -# 2007-01-19 Add csw.conf support -# 2007-09-11 Fix PKG_INSTALL_ROOT usage. BASEDIR is not used for non -# relocatable packages. -# - -# daemons are started by default -enable_daemon=yes - -# Source csw.conf, if it exists -if [ -f $PKG_INSTALL_ROOT/opt/csw/etc/csw.conf ] ; then - . $PKG_INSTALL_ROOT/opt/csw/etc/csw.conf -fi -if [ -f $PKG_INSTALL_ROOT/etc/opt/csw/csw.conf ] ; then - . $PKG_INSTALL_ROOT/etc/opt/csw/csw.conf -fi - -# If defined, autoenable for the specific daemon name takes precedence -if [ "$autoenable_nrpe" = "no" ] ; then - enable_daemon=no -elif [ "$autoenable_daemons" = "no" -a ! -n "$autoenable_nrpe" ] ; then - enable_daemon=no -fi - -# Set variable for the availability of SMF -smf=no -if [ -f /usr/sbin/svccfg -a -f $BASEDIR/usr/sbin/svcadm ] - then - smf=yes -fi - -# Stop nrpe if it is running -if pgrep nrpe >/dev/null 2>&1 ; then - echo "## Stopping nrpe" - if [ $smf = yes ]; then - /usr/sbin/svcadm disable svc:/application/cswnrpe >/dev/null 2>&1 - else - /etc/init.d/cswnrpe stop >/dev/null 2>&1 - fi - while pgrep nrpe > /dev/null - do - sleep 1 - done -fi - -if [ $smf = yes ]; then - # Register with SMF - echo "Configuring service in SMF" - /usr/sbin/svccfg import /opt/csw/var/svc/manifest/application/nrpe.xml >/dev/null 2>&1 - /usr/sbin/svcadm disable svc:application/cswnrpe >/dev/null 2>&1 - echo "nrpe is using Service Management Facility. The FMRI is:" - echo " svc:/application/cswnrpe:default" -fi - -# Start nrpe -if [ "$enable_daemon" = "yes" ] ; then - if [ -f $BASEDIR/opt/csw/nagios/etc/nrpe.cfg ]; then - echo "## Starting nrpe" - if [ $smf = yes ]; then - /usr/sbin/svcadm enable svc:/application/cswnrpe >/dev/null 2>&1 - else - /etc/init.d/cswnrpe start >/dev/null 2>&1 - fi - else - echo "## Not starting nrpe - configuration file not found" - if [ $smf = yes ] ; then - /usr/sbin/svcadm disable svc:/application/cswnrpe >/dev/null 2>&1 - fi - fi -fi Modified: csw/mgar/pkg/nrpe/trunk/files/cswnrpe =================================================================== --- csw/mgar/pkg/nrpe/trunk/files/cswnrpe 2012-06-03 11:00:42 UTC (rev 18209) +++ csw/mgar/pkg/nrpe/trunk/files/cswnrpe 2012-06-03 15:45:46 UTC (rev 18210) @@ -1,86 +1,144 @@ #!/bin/sh + +BINDIR="/opt/csw/bin" +BINFILE="$BINDIR/nrpe" + +RUNFLAG=1 + # -# Copyright (c) 1992 - 2001 by Sun Microsystems, Inc. -# All rights reserved. +# Solaris Release # -#ident "@(#)nrpe 1.19 01/12/05 SMI" -# Modified for CSW by Alex Moore 2005-12-03 -# 2007-08-18 Add pid file support. -# 2007-08-19 Fix nagios uid used for pgrep. Thanks to Will McDonald for this. -# Modified for OpenCSW by Juergen Arndt 2009-03-14 -#RC_KNUM 20 # Number used for kill script symlink, e.g. K20cswfoo -#RC_SNUM 80 # Number used for start script symlink, e.g. S80cswfoo -#RC_KLEV 0,1,2,S # Run levels that should have a kill script symlink -#RC_SLEV 3 # Run levels that should have a start script symlink -#FMRI application # FMRI path for service -#AUTOENABLE yes +SOLREL=`uname -r | awk -F. '{print $2}'` -SMF_EXIT_ERR_CONFIG=1 +# +# +# -if [ -f /lib/svc/share/smf_include.sh ] +if [ $SOLREL -ge 10 ] then - . /lib/svc/share/smf_include.sh + ZONENAME=`zonename` + . /lib/svc/share/smf_include.sh fi +# +# +# + CONFIG_FILE=/etc/opt/csw/nrpe.cfg -if [ ! -f $CONFIG_FILE ] ; then - CONFIG_FILE=/opt/csw/etc/nrpe.cfg -fi if [ ! -f $CONFIG_FILE ] then - exit $SMF_EXIT_ERR_CONFIG + if [ $SOLREL -lt 10 ] + then + exit 1 + else + exit $SMF_EXIT_ERR_CONFIG + fi fi -BIN_FILE="/opt/csw/bin/nrpe" -pidfile=`awk -F'=' '/^[ \t]*pid_file/ {print $2}' $CONFIG_FILE` -NRPE_USER=`awk -F'=' '/^[ \t]*nrpe_user/ { print $2 }' $CONFIG_FILE` +# +# +# -start_nrpe () +get_pid () { - if [ -f $CONFIG_FILE ]; then - wait 1 - $BIN_FILE -c $CONFIG_FILE -d + if [ $SOLREL -lt 10 ] + then + pid=`ps -ef | grep -v "grep" | grep $BINFILE | awk '{print $2}'` + else + pid=`ps -fz $ZONENAME | grep -v "grep" | grep $BINFILE | awk '{print $2}'` fi } -stop_nrpe () +# +# +# + +stop () { - if [ -f "$pidfile" ]; then - if [ `uname -r` = 5.8 -o `uname -r` = 5.9 ] - then - [ -n "`pgrep -x -u 0,1,$NRPE_USER -f \"$BIN_FILE -c $CONFIGFILE -d\"`" ] && /usr/bin/kill `head -1 $pidfile` - else - [ -n "`pgrep -x -u 0,1,$NRPE_USER -z \`zonename\` -f \"$BIN_FILE -c $CONFIG_FILE -d\"`" ] && /usr/bin/kill `head -1 $pidfile` - fi - rm "$pidfile" - else - if [ `uname -r` = 5.8 -o `uname -r` = 5.9 ] - then - /usr/bin/kill `pgrep -x -u 0,1,$NRPE_USER -f "$BIN_FILE -c $CONFIGFILE -d"` - else - /usr/bin/kill `pgrep -x -u 0,1,$NRPE_USER -z \`zonename\` -f "$BIN_FILE -c $CONFIG_FILE -d"` - fi - fi + get_pid + + if [ "$pid" ] + then + kill $pid + sleep 1 + kill -9 $pid 2>/dev/null + echo "$BINFILE stopped." + else + echo "$BINFILE was not running." + fi } -case "$1" in -'restart') - stop_nrpe - start_nrpe - ;; +# +# +# -'start') - start_nrpe - ;; -'stop') - stop_nrpe - ;; +status () +{ + get_pid + + if [ "$pid" ] + then + echo "$BINFILE running with pid $pid." + RUNFLAG=0 + else + echo "$BINFILE not running." + RUNFLAG=1 + fi +} -*) - echo "Usage: $0 { start | stop | restart }" - exit 1 - ;; +# +# +# + +start () +{ + get_pid + + if [ "$pid" ] # already running? + then + echo "$BINFILE already running with $pid." + return 1 + fi + + if [ -f $BINFILE ] # does it exist? + then + $BINFILE -c $CONFIG_FILE -d + get_pid + echo "$BINFILE running with pid $pid" + else + if [ $SOLREL -lt 10 ] + then + echo "$BINFILE does not exist." + exit 1 + else + echo "$BINFILE does not exist." + exit $SMF_EXIT_ERR_FATAL + fi + fi +} + +# +# +# + +print_usage () +{ + echo "usage: $0 {start|stop|status}" +} + +case "$1" in + "status" ) status + exit $RUNFLAG + ;; + "start" ) start + exit 0 + ;; + "stop" ) stop + exit 0 + ;; + * ) print_usage + exit 1 + ;; esac -exit 0 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 3 19:18:59 2012 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Sun, 03 Jun 2012 17:18:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[18211] csw/mgar/pkg/nagios_plugins/trunk/Makefile Message-ID: Revision: 18211 http://gar.svn.sourceforge.net/gar/?rev=18211&view=rev Author: j_arndt Date: 2012-06-03 17:18:59 +0000 (Sun, 03 Jun 2012) Log Message: ----------- nagios_plugins: path libexecdir added Modified Paths: -------------- csw/mgar/pkg/nagios_plugins/trunk/Makefile Modified: csw/mgar/pkg/nagios_plugins/trunk/Makefile =================================================================== --- csw/mgar/pkg/nagios_plugins/trunk/Makefile 2012-06-03 15:45:46 UTC (rev 18210) +++ csw/mgar/pkg/nagios_plugins/trunk/Makefile 2012-06-03 17:18:59 UTC (rev 18211) @@ -14,10 +14,9 @@ PACKAGES += CSWnagiosp SPKG_CATALOG_NAME_CSWnagiosp = nagios_plugins -PATCHFILES += check_procs.c.diff -PATCHFILES += subst.in.diff -PATCHFILES += pst3.c.diff -PATCHFILES += 0004-Use-32-bit-pst3-on-Solaris.patch +#PATCHFILES += 0001-disable-cflags-detection-for-pst3.patch +#PATCHFILES += 0002-changed-paths-in-hardcoded-examples.patch +PATCHFILES += 0004-Use-32-bit-pst3-on-Solaris.patch REINPLACE_USRLOCAL += contrib/* REINPLACE_USRLOCAL += plugins/* @@ -31,8 +30,20 @@ CONFIGURE_ARGS += --with-mysql-dir=/opt/csw CONFIGURE_ARGS += --with-pg-dir=/opt/csw/postgresql/include/ CONFIGURE_ARGS += --disable-largefile +CONFIGURE_ARGS += --libexecdir=$(prefix)/libexec/nagios-plugins CONFIGURE_ARGS += --with-perl=/opt/csw/bin/perl +CONFIGURE_ARGS += --with-openssl=/opt/csw +# http://184.82.236.176/?p=4 +#CONFIGURE_ARGS += --with-ps-command="/usr/bin/ps -eo 's uid pid ppid vsz rss pcpu etime comm args'" +#CONFIGURE_ARGS += --with-ps-format="%s %d %d %d %d %d %f %s %s %n" +#CONFIGURE_ARGS += --with-ps-cols=10 +#CONFIGURE_ARGS += --with-ps-varlist="procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procetime,procprog,&pos" +# +CONFIGURE_ARGS += --with-trusted-path=/usr/bin:/usr/sbin:/opt/csw/bin:/opt/csw/sbin:$(prefix)/libexec/nagios-plugins +CONFIGURE_ARGS += --with-ping6-command="/usr/sbin/ping -a inet6 -s %s 56 %d" +libexecdir ?= $(prefix)/libexec/nagios-plugins + CFLAGS += -I /opt/csw/postgresql/include/ EXTRA_INC = /opt/csw/postgresql/include EXTRA_LIB += /opt/csw/postgresql/lib This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Mon Jun 4 13:53:29 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Mon, 04 Jun 2012 11:53:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[18212] csw/mgar/pkg/emacs/trunk/Makefile Message-ID: Revision: 18212 http://gar.svn.sourceforge.net/gar/?rev=18212&view=rev Author: pfelecan Date: 2012-06-04 11:53:28 +0000 (Mon, 04 Jun 2012) Log Message: ----------- addition to the list of build dependencies. Modified Paths: -------------- csw/mgar/pkg/emacs/trunk/Makefile Modified: csw/mgar/pkg/emacs/trunk/Makefile =================================================================== --- csw/mgar/pkg/emacs/trunk/Makefile 2012-06-03 17:18:59 UTC (rev 18211) +++ csw/mgar/pkg/emacs/trunk/Makefile 2012-06-04 11:53:28 UTC (rev 18212) @@ -21,8 +21,10 @@ INSTALL_ARGS += PATH="/opt/csw/gnu:$$PATH" GARCOMPILER = GNU +#GCC4_VERSION = 4.7 BUILD_DEP_PKGS = CSWcoreutils +BUILD_DEP_PKGS += CSWfconfig-dev BUILD_DEP_PKGS += CSWglib2devel BUILD_DEP_PKGS += CSWlibatk-dev BUILD_DEP_PKGS += CSWlibbz2-dev 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 4 16:21:53 2012 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 04 Jun 2012 14:21:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[18213] csw/mgar/pkg/bind/trunk Message-ID: Revision: 18213 http://gar.svn.sourceforge.net/gar/?rev=18213&view=rev Author: bonivart Date: 2012-06-04 14:21:53 +0000 (Mon, 04 Jun 2012) Log Message: ----------- bind/trunk: update to 9.8.3-P1 Modified Paths: -------------- csw/mgar/pkg/bind/trunk/Makefile csw/mgar/pkg/bind/trunk/checksums Modified: csw/mgar/pkg/bind/trunk/Makefile =================================================================== --- csw/mgar/pkg/bind/trunk/Makefile 2012-06-04 11:53:28 UTC (rev 18212) +++ csw/mgar/pkg/bind/trunk/Makefile 2012-06-04 14:21:53 UTC (rev 18213) @@ -9,11 +9,11 @@ # Enable these for Px-releases #RELEASE = rc2 -#RELEASE = P1 -#DISTVERSION = $(VERSION)-$(RELEASE) -#SPKG_VERSION = $(VERSION)$(RELEASE) -#DISTNAME = $(NAME)-$(VERSION)-$(RELEASE) -#WORKSRC = $(WORKDIR)/$(DISTNAME) +RELEASE = P1 +DISTVERSION = $(VERSION)-$(RELEASE) +SPKG_VERSION = $(VERSION)$(RELEASE) +DISTNAME = $(NAME)-$(VERSION)-$(RELEASE) +WORKSRC = $(WORKDIR)/$(DISTNAME) DESCRIPTION = ISC BIND DNS reference implementation define BLURB @@ -24,12 +24,12 @@ endef # Enable these for Px-releases -#MASTER_SITES = http://ftp.isc.org/isc/bind9/$(VERSION)-$(RELEASE)/ -#DISTFILES = $(DISTNAME).tar.gz +MASTER_SITES = http://ftp.isc.org/isc/bind9/$(VERSION)-$(RELEASE)/ +DISTFILES = $(DISTNAME).tar.gz # Disable these for Px-releases -MASTER_SITES = http://ftp.isc.org/isc/bind9/$(VERSION)/ -DISTFILES = $(NAME)-$(VERSION).tar.gz +#MASTER_SITES = http://ftp.isc.org/isc/bind9/$(VERSION)/ +#DISTFILES = $(NAME)-$(VERSION).tar.gz DISTFILES += CSWbindchroot.postinstall Modified: csw/mgar/pkg/bind/trunk/checksums =================================================================== --- csw/mgar/pkg/bind/trunk/checksums 2012-06-04 11:53:28 UTC (rev 18212) +++ csw/mgar/pkg/bind/trunk/checksums 2012-06-04 14:21:53 UTC (rev 18213) @@ -1 +1 @@ -c3f5fff4bfa2fc16110a0556c19b3998 bind-9.8.3.tar.gz +2e84a3c5fa5f23718fff87e47c1fceb0 bind-9.8.3-P1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Mon Jun 4 20:07:59 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Mon, 04 Jun 2012 18:07:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[18214] csw/mgar/pkg/irssi/trunk/Makefile Message-ID: Revision: 18214 http://gar.svn.sourceforge.net/gar/?rev=18214&view=rev Author: wilbury Date: 2012-06-04 18:07:58 +0000 (Mon, 04 Jun 2012) Log Message: ----------- irssi/trunk: Add REIPLACEments, adjust dependencies. Modified Paths: -------------- csw/mgar/pkg/irssi/trunk/Makefile Modified: csw/mgar/pkg/irssi/trunk/Makefile =================================================================== --- csw/mgar/pkg/irssi/trunk/Makefile 2012-06-04 14:21:53 UTC (rev 18213) +++ csw/mgar/pkg/irssi/trunk/Makefile 2012-06-04 18:07:58 UTC (rev 18214) @@ -17,8 +17,6 @@ DISTFILES = $(NAME)-$(VERSION).tar.gz UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz -PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 - SAMPLECONF = .*/irssi.conf CONFIGURE_ARGS += $(DIRPATHS) @@ -28,16 +26,21 @@ CONFIGURE_ARGS += --with-proxy CONFIGURE_ARGS += --with-perl=yes CONFIGURE_ARGS += --with-perl-lib=vendor +CONFIGURE_ARGS += --with-ncurses=$(prefix) EXTRA_LIB += $(prefix)/bdb47/lib EXTRA_INC += $(prefix)/bdb47/include EXTRA_MERGE_EXCLUDE_FILES = .*~ .*perllocal\.pod +RUNTIME_DEP_PKGS += CSWlibintl8 +RUNTIME_DEP_PKGS += CSWlibsocks RUNTIME_DEP_PKGS += CSWglib2 -RUNTIME_DEP_PKGS += CSWosslrt +RUNTIME_DEP_PKGS += CSWlibssl1-0-0 RUNTIME_DEP_PKGS += CSWperl -RUNTIME_DEP_PKGS += CSWggettextrt -RUNTIME_DEP_PKGS += CSWbdb47 +REINPLACE_USRLOCAL += docs/perl.txt +REINPLACE_USRLOCAL += docs/irssi.1 +REINPLACE_USRLOCAL += docs/help/load + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From j_arndt at users.sourceforge.net Mon Jun 4 21:02:10 2012 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Mon, 04 Jun 2012 19:02:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[18215] csw/mgar/pkg/nagios_plugins/trunk/Makefile Message-ID: Revision: 18215 http://gar.svn.sourceforge.net/gar/?rev=18215&view=rev Author: j_arndt Date: 2012-06-04 19:02:09 +0000 (Mon, 04 Jun 2012) Log Message: ----------- nagios-plugins: rename catalog name Modified Paths: -------------- csw/mgar/pkg/nagios_plugins/trunk/Makefile Modified: csw/mgar/pkg/nagios_plugins/trunk/Makefile =================================================================== --- csw/mgar/pkg/nagios_plugins/trunk/Makefile 2012-06-04 18:07:58 UTC (rev 18214) +++ csw/mgar/pkg/nagios_plugins/trunk/Makefile 2012-06-04 19:02:09 UTC (rev 18215) @@ -3,7 +3,7 @@ CATEGORIES = apps GARTYPE = v2 -DESCRIPTION = Plugins for nagios +SPKG_DESC_CSWnagios-plugins = Plugins for nagios define BLURB Plugins for Nagios endef @@ -11,9 +11,12 @@ MASTER_SITES = http://surfnet.dl.sourceforge.net/sourceforge/nagiosplug/ DISTFILES = $(NAME)-$(VERSION).tar.gz -PACKAGES += CSWnagiosp -SPKG_CATALOG_NAME_CSWnagiosp = nagios_plugins +PACKAGES = CSWnagios-plugins +SPKG_CATALOG_NAME_CSWnagios-plugins = nagios_plugins +OBSOLETED_BY_CSWnagios-plugins = CSWnagiosp +SPKG_CATALOG_NAME_CSWnagiosp = nagiosp_stub + #PATCHFILES += 0001-disable-cflags-detection-for-pst3.patch #PATCHFILES += 0002-changed-paths-in-hardcoded-examples.patch PATCHFILES += 0004-Use-32-bit-pst3-on-Solaris.patch @@ -50,14 +53,14 @@ PACKAGING_PLATFORMS = solaris10-i386 solaris10-sparc -RUNTIME_DEP_PKGS_CSWnagiosp += CSWlibintl8 CSWlibpq5 -RUNTIME_DEP_PKGS_CSWnagiosp += CSWlibmysqlclient15 CSWlibssl1-0-0 -RUNTIME_DEP_PKGS_CSWnagiosp += CSWlibz1 CSWperl CSWliblber2-4-2 CSWlibldap2-4-2 +RUNTIME_DEP_PKGS_CSWnagios-plugins += CSWlibintl8 CSWlibpq5 +RUNTIME_DEP_PKGS_CSWnagios-plugins += CSWlibmysqlclient15 CSWlibssl1-0-0 +RUNTIME_DEP_PKGS_CSWnagios-plugins += CSWlibz1 CSWperl CSWliblber2-4-2 CSWlibldap2-4-2 -BUILD_DEP_PKGS_CSWnagiosp += CSWmysql-dev -BUILD_DEP_PKGS_CSWnagiosp += CSWpostgresql-dev -BUILD_DEP_PKGS_CSWnagiosp += CSWlibz-dev -BUILD_DEP_PKGS_CSWnagiosp += CSWlibnet-dev +BUILD_DEP_PKGS_CSWnagios-plugins += CSWmysql-dev +BUILD_DEP_PKGS_CSWnagios-plugins += CSWpostgresql-dev +BUILD_DEP_PKGS_CSWnagios-plugins += CSWlibz-dev +BUILD_DEP_PKGS_CSWnagios-plugins += CSWlibnet-dev TEST_TARGET = 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 4 21:18:49 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 04 Jun 2012 19:18:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[18216] csw/mgar/pkg/fluxbox/trunk Message-ID: Revision: 18216 http://gar.svn.sourceforge.net/gar/?rev=18216&view=rev Author: wahwah Date: 2012-06-04 19:18:49 +0000 (Mon, 04 Jun 2012) Log Message: ----------- fluxbox/trunk: Use gwhoami in fbsetbg Modified Paths: -------------- csw/mgar/pkg/fluxbox/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/fluxbox/trunk/files/0001-Use-gwhoami-from-CSWcoreutils.patch Modified: csw/mgar/pkg/fluxbox/trunk/Makefile =================================================================== --- csw/mgar/pkg/fluxbox/trunk/Makefile 2012-06-04 19:02:09 UTC (rev 18215) +++ csw/mgar/pkg/fluxbox/trunk/Makefile 2012-06-04 19:18:49 UTC (rev 18216) @@ -20,21 +20,25 @@ EXTRA_CPPFLAGS = -features=extensions -D__FUNCTION__=__func__ EXTRA_LINKER_FLAGS = -norunpath +PATCHFILES += 0001-Use-gwhoami-from-CSWcoreutils.patch + CONFIGURE_ARGS = $(DIRPATHS) +RUNTIME_DEP_PKGS_CSWfluxbox += CSWcoreutils +RUNTIME_DEP_PKGS_CSWfluxbox += CSWimlib2 +RUNTIME_DEP_PKGS_CSWfluxbox += CSWlibfontconfig1 +RUNTIME_DEP_PKGS_CSWfluxbox += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWfluxbox += CSWlibfribidi0 RUNTIME_DEP_PKGS_CSWfluxbox += CSWlibiconv2 -RUNTIME_DEP_PKGS_CSWfluxbox += CSWimlib2 -RUNTIME_DEP_PKGS_CSWfluxbox += CSWlibz1 RUNTIME_DEP_PKGS_CSWfluxbox += CSWlibxft2 RUNTIME_DEP_PKGS_CSWfluxbox += CSWlibxrender -RUNTIME_DEP_PKGS_CSWfluxbox += CSWlibfribidi0 +RUNTIME_DEP_PKGS_CSWfluxbox += CSWlibz1 RUNTIME_DEP_PKGS_CSWfluxbox += CSWxpm -RUNTIME_DEP_PKGS_CSWfluxbox += CSWlibfontconfig1 -RUNTIME_DEP_PKGS_CSWfluxbox += CSWlibfreetype6 CHECKPKG_OVERRIDES_CSWfluxbox += file-with-bad-content|/usr/share|root/opt/csw/share/man/man5/fluxbox-style.5 CHECKPKG_OVERRIDES_CSWfluxbox += file-with-bad-content|/usr/share|root/opt/csw/bin/fluxbox-generate_menu CHECKPKG_OVERRIDES_CSWfluxbox += file-with-bad-content|/usr/local|root/opt/csw/bin/fluxbox-generate_menu CHECKPKG_OVERRIDES_CSWfluxbox += file-with-bad-content|/usr/local|root/opt/csw/bin/fbsetbg +CHECKPKG_OVERRIDES_CSWfluxbox += surplus-dependency|CSWcoreutils include gar/category.mk Added: csw/mgar/pkg/fluxbox/trunk/files/0001-Use-gwhoami-from-CSWcoreutils.patch =================================================================== --- csw/mgar/pkg/fluxbox/trunk/files/0001-Use-gwhoami-from-CSWcoreutils.patch (rev 0) +++ csw/mgar/pkg/fluxbox/trunk/files/0001-Use-gwhoami-from-CSWcoreutils.patch 2012-06-04 19:18:49 UTC (rev 18216) @@ -0,0 +1,25 @@ +From 9ad03afab9348046c24a45e0eecda76568f778a9 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Mon, 4 Jun 2012 21:14:44 +0200 +Subject: [PATCH] Use gwhoami from CSWcoreutils + +--- + util/fbsetbg | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/util/fbsetbg b/util/fbsetbg +index 0bdb804..cf888e7 100644 +--- a/util/fbsetbg ++++ b/util/fbsetbg +@@ -48,7 +48,7 @@ wpsetters="${wpsetters:=Esetroot wmsetbg feh hsetroot chbg display qiv xv xsri x + lastwallpaper="${HOME}/.fluxbox/lastwallpaper" + + +-WHOAMI=`whoami` ++WHOAMI=`gwhoami` + [ "$WHOAMI" = root ] && PATH=/bin:/usr/bin/:/usr/local/bin:/usr/X11R6/bin + + command="`basename \"$0\"`" +-- +1.7.10 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From j_arndt at users.sourceforge.net Mon Jun 4 21:36:36 2012 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Mon, 04 Jun 2012 19:36:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[18217] csw/mgar/pkg/nagios/trunk Message-ID: Revision: 18217 http://gar.svn.sourceforge.net/gar/?rev=18217&view=rev Author: j_arndt Date: 2012-06-04 19:36:36 +0000 (Mon, 04 Jun 2012) Log Message: ----------- nagios: modified dependencies Modified Paths: -------------- csw/mgar/pkg/nagios/trunk/Makefile csw/mgar/pkg/nagios/trunk/checksums Modified: csw/mgar/pkg/nagios/trunk/Makefile =================================================================== --- csw/mgar/pkg/nagios/trunk/Makefile 2012-06-04 19:18:49 UTC (rev 18216) +++ csw/mgar/pkg/nagios/trunk/Makefile 2012-06-04 19:36:36 UTC (rev 18217) @@ -1,5 +1,5 @@ NAME = nagios -VERSION = 3.3.1 +VERSION = 3.4.1 CATEGORIES = apps GARTYPE = v2 @@ -23,11 +23,11 @@ PATCHFILES += 0005-changed-object-files-to-executables.patch PATCHFILES += 0005-Adjusted-CFLAGS-to-solaris-compiler.patch PATCHFILES += 0006-path-to-csw-perl.patch -PATCHFILES += 0007-nagios-bug-244.patch +#PATCHFILES += 0007-nagios-bug-244.patch PATCHFILES += 0008-changed-paths-to-match-csw-standards.patch RUNTIME_DEP_PKGS_CSWnagios = CSWapache2 CSWgd CSWglib2 CSWjpeg CSWlibtoolrt CSWggettextrt -RUNTIME_DEP_PKGS_CSWnagios += CSWperl CSWnagiosp CSWap2-modphp5 +RUNTIME_DEP_PKGS_CSWnagios += CSWperl CSWnagios-plugins CSWap2-modphp5 RUNTIME_DEP_PKGS_CSWnagios += CSWlibgd2 RUNTIME_DEP_PKGS_CSWnagios += CSWlibiconv2 RUNTIME_DEP_PKGS_CSWnagios += CSWlibpng12-0 @@ -117,7 +117,7 @@ CHECKPKG_OVERRIDES_CSWnagios += surplus-dependency|CSWgd CHECKPKG_OVERRIDES_CSWnagios += surplus-dependency|CSWglib2 -CHECKPKG_OVERRIDES_CSWnagios += surplus-dependency|CSWnagiosp +CHECKPKG_OVERRIDES_CSWnagios += surplus-dependency|CSWnagios-plugins CHECKPKG_OVERRIDES_CSWnagios += surplus-dependency|CSWlibtoolrt CHECKPKG_OVERRIDES_CSWnagios += surplus-dependency|CSWap2-modphp5 CHECKPKG_OVERRIDES_CSWnagios += surplus-dependency|CSWggettextrt Modified: csw/mgar/pkg/nagios/trunk/checksums =================================================================== --- csw/mgar/pkg/nagios/trunk/checksums 2012-06-04 19:18:49 UTC (rev 18216) +++ csw/mgar/pkg/nagios/trunk/checksums 2012-06-04 19:36:36 UTC (rev 18217) @@ -1 +1 @@ -d03a52e1f24ee582cf05fde4d15ff30b nagios-3.3.1.tar.gz +2fa8acfb2a92b1bf8d173a855832de1f nagios-3.4.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From j_arndt at users.sourceforge.net Mon Jun 4 22:07:41 2012 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Mon, 04 Jun 2012 20:07:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[18218] csw/mgar/pkg/nagios/trunk/Makefile Message-ID: Revision: 18218 http://gar.svn.sourceforge.net/gar/?rev=18218&view=rev Author: j_arndt Date: 2012-06-04 20:07:41 +0000 (Mon, 04 Jun 2012) Log Message: ----------- nagios: added (temporary) override Modified Paths: -------------- csw/mgar/pkg/nagios/trunk/Makefile Modified: csw/mgar/pkg/nagios/trunk/Makefile =================================================================== --- csw/mgar/pkg/nagios/trunk/Makefile 2012-06-04 19:36:36 UTC (rev 18217) +++ csw/mgar/pkg/nagios/trunk/Makefile 2012-06-04 20:07:41 UTC (rev 18218) @@ -125,6 +125,8 @@ CHECKPKG_OVERRIDES_CSWnagios += surplus-dependency|CSWlibiconv2 CHECKPKG_OVERRIDES_CSWnagios += surplus-dependency|CSWjpeg +CHECKPKG_OVERRIDES_CSWnagios += unidentified-dependency|CSWnagios-plugins + include gar/category.mk DOCS = Changelog INSTALLING README UPGRADING This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Tue Jun 5 07:20:40 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Tue, 05 Jun 2012 05:20:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[18219] csw/mgar/pkg/irssi/trunk/Makefile Message-ID: Revision: 18219 http://gar.svn.sourceforge.net/gar/?rev=18219&view=rev Author: wilbury Date: 2012-06-05 05:20:40 +0000 (Tue, 05 Jun 2012) Log Message: ----------- irssi/trunk: It is /usr/share in irssi.1 Modified Paths: -------------- csw/mgar/pkg/irssi/trunk/Makefile Modified: csw/mgar/pkg/irssi/trunk/Makefile =================================================================== --- csw/mgar/pkg/irssi/trunk/Makefile 2012-06-04 20:07:41 UTC (rev 18218) +++ csw/mgar/pkg/irssi/trunk/Makefile 2012-06-05 05:20:40 UTC (rev 18219) @@ -40,7 +40,8 @@ RUNTIME_DEP_PKGS += CSWperl REINPLACE_USRLOCAL += docs/perl.txt -REINPLACE_USRLOCAL += docs/irssi.1 REINPLACE_USRLOCAL += docs/help/load +REINPLACE_USRSHARE += docs/irssi.1 + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Jun 5 10:13:45 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 05 Jun 2012 08:13:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[18220] csw/mgar/gar/v2/lib/python/generate_catalog_file.py Message-ID: Revision: 18220 http://gar.svn.sourceforge.net/gar/?rev=18220&view=rev Author: wahwah Date: 2012-06-05 08:13:45 +0000 (Tue, 05 Jun 2012) Log Message: ----------- generate-catalog-file: Whitespace fixes Modified Paths: -------------- csw/mgar/gar/v2/lib/python/generate_catalog_file.py Modified: csw/mgar/gar/v2/lib/python/generate_catalog_file.py =================================================================== --- csw/mgar/gar/v2/lib/python/generate_catalog_file.py 2012-06-05 05:20:40 UTC (rev 18219) +++ csw/mgar/gar/v2/lib/python/generate_catalog_file.py 2012-06-05 08:13:45 UTC (rev 18220) @@ -58,11 +58,11 @@ deps = [] for dep, _ in deps_data["deps"]: if "CSW" in dep: - deps.append(dep) + deps.append(dep) if deps: - deps = "|".join(deps) + deps = "|".join(deps) else: - deps = "none" + deps = "none" items = [ pkg_data["catalogname"], pkg_data["version_string"], 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 5 10:15:42 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 05 Jun 2012 08:15:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[18221] csw/mgar/gar/v2-solaris11/lib/python Message-ID: Revision: 18221 http://gar.svn.sourceforge.net/gar/?rev=18221&view=rev Author: wahwah Date: 2012-06-05 08:15:42 +0000 (Tue, 05 Jun 2012) Log Message: ----------- checkpkg: Solaris 11 support, unit tests and style No functional changes or refactoring. Modified Paths: -------------- csw/mgar/gar/v2-solaris11/lib/python/common_constants.py csw/mgar/gar/v2-solaris11/lib/python/system_pkgmap.py csw/mgar/gar/v2-solaris11/lib/python/system_pkgmap_test.py Modified: csw/mgar/gar/v2-solaris11/lib/python/common_constants.py =================================================================== --- csw/mgar/gar/v2-solaris11/lib/python/common_constants.py 2012-06-05 08:13:45 UTC (rev 18220) +++ csw/mgar/gar/v2-solaris11/lib/python/common_constants.py 2012-06-05 08:15:42 UTC (rev 18221) @@ -14,8 +14,16 @@ OS_REL_511, ) OBSOLETE_OS_RELS = ( - u"SunOS5.8", + OS_REL_58, ) +SVR4_OS_RELS = ( + OS_REL_58, + OS_REL_59, + OS_REL_510, +) +IPS_OS_RELS = ( + OS_REL_511, +) SYSTEM_SYMLINKS = ( ("/opt/csw/bdb4", ("/opt/csw/bdb42",)), Modified: csw/mgar/gar/v2-solaris11/lib/python/system_pkgmap.py =================================================================== --- csw/mgar/gar/v2-solaris11/lib/python/system_pkgmap.py 2012-06-05 08:13:45 UTC (rev 18220) +++ csw/mgar/gar/v2-solaris11/lib/python/system_pkgmap.py 2012-06-05 08:15:42 UTC (rev 18221) @@ -123,11 +123,11 @@ def _ParsePkgContentsLine(self, line): """Parses one line of "pkg contents" output - - Returns: A dictionary of fields, or none. + + Returns: A dictionary of fields, or None. """ # we will map from IPS type to SVR4 type - type_mapping = { 'link': 's', 'hardlink': 'l', 'file': 'f', 'dir': 'd' } + type_mapping = { "link": "s", "hardlink": "l", "file": "f", "dir": "d" } parts = re.split(c.WS_RE, line.strip()) if len(parts) < 4: @@ -146,11 +146,11 @@ f_group = None f_pkgname = None pkgnames = [ self._IpsNameToSrv4Name(parts[2]) ] - if f_type == 's' or f_type == 'l': + if f_type in ("s", "l"): f_target = parts[3] else: (f_mode, f_owner, f_group) = parts[3:6] - + d = { "path": f_path, "target": f_target, @@ -162,11 +162,11 @@ "line": line, } return d - + def _ParsePkgmapLine(self, line): """Parses one line of /var/sadm/install/contents. - Returns: A dictionary of fields, or none. + Returns: A dictionary of fields, or None. """ if line.startswith("#"): return None @@ -267,16 +267,15 @@ c = itertools.count() # Progressbar stuff can go here. streams_and_parsers = zip(streams, (self._ParsePkgmapLine, self._ParsePkgContentsLine)) - for stream_info in streams_and_parsers: - parseMethod = stream_info[1] - if stream_info[0] == None: + for stream_data, ParseMethod in streams_and_parsers: + if stream_data is None: continue - for line in stream_info[0]: + for line in stream_data: if show_progress: if not c.next() % 1000: sys.stdout.write(".") sys.stdout.flush() - d = parseMethod(line) + d = ParseMethod(line) # d might be None if line was a comment if d: parsed_lines.append(d) @@ -305,7 +304,7 @@ def _GetArch(self): return self._GetUname("-p") - + def GetDataStructure(self, contents_streams, pkginfo_streams, osrel, arch, show_progress=False): """Gets the data structure to be pickled. @@ -338,10 +337,9 @@ def _GetPkgcontentsStreams(self): contents_stream = open(self.infile_contents, "r") - - if self.osrel in ["SunOS5.9", "SunOS5.10"]: - pkgcontents_stream = None - else: + + pkgcontents_stream = None + if self.osrel in common_constants.IPS_OS_RELS: args = ["pkg", "contents", "-H", "-o", "path,action.name,pkg.name,target,mode,owner,group", "-t", "dir,file,hardlink,link"] @@ -349,7 +347,7 @@ stdout, stderr = pkg_proc.communicate() ret = pkg_proc.wait() pkgcontents_stream = stdout.splitlines() - + return (contents_stream, pkgcontents_stream) def _GetPkginfoStreams(self): @@ -363,32 +361,40 @@ ret = pkginfo_proc.wait() pkginfo_stream = stdout.splitlines() - if self.osrel in ["SunOS5.9", "SunOS5.10"]: - pkglist_stream = None - else: + pkglist_stream = None + if self.osrel in common_constants.IPS_OS_RELS: args = ["pkg", "list", "-H", "-s"] pkg_proc = subprocess.Popen(args, stdout=subprocess.PIPE) stdout, stderr = pkg_proc.communicate() ret = pkg_proc.wait() pkglist_stream = stdout.splitlines() - + return (pkginfo_stream, pkglist_stream) def _ParsePkginfoOutput(self, streams, unused_show_progress): + """Parses output from pkginfo. + + Args: + streams: A list of two streams of strings, the first one from SVR4 + pkginfo, the second from IPS + unused_show_progress: Used to display a progress bar, which was removed. + Returns: + A dictionary from pkgnames to descriptions. + """ logging.debug("-> _ParsePkginfoOutput()") packages_by_pkgname = {} for line in streams[0]: pkgname, pkg_desc = self._ParsePkginfoLine(line) packages_by_pkgname.setdefault(pkgname, pkg_desc) - if streams[1] != None: + if streams[1]: for line in streams[1]: pkgname, pkg_desc = self._ParsePkgListLine(line) packages_by_pkgname.setdefault(pkgname, pkg_desc) logging.debug("<- _ParsePkginfoOutput()") return packages_by_pkgname - + def _IpsNameToSrv4Name(self, ips_name): - """Create a fake Svr4 pkgname from an ips pkgname""" + """Create a fake Svr4 pkgname from an ips pkgname.""" return "SUNW" + "-".join(re.findall (ALPHANUMERIC_RE, ips_name)) class InstallContentsImporter(object): @@ -519,6 +525,7 @@ pbar.maxval = len(contents) / progressbar_divisor pbar.start() cleaned_pkgs = set() + logging.debug("Content leghts: %s", len(contents)) for d in contents: i = count.next() if not i % update_period and (i / progressbar_divisor) <= pbar.maxval: @@ -573,7 +580,7 @@ def ComposeFakeSrv4Md5(self, pkgname, osrel, arch): """Returns a fake md5 sum of a fake srv4 package. - + For the purposes of fake srv4 packages for SUNW stuff. """ key = pkgname + osrel + arch Modified: csw/mgar/gar/v2-solaris11/lib/python/system_pkgmap_test.py =================================================================== --- csw/mgar/gar/v2-solaris11/lib/python/system_pkgmap_test.py 2012-06-05 08:13:45 UTC (rev 18220) +++ csw/mgar/gar/v2-solaris11/lib/python/system_pkgmap_test.py 2012-06-05 08:15:42 UTC (rev 18221) @@ -140,14 +140,96 @@ system_pkgmap.ParsingError, spi._ParsePkgmapLine, "/") + def test_ParsePkgContentsLineLink(self): + spi = system_pkgmap.Indexer() + line = "bin\tlink\tsystem/core-os\t./usr/bin" + expected = { + 'pkgnames': ['SUNWsystem-core-os'], + 'group': None, + 'target': './usr/bin', + 'owner': None, + 'path': '/bin', + 'line': 'bin\tlink\tsystem/core-os\t./usr/bin', + 'type': 's', + 'mode': None, + } + self.assertEquals( + expected, + spi._ParsePkgContentsLine(line)) + + def test_ParsePkgContentsLineDir(self): + spi = system_pkgmap.Indexer() + line = "dev\tdir\tsystem/core-os\t\t0755\troot\tsys" + expected = { + 'pkgnames': ['SUNWsystem-core-os'], + 'group': 'sys', + 'target': None, + 'owner': 'root', + 'path': '/dev', + 'line': 'dev\tdir\tsystem/core-os\t\t0755\troot\tsys', + 'type': 'd', + 'mode': '0755', + } + self.assertEquals( + expected, + spi._ParsePkgContentsLine(line)) + + def test_ParsePkgContentsLineHardlink(self): + spi = system_pkgmap.Indexer() + line = ("etc/svc/profile/platform_SUNW,UltraSPARC-IIe-NetraCT-40.xml\thardlink\t" + "system/core-os\t./platform_SUNW,UltraSPARC-IIi-Netract.xml") + expected = { + 'pkgnames': ['SUNWsystem-core-os'], + 'group': None, + 'target': './platform_SUNW,UltraSPARC-IIi-Netract.xml', + 'owner': None, + 'path': '/etc/svc/profile/platform_SUNW,UltraSPARC-IIe-NetraCT-40.xml', + 'line': ('etc/svc/profile/platform_SUNW,UltraSPARC-IIe-NetraCT-40.xml\t' + 'hardlink\tsystem/core-os\t' + './platform_SUNW,UltraSPARC-IIi-Netract.xml'), + 'type': 'l', + 'mode': None, + } + self.assertEquals( + expected, + spi._ParsePkgContentsLine(line)) + + def test_ParsePkgContentsLineFile(self): + spi = system_pkgmap.Indexer() + line = ("lib/libc.so.1\tfile\tsystem/library\t\t0755\troot\tbin") + expected = { + 'pkgnames': ['SUNWsystem-library'], + 'group': 'bin', + 'target': None, + 'owner': 'root', + 'path': '/lib/libc.so.1', + 'line': 'lib/libc.so.1\tfile\tsystem/library\t\t0755\troot\tbin', + 'type': 'f', + 'mode': '0755', + } + self.assertEquals( + expected, + spi._ParsePkgContentsLine(line)) + + def test_IpsNameToSrv4Name(self): + spi = system_pkgmap.Indexer() + self.assertEquals( + 'SUNWsystem-core-os', + spi._IpsNameToSrv4Name("system/core-os")) + + def test_ParseInstallContents(self): spi = system_pkgmap.Indexer() - data = ( - PKGMAP_LINE_1, - PKGMAP_LINE_2, - PKGMAP_LINE_3, - PKGMAP_LINE_4) - self.assertEqual(4, len(spi._ParseInstallContents(data, False))) + streams = ( + ( + PKGMAP_LINE_1, + PKGMAP_LINE_2, + PKGMAP_LINE_3, + PKGMAP_LINE_4 + ), + None + ) + self.assertEqual(4, len(spi._ParseInstallContents(streams, False))) class InstallContentsImporterUnitTest(test_base.SqlObjectTestMixin, 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 5 10:16:08 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 05 Jun 2012 08:16:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[18222] csw/mgar/gar/v2/lib/python/integrate_catalogs.py Message-ID: Revision: 18222 http://gar.svn.sourceforge.net/gar/?rev=18222&view=rev Author: wahwah Date: 2012-06-05 08:16:07 +0000 (Tue, 05 Jun 2012) Log Message: ----------- integrate-catalogs: A fix for creating new catalog If the dict element exists, but isn't iterable (e.g. None isn't). Modified Paths: -------------- csw/mgar/gar/v2/lib/python/integrate_catalogs.py Modified: csw/mgar/gar/v2/lib/python/integrate_catalogs.py =================================================================== --- csw/mgar/gar/v2/lib/python/integrate_catalogs.py 2012-06-05 08:15:42 UTC (rev 18221) +++ csw/mgar/gar/v2/lib/python/integrate_catalogs.py 2012-06-05 08:16:07 UTC (rev 18222) @@ -249,21 +249,22 @@ bundles_missing = set() cp = rest.CachedPkgstats("pkgstats") for key in catalogs: - for pkg in catalogs[key]: - # logging.debug("%r", pkg) - md5 = pkg["md5_sum"] - if md5 not in bundles_by_md5 and md5 not in bundles_missing: - stats = cp.GetPkgstats(md5) - bundle_key = "OPENCSW_BUNDLE" - # pprint.pprint(stats) - if stats: - if bundle_key in stats["pkginfo"]: - bundles_by_md5[md5] = stats["pkginfo"][bundle_key] - else: - logging.debug( - "%r (%r) does not have the bundle set", - stats["basic_stats"]["pkg_basename"], md5) - bundles_missing.add(md5) + if catalogs[key]: # could be None + for pkg in catalogs[key]: + # logging.debug("%r", pkg) + md5 = pkg["md5_sum"] + if md5 not in bundles_by_md5 and md5 not in bundles_missing: + stats = cp.GetPkgstats(md5) + bundle_key = "OPENCSW_BUNDLE" + # pprint.pprint(stats) + if stats: + if bundle_key in stats["pkginfo"]: + bundles_by_md5[md5] = stats["pkginfo"][bundle_key] + else: + logging.debug( + "%r (%r) does not have the bundle set", + stats["basic_stats"]["pkg_basename"], md5) + bundles_missing.add(md5) # Here's a good place to calculate the mapping between catalognames and # bundle names. change_types = "new_pkgs", "removed_pkgs", "updated_pkgs" 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 5 10:16:38 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 05 Jun 2012 08:16:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[18223] csw/mgar/gar/v2/lib/python/integrate_catalogs.py Message-ID: Revision: 18223 http://gar.svn.sourceforge.net/gar/?rev=18223&view=rev Author: wahwah Date: 2012-06-05 08:16:38 +0000 (Tue, 05 Jun 2012) Log Message: ----------- integrate-catalogs: Add easy undo Create undo_* functions that revert the actions. To be used to roll back integrations in case of any trouble. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/integrate_catalogs.py Modified: csw/mgar/gar/v2/lib/python/integrate_catalogs.py =================================================================== --- csw/mgar/gar/v2/lib/python/integrate_catalogs.py 2012-06-05 08:16:07 UTC (rev 18222) +++ csw/mgar/gar/v2/lib/python/integrate_catalogs.py 2012-06-05 08:16:38 UTC (rev 18223) @@ -41,6 +41,12 @@ \${PKGDB} add-to-cat $osrel $arch $catrel_to $new_pkg["md5_sum"] #end for } +function undo_new_pkg_$catalogname { +#for arch, osrel, new_pkg in $diffs_by_catalogname[$catalogname]["new_pkgs"]: + # adding $new_pkg["basename"] + \${PKGDB} del-from-cat $osrel $arch $catrel_to $new_pkg["md5_sum"] +#end for +} #end if #if "removed_pkgs" in $diffs_by_catalogname[$catalogname]: function remove_pkg_$catalogname { @@ -49,6 +55,12 @@ \${PKGDB} del-from-cat $osrel $arch $catrel_to $rem_pkg["md5_sum"] #end for } +function undo_remove_pkg_$catalogname { +#for arch, osrel, rem_pkg in $diffs_by_catalogname[$catalogname]["removed_pkgs"]: + # removing $rem_pkg["basename"] + \${PKGDB} add-to-cat $osrel $arch $catrel_to $rem_pkg["md5_sum"] +#end for +} #end if #if "updated_pkgs" in $diffs_by_catalogname[$catalogname]: function # @@ -67,6 +79,13 @@ \${PKGDB} add-to-cat $osrel $arch $catrel_to $up_pkg_pair["to"]["md5_sum"] #end for } +function undo_upgrade_$catalogname { +#for arch, osrel, up_pkg_pair in $diffs_by_catalogname[$catalogname]["updated_pkgs"]: + # UNDO of $catalogname $up_pkg_pair["direction"] from $up_pkg_pair["from"]["version"] to $up_pkg_pair["to"]["version"] + \${PKGDB} del-from-cat $osrel $arch $catrel_to $up_pkg_pair["to"]["md5_sum"] + \${PKGDB} add-to-cat $osrel $arch $catrel_to $up_pkg_pair["from"]["md5_sum"] +#end for +} #end if #end for 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 5 10:17:00 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 05 Jun 2012 08:17:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[18224] csw/mgar/gar/v2/lib/python Message-ID: Revision: 18224 http://gar.svn.sourceforge.net/gar/?rev=18224&view=rev Author: wahwah Date: 2012-06-05 08:17:00 +0000 (Tue, 05 Jun 2012) Log Message: ----------- pkgdb: Insignificant changes, lumped together Mostly cleanup. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/integrate_catalogs.py csw/mgar/gar/v2/lib/python/pkgdb.py csw/mgar/gar/v2/lib/python/system_pkgmap.py Modified: csw/mgar/gar/v2/lib/python/integrate_catalogs.py =================================================================== --- csw/mgar/gar/v2/lib/python/integrate_catalogs.py 2012-06-05 08:16:38 UTC (rev 18223) +++ csw/mgar/gar/v2/lib/python/integrate_catalogs.py 2012-06-05 08:17:00 UTC (rev 18224) @@ -258,8 +258,12 @@ if options.from_json: with open(options.from_json, "rb") as fd: logging.info("Loading %s", options.from_json) - bundles_by_md5, jsonable_catalogs, diffs_by_catalogname = cjson.decode(fd.read()) - catalogs = dict((tuple(cjson.decode(x)), jsonable_catalogs[x]) for x in jsonable_catalogs) + (bundles_by_md5, + jsonable_catalogs, + diffs_by_catalogname) = cjson.decode(fd.read()) + catalogs = dict( + (tuple(cjson.decode(x)), jsonable_catalogs[x]) + for x in jsonable_catalogs) else: catalogs, diffs_by_catalogname = GetDiffsByCatalogname( catrel_from, catrel_to, options.include_downgrades, Modified: csw/mgar/gar/v2/lib/python/pkgdb.py =================================================================== --- csw/mgar/gar/v2/lib/python/pkgdb.py 2012-06-05 08:16:38 UTC (rev 18223) +++ csw/mgar/gar/v2/lib/python/pkgdb.py 2012-06-05 08:17:00 UTC (rev 18224) @@ -578,7 +578,8 @@ elif command == 'gen-cat': catrel = options.catrel or 'dublin' if options.catrel and options.catrel != catrel: - logging.warn("Generating the %s catalog.", catrel) + logging.warn("Generating the %s catalog, not %s.", + catrel, options.catrel) if catrel not in CATALOGS_ALLOWED_TO_GENERATE: raise UsageError( "Catalog %s not allowed to be generated from the database. " Modified: csw/mgar/gar/v2/lib/python/system_pkgmap.py =================================================================== --- csw/mgar/gar/v2/lib/python/system_pkgmap.py 2012-06-05 08:16:38 UTC (rev 18223) +++ csw/mgar/gar/v2/lib/python/system_pkgmap.py 2012-06-05 08:17:00 UTC (rev 18224) @@ -427,6 +427,7 @@ pbar.maxval = len(contents) / progressbar_divisor pbar.start() cleaned_pkgs = set() + logging.debug("Content leghts: %s", len(contents)) for d in contents: i = count.next() if not i % update_period and (i / progressbar_divisor) <= pbar.maxval: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Tue Jun 5 10:49:29 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Tue, 05 Jun 2012 08:49:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[18225] csw/mgar/pkg/emacs/trunk/Makefile Message-ID: Revision: 18225 http://gar.svn.sourceforge.net/gar/?rev=18225&view=rev Author: pfelecan Date: 2012-06-05 08:49:29 +0000 (Tue, 05 Jun 2012) Log Message: ----------- overrides again... Modified Paths: -------------- csw/mgar/pkg/emacs/trunk/Makefile Modified: csw/mgar/pkg/emacs/trunk/Makefile =================================================================== --- csw/mgar/pkg/emacs/trunk/Makefile 2012-06-05 08:17:00 UTC (rev 18224) +++ csw/mgar/pkg/emacs/trunk/Makefile 2012-06-05 08:49:29 UTC (rev 18225) @@ -234,6 +234,7 @@ CATALOGNAME_CSWemacs = emacs PKGFILES_CSWemacs = NOFILES RUNTIME_DEP_PKGS_CSWemacs = CSWemacs-athena +CHECKPKG_OVERRIDES_CSWemacs += surplus-dependency|CSWemacs-athena PACKAGES += CSWemacs-athena SPKG_DESC_CSWemacs-athena = $(DESCRIPTION) - based on the Athena toolkit @@ -297,6 +298,17 @@ CHECKPKG_OVERRIDES_CSWemacs-athena += surplus-dependency|CSWlibexpat1 CHECKPKG_OVERRIDES_CSWemacs-athena += surplus-dependency|CSWlibpixman1-0 CHECKPKG_OVERRIDES_CSWemacs-athena += surplus-dependency|CSWfconfig +CHECKPKG_OVERRIDES_CSWemacs-athena += unidentified-dependency|CSWemacs-common +CHECKPKG_OVERRIDES_CSWemacs-athena += unidentified-dependency|CSWemacs-bin-common +CHECKPKG_OVERRIDES_CSWemacs-athena += surplus-dependency|CSWlibbz2-1-0 +CHECKPKG_OVERRIDES_CSWemacs-athena += surplus-dependency|CSWlibxft2 +CHECKPKG_OVERRIDES_CSWemacs-athena += surplus-dependency|CSWlibfreetype6 +CHECKPKG_OVERRIDES_CSWemacs-athena += surplus-dependency|CSWlibxrender +CHECKPKG_OVERRIDES_CSWemacs-athena += surplus-dependency|CSWemacs-bin-common +CHECKPKG_OVERRIDES_CSWemacs-athena += surplus-dependency|CSWlibfontconfig1 +CHECKPKG_OVERRIDES_CSWemacs-athena += surplus-dependency|CSWemacs-common +CHECKPKG_OVERRIDES_CSWemacs-athena += surplus-dependency|CSWlibm17n-utils +CHECKPKG_OVERRIDES_CSWemacs-athena += surplus-dependency|CSWlibotf-utils PKGFILES_CSWemacs-athena = /opt/csw/bin/emacs-athena PKGFILES_CSWemacs-athena += /opt/csw/bin/emacs-$(VERSION)-athena @@ -367,6 +379,8 @@ CHECKPKG_OVERRIDES_CSWemacs-gtk += surplus-dependency|CSWlibpixman1-0 CHECKPKG_OVERRIDES_CSWemacs-gtk += surplus-dependency|CSWfconfig CHECKPKG_OVERRIDES_CSWemacs-gtk += surplus-dependency|CSWorbit2 +CHECKPKG_OVERRIDES_CSWemacs-gtk += unidentified-dependency|CSWemacs-common +CHECKPKG_OVERRIDES_CSWemacs-gtk += unidentified-dependency|CSWemacs-bin-common PKGFILES_CSWemacs-gtk = /opt/csw/bin/emacs-gtk PKGFILES_CSWemacs-gtk += /opt/csw/bin/emacs-$(VERSION)-gtk @@ -383,6 +397,8 @@ CHECKPKG_OVERRIDES_CSWemacs-nox += file-with-bad-content|/usr/share|root/opt/csw/bin/emacs-nox CHECKPKG_OVERRIDES_CSWemacs-nox += surplus-dependency|CSWemacs-bin-common CHECKPKG_OVERRIDES_CSWemacs-nox += surplus-dependency|CSWemacs-common +CHECKPKG_OVERRIDES_CSWemacs-nox += unidentified-dependency|CSWemacs-common +CHECKPKG_OVERRIDES_CSWemacs-nox += unidentified-dependency|CSWemacs-bin-common PKGFILES_CSWemacs-nox = /opt/csw/bin/emacs-nox PKGFILES_CSWemacs-nox += /opt/csw/bin/emacs-$(VERSION)-nox 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 5 13:48:38 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 05 Jun 2012 11:48:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[18226] csw/mgar/pkg/alpine/trunk/Makefile Message-ID: Revision: 18226 http://gar.svn.sourceforge.net/gar/?rev=18226&view=rev Author: bdwalton Date: 2012-06-05 11:48:38 +0000 (Tue, 05 Jun 2012) Log Message: ----------- alpine/trunk: update ssl runtime dep and note ssl build dependency Modified Paths: -------------- csw/mgar/pkg/alpine/trunk/Makefile Modified: csw/mgar/pkg/alpine/trunk/Makefile =================================================================== --- csw/mgar/pkg/alpine/trunk/Makefile 2012-06-05 08:49:29 UTC (rev 18225) +++ csw/mgar/pkg/alpine/trunk/Makefile 2012-06-05 11:48:38 UTC (rev 18226) @@ -17,6 +17,8 @@ SPKG_SOURCEURL = http://www.washington.edu/alpine/ DISTFILES = $(NAME).tar.bz2 +BUILD_DEP_PKGS += CSWlibssl-dev + PACKAGES = CSWalpine CATALOGNAME_CSWalpine = alpine SPKG_DESC_CSWalpine = $(DESCRIPTION) @@ -79,7 +81,7 @@ RUNTIME_DEP_PKGS_CSWalpine += CSWliblber2-4-2 RUNTIME_DEP_PKGS_CSWalpine += CSWlibiconv2 RUNTIME_DEP_PKGS_CSWalpine += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWalpine += CSWlibssl0-9-8 +RUNTIME_DEP_PKGS_CSWalpine += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWalpine += CSWlibncurses5 RUNTIME_DEP_PKGS_CSWalpine += CSWlibgssapi-krb5-2 RUNTIME_DEP_PKGS_CSWalpine += CSWlibkrb5-3 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Tue Jun 5 14:02:30 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Tue, 05 Jun 2012 12:02:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[18227] csw/mgar/pkg/emacs/trunk/Makefile Message-ID: Revision: 18227 http://gar.svn.sourceforge.net/gar/?rev=18227&view=rev Author: pfelecan Date: 2012-06-05 12:02:30 +0000 (Tue, 05 Jun 2012) Log Message: ----------- correct the broken packages list Modified Paths: -------------- csw/mgar/pkg/emacs/trunk/Makefile Modified: csw/mgar/pkg/emacs/trunk/Makefile =================================================================== --- csw/mgar/pkg/emacs/trunk/Makefile 2012-06-05 11:48:38 UTC (rev 18226) +++ csw/mgar/pkg/emacs/trunk/Makefile 2012-06-05 12:02:30 UTC (rev 18227) @@ -229,7 +229,7 @@ PKGFILES_CSWemacs-bin-common += /opt/csw/libexec/emacs/$(VERSION)/[^/]*solaris[^/]*/sorted-doc PKGFILES_CSWemacs-bin-common += /opt/csw/libexec/emacs/$(VERSION)/[^/]*solaris[^/]*/update-game-score -PACKAGES = CSWemacs +PACKAGES += CSWemacs SPKG_DESC_CSWemacs = $(DESCRIPTION) - metapackage for generic dependencies CATALOGNAME_CSWemacs = emacs PKGFILES_CSWemacs = NOFILES This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dam at opencsw.org Tue Jun 5 14:13:53 2012 From: dam at opencsw.org (dam at opencsw.org) Date: Tue, 5 Jun 2012 14:13:53 +0200 (CEST) Subject: [csw-devel] SF.net SVN: gar:[18225] csw/mgar/pkg/emacs/trunk/Makefile In-Reply-To: References: Message-ID: Hi Peter, the problem is you set PACKAGES in line 215: PACKAGES = CSWemacs and overwrite the previous package definitions. This leads to the unknown packages warning. I suggest always using PACKAGES += for this reason. Please also see http://wiki.opencsw.org/checkpkg-error-tags#toc51 Best regards -- Dago > Revision: 18225 > http://gar.svn.sourceforge.net/gar/?rev=18225&view=rev > Author: pfelecan > Date: 2012-06-05 08:49:29 +0000 (Tue, 05 Jun 2012) > Log Message: > ----------- > overrides again... > > Modified Paths: > -------------- > csw/mgar/pkg/emacs/trunk/Makefile > > Modified: csw/mgar/pkg/emacs/trunk/Makefile > =================================================================== > --- csw/mgar/pkg/emacs/trunk/Makefile 2012-06-05 08:17:00 UTC (rev 18224) > +++ csw/mgar/pkg/emacs/trunk/Makefile 2012-06-05 08:49:29 UTC (rev 18225) > @@ -234,6 +234,7 @@ > CATALOGNAME_CSWemacs = emacs > PKGFILES_CSWemacs = NOFILES > RUNTIME_DEP_PKGS_CSWemacs = CSWemacs-athena > +CHECKPKG_OVERRIDES_CSWemacs += surplus-dependency|CSWemacs-athena > > PACKAGES += CSWemacs-athena > SPKG_DESC_CSWemacs-athena = $(DESCRIPTION) - based on the Athena > toolkit > @@ -297,6 +298,17 @@ > CHECKPKG_OVERRIDES_CSWemacs-athena += surplus-dependency|CSWlibexpat1 > CHECKPKG_OVERRIDES_CSWemacs-athena += surplus-dependency|CSWlibpixman1-0 > CHECKPKG_OVERRIDES_CSWemacs-athena += surplus-dependency|CSWfconfig > +CHECKPKG_OVERRIDES_CSWemacs-athena += unidentified-dependency|CSWemacs-common > +CHECKPKG_OVERRIDES_CSWemacs-athena += unidentified-dependency|CSWemacs-bin-common > +CHECKPKG_OVERRIDES_CSWemacs-athena += surplus-dependency|CSWlibbz2-1-0 > +CHECKPKG_OVERRIDES_CSWemacs-athena += surplus-dependency|CSWlibxft2 > +CHECKPKG_OVERRIDES_CSWemacs-athena += surplus-dependency|CSWlibfreetype6 > +CHECKPKG_OVERRIDES_CSWemacs-athena += surplus-dependency|CSWlibxrender > +CHECKPKG_OVERRIDES_CSWemacs-athena += surplus-dependency|CSWemacs-bin-common > +CHECKPKG_OVERRIDES_CSWemacs-athena += surplus-dependency|CSWlibfontconfig1 > +CHECKPKG_OVERRIDES_CSWemacs-athena += surplus-dependency|CSWemacs-common > +CHECKPKG_OVERRIDES_CSWemacs-athena += surplus-dependency|CSWlibm17n-utils > +CHECKPKG_OVERRIDES_CSWemacs-athena += surplus-dependency|CSWlibotf-utils > PKGFILES_CSWemacs-athena = /opt/csw/bin/emacs-athena > PKGFILES_CSWemacs-athena += /opt/csw/bin/emacs-$(VERSION)-athena > > @@ -367,6 +379,8 @@ > CHECKPKG_OVERRIDES_CSWemacs-gtk += surplus-dependency|CSWlibpixman1-0 > CHECKPKG_OVERRIDES_CSWemacs-gtk += surplus-dependency|CSWfconfig > CHECKPKG_OVERRIDES_CSWemacs-gtk += surplus-dependency|CSWorbit2 > +CHECKPKG_OVERRIDES_CSWemacs-gtk += unidentified-dependency|CSWemacs-common > +CHECKPKG_OVERRIDES_CSWemacs-gtk += unidentified-dependency|CSWemacs-bin-common > PKGFILES_CSWemacs-gtk = /opt/csw/bin/emacs-gtk > PKGFILES_CSWemacs-gtk += /opt/csw/bin/emacs-$(VERSION)-gtk > > @@ -383,6 +397,8 @@ > CHECKPKG_OVERRIDES_CSWemacs-nox += file-with-bad-content|/usr/share|root/opt/csw/bin/emacs-nox > CHECKPKG_OVERRIDES_CSWemacs-nox += surplus-dependency|CSWemacs-bin-common > CHECKPKG_OVERRIDES_CSWemacs-nox += surplus-dependency|CSWemacs-common > +CHECKPKG_OVERRIDES_CSWemacs-nox += unidentified-dependency|CSWemacs-common > +CHECKPKG_OVERRIDES_CSWemacs-nox += unidentified-dependency|CSWemacs-bin-common > PKGFILES_CSWemacs-nox = /opt/csw/bin/emacs-nox > PKGFILES_CSWemacs-nox += /opt/csw/bin/emacs-$(VERSION)-nox > > > 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 > From pfelecan at users.sourceforge.net Tue Jun 5 15:45:44 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Tue, 05 Jun 2012 13:45:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[18228] csw/mgar/pkg/emacs/trunk/Makefile Message-ID: Revision: 18228 http://gar.svn.sourceforge.net/gar/?rev=18228&view=rev Author: pfelecan Date: 2012-06-05 13:45:43 +0000 (Tue, 05 Jun 2012) Log Message: ----------- reverted the last overrides resulted from an incorrect packages list. Modified Paths: -------------- csw/mgar/pkg/emacs/trunk/Makefile Modified: csw/mgar/pkg/emacs/trunk/Makefile =================================================================== --- csw/mgar/pkg/emacs/trunk/Makefile 2012-06-05 12:02:30 UTC (rev 18227) +++ csw/mgar/pkg/emacs/trunk/Makefile 2012-06-05 13:45:43 UTC (rev 18228) @@ -298,17 +298,6 @@ CHECKPKG_OVERRIDES_CSWemacs-athena += surplus-dependency|CSWlibexpat1 CHECKPKG_OVERRIDES_CSWemacs-athena += surplus-dependency|CSWlibpixman1-0 CHECKPKG_OVERRIDES_CSWemacs-athena += surplus-dependency|CSWfconfig -CHECKPKG_OVERRIDES_CSWemacs-athena += unidentified-dependency|CSWemacs-common -CHECKPKG_OVERRIDES_CSWemacs-athena += unidentified-dependency|CSWemacs-bin-common -CHECKPKG_OVERRIDES_CSWemacs-athena += surplus-dependency|CSWlibbz2-1-0 -CHECKPKG_OVERRIDES_CSWemacs-athena += surplus-dependency|CSWlibxft2 -CHECKPKG_OVERRIDES_CSWemacs-athena += surplus-dependency|CSWlibfreetype6 -CHECKPKG_OVERRIDES_CSWemacs-athena += surplus-dependency|CSWlibxrender -CHECKPKG_OVERRIDES_CSWemacs-athena += surplus-dependency|CSWemacs-bin-common -CHECKPKG_OVERRIDES_CSWemacs-athena += surplus-dependency|CSWlibfontconfig1 -CHECKPKG_OVERRIDES_CSWemacs-athena += surplus-dependency|CSWemacs-common -CHECKPKG_OVERRIDES_CSWemacs-athena += surplus-dependency|CSWlibm17n-utils -CHECKPKG_OVERRIDES_CSWemacs-athena += surplus-dependency|CSWlibotf-utils PKGFILES_CSWemacs-athena = /opt/csw/bin/emacs-athena PKGFILES_CSWemacs-athena += /opt/csw/bin/emacs-$(VERSION)-athena @@ -379,8 +368,6 @@ CHECKPKG_OVERRIDES_CSWemacs-gtk += surplus-dependency|CSWlibpixman1-0 CHECKPKG_OVERRIDES_CSWemacs-gtk += surplus-dependency|CSWfconfig CHECKPKG_OVERRIDES_CSWemacs-gtk += surplus-dependency|CSWorbit2 -CHECKPKG_OVERRIDES_CSWemacs-gtk += unidentified-dependency|CSWemacs-common -CHECKPKG_OVERRIDES_CSWemacs-gtk += unidentified-dependency|CSWemacs-bin-common PKGFILES_CSWemacs-gtk = /opt/csw/bin/emacs-gtk PKGFILES_CSWemacs-gtk += /opt/csw/bin/emacs-$(VERSION)-gtk @@ -397,8 +384,6 @@ CHECKPKG_OVERRIDES_CSWemacs-nox += file-with-bad-content|/usr/share|root/opt/csw/bin/emacs-nox CHECKPKG_OVERRIDES_CSWemacs-nox += surplus-dependency|CSWemacs-bin-common CHECKPKG_OVERRIDES_CSWemacs-nox += surplus-dependency|CSWemacs-common -CHECKPKG_OVERRIDES_CSWemacs-nox += unidentified-dependency|CSWemacs-common -CHECKPKG_OVERRIDES_CSWemacs-nox += unidentified-dependency|CSWemacs-bin-common PKGFILES_CSWemacs-nox = /opt/csw/bin/emacs-nox PKGFILES_CSWemacs-nox += /opt/csw/bin/emacs-$(VERSION)-nox This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Tue Jun 5 16:22:54 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Tue, 05 Jun 2012 14:22:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[18229] csw/mgar/pkg/emacs/trunk/Makefile Message-ID: Revision: 18229 http://gar.svn.sourceforge.net/gar/?rev=18229&view=rev Author: pfelecan Date: 2012-06-05 14:22:54 +0000 (Tue, 05 Jun 2012) Log Message: ----------- - CSWemacs is now architecture neutral - corrected CSWemacs-athena overrides Modified Paths: -------------- csw/mgar/pkg/emacs/trunk/Makefile Modified: csw/mgar/pkg/emacs/trunk/Makefile =================================================================== --- csw/mgar/pkg/emacs/trunk/Makefile 2012-06-05 13:45:43 UTC (rev 18228) +++ csw/mgar/pkg/emacs/trunk/Makefile 2012-06-05 14:22:54 UTC (rev 18229) @@ -284,7 +284,7 @@ CHECKPKG_OVERRIDES_CSWemacs-athena += missing-dependency|CSWlibotf-utils CHECKPKG_OVERRIDES_CSWemacs-athena += missing-dependency|CSWlibfontconfig1 CHECKPKG_OVERRIDES_CSWemacs-athena += surplus-dependency|CSWlibcroco -CHECKPKG_OVERRIDES_CSWemacs-athena += surplus-dependency|CSWemacs-athena-common +CHECKPKG_OVERRIDES_CSWemacs-athena += surplus-dependency|CSWemacs-common CHECKPKG_OVERRIDES_CSWemacs-athena += surplus-dependency|CSWlibiconv2 CHECKPKG_OVERRIDES_CSWemacs-athena += surplus-dependency|CSWlibotf0 CHECKPKG_OVERRIDES_CSWemacs-athena += surplus-dependency|CSWlibdatrie1 @@ -293,7 +293,7 @@ CHECKPKG_OVERRIDES_CSWemacs-athena += surplus-dependency|CSWlibm17n0 CHECKPKG_OVERRIDES_CSWemacs-athena += surplus-dependency|CSWlibjbig2 CHECKPKG_OVERRIDES_CSWemacs-athena += surplus-dependency|CSWpango -CHECKPKG_OVERRIDES_CSWemacs-athena += surplus-dependency|CSWemacs-athena-bin-common +CHECKPKG_OVERRIDES_CSWemacs-athena += surplus-dependency|CSWemacs-bin-common CHECKPKG_OVERRIDES_CSWemacs-athena += surplus-dependency|CSWlibxml2-2 CHECKPKG_OVERRIDES_CSWemacs-athena += surplus-dependency|CSWlibexpat1 CHECKPKG_OVERRIDES_CSWemacs-athena += surplus-dependency|CSWlibpixman1-0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Tue Jun 5 16:53:13 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Tue, 05 Jun 2012 14:53:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[18230] csw/mgar/pkg/emacs/trunk/Makefile Message-ID: Revision: 18230 http://gar.svn.sourceforge.net/gar/?rev=18230&view=rev Author: pfelecan Date: 2012-06-05 14:53:13 +0000 (Tue, 05 Jun 2012) Log Message: ----------- - CSWemacs is now really architecture neutral Modified Paths: -------------- csw/mgar/pkg/emacs/trunk/Makefile Modified: csw/mgar/pkg/emacs/trunk/Makefile =================================================================== --- csw/mgar/pkg/emacs/trunk/Makefile 2012-06-05 14:22:54 UTC (rev 18229) +++ csw/mgar/pkg/emacs/trunk/Makefile 2012-06-05 14:53:13 UTC (rev 18230) @@ -235,6 +235,7 @@ PKGFILES_CSWemacs = NOFILES RUNTIME_DEP_PKGS_CSWemacs = CSWemacs-athena CHECKPKG_OVERRIDES_CSWemacs += surplus-dependency|CSWemacs-athena +ARCHALL_CSWemacs = 1 PACKAGES += CSWemacs-athena SPKG_DESC_CSWemacs-athena = $(DESCRIPTION) - based on the Athena toolkit This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Tue Jun 5 23:52:09 2012 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Tue, 05 Jun 2012 21:52:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[18231] csw/mgar/gar/v2-solaris11/lib/python Message-ID: Revision: 18231 http://gar.svn.sourceforge.net/gar/?rev=18231&view=rev Author: chninkel Date: 2012-06-05 21:52:09 +0000 (Tue, 05 Jun 2012) Log Message: ----------- v2-solaris11: Make distinction between Ips and Svr4 clearer Modified Paths: -------------- csw/mgar/gar/v2-solaris11/lib/python/system_pkgmap.py csw/mgar/gar/v2-solaris11/lib/python/system_pkgmap_test.py Modified: csw/mgar/gar/v2-solaris11/lib/python/system_pkgmap.py =================================================================== --- csw/mgar/gar/v2-solaris11/lib/python/system_pkgmap.py 2012-06-05 14:53:13 UTC (rev 18230) +++ csw/mgar/gar/v2-solaris11/lib/python/system_pkgmap.py 2012-06-05 21:52:09 UTC (rev 18231) @@ -104,13 +104,13 @@ repr(self.infile_contents), repr(self.outfile), repr(self.osrel), repr(self.arch)) - def _ParsePkginfoLine(self, line): + def _ParseSrv4PkginfoLine(self, line): fields = re.split(c.WS_RE, line) pkgname = fields[1] pkg_desc = u" ".join(fields[2:]) return pkgname, pkg_desc - def _ParsePkgListLine(self, line): + def _ParseIpsPkgListLine(self, line): fields = re.split(c.WS_RE, line) pkgname = self._IpsNameToSrv4Name(fields[0]) desc_field_start = 1 @@ -121,7 +121,7 @@ pkg_desc = u" ".join(fields[desc_field_start:]) return pkgname, pkg_desc - def _ParsePkgContentsLine(self, line): + def _ParseIpsPkgContentsLine(self, line): """Parses one line of "pkg contents" output Returns: A dictionary of fields, or None. @@ -163,7 +163,7 @@ } return d - def _ParsePkgmapLine(self, line): + def _ParseSrv4PkgmapLine(self, line): """Parses one line of /var/sadm/install/contents. Returns: A dictionary of fields, or None. @@ -261,27 +261,23 @@ } return d - def _ParseInstallContents(self, streams, show_progress): - logging.debug("-> _ParseInstallContents()") + def _ParsePkgContents(self, stream, parser, show_progress): + logging.debug("-> _ParsePkgContents()") parsed_lines = [] c = itertools.count() # Progressbar stuff can go here. - streams_and_parsers = zip(streams, (self._ParsePkgmapLine, self._ParsePkgContentsLine)) - for stream_data, ParseMethod in streams_and_parsers: - if stream_data is None: - continue - for line in stream_data: - if show_progress: - if not c.next() % 1000: - sys.stdout.write(".") - sys.stdout.flush() - d = ParseMethod(line) - # d might be None if line was a comment - if d: - parsed_lines.append(d) + for line in stream: + if show_progress: + if not c.next() % 1000: + sys.stdout.write(".") + sys.stdout.flush() + d = parser(line) + # d might be None if line was a comment + if d: + parsed_lines.append(d) if show_progress: sys.stdout.write("\n") - logging.debug("<- _ParseInstallContents()") + logging.debug("<- _ParsePkgContents()") return parsed_lines def _GetUname(self, uname_option=None): @@ -305,8 +301,9 @@ def _GetArch(self): return self._GetUname("-p") - def GetDataStructure(self, contents_streams, pkginfo_streams, osrel, arch, - show_progress=False): + def GetDataStructure(self, srv4_pkgcontent_stream, srv4_pkginfo_stream, + ips_pkgcontent_stream, ips_pkginfo_stream, + osrel, arch, show_progress=False): """Gets the data structure to be pickled. Does not interact with the OS. @@ -314,17 +311,30 @@ data = { "osrel": osrel, "arch": arch, - "contents": self._ParseInstallContents(contents_streams, show_progress), - "pkginfo": self._ParsePkginfoOutput(pkginfo_streams, show_progress), + "contents": self._ParsePkgContents(srv4_pkgcontent_stream, self._ParseSrv4PkgmapLine, show_progress), + "pkginfo": self._ParsePkgInfos(srv4_pkginfo_stream, self._ParseSrv4PkginfoLine, show_progress), } + if ips_pkginfo_stream and ips_pkgcontent_stream: + data["contents"].append(self._ParsePkgContents(ips_pkgcontent_stream, self._ParseIpsPkgContentsLine, show_progress)) + data["pkginfo"].update(self._ParsePkgInfos(ips_pkgcontent_stream, self._ParseIpsPkgListLine, show_progress)) + return data def Index(self, show_progress=False): # This function interacts with the OS. - contents_streams = self._GetPkgcontentsStreams() - pkginfo_streams = self._GetPkginfoStreams() - data = self.GetDataStructure( - contents_streams, pkginfo_streams, self.osrel, self.arch, show_progress) + srv4_pkgcontents_stream = self._GetSrv4PkgcontentStream() + srv4_pkginfos_stream = self._GetSrv4PkginfosStream() + + if self.osrel in common_constants.IPS_OS_RELS: + ips_pkgcontents_stream = self._GetIpsPkgcontentStream() + ips_pkginfos_stream = self._GetIpsPkginfosStream() + else: + ips_pkgcontents_stream = None + ips_pkginfos_stream = None + + data = self.GetDataStructure(srv4_pkgcontents_stream, srv4_pkginfos_stream, + ips_pkgcontents_stream, ips_pkginfos_stream, + self.osrel, self.arch, show_progress) return data def IndexAndSave(self): @@ -335,22 +345,19 @@ cPickle.dump(data, out_fd, cPickle.HIGHEST_PROTOCOL) logging.debug("IndexAndSave(): pickling done.") - def _GetPkgcontentsStreams(self): - contents_stream = open(self.infile_contents, "r") + def _GetSrv4PkgcontentStream(self): + return (open(self.infile_contents, "r")) - pkgcontents_stream = None - if self.osrel in common_constants.IPS_OS_RELS: - args = ["pkg", "contents", "-H", "-o", - "path,action.name,pkg.name,target,mode,owner,group", - "-t", "dir,file,hardlink,link"] - pkg_proc = subprocess.Popen(args, stdout=subprocess.PIPE) - stdout, stderr = pkg_proc.communicate() - ret = pkg_proc.wait() - pkgcontents_stream = stdout.splitlines() + def _GetIpsPkgcontentStream(self): + args = ["pkg", "contents", "-H", "-o", + "path,action.name,pkg.name,target,mode,owner,group", + "-t", "dir,file,hardlink,link"] + pkg_proc = subprocess.Popen(args, stdout=subprocess.PIPE) + stdout, stderr = pkg_proc.communicate() + ret = pkg_proc.wait() + return stdout.splitlines() - return (contents_stream, pkgcontents_stream) - - def _GetPkginfoStreams(self): + def _GetSrv4PkginfosStream(self): """Calls pkginfo if file is not specified.""" if self.infile_pkginfo: pkginfo_stream = open(self.infile_pkginfo, "r") @@ -360,41 +367,37 @@ stdout, stderr = pkginfo_proc.communicate() ret = pkginfo_proc.wait() pkginfo_stream = stdout.splitlines() + + return pkginfo_stream - pkglist_stream = None - if self.osrel in common_constants.IPS_OS_RELS: - args = ["pkg", "list", "-H", "-s"] - pkg_proc = subprocess.Popen(args, stdout=subprocess.PIPE) - stdout, stderr = pkg_proc.communicate() - ret = pkg_proc.wait() - pkglist_stream = stdout.splitlines() + def _GetIpsPkginfosStream(self): + args = ["pkg", "list", "-H", "-s"] + pkg_proc = subprocess.Popen(args, stdout=subprocess.PIPE) + stdout, stderr = pkg_proc.communicate() + ret = pkg_proc.wait() + pkglist_stream = stdout.splitlines() + return pkglist_stream - return (pkginfo_stream, pkglist_stream) + def _ParsePkgInfos(self, stream, parser, unused_show_progress): + """Parses informations about packages - def _ParsePkginfoOutput(self, streams, unused_show_progress): - """Parses output from pkginfo. - Args: - streams: A list of two streams of strings, the first one from SVR4 - pkginfo, the second from IPS + stream: A stream that contains informations about packages + parser: The parse method used to retrieve information from the stream unused_show_progress: Used to display a progress bar, which was removed. Returns: A dictionary from pkgnames to descriptions. """ - logging.debug("-> _ParsePkginfoOutput()") + logging.debug("-> _ParsePkgInfos()") packages_by_pkgname = {} - for line in streams[0]: - pkgname, pkg_desc = self._ParsePkginfoLine(line) + for line in stream: + pkgname, pkg_desc = parser(line) packages_by_pkgname.setdefault(pkgname, pkg_desc) - if streams[1]: - for line in streams[1]: - pkgname, pkg_desc = self._ParsePkgListLine(line) - packages_by_pkgname.setdefault(pkgname, pkg_desc) - logging.debug("<- _ParsePkginfoOutput()") + logging.debug("<- _ParsePkgInfos()") return packages_by_pkgname def _IpsNameToSrv4Name(self, ips_name): - """Create a fake Svr4 pkgname from an ips pkgname.""" + """Create a fake Srv4 pkgname from an ips pkgname.""" return "SUNW" + "-".join(re.findall (ALPHANUMERIC_RE, ips_name)) class InstallContentsImporter(object): Modified: csw/mgar/gar/v2-solaris11/lib/python/system_pkgmap_test.py =================================================================== --- csw/mgar/gar/v2-solaris11/lib/python/system_pkgmap_test.py 2012-06-05 14:53:13 UTC (rev 18230) +++ csw/mgar/gar/v2-solaris11/lib/python/system_pkgmap_test.py 2012-06-05 21:52:09 UTC (rev 18231) @@ -31,7 +31,7 @@ class IndexerUnitTest(unittest.TestCase): - def test_ParsePkgmapLineFile(self): + def test_ParseSrv4PkgmapLineFile(self): spi = system_pkgmap.Indexer() expected = { 'cksum': '28258', @@ -48,9 +48,9 @@ 'target': None, 'type': 'f', 'line': PKGMAP_LINE_1} - self.assertEqual(expected, spi._ParsePkgmapLine(PKGMAP_LINE_1)) + self.assertEqual(expected, spi._ParseSrv4PkgmapLine(PKGMAP_LINE_1)) - def test_ParsePkgmapLineTypeSymlink(self): + def test_ParseSrv4PkgmapLineTypeSymlink(self): spi = system_pkgmap.Indexer() expected = { 'cksum': None, @@ -68,9 +68,9 @@ 'type': 's', 'line': PKGMAP_LINE_3, } - self.assertEqual(expected, spi._ParsePkgmapLine(PKGMAP_LINE_3)) + self.assertEqual(expected, spi._ParseSrv4PkgmapLine(PKGMAP_LINE_3)) - def test_ParsePkgmapLineTypeQuestionMark(self): + def test_ParseSrv4PkgmapLineTypeQuestionMark(self): """A question mark is not a valid type, but we have to cope with it.""" spi = system_pkgmap.Indexer() expected = { @@ -84,9 +84,9 @@ 'mode': None, 'type': 'd', 'minor': None, } - self.assertEqual(expected, spi._ParsePkgmapLine(PKGMAP_LINE_5)) + self.assertEqual(expected, spi._ParseSrv4PkgmapLine(PKGMAP_LINE_5)) - def test_ParsePkgmapLineTypePipe(self): + def test_ParseSrv4PkgmapLineTypePipe(self): """A pipe is a valid type and we have to cope with it.""" spi = system_pkgmap.Indexer() expected = { @@ -105,9 +105,9 @@ 'type': 'p', 'minor': None, } - self.assertEqual(expected, spi._ParsePkgmapLine(PKGMAP_LINE_8)) + self.assertEqual(expected, spi._ParseSrv4PkgmapLine(PKGMAP_LINE_8)) - def test_ParsePkgmapLibc(self): + def test_ParseSrv4PkgmapLibc(self): """A question mark is not a valid type, but we have to cope with it.""" spi = system_pkgmap.Indexer() expected = { @@ -126,21 +126,21 @@ 'type': 'f', 'minor': None, } - self.assertEqual(expected, spi._ParsePkgmapLine(PKGMAP_LINE_6)) + self.assertEqual(expected, spi._ParseSrv4PkgmapLine(PKGMAP_LINE_6)) - def test_ParsePkgmapExclamationMark(self): + def test_ParseSrv4PkgmapExclamationMark(self): spi = system_pkgmap.Indexer() self.assertEqual( ["!CSWmozilla"], - spi._ParsePkgmapLine(PKGMAP_LINE_7)["pkgnames"]) + spi._ParseSrv4PkgmapLine(PKGMAP_LINE_7)["pkgnames"]) - def test_ParsePkgmapLineTypeWrongSyntax(self): + def test_ParseSrv4PkgmapLineTypeWrongSyntax(self): spi = system_pkgmap.Indexer() self.assertRaises( system_pkgmap.ParsingError, - spi._ParsePkgmapLine, "/") + spi._ParseSrv4PkgmapLine, "/") - def test_ParsePkgContentsLineLink(self): + def test_ParseIpsPkgContentsLineLink(self): spi = system_pkgmap.Indexer() line = "bin\tlink\tsystem/core-os\t./usr/bin" expected = { @@ -155,9 +155,9 @@ } self.assertEquals( expected, - spi._ParsePkgContentsLine(line)) + spi._ParseIpsPkgContentsLine(line)) - def test_ParsePkgContentsLineDir(self): + def test_ParseIpsPkgContentsLineDir(self): spi = system_pkgmap.Indexer() line = "dev\tdir\tsystem/core-os\t\t0755\troot\tsys" expected = { @@ -172,9 +172,9 @@ } self.assertEquals( expected, - spi._ParsePkgContentsLine(line)) + spi._ParseIpsPkgContentsLine(line)) - def test_ParsePkgContentsLineHardlink(self): + def test_ParseIpsPkgContentsLineHardlink(self): spi = system_pkgmap.Indexer() line = ("etc/svc/profile/platform_SUNW,UltraSPARC-IIe-NetraCT-40.xml\thardlink\t" "system/core-os\t./platform_SUNW,UltraSPARC-IIi-Netract.xml") @@ -192,9 +192,9 @@ } self.assertEquals( expected, - spi._ParsePkgContentsLine(line)) + spi._ParseIpsPkgContentsLine(line)) - def test_ParsePkgContentsLineFile(self): + def test_ParseIpsPkgContentsLineFile(self): spi = system_pkgmap.Indexer() line = ("lib/libc.so.1\tfile\tsystem/library\t\t0755\troot\tbin") expected = { @@ -209,7 +209,7 @@ } self.assertEquals( expected, - spi._ParsePkgContentsLine(line)) + spi._ParseIpsPkgContentsLine(line)) def test_IpsNameToSrv4Name(self): spi = system_pkgmap.Indexer() @@ -218,18 +218,15 @@ spi._IpsNameToSrv4Name("system/core-os")) - def test_ParseInstallContents(self): + def test_ParsePkgContents(self): spi = system_pkgmap.Indexer() - streams = ( - ( + stream = ( PKGMAP_LINE_1, PKGMAP_LINE_2, PKGMAP_LINE_3, PKGMAP_LINE_4 - ), - None ) - self.assertEqual(4, len(spi._ParseInstallContents(streams, False))) + self.assertEqual(4, len(spi._ParsePkgContents(stream, spi._ParseSrv4PkgmapLine, False))) class InstallContentsImporterUnitTest(test_base.SqlObjectTestMixin, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Wed Jun 6 00:56:28 2012 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Tue, 05 Jun 2012 22:56:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[18232] csw/mgar/gar/v2-solaris11/lib/python Message-ID: Revision: 18232 http://gar.svn.sourceforge.net/gar/?rev=18232&view=rev Author: chninkel Date: 2012-06-05 22:56:28 +0000 (Tue, 05 Jun 2012) Log Message: ----------- v2-solaris11: fixed a mistake in IPS package contents merging Modified Paths: -------------- csw/mgar/gar/v2-solaris11/lib/python/system_pkgmap.py csw/mgar/gar/v2-solaris11/lib/python/system_pkgmap_test.py Modified: csw/mgar/gar/v2-solaris11/lib/python/system_pkgmap.py =================================================================== --- csw/mgar/gar/v2-solaris11/lib/python/system_pkgmap.py 2012-06-05 21:52:09 UTC (rev 18231) +++ csw/mgar/gar/v2-solaris11/lib/python/system_pkgmap.py 2012-06-05 22:56:28 UTC (rev 18232) @@ -315,7 +315,7 @@ "pkginfo": self._ParsePkgInfos(srv4_pkginfo_stream, self._ParseSrv4PkginfoLine, show_progress), } if ips_pkginfo_stream and ips_pkgcontent_stream: - data["contents"].append(self._ParsePkgContents(ips_pkgcontent_stream, self._ParseIpsPkgContentsLine, show_progress)) + data["contents"].extend(self._ParsePkgContents(ips_pkgcontent_stream, self._ParseIpsPkgContentsLine, show_progress)) data["pkginfo"].update(self._ParsePkgInfos(ips_pkgcontent_stream, self._ParseIpsPkgListLine, show_progress)) return data Modified: csw/mgar/gar/v2-solaris11/lib/python/system_pkgmap_test.py =================================================================== --- csw/mgar/gar/v2-solaris11/lib/python/system_pkgmap_test.py 2012-06-05 21:52:09 UTC (rev 18231) +++ csw/mgar/gar/v2-solaris11/lib/python/system_pkgmap_test.py 2012-06-05 22:56:28 UTC (rev 18232) @@ -7,6 +7,14 @@ import logging import common_constants +PKGINFO_LINE_1 = ("system SUNWwpau Wireless WPA Supplicant, (Usr)") +PKGINFO_LINE_2 = ("system SUNWpcan Cisco-Aironet 802.11b driver") + +PKGLIST_LINE_1 = ("developer/versioning/sccs " + " Source Code Control System") +PKGLIST_LINE_2 = ("developer/solarisstudio-122/c++ (solarisstudio) " + " C++ Compilers") + PKGMAP_LINE_1 = ("/usr/lib/sparcv9/libpthread.so.1 f none " "0755 root bin 41296 28258 1018129099 SUNWcslx") PKGMAP_LINE_2 = ("/usr/lib/libCrun.so.1 f none " @@ -28,9 +36,25 @@ "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") +PKGCONTENT_LINE_1 = ("bin\tlink\tsystem/core-os\t./usr/bin") +PKGCONTENT_LINE_2 = ("dev\tdir\tsystem/core-os\t\t0755\troot\tsys") +PKGCONTENT_LINE_3 = ("etc/svc/profile/platform_SUNW,UltraSPARC-IIe-NetraCT-40.xml\thardlink\t" + "system/core-os\t./platform_SUNW,UltraSPARC-IIi-Netract.xml") +PKGCONTENT_LINE_4 = ("lib/libc.so.1\tfile\tsystem/library\t\t0755\troot\tbin") + class IndexerUnitTest(unittest.TestCase): + def test_ParseSrv4PkginfoLine(self): + spi = system_pkgmap.Indexer() + expected = ('SUNWwpau', 'Wireless WPA Supplicant, (Usr)') + self.assertEqual(expected, spi._ParseSrv4PkginfoLine(PKGINFO_LINE_1)) + + def test_ParseIpsPkgListLine(self): + spi = system_pkgmap.Indexer() + expected = ('SUNWdeveloper-versioning-sccs', 'Source Code Control System') + self.assertEqual(expected, spi._ParseIpsPkgListLine(PKGLIST_LINE_1)) + def test_ParseSrv4PkgmapLineFile(self): spi = system_pkgmap.Indexer() expected = { @@ -142,14 +166,14 @@ def test_ParseIpsPkgContentsLineLink(self): spi = system_pkgmap.Indexer() - line = "bin\tlink\tsystem/core-os\t./usr/bin" + line = PKGCONTENT_LINE_1 expected = { 'pkgnames': ['SUNWsystem-core-os'], 'group': None, 'target': './usr/bin', 'owner': None, 'path': '/bin', - 'line': 'bin\tlink\tsystem/core-os\t./usr/bin', + 'line': PKGCONTENT_LINE_1, 'type': 's', 'mode': None, } @@ -159,14 +183,14 @@ def test_ParseIpsPkgContentsLineDir(self): spi = system_pkgmap.Indexer() - line = "dev\tdir\tsystem/core-os\t\t0755\troot\tsys" + line = PKGCONTENT_LINE_2 expected = { 'pkgnames': ['SUNWsystem-core-os'], 'group': 'sys', 'target': None, 'owner': 'root', 'path': '/dev', - 'line': 'dev\tdir\tsystem/core-os\t\t0755\troot\tsys', + 'line': PKGCONTENT_LINE_2, 'type': 'd', 'mode': '0755', } @@ -176,17 +200,14 @@ def test_ParseIpsPkgContentsLineHardlink(self): spi = system_pkgmap.Indexer() - line = ("etc/svc/profile/platform_SUNW,UltraSPARC-IIe-NetraCT-40.xml\thardlink\t" - "system/core-os\t./platform_SUNW,UltraSPARC-IIi-Netract.xml") + line = PKGCONTENT_LINE_3 expected = { 'pkgnames': ['SUNWsystem-core-os'], 'group': None, 'target': './platform_SUNW,UltraSPARC-IIi-Netract.xml', 'owner': None, 'path': '/etc/svc/profile/platform_SUNW,UltraSPARC-IIe-NetraCT-40.xml', - 'line': ('etc/svc/profile/platform_SUNW,UltraSPARC-IIe-NetraCT-40.xml\t' - 'hardlink\tsystem/core-os\t' - './platform_SUNW,UltraSPARC-IIi-Netract.xml'), + 'line': PKGCONTENT_LINE_3, 'type': 'l', 'mode': None, } @@ -196,14 +217,14 @@ def test_ParseIpsPkgContentsLineFile(self): spi = system_pkgmap.Indexer() - line = ("lib/libc.so.1\tfile\tsystem/library\t\t0755\troot\tbin") + line = PKGCONTENT_LINE_4 expected = { 'pkgnames': ['SUNWsystem-library'], 'group': 'bin', 'target': None, 'owner': 'root', 'path': '/lib/libc.so.1', - 'line': 'lib/libc.so.1\tfile\tsystem/library\t\t0755\troot\tbin', + 'line': PKGCONTENT_LINE_4, 'type': 'f', 'mode': '0755', } @@ -220,15 +241,66 @@ def test_ParsePkgContents(self): spi = system_pkgmap.Indexer() - stream = ( + srv4_stream = ( PKGMAP_LINE_1, PKGMAP_LINE_2, PKGMAP_LINE_3, PKGMAP_LINE_4 ) - self.assertEqual(4, len(spi._ParsePkgContents(stream, spi._ParseSrv4PkgmapLine, False))) + ips_stream = ( + PKGCONTENT_LINE_1, + PKGCONTENT_LINE_2, + PKGCONTENT_LINE_3, + PKGCONTENT_LINE_4 + ) + self.assertEqual(4, len(spi._ParsePkgContents(srv4_stream, spi._ParseSrv4PkgmapLine, False))) + self.assertEqual(4, len(spi._ParsePkgContents(ips_stream, spi._ParseIpsPkgContentsLine, False))) + def test_GetDataStructure(self): + spi = system_pkgmap.Indexer() + expected = {'arch': 'sparc', 'osrel': 'SunOS5.11', + 'contents': [ + {'cksum': '28258', 'class': 'none', 'group': 'bin', + 'line': '/usr/lib/sparcv9/libpthread.so.1 f none 0755 root bin 41296 28258 1018129099 SUNWcslx', + 'major': None, 'minor': None, 'mode': '0755', 'modtime': '1018129099', 'owner': 'root', + 'path': '/usr/lib/sparcv9/libpthread.so.1', 'pkgnames': ['SUNWcslx'], 'size': '41296', + 'target': None, 'type': 'f'}, + {'cksum': '6287', 'class': 'none', 'group': 'bin', + 'line': '/usr/lib/libCrun.so.1 f none 0755 root bin 63588 6287 1256043984 SUNWlibC', + 'major': None, 'minor': None, 'mode': '0755', 'modtime': '1256043984', 'owner': 'root', + 'path': '/usr/lib/libCrun.so.1', 'pkgnames': ['SUNWlibC'], 'size': '63588', + 'target': None, 'type': 'f'}, + {'group': None, 'line': 'bin\tlink\tsystem/core-os\t./usr/bin', 'mode': None, 'owner': None, + 'path': '/bin', 'pkgnames': ['SUNWsystem-core-os'], 'target': './usr/bin', 'type': 's'}, + {'group': 'sys', 'line': 'dev\tdir\tsystem/core-os\t\t0755\troot\tsys', 'mode': '0755', 'owner': 'root', + 'path': '/dev', 'pkgnames': ['SUNWsystem-core-os'], 'target': None, 'type': 'd'}], + 'pkginfo': {'SUNWbin': u'link system/core-os ./usr/bin', + 'SUNWdev': u'dir system/core-os 0755 root sys', + 'SUNWpcan': u'Cisco-Aironet 802.11b driver', + 'SUNWwpau': u'Wireless WPA Supplicant, (Usr)'} + } + srv4_pkginfos_stream = ( + PKGINFO_LINE_1, + PKGINFO_LINE_2, + ) + ips_pkginfos_stream = ( + PKGLIST_LINE_1, + PKGLIST_LINE_2, + ) + srv4_pkgcontents_stream = ( + PKGMAP_LINE_1, + PKGMAP_LINE_2, + ) + ips_pkgcontents_stream = ( + PKGCONTENT_LINE_1, + PKGCONTENT_LINE_2, + ) + self.assertEqual(expected, spi.GetDataStructure(srv4_pkgcontents_stream, srv4_pkginfos_stream, + ips_pkgcontents_stream, ips_pkginfos_stream, + 'SunOS5.11', 'sparc', False)) + + class InstallContentsImporterUnitTest(test_base.SqlObjectTestMixin, unittest.TestCase): This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Wed Jun 6 10:35:56 2012 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Wed, 06 Jun 2012 08:35:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[18233] csw/mgar/pkg/cpan Message-ID: Revision: 18233 http://gar.svn.sourceforge.net/gar/?rev=18233&view=rev Author: idogan23 Date: 2012-06-06 08:35:56 +0000 (Wed, 06 Jun 2012) Log Message: ----------- Google-ProtocolBuffers: initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Google-ProtocolBuffers/ csw/mgar/pkg/cpan/Google-ProtocolBuffers/Makefile csw/mgar/pkg/cpan/Google-ProtocolBuffers/branches/ csw/mgar/pkg/cpan/Google-ProtocolBuffers/tags/ csw/mgar/pkg/cpan/Google-ProtocolBuffers/trunk/ csw/mgar/pkg/cpan/Google-ProtocolBuffers/trunk/Makefile csw/mgar/pkg/cpan/Google-ProtocolBuffers/trunk/checksums csw/mgar/pkg/cpan/Google-ProtocolBuffers/trunk/files/ csw/mgar/pkg/cpan/Google-ProtocolBuffers/trunk/files/LICENSE Added: csw/mgar/pkg/cpan/Google-ProtocolBuffers/Makefile =================================================================== --- csw/mgar/pkg/cpan/Google-ProtocolBuffers/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Google-ProtocolBuffers/Makefile 2012-06-06 08:35:56 UTC (rev 18233) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/cpan/Google-ProtocolBuffers/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/cpan/Google-ProtocolBuffers/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Google-ProtocolBuffers/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Google-ProtocolBuffers/trunk/Makefile 2012-06-06 08:35:56 UTC (rev 18233) @@ -0,0 +1,41 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = Google-ProtocolBuffers +VERSION = 0.08 +GARTYPE = v2 +CATEGORIES = cpan +AUTHOR = GARIEV + +DESCRIPTION = Simple Interface To Google Protocol Buffers +define BLURB + Simple Interface To Google Protocol Buffers +endef + +MASTER_SITES = +DISTFILES = $(DISTNAME).tar.gz +DISTFILES += LICENSE + +LICENSE = LICENSE + +PACKAGES = CSWpm-google-protocolbuffers +CATALOGNAME = pm_google_protocolbuffers + +RUNTIME_DEP_PKGS = CSWpmparserecdescent +RUNTIME_DEP_PKGS += CSWpmclsaccessor + +# File name regex to get notifications about upstream software releases +# NOTE: Use this only if the automatic regex creation +# does not work for your package +# 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 = + +ARCHALL = 1 + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Property changes on: csw/mgar/pkg/cpan/Google-ProtocolBuffers/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/cpan/Google-ProtocolBuffers/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Google-ProtocolBuffers/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Google-ProtocolBuffers/trunk/checksums 2012-06-06 08:35:56 UTC (rev 18233) @@ -0,0 +1 @@ +30f193270dbc09a0cd56811b5d766240 Google-ProtocolBuffers-0.08.tar.gz Added: csw/mgar/pkg/cpan/Google-ProtocolBuffers/trunk/files/LICENSE =================================================================== --- csw/mgar/pkg/cpan/Google-ProtocolBuffers/trunk/files/LICENSE (rev 0) +++ csw/mgar/pkg/cpan/Google-ProtocolBuffers/trunk/files/LICENSE 2012-06-06 08:35:56 UTC (rev 18233) @@ -0,0 +1,5 @@ +Copyright (C) 2008 by Igor Gariev, + +This library is free software; you can redistribute it and/or modify +it under the same terms as Perl itself, either Perl version 5.10.0 or, +at your option, any later version of Perl 5 you may have available. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Wed Jun 6 11:42:35 2012 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 06 Jun 2012 09:42:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[18234] csw/mgar/pkg/dhcp/trunk Message-ID: Revision: 18234 http://gar.svn.sourceforge.net/gar/?rev=18234&view=rev Author: bonivart Date: 2012-06-06 09:42:35 +0000 (Wed, 06 Jun 2012) Log Message: ----------- dhcp/trunk: update to 4.2.4 Modified Paths: -------------- csw/mgar/pkg/dhcp/trunk/Makefile csw/mgar/pkg/dhcp/trunk/checksums Modified: csw/mgar/pkg/dhcp/trunk/Makefile =================================================================== --- csw/mgar/pkg/dhcp/trunk/Makefile 2012-06-06 08:35:56 UTC (rev 18233) +++ csw/mgar/pkg/dhcp/trunk/Makefile 2012-06-06 09:42:35 UTC (rev 18234) @@ -1,10 +1,10 @@ NAME = dhcp -VERSION = 4.2.3 -RELEASE = P2 -DISTVERSION = $(VERSION)-$(RELEASE) -SPKG_VERSION = $(VERSION)$(RELEASE) -DISTNAME = $(NAME)-$(VERSION)-$(RELEASE) -WORKSRC = $(WORKDIR)/$(DISTNAME) +VERSION = 4.2.4 +#RELEASE = P2 +#DISTVERSION = $(VERSION)-$(RELEASE) +#SPKG_VERSION = $(VERSION)$(RELEASE) +#DISTNAME = $(NAME)-$(VERSION)-$(RELEASE) +#WORKSRC = $(WORKDIR)/$(DISTNAME) CATEGORIES = net GARTYPE = v2 @@ -16,8 +16,8 @@ suitable for use in high-volume and high-reliability applications. endef -#MASTER_SITES = http://ftp.isc.org/isc/dhcp/$(VERSION)/ -MASTER_SITES = http://ftp.isc.org/isc/dhcp/$(DISTVERSION)/ +MASTER_SITES = http://ftp.isc.org/isc/dhcp/$(VERSION)/ +#MASTER_SITES = http://ftp.isc.org/isc/dhcp/$(DISTVERSION)/ DISTFILES = $(NAME)-$(VERSION).tar.gz DISTFILES = $(DISTNAME).tar.gz Modified: csw/mgar/pkg/dhcp/trunk/checksums =================================================================== --- csw/mgar/pkg/dhcp/trunk/checksums 2012-06-06 08:35:56 UTC (rev 18233) +++ csw/mgar/pkg/dhcp/trunk/checksums 2012-06-06 09:42:35 UTC (rev 18234) @@ -1 +1 @@ -14f57fd580d01633d0fad4809007a801 dhcp-4.2.3-P2.tar.gz +c244cefe663d43100af757d8ff625a1f dhcp-4.2.4.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 Wed Jun 6 11:50:25 2012 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 06 Jun 2012 09:50:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[18235] csw/mgar/gar/v2/lib/python/package_stats.py Message-ID: Revision: 18235 http://gar.svn.sourceforge.net/gar/?rev=18235&view=rev Author: bonivart Date: 2012-06-06 09:50:25 +0000 (Wed, 06 Jun 2012) Log Message: ----------- fix srv4 Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package_stats.py Modified: csw/mgar/gar/v2/lib/python/package_stats.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_stats.py 2012-06-06 09:42:35 UTC (rev 18234) +++ csw/mgar/gar/v2/lib/python/package_stats.py 2012-06-06 09:50:25 UTC (rev 18235) @@ -486,7 +486,7 @@ if not total_packages: raise PackageError("The length of package list is zero.") counter = itertools.count(1) - self.logger.info("Juicing the srv4 package stream files...") + self.logger.info("Juicing the svr4 package stream files...") pbar = progressbar.ProgressBar() pbar.maxval = total_packages pbar.start() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Wed Jun 6 15:18:44 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Wed, 06 Jun 2012 13:18:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[18236] csw/mgar/pkg/qt4-gcc/trunk/Makefile Message-ID: Revision: 18236 http://gar.svn.sourceforge.net/gar/?rev=18236&view=rev Author: cgrzemba Date: 2012-06-06 13:18:44 +0000 (Wed, 06 Jun 2012) Log Message: ----------- qt4-gcc/trunk: refine runtime dependencies Modified Paths: -------------- csw/mgar/pkg/qt4-gcc/trunk/Makefile Modified: csw/mgar/pkg/qt4-gcc/trunk/Makefile =================================================================== --- csw/mgar/pkg/qt4-gcc/trunk/Makefile 2012-06-06 09:50:25 UTC (rev 18235) +++ csw/mgar/pkg/qt4-gcc/trunk/Makefile 2012-06-06 13:18:44 UTC (rev 18236) @@ -46,6 +46,7 @@ INSTALL_ROOT = $(DESTDIR) EXTRA_INSTALL_EXPORTS = INSTALL_ROOT + PACKAGES += CSWlibqtcore4-gxx PKGFILES_CSWlibqtcore4-gxx += $(call baseisadirs,$(libdir),libQtCore\.so\.4(\.\d+)*) SPKG_DESC_CSWlibqtcore4-gxx += $(DESCRIPTION), libQtCore.so.4 @@ -67,6 +68,9 @@ RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx += CSWlibqtcore4-gxx +RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx += CSWlibfontconfig1 +RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx += CSWlibfreetype6 CHECKPKG_OVERRIDES_CSWlibqtgui4-gxx += file-with-bad-content|/usr/local|root/opt/csw/gxx/lib/libQtGui.so.4.8.0 CHECKPKG_OVERRIDES_CSWlibqtgui4-gxx += file-with-bad-content|/usr/share|root/opt/csw/gxx/lib/libQtGui.so.4.8.0 @@ -115,6 +119,8 @@ RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibpq5 RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibodbc2 RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibtiff3 +RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibfontconfig1 +RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibfreetype6 # These are code examples. CHECKPKG_OVERRIDES_CSWqt4-gxx-dev += binary-architecture-does-not-match-placement # REFINE this later! @@ -160,6 +166,8 @@ RUNTIME_DEP_PKGS_CSWlibqtopengl4-gxx += CSWlibstdc++6 RUNTIME_DEP_PKGS_CSWlibqtopengl4-gxx += CSWlibqtgui4-gxx RUNTIME_DEP_PKGS_CSWlibqtopengl4-gxx += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibqtopengl4-gxx += CSWlibfontconfig1 +RUNTIME_DEP_PKGS_CSWlibqtopengl4-gxx += CSWlibfreetype6 PACKAGES += CSWlibqtscript4-gxx PKGFILES_CSWlibqtscript4-gxx += $(call baseisadirs,$(libdir),libQtScript\.so\.4(\.\d+)*) @@ -267,6 +275,7 @@ PACKAGES += CSWqt4-gxx-doc SPKG_DESC_CSWqt4-gxx-doc += $(DESCRIPTION), documentation # Catch-all +ARCHALL_CSWqt4-gxx-doc = 1 CHECKPKG_OVERRIDES_CSWqt4-gxx-doc += file-with-bad-content include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Wed Jun 6 23:09:26 2012 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Wed, 06 Jun 2012 21:09:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[18237] csw/mgar/gar/v2 Message-ID: Revision: 18237 http://gar.svn.sourceforge.net/gar/?rev=18237&view=rev Author: chninkel Date: 2012-06-06 21:09:26 +0000 (Wed, 06 Jun 2012) Log Message: ----------- v2: merged v2-solaris11 branch to have a working pkgdb under SunOS 5.11 Modified Paths: -------------- csw/mgar/gar/v2/lib/python/common_constants.py csw/mgar/gar/v2/lib/python/system_pkgmap.py csw/mgar/gar/v2/lib/python/system_pkgmap_test.py Property Changed: ---------------- csw/mgar/gar/v2/ Property changes on: csw/mgar/gar/v2 ___________________________________________________________________ Modified: svn:mergeinfo - /csw/mgar/gar/v2:4936-6678 /csw/mgar/gar/v2-bwalton:9784-10011 /csw/mgar/gar/v2-checkpkg:7722-7855 /csw/mgar/gar/v2-checkpkg-override-relocation:10585-10737 /csw/mgar/gar/v2-checkpkg-stats:8454-8649 /csw/mgar/gar/v2-collapsed-modulations:6895 /csw/mgar/gar/v2-defaultchange:13903-14022 /csw/mgar/gar/v2-dirpackage:8125-8180 /csw/mgar/gar/v2-fortran:10883-12516 /csw/mgar/gar/v2-git/v2-relocate:7617 /csw/mgar/gar/v2-migrateconf:7082-7211 /csw/mgar/gar/v2-noexternals:11592-11745 /csw/mgar/gar/v2-raised-buildlevel:15906-15949 /csw/mgar/gar/v2-relocate:5028-11738 /csw/mgar/gar/v2-skayser:6087-6132 /csw/mgar/gar/v2-sqlite:10434-10449 /csw/mgar/gar/v2-uwatch2:12141-13270 + /csw/mgar/gar/v2:4936-6678 /csw/mgar/gar/v2-bwalton:9784-10011 /csw/mgar/gar/v2-checkpkg:7722-7855 /csw/mgar/gar/v2-checkpkg-override-relocation:10585-10737 /csw/mgar/gar/v2-checkpkg-stats:8454-8649 /csw/mgar/gar/v2-collapsed-modulations:6895 /csw/mgar/gar/v2-defaultchange:13903-14022 /csw/mgar/gar/v2-dirpackage:8125-8180 /csw/mgar/gar/v2-fortran:10883-12516 /csw/mgar/gar/v2-git/v2-relocate:7617 /csw/mgar/gar/v2-migrateconf:7082-7211 /csw/mgar/gar/v2-noexternals:11592-11745 /csw/mgar/gar/v2-raised-buildlevel:15906-15949 /csw/mgar/gar/v2-relocate:5028-11738 /csw/mgar/gar/v2-skayser:6087-6132 /csw/mgar/gar/v2-solaris11:18134-18236 /csw/mgar/gar/v2-sqlite:10434-10449 /csw/mgar/gar/v2-uwatch2:12141-13270 Modified: csw/mgar/gar/v2/lib/python/common_constants.py =================================================================== --- csw/mgar/gar/v2/lib/python/common_constants.py 2012-06-06 13:18:44 UTC (rev 18236) +++ csw/mgar/gar/v2/lib/python/common_constants.py 2012-06-06 21:09:26 UTC (rev 18237) @@ -14,8 +14,16 @@ OS_REL_511, ) OBSOLETE_OS_RELS = ( - u"SunOS5.8", + OS_REL_58, ) +SVR4_OS_RELS = ( + OS_REL_58, + OS_REL_59, + OS_REL_510, +) +IPS_OS_RELS = ( + OS_REL_511, +) SYSTEM_SYMLINKS = ( ("/opt/csw/bdb4", ("/opt/csw/bdb42",)), Modified: csw/mgar/gar/v2/lib/python/system_pkgmap.py =================================================================== --- csw/mgar/gar/v2/lib/python/system_pkgmap.py 2012-06-06 13:18:44 UTC (rev 18236) +++ csw/mgar/gar/v2/lib/python/system_pkgmap.py 2012-06-06 21:09:26 UTC (rev 18237) @@ -21,6 +21,7 @@ import sys CONTENT_PKG_RE = r"^\*?(CSW|SUNW)[0-9a-zA-Z\-]?[0-9a-z\-]+$" +ALPHANUMERIC_RE = r"[0-9a-zA-Z]+" class Error(Exception): pass @@ -103,16 +104,69 @@ repr(self.infile_contents), repr(self.outfile), repr(self.osrel), repr(self.arch)) - def _ParsePkginfoLine(self, line): + def _ParseSrv4PkginfoLine(self, line): fields = re.split(c.WS_RE, line) pkgname = fields[1] pkg_desc = u" ".join(fields[2:]) return pkgname, pkg_desc - def _ParsePkgmapLine(self, line): + def _ParseIpsPkgListLine(self, line): + fields = re.split(c.WS_RE, line) + pkgname = self._IpsNameToSrv4Name(fields[0]) + desc_field_start = 1 + # The optional publisher field is always between + # parenthesis, we skip it if necessary + if fields[desc_field_start].startswith("("): + desc_field_start += 1 + pkg_desc = u" ".join(fields[desc_field_start:]) + return pkgname, pkg_desc + + def _ParseIpsPkgContentsLine(self, line): + """Parses one line of "pkg contents" output + + Returns: A dictionary of fields, or None. + """ + # we will map from IPS type to SVR4 type + type_mapping = { "link": "s", "hardlink": "l", "file": "f", "dir": "d" } + + parts = re.split(c.WS_RE, line.strip()) + if len(parts) < 4: + raise ParsingError("Line does not have enough fields: %s" + % repr(parts)) + # paths are relative to "/" in pkg contents output + f_path = "/" + parts[0] + f_target = None + try: + f_type = type_mapping[parts[1]] + except: + raise ParsingError("Wrong file type: %s in %s" + % (repr(parts[1]), repr(line))) + f_mode = None + f_owner = None + f_group = None + f_pkgname = None + pkgnames = [ self._IpsNameToSrv4Name(parts[2]) ] + if f_type in ("s", "l"): + f_target = parts[3] + else: + (f_mode, f_owner, f_group) = parts[3:6] + + d = { + "path": f_path, + "target": f_target, + "type": f_type, + "mode": f_mode, + "owner": f_owner, + "group": f_group, + "pkgnames": pkgnames, + "line": line, + } + return d + + def _ParseSrv4PkgmapLine(self, line): """Parses one line of /var/sadm/install/contents. - Returns: A dictionary of fields, or none. + Returns: A dictionary of fields, or None. """ if line.startswith("#"): return None @@ -207,8 +261,8 @@ } return d - def _ParseInstallContents(self, stream, show_progress): - logging.debug("-> _ParseInstallContents()") + def _ParsePkgContents(self, stream, parser, show_progress): + logging.debug("-> _ParsePkgContents()") parsed_lines = [] c = itertools.count() # Progressbar stuff can go here. @@ -217,13 +271,13 @@ if not c.next() % 1000: sys.stdout.write(".") sys.stdout.flush() - d = self._ParsePkgmapLine(line) + d = parser(line) # d might be None if line was a comment if d: parsed_lines.append(d) if show_progress: sys.stdout.write("\n") - logging.debug("<- _ParseInstallContents()") + logging.debug("<- _ParsePkgContents()") return parsed_lines def _GetUname(self, uname_option=None): @@ -246,9 +300,10 @@ def _GetArch(self): return self._GetUname("-p") - - def GetDataStructure(self, contents_stream, pkginfo_stream, osrel, arch, - show_progress=False): + + def GetDataStructure(self, srv4_pkgcontent_stream, srv4_pkginfo_stream, + ips_pkgcontent_stream, ips_pkginfo_stream, + osrel, arch, show_progress=False): """Gets the data structure to be pickled. Does not interact with the OS. @@ -256,17 +311,30 @@ data = { "osrel": osrel, "arch": arch, - "contents": self._ParseInstallContents(contents_stream, show_progress), - "pkginfo": self._ParsePkginfoOutput(pkginfo_stream, show_progress), + "contents": self._ParsePkgContents(srv4_pkgcontent_stream, self._ParseSrv4PkgmapLine, show_progress), + "pkginfo": self._ParsePkgInfos(srv4_pkginfo_stream, self._ParseSrv4PkginfoLine, show_progress), } + if ips_pkginfo_stream and ips_pkgcontent_stream: + data["contents"].extend(self._ParsePkgContents(ips_pkgcontent_stream, self._ParseIpsPkgContentsLine, show_progress)) + data["pkginfo"].update(self._ParsePkgInfos(ips_pkgcontent_stream, self._ParseIpsPkgListLine, show_progress)) + return data def Index(self, show_progress=False): # This function interacts with the OS. - contents_stream = open(self.infile_contents, "r") - pkginfo_stream = self._GetPkginfoStream() - data = self.GetDataStructure( - contents_stream, pkginfo_stream, self.osrel, self.arch, show_progress) + srv4_pkgcontents_stream = self._GetSrv4PkgcontentStream() + srv4_pkginfos_stream = self._GetSrv4PkginfosStream() + + if self.osrel in common_constants.IPS_OS_RELS: + ips_pkgcontents_stream = self._GetIpsPkgcontentStream() + ips_pkginfos_stream = self._GetIpsPkginfosStream() + else: + ips_pkgcontents_stream = None + ips_pkginfos_stream = None + + data = self.GetDataStructure(srv4_pkgcontents_stream, srv4_pkginfos_stream, + ips_pkgcontents_stream, ips_pkginfos_stream, + self.osrel, self.arch, show_progress) return data def IndexAndSave(self): @@ -277,27 +345,60 @@ cPickle.dump(data, out_fd, cPickle.HIGHEST_PROTOCOL) logging.debug("IndexAndSave(): pickling done.") - def _GetPkginfoStream(self): + def _GetSrv4PkgcontentStream(self): + return (open(self.infile_contents, "r")) + + def _GetIpsPkgcontentStream(self): + args = ["pkg", "contents", "-H", "-o", + "path,action.name,pkg.name,target,mode,owner,group", + "-t", "dir,file,hardlink,link"] + pkg_proc = subprocess.Popen(args, stdout=subprocess.PIPE) + stdout, stderr = pkg_proc.communicate() + ret = pkg_proc.wait() + return stdout.splitlines() + + def _GetSrv4PkginfosStream(self): """Calls pkginfo if file is not specified.""" if self.infile_pkginfo: - return open(self.infile_pkginfo, "r") + pkginfo_stream = open(self.infile_pkginfo, "r") else: args = ["pkginfo"] pkginfo_proc = subprocess.Popen(args, stdout=subprocess.PIPE) stdout, stderr = pkginfo_proc.communicate() ret = pkginfo_proc.wait() pkginfo_stream = stdout.splitlines() - return pkginfo_stream + + return pkginfo_stream - def _ParsePkginfoOutput(self, pkginfo_stream, unused_show_progress): - logging.debug("-> _ParsePkginfoOutput()") + def _GetIpsPkginfosStream(self): + args = ["pkg", "list", "-H", "-s"] + pkg_proc = subprocess.Popen(args, stdout=subprocess.PIPE) + stdout, stderr = pkg_proc.communicate() + ret = pkg_proc.wait() + pkglist_stream = stdout.splitlines() + return pkglist_stream + + def _ParsePkgInfos(self, stream, parser, unused_show_progress): + """Parses informations about packages + + Args: + stream: A stream that contains informations about packages + parser: The parse method used to retrieve information from the stream + unused_show_progress: Used to display a progress bar, which was removed. + Returns: + A dictionary from pkgnames to descriptions. + """ + logging.debug("-> _ParsePkgInfos()") packages_by_pkgname = {} - for line in pkginfo_stream: - pkgname, pkg_desc = self._ParsePkginfoLine(line) + for line in stream: + pkgname, pkg_desc = parser(line) packages_by_pkgname.setdefault(pkgname, pkg_desc) - logging.debug("<- _ParsePkginfoOutput()") + logging.debug("<- _ParsePkgInfos()") return packages_by_pkgname + def _IpsNameToSrv4Name(self, ips_name): + """Create a fake Srv4 pkgname from an ips pkgname.""" + return "SUNW" + "-".join(re.findall (ALPHANUMERIC_RE, ips_name)) class InstallContentsImporter(object): """Responsible for importing a pickled file into the database.""" @@ -482,7 +583,7 @@ def ComposeFakeSrv4Md5(self, pkgname, osrel, arch): """Returns a fake md5 sum of a fake srv4 package. - + For the purposes of fake srv4 packages for SUNW stuff. """ key = pkgname + osrel + arch Modified: csw/mgar/gar/v2/lib/python/system_pkgmap_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/system_pkgmap_test.py 2012-06-06 13:18:44 UTC (rev 18236) +++ csw/mgar/gar/v2/lib/python/system_pkgmap_test.py 2012-06-06 21:09:26 UTC (rev 18237) @@ -7,6 +7,14 @@ import logging import common_constants +PKGINFO_LINE_1 = ("system SUNWwpau Wireless WPA Supplicant, (Usr)") +PKGINFO_LINE_2 = ("system SUNWpcan Cisco-Aironet 802.11b driver") + +PKGLIST_LINE_1 = ("developer/versioning/sccs " + " Source Code Control System") +PKGLIST_LINE_2 = ("developer/solarisstudio-122/c++ (solarisstudio) " + " C++ Compilers") + PKGMAP_LINE_1 = ("/usr/lib/sparcv9/libpthread.so.1 f none " "0755 root bin 41296 28258 1018129099 SUNWcslx") PKGMAP_LINE_2 = ("/usr/lib/libCrun.so.1 f none " @@ -28,11 +36,27 @@ "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") +PKGCONTENT_LINE_1 = ("bin\tlink\tsystem/core-os\t./usr/bin") +PKGCONTENT_LINE_2 = ("dev\tdir\tsystem/core-os\t\t0755\troot\tsys") +PKGCONTENT_LINE_3 = ("etc/svc/profile/platform_SUNW,UltraSPARC-IIe-NetraCT-40.xml\thardlink\t" + "system/core-os\t./platform_SUNW,UltraSPARC-IIi-Netract.xml") +PKGCONTENT_LINE_4 = ("lib/libc.so.1\tfile\tsystem/library\t\t0755\troot\tbin") + class IndexerUnitTest(unittest.TestCase): - def test_ParsePkgmapLineFile(self): + def test_ParseSrv4PkginfoLine(self): spi = system_pkgmap.Indexer() + expected = ('SUNWwpau', 'Wireless WPA Supplicant, (Usr)') + self.assertEqual(expected, spi._ParseSrv4PkginfoLine(PKGINFO_LINE_1)) + + def test_ParseIpsPkgListLine(self): + spi = system_pkgmap.Indexer() + expected = ('SUNWdeveloper-versioning-sccs', 'Source Code Control System') + self.assertEqual(expected, spi._ParseIpsPkgListLine(PKGLIST_LINE_1)) + + def test_ParseSrv4PkgmapLineFile(self): + spi = system_pkgmap.Indexer() expected = { 'cksum': '28258', 'class': 'none', @@ -48,9 +72,9 @@ 'target': None, 'type': 'f', 'line': PKGMAP_LINE_1} - self.assertEqual(expected, spi._ParsePkgmapLine(PKGMAP_LINE_1)) + self.assertEqual(expected, spi._ParseSrv4PkgmapLine(PKGMAP_LINE_1)) - def test_ParsePkgmapLineTypeSymlink(self): + def test_ParseSrv4PkgmapLineTypeSymlink(self): spi = system_pkgmap.Indexer() expected = { 'cksum': None, @@ -68,9 +92,9 @@ 'type': 's', 'line': PKGMAP_LINE_3, } - self.assertEqual(expected, spi._ParsePkgmapLine(PKGMAP_LINE_3)) + self.assertEqual(expected, spi._ParseSrv4PkgmapLine(PKGMAP_LINE_3)) - def test_ParsePkgmapLineTypeQuestionMark(self): + def test_ParseSrv4PkgmapLineTypeQuestionMark(self): """A question mark is not a valid type, but we have to cope with it.""" spi = system_pkgmap.Indexer() expected = { @@ -84,9 +108,9 @@ 'mode': None, 'type': 'd', 'minor': None, } - self.assertEqual(expected, spi._ParsePkgmapLine(PKGMAP_LINE_5)) + self.assertEqual(expected, spi._ParseSrv4PkgmapLine(PKGMAP_LINE_5)) - def test_ParsePkgmapLineTypePipe(self): + def test_ParseSrv4PkgmapLineTypePipe(self): """A pipe is a valid type and we have to cope with it.""" spi = system_pkgmap.Indexer() expected = { @@ -105,9 +129,9 @@ 'type': 'p', 'minor': None, } - self.assertEqual(expected, spi._ParsePkgmapLine(PKGMAP_LINE_8)) + self.assertEqual(expected, spi._ParseSrv4PkgmapLine(PKGMAP_LINE_8)) - def test_ParsePkgmapLibc(self): + def test_ParseSrv4PkgmapLibc(self): """A question mark is not a valid type, but we have to cope with it.""" spi = system_pkgmap.Indexer() expected = { @@ -126,30 +150,157 @@ 'type': 'f', 'minor': None, } - self.assertEqual(expected, spi._ParsePkgmapLine(PKGMAP_LINE_6)) + self.assertEqual(expected, spi._ParseSrv4PkgmapLine(PKGMAP_LINE_6)) - def test_ParsePkgmapExclamationMark(self): + def test_ParseSrv4PkgmapExclamationMark(self): spi = system_pkgmap.Indexer() self.assertEqual( ["!CSWmozilla"], - spi._ParsePkgmapLine(PKGMAP_LINE_7)["pkgnames"]) + spi._ParseSrv4PkgmapLine(PKGMAP_LINE_7)["pkgnames"]) - def test_ParsePkgmapLineTypeWrongSyntax(self): + def test_ParseSrv4PkgmapLineTypeWrongSyntax(self): spi = system_pkgmap.Indexer() self.assertRaises( system_pkgmap.ParsingError, - spi._ParsePkgmapLine, "/") + spi._ParseSrv4PkgmapLine, "/") - def test_ParseInstallContents(self): + def test_ParseIpsPkgContentsLineLink(self): spi = system_pkgmap.Indexer() - data = ( - PKGMAP_LINE_1, - PKGMAP_LINE_2, - PKGMAP_LINE_3, - PKGMAP_LINE_4) - self.assertEqual(4, len(spi._ParseInstallContents(data, False))) + line = PKGCONTENT_LINE_1 + expected = { + 'pkgnames': ['SUNWsystem-core-os'], + 'group': None, + 'target': './usr/bin', + 'owner': None, + 'path': '/bin', + 'line': PKGCONTENT_LINE_1, + 'type': 's', + 'mode': None, + } + self.assertEquals( + expected, + spi._ParseIpsPkgContentsLine(line)) + def test_ParseIpsPkgContentsLineDir(self): + spi = system_pkgmap.Indexer() + line = PKGCONTENT_LINE_2 + expected = { + 'pkgnames': ['SUNWsystem-core-os'], + 'group': 'sys', + 'target': None, + 'owner': 'root', + 'path': '/dev', + 'line': PKGCONTENT_LINE_2, + 'type': 'd', + 'mode': '0755', + } + self.assertEquals( + expected, + spi._ParseIpsPkgContentsLine(line)) + def test_ParseIpsPkgContentsLineHardlink(self): + spi = system_pkgmap.Indexer() + line = PKGCONTENT_LINE_3 + expected = { + 'pkgnames': ['SUNWsystem-core-os'], + 'group': None, + 'target': './platform_SUNW,UltraSPARC-IIi-Netract.xml', + 'owner': None, + 'path': '/etc/svc/profile/platform_SUNW,UltraSPARC-IIe-NetraCT-40.xml', + 'line': PKGCONTENT_LINE_3, + 'type': 'l', + 'mode': None, + } + self.assertEquals( + expected, + spi._ParseIpsPkgContentsLine(line)) + + def test_ParseIpsPkgContentsLineFile(self): + spi = system_pkgmap.Indexer() + line = PKGCONTENT_LINE_4 + expected = { + 'pkgnames': ['SUNWsystem-library'], + 'group': 'bin', + 'target': None, + 'owner': 'root', + 'path': '/lib/libc.so.1', + 'line': PKGCONTENT_LINE_4, + 'type': 'f', + 'mode': '0755', + } + self.assertEquals( + expected, + spi._ParseIpsPkgContentsLine(line)) + + def test_IpsNameToSrv4Name(self): + spi = system_pkgmap.Indexer() + self.assertEquals( + 'SUNWsystem-core-os', + spi._IpsNameToSrv4Name("system/core-os")) + + + def test_ParsePkgContents(self): + spi = system_pkgmap.Indexer() + srv4_stream = ( + PKGMAP_LINE_1, + PKGMAP_LINE_2, + PKGMAP_LINE_3, + PKGMAP_LINE_4 + ) + ips_stream = ( + PKGCONTENT_LINE_1, + PKGCONTENT_LINE_2, + PKGCONTENT_LINE_3, + PKGCONTENT_LINE_4 + ) + self.assertEqual(4, len(spi._ParsePkgContents(srv4_stream, spi._ParseSrv4PkgmapLine, False))) + self.assertEqual(4, len(spi._ParsePkgContents(ips_stream, spi._ParseIpsPkgContentsLine, False))) + + def test_GetDataStructure(self): + spi = system_pkgmap.Indexer() + expected = {'arch': 'sparc', 'osrel': 'SunOS5.11', + 'contents': [ + {'cksum': '28258', 'class': 'none', 'group': 'bin', + 'line': '/usr/lib/sparcv9/libpthread.so.1 f none 0755 root bin 41296 28258 1018129099 SUNWcslx', + 'major': None, 'minor': None, 'mode': '0755', 'modtime': '1018129099', 'owner': 'root', + 'path': '/usr/lib/sparcv9/libpthread.so.1', 'pkgnames': ['SUNWcslx'], 'size': '41296', + 'target': None, 'type': 'f'}, + {'cksum': '6287', 'class': 'none', 'group': 'bin', + 'line': '/usr/lib/libCrun.so.1 f none 0755 root bin 63588 6287 1256043984 SUNWlibC', + 'major': None, 'minor': None, 'mode': '0755', 'modtime': '1256043984', 'owner': 'root', + 'path': '/usr/lib/libCrun.so.1', 'pkgnames': ['SUNWlibC'], 'size': '63588', + 'target': None, 'type': 'f'}, + {'group': None, 'line': 'bin\tlink\tsystem/core-os\t./usr/bin', 'mode': None, 'owner': None, + 'path': '/bin', 'pkgnames': ['SUNWsystem-core-os'], 'target': './usr/bin', 'type': 's'}, + {'group': 'sys', 'line': 'dev\tdir\tsystem/core-os\t\t0755\troot\tsys', 'mode': '0755', 'owner': 'root', + 'path': '/dev', 'pkgnames': ['SUNWsystem-core-os'], 'target': None, 'type': 'd'}], + 'pkginfo': {'SUNWbin': u'link system/core-os ./usr/bin', + 'SUNWdev': u'dir system/core-os 0755 root sys', + 'SUNWpcan': u'Cisco-Aironet 802.11b driver', + 'SUNWwpau': u'Wireless WPA Supplicant, (Usr)'} + } + srv4_pkginfos_stream = ( + PKGINFO_LINE_1, + PKGINFO_LINE_2, + ) + ips_pkginfos_stream = ( + PKGLIST_LINE_1, + PKGLIST_LINE_2, + ) + srv4_pkgcontents_stream = ( + PKGMAP_LINE_1, + PKGMAP_LINE_2, + ) + ips_pkgcontents_stream = ( + PKGCONTENT_LINE_1, + PKGCONTENT_LINE_2, + ) + self.assertEqual(expected, spi.GetDataStructure(srv4_pkgcontents_stream, srv4_pkginfos_stream, + ips_pkgcontents_stream, ips_pkginfos_stream, + 'SunOS5.11', 'sparc', False)) + + + class InstallContentsImporterUnitTest(test_base.SqlObjectTestMixin, unittest.TestCase): 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 7 02:10:55 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 07 Jun 2012 00:10:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[18238] csw/mgar/pkg/exim/trunk Message-ID: Revision: 18238 http://gar.svn.sourceforge.net/gar/?rev=18238&view=rev Author: bdwalton Date: 2012-06-07 00:10:55 +0000 (Thu, 07 Jun 2012) Log Message: ----------- exim/trunk: setup the sendmail/mailq/newaliases alternatives handling Modified Paths: -------------- csw/mgar/pkg/exim/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/exim/trunk/files/newaliases Modified: csw/mgar/pkg/exim/trunk/Makefile =================================================================== --- csw/mgar/pkg/exim/trunk/Makefile 2012-06-06 21:09:26 UTC (rev 18237) +++ csw/mgar/pkg/exim/trunk/Makefile 2012-06-07 00:10:55 UTC (rev 18238) @@ -53,6 +53,8 @@ PRESERVECONF += /etc/opt/csw/exim/exim.conf /etc/opt/csw/exim/exim-env.sh PRESERVECONF += /etc/opt/csw/exim/aliases +ALTERNATIVE = /opt/csw/bin/sendmail sendmail /opt/csw/sbin/sendmail.exim 50 /opt/csw/bin/mailq mailq /opt/csw/bin/mailq.exim /opt/csw/bin/newaliases newaliases /opt/csw/bin/newaliases.exim + # scripts/exim_install has been patched to use this variable EXIM_VERSION = $(VERSION) export EXIM_VERSION @@ -145,5 +147,9 @@ post-merge: ( cd $(PKGROOT); mkdir -p ./$(UGPATH); \ echo "$(UGENTRY)" > ./$(UGPATH)/cswusergroup ) - ( cd $(PKGROOT); mkdir -p var/opt/csw/log/exim ) + ( cd $(PKGROOT); mkdir -p opt/csw/bin var/opt/csw/log/exim ) + @( cd $(PKGROOT)/$(bindir); \ + ln -s ../sbin/exim sendmail.exim; \ + ln -s ../sbin/exim mailq.exim; \ + ginstall -m 0755 $(abspath $(FILEDIR))/newaliases $(PKGROOT)/$(bindir)/newaliases.exim ) @$(MAKECOOKIE) Added: csw/mgar/pkg/exim/trunk/files/newaliases =================================================================== --- csw/mgar/pkg/exim/trunk/files/newaliases (rev 0) +++ csw/mgar/pkg/exim/trunk/files/newaliases 2012-06-07 00:10:55 UTC (rev 18238) @@ -0,0 +1,4 @@ +#!/bin/ksh + +# Note: This script is part of CSWexim +/opt/csw/bin/exim -bi 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 7 02:31:22 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 07 Jun 2012 00:31:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[18239] csw/mgar/pkg Message-ID: Revision: 18239 http://gar.svn.sourceforge.net/gar/?rev=18239&view=rev Author: bdwalton Date: 2012-06-07 00:31:22 +0000 (Thu, 07 Jun 2012) Log Message: ----------- initial commit Added Paths: ----------- csw/mgar/pkg/libvirt/ csw/mgar/pkg/libvirt/Makefile csw/mgar/pkg/libvirt/branches/ csw/mgar/pkg/libvirt/tags/ csw/mgar/pkg/libvirt/trunk/ csw/mgar/pkg/libvirt/trunk/Makefile csw/mgar/pkg/libvirt/trunk/checksums csw/mgar/pkg/libvirt/trunk/files/ Copied: csw/mgar/pkg/libvirt/Makefile (from rev 15145, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/libvirt/Makefile (rev 0) +++ csw/mgar/pkg/libvirt/Makefile 2012-06-07 00:31:22 UTC (rev 18239) @@ -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/libvirt/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/libvirt/trunk/Makefile =================================================================== --- csw/mgar/pkg/libvirt/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libvirt/trunk/Makefile 2012-06-07 00:31:22 UTC (rev 18239) @@ -0,0 +1,23 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = libvirt +VERSION = 0.9.12 +GARTYPE = v2 +CATEGORIES = lib + +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + +DESCRIPTION = The Virtualization API +define BLURB +A toolkit to interact with the virtualization capabilities of recent +versions of Linux (and other OSes) +endef + +MASTER_SITES = http://libvirt.org/sources/ +DISTFILES = $(DISTNAME).tar.gz + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Property changes on: csw/mgar/pkg/libvirt/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/libvirt/trunk/checksums =================================================================== --- csw/mgar/pkg/libvirt/trunk/checksums (rev 0) +++ csw/mgar/pkg/libvirt/trunk/checksums 2012-06-07 00:31:22 UTC (rev 18239) @@ -0,0 +1 @@ +5e842bc55733ceba60c64767580ff3e4 libvirt-0.9.12.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 Thu Jun 7 02:36:52 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 07 Jun 2012 00:36:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[18240] csw/mgar/pkg/exim/trunk/Makefile Message-ID: Revision: 18240 http://gar.svn.sourceforge.net/gar/?rev=18240&view=rev Author: bdwalton Date: 2012-06-07 00:36:52 +0000 (Thu, 07 Jun 2012) Log Message: ----------- exim/trunk: correct path to sendmail.exim in alternatives handler Modified Paths: -------------- csw/mgar/pkg/exim/trunk/Makefile Modified: csw/mgar/pkg/exim/trunk/Makefile =================================================================== --- csw/mgar/pkg/exim/trunk/Makefile 2012-06-07 00:31:22 UTC (rev 18239) +++ csw/mgar/pkg/exim/trunk/Makefile 2012-06-07 00:36:52 UTC (rev 18240) @@ -53,7 +53,7 @@ PRESERVECONF += /etc/opt/csw/exim/exim.conf /etc/opt/csw/exim/exim-env.sh PRESERVECONF += /etc/opt/csw/exim/aliases -ALTERNATIVE = /opt/csw/bin/sendmail sendmail /opt/csw/sbin/sendmail.exim 50 /opt/csw/bin/mailq mailq /opt/csw/bin/mailq.exim /opt/csw/bin/newaliases newaliases /opt/csw/bin/newaliases.exim +ALTERNATIVE = /opt/csw/bin/sendmail sendmail /opt/csw/bin/sendmail.exim 50 /opt/csw/bin/mailq mailq /opt/csw/bin/mailq.exim /opt/csw/bin/newaliases newaliases /opt/csw/bin/newaliases.exim # scripts/exim_install has been patched to use this variable EXIM_VERSION = $(VERSION) 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 7 03:06:44 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 07 Jun 2012 01:06:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[18241] csw/mgar/pkg/postgresql/trunk/Makefile Message-ID: Revision: 18241 http://gar.svn.sourceforge.net/gar/?rev=18241&view=rev Author: bdwalton Date: 2012-06-07 01:06:44 +0000 (Thu, 07 Jun 2012) Log Message: ----------- postgresql/trunk: update the libssl dependency to 1.0.0 from 0.9.8 Modified Paths: -------------- csw/mgar/pkg/postgresql/trunk/Makefile Modified: csw/mgar/pkg/postgresql/trunk/Makefile =================================================================== --- csw/mgar/pkg/postgresql/trunk/Makefile 2012-06-07 00:36:52 UTC (rev 18240) +++ csw/mgar/pkg/postgresql/trunk/Makefile 2012-06-07 01:06:44 UTC (rev 18241) @@ -322,7 +322,7 @@ PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += .*/CSW$(NAME)$(BASE_VERSION_NODOT)-server.postmsg PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += .*$(docdir)/$(NAME)$(BASE_VERSION_NODOT)_server/README.CSW RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibreadline6 -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibssl0-9-8 +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibz1 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibpq5 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibgnugetopt0 @@ -340,7 +340,7 @@ PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-client += .*/CSW$(NAME)$(BASE_VERSION_NODOT)-client.postmsg PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-client += .*$(docdir)/$(NAME)$(BASE_VERSION_NODOT)_client/README.CSW RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibreadline6 -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibssl0-9-8 +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibz1 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibpq5 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibgnugetopt0 @@ -361,7 +361,7 @@ PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += .*/alternatives/$(NAME)$(BASE_VERSION_NODOT)_contrib.* PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += .*/CSW$(NAME)$(BASE_VERSION_NODOT)-contrib.postmsg PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += .*$(docdir)/$(NAME)$(BASE_VERSION_NODOT)_contrib/README.CSW -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibssl0-9-8 +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibz1 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibpq5 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibgnugetopt0 @@ -391,7 +391,7 @@ RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibxslt1 RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibreadline6 -RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibssl0-9-8 +RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibssl1-0-0 # Those '/usr/local' are ok, they are in a HPUX section of the file CHECKPKG_OVERRIDES_CSW$(NAME)-dev += $(foreach i,$(NEEDED_ISAS), $(subst $(ISA_DEFAULT)/,,file-with-bad-content|/usr/local|root$(libdir)/$(i)/$(NAME)/$(BASE_VERSION_NODOT)/pgxs/src/Makefile.shlib) ) # That's ok too, it's docbook stuff which we don't use in this build @@ -426,7 +426,7 @@ PACKAGES += CSWlibpq5 SPKG_DESC_CSWlibpq5 = PostgreSQL $(VERSION), libpq PKGFILES_CSWlibpq5 = $(call pkgfiles_lib,libpq.so.5) -RUNTIME_DEP_PKGS_CSWlibpq5 = CSWlibssl0-9-8 +RUNTIME_DEP_PKGS_CSWlibpq5 = CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWlibpq5 += CSWlibgssapi-krb5-2 BUILD_DEP_PKGS = CSWlibxml2-dev 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 Thu Jun 7 09:13:31 2012 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Thu, 07 Jun 2012 07:13:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[18242] csw/mgar/pkg/munin/trunk Message-ID: Revision: 18242 http://gar.svn.sourceforge.net/gar/?rev=18242&view=rev Author: j_arndt Date: 2012-06-07 07:13:31 +0000 (Thu, 07 Jun 2012) Log Message: ----------- munin: update to 2.0.0, pre-experimental Modified Paths: -------------- csw/mgar/pkg/munin/trunk/Makefile csw/mgar/pkg/munin/trunk/checksums Added Paths: ----------- csw/mgar/pkg/munin/trunk/files/0001-Expand-paths-with-DESTDIR.patch csw/mgar/pkg/munin/trunk/files/0001-Use-CSWtop-in-memory.in.patch csw/mgar/pkg/munin/trunk/files/0001-changed-shebang-in-files.patch csw/mgar/pkg/munin/trunk/files/0001-paths-and-hostname-in-munin-node.conf.in.patch csw/mgar/pkg/munin/trunk/files/0001-paths-in-Makefile.config.patch csw/mgar/pkg/munin/trunk/files/0001-paths-in-munin-htaccess.in.patch csw/mgar/pkg/munin/trunk/files/0001-replace-yourhostname-with-hostname-in-postinstall.patch Removed Paths: ------------- csw/mgar/pkg/munin/trunk/files/Makefile.config.patch csw/mgar/pkg/munin/trunk/files/Makefile.patch csw/mgar/pkg/munin/trunk/files/munin-graph.in.patch csw/mgar/pkg/munin/trunk/files/munin-htaccess.in.patch csw/mgar/pkg/munin/trunk/files/munin-node.conf.in.patch csw/mgar/pkg/munin/trunk/files/munin.conf.in.patch csw/mgar/pkg/munin/trunk/files/sunos_memory.in.patch Modified: csw/mgar/pkg/munin/trunk/Makefile =================================================================== --- csw/mgar/pkg/munin/trunk/Makefile 2012-06-07 01:06:44 UTC (rev 18241) +++ csw/mgar/pkg/munin/trunk/Makefile 2012-06-07 07:13:31 UTC (rev 18242) @@ -1,11 +1,11 @@ NAME = munin -VERSION = 1.4.6 +VERSION = 2.0.0 CATEGORIES = apps GARTYPE = v2 -SPKG_DESC_CSWmunin-master = Master component of the graphical network and system monitoring munin -SPKG_DESC_CSWmunin-node = Node component of the graphical network and system monitoring munin -SPKG_DESC_CSWmunin-common = Common files for munin node and master +SPKG_DESC_CSWmunin-master = Master component of the graphical network and system monitoring Munin +SPKG_DESC_CSWmunin-node = Node component of the graphical network and system monitoring Munin +SPKG_DESC_CSWmunin-common = Common files for Munin node and master define BLURB Munin the monitoring tool surveys all your computers and remembers what it saw. It presents all the information in graphs through a web interface. @@ -19,23 +19,23 @@ DISTFILES += apache-munin.conf.CSW apache-munin-cgi.conf.CSW DISTFILES += README.CSW -PATCHFILES += Makefile.patch -PATCHFILES += Makefile.config.patch -PATCHFILES += sunos_memory.in.patch -PATCHFILES += munin-node.conf.in.patch -PATCHFILES += munin.conf.in.patch -PATCHFILES += munin-htaccess.in.patch -PATCHFILES += munin-graph.in.patch # match some paths to /{etc|var}/opt/csw/munin -PATCHFILES += perl.patch # shebang correctly set +PATCHFILES += 0001-Expand-paths-with-DESTDIR.patch +PATCHFILES += 0001-paths-in-Makefile.config.patch +PATCHFILES += 0001-Use-CSWtop-in-memory.in.patch +PATCHFILES += 0001-paths-and-hostname-in-munin-node.conf.in.patch +PATCHFILES += 0001-replace-yourhostname-with-hostname-in-postinstall.patch +PATCHFILES += 0001-paths-in-munin-htaccess.in.patch +#PATCHFILES += munin-graph.in.patch # match some paths to /{etc|var}/opt/csw/munin +PATCHFILES += 0001-changed-shebang-in-files.patch PACKAGES = CSWmunin-master CSWmunin-node CSWmunin-common CATALOGNAME_CSWmunin-master = munin_master CATALOGNAME_CSWmunin-node = munin_node CATALOGNAME_CSWmunin-common = munin_common -ARCHALL_CSWmunin-master = 1 -ARCHALL_CSWmunin-node = 1 -ARCHALL_CSWmunin-common = 1 +ARCHALL_CSWmunin-master = 1 +ARCHALL_CSWmunin-node = 1 +ARCHALL_CSWmunin-common = 1 RUNTIME_DEP_PKGS_CSWmunin-common = CSWperl @@ -53,7 +53,7 @@ PKGFILES_CSWmunin-common += .*/Munin::Common.* PKGFILES_CSWmunin-common += .*/Munin\/Common.* -PKGFILES_CSWmunin-common += .*munin_common.* +#PKGFILES_CSWmunin-common += .*munin_common.* # # files for CSWmunin-node @@ -62,7 +62,7 @@ MUNINNODE_UGFILES = /var/opt/csw/munin /var/opt/csw/munin/log /var/opt/csw/munin/db /var/opt/csw/munin/run MUNINNODE_SMF = /etc/opt/csw/init.d/cswmuninnode MUNINNODE_USERGROUP = /opt/csw/etc/pkg/CSWmunin-node/cswusergroup -MUNINNODE_EXECS = .*munin-node .*munin-node-configure.* .*munindoc.* .*munin-run.* +MUNINNODE_EXECS = .*munin-node .*munin-node-configure.* .*munindoc.* .*munin-run.* .*munin-sched.* MUNINNODE_CONF = .*munin-node.conf .*munin-node.conf.5 .*munin-node.1 /etc/opt/csw/munin/munin-conf.d /etc/opt/csw/munin/plugin-conf.d PKGFILES_CSWmunin-node += .*muninnode.* .*CSWmunin-node.* @@ -89,12 +89,14 @@ # files for CSWmunin-master # -MUNINMASTER_UGFILES = /var/opt/csw/munin.* /etc/opt/csw/munin/apache.* /etc/opt/csw/munin/templates.* -MUNINMASTER_USERGROUP = /opt/csw/etc/pkg/CSWmunin-master/cswusergroup -MUNINMASTER_EXECS = .*munin-check.* .*munin-cron.* .*munin-graph.* .*munin-html.* .*munin-limits.* .*munin-update.* -MUNINMASTER_FONTS = .*ttf.* -MUNINMASTER_CRONTABS = /etc/opt/csw/pkg/CSWmunin-master/crontabs/munin -MUNINMASTER_POSTMSG = /opt/csw/share/doc/munin_master/README.CSW +MUNINMASTER_UGFILES = /var/opt/csw/munin.* /etc/opt/csw/munin/apache.* /etc/opt/csw/munin/templates.* +MUNINMASTER_UGFILES += /etc/opt/csw/munin/static.* +MUNINMASTER_USERGROUP = /opt/csw/etc/pkg/CSWmunin-master/cswusergroup +MUNINMASTER_EXECS = .*munin-check.* .*munin-cron.* .*munin-graph.* .*munin-html.* .*munin-limits.* .*munin-update.* +MUNINMASTER_EXECS += .*munin-datafile2storable.* .*munin-storable2datafile.* .*munin-cgi-graph.* .*munin-cgi-html.* +MUNINMASTER_FONTS = .*ttf.* +MUNINMASTER_CRONTABS = /etc/opt/csw/pkg/CSWmunin-master/crontabs/munin +MUNINMASTER_POSTMSG = /opt/csw/share/doc/munin_master/README.CSW PKGFILES_CSWmunin-master += .*muninmaster.* PKGFILES_CSWmunin-master += .*Munin::Master.* @@ -195,6 +197,7 @@ @# @cat $(WORKSRC)/Makefile | sed -e "s;DESTDIR =;& $(DESTDIR);g" > $(WORKSRC)/Makefile.tmp @( cd $(WORKSRC); gmake -f Makefile ; cp Makefile.tmp Makefile ; gmake -f Makefile install) + @#( cd $(WORKSRC); cp Makefile.tmp Makefile ; gmake -f Makefile) @# @# we are using cswclassutils -> cswcptemplate @# @@ -240,9 +243,8 @@ @# @# handle some other files @# - @ginstall -d $(DESTDIR)/opt/csw/share/munin/fonts - @ginstall -m 644 $(WORKSRC)/master/VeraMono.ttf $(DESTDIR)/opt/csw/share/munin/fonts/VeraMono.ttf - @$(MAKECOOKIE) + @#ginstall -d $(DESTDIR)/opt/csw/share/munin/fonts + @#ginstall -m 644 $(WORKSRC)/master/VeraMono.ttf $(DESTDIR)/opt/csw/share/munin/fonts/VeraMono.ttf @# @# make some links for munin node @# @@ -250,3 +252,4 @@ @ln -s /opt/csw/libexec/munin/plugins/uptime $(DESTDIR)/etc/opt/csw/munin/plugins/uptime @ln -s /opt/csw/libexec/munin/plugins/cpu $(DESTDIR)/etc/opt/csw/munin/plugins/cpu @ln -s /opt/csw/libexec/munin/plugins/df $(DESTDIR)/etc/opt/csw/munin/plugins/df + @$(MAKECOOKIE) Modified: csw/mgar/pkg/munin/trunk/checksums =================================================================== --- csw/mgar/pkg/munin/trunk/checksums 2012-06-07 01:06:44 UTC (rev 18241) +++ csw/mgar/pkg/munin/trunk/checksums 2012-06-07 07:13:31 UTC (rev 18242) @@ -1 +1 @@ -b54f320ba75f97ad2ddba3664f7158f2 munin-1.4.6.tar.gz +9cbe5b5651905cc022f6c97489396564 munin-2.0.0.tar.gz Added: csw/mgar/pkg/munin/trunk/files/0001-Expand-paths-with-DESTDIR.patch =================================================================== --- csw/mgar/pkg/munin/trunk/files/0001-Expand-paths-with-DESTDIR.patch (rev 0) +++ csw/mgar/pkg/munin/trunk/files/0001-Expand-paths-with-DESTDIR.patch 2012-06-07 07:13:31 UTC (rev 18242) @@ -0,0 +1,365 @@ +From 5d6dad6dcd4f57e114f39fe8b467bdf92172f62b Mon Sep 17 00:00:00 2001 +From: Juergen Arndt +Date: Sun, 3 Jun 2012 17:51:49 +0200 +Subject: [PATCH] Expand paths with $(DESTDIR) + +--- + Makefile | 224 +++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 113 insertions(+), 111 deletions(-) + +diff --git a/Makefile b/Makefile +index f610539..bd3d9a6 100644 +--- a/Makefile ++++ b/Makefile +@@ -9,6 +9,8 @@ + DEFAULTS = Makefile.config + CONFIG = Makefile.config + ++DESTDIR = ++ + include $(DEFAULTS) + include $(CONFIG) + +@@ -49,8 +51,8 @@ uninstall: + # This removes the installed config so that the next install-pass installs + # a new config. Target _only_ suitable for maintainers. + unconfig: +- rm -f $(HTMLDIR)/.htaccess +- rm -f $(CONFDIR)/munin.conf ++ rm -f $(DESTDIR)$(HTMLDIR)/.htaccess ++ rm -f $(DESTDIR)$(CONFDIR)/munin.conf + + tags: + -rm -f TAGS +@@ -66,63 +68,63 @@ endif + + install-pre: Makefile Makefile.config + @$(CHECKUSER) +- mkdir -p $(LOGDIR) +- mkdir -p $(STATEDIR) +- mkdir -p $(SPOOLDIR) +- mkdir -p $(CONFDIR) +- $(CHOWN) $(USER) $(LOGDIR) $(STATEDIR) $(SPOOLDIR) ++ mkdir -p $(DESTDIR)$(LOGDIR) ++ mkdir -p $(DESTDIR)$(STATEDIR) ++ mkdir -p $(DESTDIR)$(SPOOLDIR) ++ mkdir -p $(DESTDIR)$(CONFDIR) ++# $(CHOWN) $(USER) $(LOGDIR) $(STATEDIR) $(SPOOLDIR) + + install-master-prime: $(INFILES_MASTER) install-pre install-master +- mkdir -p $(CONFDIR)/templates +- mkdir -p $(CONFDIR)/static +- mkdir -p $(CONFDIR)/templates/partial +- mkdir -p $(CONFDIR)/munin-conf.d +- mkdir -p $(LIBDIR) +- mkdir -p $(BINDIR) +- mkdir -p $(PERLLIB) +- mkdir -p $(PERLLIB)/Munin/Master +- mkdir -p $(HTMLDIR) +- mkdir -p $(DBDIR) +- mkdir -p $(DBDIR)/cgi-tmp +- mkdir -p $(CGIDIR) +- +- $(CHOWN) $(USER) $(HTMLDIR) $(DBDIR) +- $(CHMOD) 0755 $(DBDIR) +- +- $(CHOWN) $(CGIUSER) $(DBDIR)/cgi-tmp +- $(CHMOD) 0755 $(DBDIR)/cgi-tmp ++ mkdir -p $(DESTDIR)$(CONFDIR)/templates ++ mkdir -p $(DESTDIR)$(CONFDIR)/static ++ mkdir -p $(DESTDIR)$(CONFDIR)/templates/partial ++ mkdir -p $(DESTDIR)$(CONFDIR)/munin-conf.d ++ mkdir -p $(DESTDIR)$(LIBDIR) ++ mkdir -p $(DESTDIR)$(BINDIR) ++ mkdir -p $(DESTDIR)$(PERLLIB) ++ mkdir -p $(DESTDIR)$(PERLLIB)/Munin/Master ++ mkdir -p $(DESTDIR)$(HTMLDIR) ++ mkdir -p $(DESTDIR)$(DBDIR) ++ mkdir -p $(DESTDIR)$(DBDIR)/cgi-tmp ++ mkdir -p $(DESTDIR)$(CGIDIR) ++ ++# $(CHOWN) $(USER) $(HTMLDIR) $(DBDIR) ++ $(CHMOD) 0755 $(DESTDIR)$(DBDIR) ++ ++# $(CHOWN) $(CGIUSER) $(DBDIR)/cgi-tmp ++ $(CHMOD) 0755 $(DESTDIR)$(DBDIR)/cgi-tmp + + for p in master/www/*.tmpl ; do \ +- $(INSTALL) -m 0644 "$$p" $(CONFDIR)/templates/ ; \ ++ $(INSTALL) -m 0644 "$$p" $(DESTDIR)$(CONFDIR)/templates/ ; \ + done + + for p in master/static/* ; do \ +- $(INSTALL) -m 0644 "$$p" $(CONFDIR)/static/ ; \ ++ $(INSTALL) -m 0644 "$$p" $(DESTDIR)$(CONFDIR)/static/ ; \ + done + + for p in master/www/partial/*.tmpl; do \ +- $(INSTALL) -m 0644 "$$p" $(CONFDIR)/templates/partial/ ; \ ++ $(INSTALL) -m 0644 "$$p" $(DESTDIR)$(CONFDIR)/templates/partial/ ; \ + done + +- $(INSTALL) -m 0755 master/DejaVuSansMono.ttf $(LIBDIR)/ +- $(INSTALL) -m 0755 master/DejaVuSans.ttf $(LIBDIR)/ ++ $(INSTALL) -m 0755 master/DejaVuSansMono.ttf $(DESTDIR)$(LIBDIR)/ ++ $(INSTALL) -m 0755 master/DejaVuSans.ttf $(DESTDIR)$(LIBDIR)/ + +- test -f $(HTMLDIR)/.htaccess || $(INSTALL) -m 0644 build/master/www/munin-htaccess $(HTMLDIR)/.htaccess +- test -f "$(CONFDIR)/munin.conf" || $(INSTALL) -m 0644 build/master/munin.conf $(CONFDIR)/ ++ test -f $(DESTDIR)$(HTMLDIR)/.htaccess || $(INSTALL) -m 0644 build/master/www/munin-htaccess $(DESTDIR)$(HTMLDIR)/.htaccess ++ test -f "$(DESTDIR)$(CONFDIR)/munin.conf" || $(INSTALL) -m 0644 build/master/munin.conf $(DESTDIR)$(CONFDIR)/ + +- $(INSTALL) -m 0755 build/master/_bin/munin-cron $(BINDIR)/ +- $(INSTALL) -m 0755 build/master/_bin/munin-check $(BINDIR)/ +- $(INSTALL) -m 0755 build/master/_bin/munin-update $(LIBDIR)/ +- $(INSTALL) -m 0755 build/master/_bin/munin-html $(LIBDIR)/ +- $(INSTALL) -m 0755 build/master/_bin/munin-graph $(LIBDIR)/ +- $(INSTALL) -m 0755 build/master/_bin/munin-limits $(LIBDIR)/ +- $(INSTALL) -m 0755 build/master/_bin/munin-datafile2storable $(LIBDIR)/ +- $(INSTALL) -m 0755 build/master/_bin/munin-storable2datafile $(LIBDIR)/ +- $(INSTALL) -m 0755 build/master/_bin/munin-cgi-graph $(CGIDIR)/munin-cgi-graph +- $(INSTALL) -m 0755 build/master/_bin/munin-cgi-html $(CGIDIR)/munin-cgi-html ++ $(INSTALL) -m 0755 build/master/_bin/munin-cron $(DESTDIR)$(BINDIR)/ ++ $(INSTALL) -m 0755 build/master/_bin/munin-check $(DESTDIR)$(BINDIR)/ ++ $(INSTALL) -m 0755 build/master/_bin/munin-update $(DESTDIR)$(LIBDIR)/ ++ $(INSTALL) -m 0755 build/master/_bin/munin-html $(DESTDIR)$(LIBDIR)/ ++ $(INSTALL) -m 0755 build/master/_bin/munin-graph $(DESTDIR)$(LIBDIR)/ ++ $(INSTALL) -m 0755 build/master/_bin/munin-limits $(DESTDIR)$(LIBDIR)/ ++ $(INSTALL) -m 0755 build/master/_bin/munin-datafile2storable $(DESTDIR)$(LIBDIR)/ ++ $(INSTALL) -m 0755 build/master/_bin/munin-storable2datafile $(DESTDIR)$(LIBDIR)/ ++ $(INSTALL) -m 0755 build/master/_bin/munin-cgi-graph $(DESTDIR)$(CGIDIR)/munin-cgi-graph ++ $(INSTALL) -m 0755 build/master/_bin/munin-cgi-html $(DESTDIR)$(CGIDIR)/munin-cgi-html + + # Not ready to be installed yet +-# $(INSTALL) -m 0755 build/master/_bin/munin-gather $(LIBDIR)/ ++# $(INSTALL) -m 0755 build/master/_bin/munin-gather $(DESTDIR)$(LIBDIR)/ + + # ALWAYS DO THE OS SPECIFIC PLUGINS LAST! THAT WAY THEY OVERWRITE THE + # GENERIC ONES +@@ -133,28 +135,28 @@ install-node-plugins: install-plugins-prime + install-plugins-prime: install-plugins build $(PLUGINS) Makefile Makefile.config + @$(CHECKGROUP) + +- mkdir -p $(CONFDIR)/plugins +- mkdir -p $(CONFDIR)/plugin-conf.d +- mkdir -p $(LIBDIR)/plugins +- mkdir -p $(PLUGSTATE) ++ mkdir -p $(DESTDIR)$(CONFDIR)/plugins ++ mkdir -p $(DESTDIR)$(CONFDIR)/plugin-conf.d ++ mkdir -p $(DESTDIR)$(LIBDIR)/plugins ++ mkdir -p $(DESTDIR)$(PLUGSTATE) + +- $(CHOWN) $(PLUGINUSER):$(GROUP) $(PLUGSTATE) +- $(CHMOD) 0775 $(PLUGSTATE) +- $(CHMOD) 0755 $(CONFDIR)/plugin-conf.d ++# $(CHOWN) $(PLUGINUSER):$(GROUP) $(PLUGSTATE) ++# $(CHMOD) 0775 $(PLUGSTATE) ++# $(CHMOD) 0755 $(CONFDIR)/plugin-conf.d + + for p in build/plugins/node.d/* build/plugins/node.d.$(OSTYPE)/* ; do \ + if test -f "$$p" ; then \ + echo Installing $$p; \ +- $(INSTALL) -m 0755 $$p $(LIBDIR)/plugins/; \ ++ $(INSTALL) -m 0755 $$p $(DESTDIR)$(LIBDIR)/plugins/; \ + fi \ + done +- -mv $(LIBDIR)/plugins/*.adv $(LIBDIR) +- $(INSTALL) -m 0644 build/plugins/plugins.history $(LIBDIR)/plugins/ +- $(INSTALL) -m 0644 build/plugins/plugin.sh $(LIBDIR)/plugins/ ++ -mv $(LIBDIR)/plugins/*.adv $(DESTDIR)$(LIBDIR) ++ $(INSTALL) -m 0644 build/plugins/plugins.history $(DESTDIR)$(LIBDIR)/plugins/ ++ $(INSTALL) -m 0644 build/plugins/plugin.sh $(DESTDIR)$(LIBDIR)/plugins/ + + install-plugins-java: build-plugins-java +- mkdir -p $(JAVALIBDIR) +- $(INSTALL) -m 0644 build/plugins/javalib/munin-jmx-plugins.jar $(JAVALIBDIR)/ ++ mkdir -p $(DESTDIR)$(JAVALIBDIR) ++ $(INSTALL) -m 0644 build/plugins/javalib/munin-jmx-plugins.jar $(DESTDIR)$(JAVALIBDIR)/ + + #TODO: + # configure plugins. Or not. Better done under the direction of the installer +@@ -162,36 +164,36 @@ install-plugins-java: build-plugins-java + + install-async-prime: +- mkdir -p $(LIBDIR) +- $(INSTALL) -m 0755 build/node/_bin/munin-async-client $(LIBDIR)/ +- $(INSTALL) -m 0755 build/node/_bin/munin-async-server $(LIBDIR)/ ++ mkdir -p $(DESTDIR)/$(LIBDIR) ++ $(INSTALL) -m 0755 build/node/_bin/munin-async-client $(DESTDIR)$(LIBDIR)/ ++ $(INSTALL) -m 0755 build/node/_bin/munin-async-server $(DESTDIR)$(LIBDIR)/ + + install-node-prime: install-node-pre install-node + + install-node-pre: build/node/munin-node.conf install-pre +- test -f "$(CONFDIR)/munin-node.conf" || $(INSTALL) -m 0644 build/node/munin-node.conf $(CONFDIR)/ ++ test -f "$(DESTDIR)$(CONFDIR)/munin-node.conf" || $(INSTALL) -m 0644 build/node/munin-node.conf $(DESTDIR)$(CONFDIR)/ + + + install-common-prime: build-common install-common + + + install-man: build-man Makefile Makefile.config +- mkdir -p $(MANDIR)/man1 $(MANDIR)/man5 $(MANDIR)/man8 +- $(INSTALL) -m 0644 build/doc/munin-node.conf.5 $(MANDIR)/man5/ +- $(INSTALL) -m 0644 build/doc/munin.conf.5 $(MANDIR)/man5/ +- $(INSTALL) -m 0644 build/doc/munin-update.8 $(MANDIR)/man8/ +- $(INSTALL) -m 0644 build/doc/munin-limits.8 $(MANDIR)/man8/ +- $(INSTALL) -m 0644 build/doc/munin-graph.8 $(MANDIR)/man8/ +- $(INSTALL) -m 0644 build/doc/munin-html.8 $(MANDIR)/man8/ +- $(INSTALL) -m 0644 build/doc/munin-cron.8 $(MANDIR)/man8/ +- $(INSTALL) -m 0644 build/doc/munin-check.8 $(MANDIR)/man8/ +- $(INSTALL) -m 0644 build/doc/munin.8 $(MANDIR)/man8/ ++ mkdir -p $(DESTDIR)$(MANDIR)/man1 $(DESTDIR)$(MANDIR)/man5 $(DESTDIR)$(MANDIR)/man8 ++ $(INSTALL) -m 0644 build/doc/munin-node.conf.5 $(DESTDIR)$(MANDIR)/man5/ ++ $(INSTALL) -m 0644 build/doc/munin.conf.5 $(DESTDIR)$(MANDIR)/man5/ ++ $(INSTALL) -m 0644 build/doc/munin-update.8 $(DESTDIR)$(MANDIR)/man8/ ++ $(INSTALL) -m 0644 build/doc/munin-limits.8 $(DESTDIR)$(MANDIR)/man8/ ++ $(INSTALL) -m 0644 build/doc/munin-graph.8 $(DESTDIR)$(MANDIR)/man8/ ++ $(INSTALL) -m 0644 build/doc/munin-html.8 $(DESTDIR)$(MANDIR)/man8/ ++ $(INSTALL) -m 0644 build/doc/munin-cron.8 $(DESTDIR)$(MANDIR)/man8/ ++ $(INSTALL) -m 0644 build/doc/munin-check.8 $(DESTDIR)$(MANDIR)/man8/ ++ $(INSTALL) -m 0644 build/doc/munin.8 $(DESTDIR)$(MANDIR)/man8/ + + + install-doc: build-doc + mkdir -p $(DOCDIR)/resources +- $(INSTALL) -m 0644 README $(DOCDIR)/ +- $(INSTALL) -m 0644 COPYING $(DOCDIR)/ +- $(INSTALL) -m 0644 build/resources/* $(DOCDIR)/resources ++ $(INSTALL) -m 0644 README $(DESTDIR)$(DOCDIR)/ ++ $(INSTALL) -m 0644 COPYING $(DESTDIR)$(DOCDIR)/ ++ $(INSTALL) -m 0644 build/resources/* $(DESTDIR)$(DOCDIR)/resources + + ###################################################################### + +@@ -208,29 +210,29 @@ build/%: %.in + @echo "$< -> $@" + @mkdir -p build/`dirname $<` + @sed -e 's|@@PREFIX@@|$(PREFIX)|g' \ +- -e 's|@@CONFDIR@@|$(CONFDIR)|g' \ +- -e 's|@@BINDIR@@|$(BINDIR)|g' \ +- -e 's|@@SBINDIR@@|$(SBINDIR)|g' \ +- -e 's|@@DOCDIR@@|$(DOCDIR)|g' \ +- -e 's|@@LIBDIR@@|$(LIBDIR)|g' \ +- -e 's|@@MANDIR@@|$(MANDIR)|g' \ +- -e 's|@@LOGDIR@@|$(LOGDIR)|g' \ +- -e 's|@@HTMLDIR@@|$(HTMLDIR)|g' \ +- -e 's|@@DBDIR@@|$(DBDIR)|g' \ +- -e 's|@@STATEDIR@@|$(STATEDIR)|g' \ +- -e 's|@@SPOOLDIR@@|$(SPOOLDIR)|g' \ ++ -e 's|@@CONFDIR@@|$(DESTDIR)$(CONFDIR)|g' \ ++ -e 's|@@BINDIR@@|$(DESTDIR)$(BINDIR)|g' \ ++ -e 's|@@SBINDIR@@|$(DESTDIR)$(SBINDIR)|g' \ ++ -e 's|@@DOCDIR@@|$(DESTDIR)$(DOCDIR)|g' \ ++ -e 's|@@LIBDIR@@|$(DESTDIR)$(LIBDIR)|g' \ ++ -e 's|@@MANDIR@@|$(DESTDIR)$(MANDIR)|g' \ ++ -e 's|@@LOGDIR@@|$(DESTDIR)$(LOGDIR)|g' \ ++ -e 's|@@HTMLDIR@@|$(DESTDIR)$(HTMLDIR)|g' \ ++ -e 's|@@DBDIR@@|$(DESTDIR)$(DBDIR)|g' \ ++ -e 's|@@STATEDIR@@|$(DESTDIR)$(STATEDIR)|g' \ ++ -e 's|@@SPOOLDIR@@|$(DESTDIR)$(SPOOLDIR)|g' \ + -e 's|@@PERL@@|$(PERL)|g' \ +- -e 's|@@PERLLIB@@|$(PERLLIB)|g' \ ++ -e 's|@@PERLLIB@@|$(DESTDIR)$(PERLLIB)|g' \ + -e 's|@@PYTHON@@|$(PYTHON)|g' \ + -e 's|@@RUBY@@|$(RUBY)|g' \ + -e 's|@@JAVARUN@@|$(JAVARUN)|g' \ +- -e 's|@@JAVALIBDIR@@|$(JAVALIBDIR)|g' \ ++ -e 's|@@JAVALIBDIR@@|$(DESTDIR)$(JAVALIBDIR)|g' \ + -e 's|@@OSTYPE@@|$(OSTYPE)|g' \ + -e 's|@@HOSTNAME@@|$(HOSTNAME)|g' \ + -e 's|@@MKTEMP@@|$(MKTEMP)|g' \ + -e 's|@@VERSION@@|$(VERSION)|g' \ +- -e 's|@@PLUGSTATE@@|$(PLUGSTATE)|g' \ +- -e 's|@@CGIDIR@@|$(CGIDIR)|g' \ ++ -e 's|@@PLUGSTATE@@|$(DESTDIR)$(PLUGSTATE)|g' \ ++ -e 's|@@CGIDIR@@|$(DESTDIR)$(CGIDIR)|g' \ + -e 's|@@USER@@|$(USER)|g' \ + -e 's|@@GROUP@@|$(GROUP)|g' \ + -e 's|@@PLUGINUSER@@|$(PLUGINUSER)|g' \ +@@ -248,17 +250,17 @@ build-common-pre: common/Build + common/blib/lib/Munin/Common/Defaults.pm: common/lib/Munin/Common/Defaults.pm build-common-pre + rm -f common/blib/lib/Munin/Common/Defaults.pm + $(PERL) -pe 's{(PREFIX \s+=\s).*}{\1q{$(PREFIX)};}x; \ +- s{(CONFDIR \s+=\s).*}{\1q{$(CONFDIR)};}x; \ +- s{(BINDIR \s+=\s).*}{\1q{$(BINDIR)};}x; \ +- s{(SBINDIR \s+=\s).*}{\1q{$(SBINDIR)};}x; \ +- s{(DOCDIR \s+=\s).*}{\1q{$(DOCDIR)};}x; \ +- s{(LIBDIR \s+=\s).*}{\1q{$(LIBDIR)};}x; \ +- s{(MANDIR \s+=\s).*}{\1q{$(MANDIR)};}x; \ +- s{(LOGDIR \s+=\s).*}{\1q{$(LOGDIR)};}x; \ +- s{(HTMLDIR \s+=\s).*}{\1q{$(HTMLDIR)};}x; \ +- s{(DBDIR \s+=\s).*}{\1q{$(DBDIR)};}x; \ +- s{(STATEDIR \s+=\s).*}{\1q{$(STATEDIR)};}x; \ +- s{(SPOOLDIR \s+=\s).*}{\1q{$(SPOOLDIR)};}x; \ ++ s{(CONFDIR \s+=\s).*}{\1q{$(DESTDIR)$(CONFDIR)};}x; \ ++ s{(BINDIR \s+=\s).*}{\1q{$(DESTDIR)$(BINDIR)};}x; \ ++ s{(SBINDIR \s+=\s).*}{\1q{$(DESTDIR)$(SBINDIR)};}x; \ ++ s{(DOCDIR \s+=\s).*}{\1q{$(DESTDIR)$(DOCDIR)};}x; \ ++ s{(LIBDIR \s+=\s).*}{\1q{$(DESTDIR)$(LIBDIR)};}x; \ ++ s{(MANDIR \s+=\s).*}{\1q{$(DESTDIR)$(MANDIR)};}x; \ ++ s{(LOGDIR \s+=\s).*}{\1q{$(DESTDIR)$(LOGDIR)};}x; \ ++ s{(HTMLDIR \s+=\s).*}{\1q{$(DESTDIR)$(HTMLDIR)};}x; \ ++ s{(DBDIR \s+=\s).*}{\1q{$(DESTDIR)$(DBDIR)};}x; \ ++ s{(STATEDIR \s+=\s).*}{\1q{$(DESTDIR)$(STATEDIR)};}x; \ ++ s{(SPOOLDIR \s+=\s).*}{\1q{$(DESTDIR)$(SPOOLDIR)};}x; \ + s{(PERL \s+=\s).*}{\1q{$(PERL)};}x; \ + s{(PERLLIB \s+=\s).*}{\1q{$(PERLLIB)};}x; \ + s{(PYTHON \s+=\s).*}{\1q{$(PYTHON)};}x; \ +@@ -267,8 +269,8 @@ common/blib/lib/Munin/Common/Defaults.pm: common/lib/Munin/Common/Defaults.pm bu + s{(HOSTNAME \s+=\s).*}{\1q{$(HOSTNAME)};}x; \ + s{(MKTEMP \s+=\s).*}{\1q{$(MKTEMP)};}x; \ + s{(VERSION \s+=\s).*}{\1q{$(VERSION)};}x; \ +- s{(PLUGSTATE \s+=\s).*}{\1q{$(PLUGSTATE)};}x; \ +- s{(CGIDIR \s+=\s).*}{\1q{$(CGIDIR)};}x; \ ++ s{(PLUGSTATE \s+=\s).*}{\1q{$(DESTDIR)$(PLUGSTATE)};}x; \ ++ s{(CGIDIR \s+=\s).*}{\1q{$(DESTDIR)$(CGIDIR)};}x; \ + s{(USER \s+=\s).*}{\1q{$(USER)};}x; \ + s{(GROUP \s+=\s).*}{\1q{$(GROUP)};}x; \ + s{(PLUGINUSER \s+=\s).*}{\1q{$(PLUGINUSER)};}x; \ +@@ -373,7 +375,7 @@ old-test: t/*.t + $(MAKE) $@ CONFIG=t/Makefile.config + else + test_plugins = id_default id_root env +-old-test: t/*.t t/install $(addprefix $(CONFDIR)/plugins/,$(test_plugins)) ++old-test: t/*.t t/install $(addprefix $(DESTDIR)$(CONFDIR)/plugins/,$(test_plugins)) + @for test in t/*.t; do \ + echo -n "$$test: "; \ + PERL5LIB=$(PERLLIB) $(PERL) $$test;\ +@@ -381,10 +383,10 @@ old-test: t/*.t t/install $(addprefix $(CONFDIR)/plugins/,$(test_plugins)) + endif + + node-monkeywrench: install-node +- rm -rf $(CONFDIR)/plugins +- rm -rf $(LIBDIR)/plugins +- mkdir -p $(LIBDIR)/plugins +- mkdir -p $(CONFDIR)/plugins ++ rm -rf $(DESTDIR)$(CONFDIR)/plugins ++ rm -rf $(DESTDIR)$(LIBDIR)/plugins ++ mkdir -p $(DESTDIR)$(LIBDIR)/plugins ++ mkdir -p $(DESTDIR)$(CONFDIR)/plugins + cp monkeywrench/plugin-break*_ $(LIBDIR)/plugins/ + $(SBINDIR)/munin-node-configure --suggest + echo 'Done?' +@@ -410,12 +412,12 @@ build-common: common/Build + # can't seem to find a way to persuade it to write otherwhere. + install-%: %/Build + cd $* && $(PERL) Build install \ +- --install_path lib=$(PERLLIB) \ +- --install_path bin=$(BINDIR) \ +- --install_path script=$(BINDIR) \ +- --install_path sbin=$(SBINDIR) \ +- --install_path bindoc=$(MANDIR)/man1 \ +- --install_path libdoc=$(MANDIR)/man3 \ ++ --install_path lib=$(DESTDIR)$(PERLLIB) \ ++ --install_path bin=$(DESTDIR)$(BINDIR) \ ++ --install_path script=$(DESTDIR)$(BINDIR) \ ++ --install_path sbin=$(DESTDIR)$(SBINDIR) \ ++ --install_path bindoc=$(DESTDIR)$(MANDIR)/man1 \ ++ --install_path libdoc=$(DESTDIR)$(MANDIR)/man3 \ + + test-%: %/Build + cd $* && $(PERL) Build test --verbose=0 || true +-- +1.7.10.3 + Added: csw/mgar/pkg/munin/trunk/files/0001-Use-CSWtop-in-memory.in.patch =================================================================== --- csw/mgar/pkg/munin/trunk/files/0001-Use-CSWtop-in-memory.in.patch (rev 0) +++ csw/mgar/pkg/munin/trunk/files/0001-Use-CSWtop-in-memory.in.patch 2012-06-07 07:13:31 UTC (rev 18242) @@ -0,0 +1,34 @@ +From 02a69c5ed4cd96c71068e1cb1b2f0a2006321396 Mon Sep 17 00:00:00 2001 +From: Juergen Arndt +Date: Sun, 3 Jun 2012 18:11:50 +0200 +Subject: [PATCH] Use CSWtop in memory.in + +--- + plugins/node.d.sunos/memory.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/plugins/node.d.sunos/memory.in b/plugins/node.d.sunos/memory.in +index 98f4bce..fea0a31 100644 +--- a/plugins/node.d.sunos/memory.in ++++ b/plugins/node.d.sunos/memory.in +@@ -17,7 +17,7 @@ top installed. + The following shows the default settings for this plugin: + + [memory] +- env.top /usr/local/bin/top ++ env.top /opt/csw/bin/top + + You can also set warning and critical limits with these env settings: + +@@ -61,7 +61,7 @@ Fixme: Using kstat would be much better + + . $MUNIN_LIBDIR/plugins/plugin.sh + +-TOP=${top:-/usr/local/bin/top} ++TOP=${top:-/opt/csw/bin/top} + + if [ "$1" = "autoconf" ]; then + if [ -x $TOP ] ; then +-- +1.7.10.3 + Added: csw/mgar/pkg/munin/trunk/files/0001-changed-shebang-in-files.patch =================================================================== --- csw/mgar/pkg/munin/trunk/files/0001-changed-shebang-in-files.patch (rev 0) +++ csw/mgar/pkg/munin/trunk/files/0001-changed-shebang-in-files.patch 2012-06-07 07:13:31 UTC (rev 18242) @@ -0,0 +1,55 @@ +From 88101738efc1d7b5e46de77f7a21eae0f4b7f838 Mon Sep 17 00:00:00 2001 +From: Juergen Arndt +Date: Sun, 3 Jun 2012 18:32:04 +0200 +Subject: [PATCH] changed shebang in files + +--- + node/bin/munindoc | 2 +- + node/sbin/munin-node | 2 +- + node/sbin/munin-node-configure | 2 +- + node/sbin/munin-run | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/node/bin/munindoc b/node/bin/munindoc +index e36f87b..e2334a1 100755 +--- a/node/bin/munindoc ++++ b/node/bin/munindoc +@@ -1,4 +1,4 @@ +-#!/usr/bin/perl -w ++#!/opt/csw/bin/perl -w + # -*- perl -*- + # + # This script provides the basis for a plugin documentation system for +diff --git a/node/sbin/munin-node b/node/sbin/munin-node +index e664074..6d88caf 100755 +--- a/node/sbin/munin-node ++++ b/node/sbin/munin-node +@@ -1,4 +1,4 @@ +-#!/usr/bin/perl -wT ++#!/opt/csw/bin/perl -wT + # -*- cperl -*- + # + # Copyright (C) 2002-2009 Audun Ytterdal, Jimmy Olsen, Tore Anderson, +diff --git a/node/sbin/munin-node-configure b/node/sbin/munin-node-configure +index 3002ea1..86fac19 100755 +--- a/node/sbin/munin-node-configure ++++ b/node/sbin/munin-node-configure +@@ -1,4 +1,4 @@ +-#!/usr/bin/perl -w ++#!/opt/csw/bin/perl -w + # -*- cperl -*- + # + # Copyright (C) 2003-2006 Jimmy Olsen, Nicolai Langfeldt. +diff --git a/node/sbin/munin-run b/node/sbin/munin-run +index cd47952..097df9d 100755 +--- a/node/sbin/munin-run ++++ b/node/sbin/munin-run +@@ -1,4 +1,4 @@ +-#!/usr/bin/perl -T ++#!/opt/csw/bin/perl -T + # -*- perl -*- + # + # Copyright (C) 2004-2009 +-- +1.7.10.3 + Added: csw/mgar/pkg/munin/trunk/files/0001-paths-and-hostname-in-munin-node.conf.in.patch =================================================================== --- csw/mgar/pkg/munin/trunk/files/0001-paths-and-hostname-in-munin-node.conf.in.patch (rev 0) +++ csw/mgar/pkg/munin/trunk/files/0001-paths-and-hostname-in-munin-node.conf.in.patch 2012-06-07 07:13:31 UTC (rev 18242) @@ -0,0 +1,38 @@ +From f103d9b215d96b3672fc38da57df703c57e1fef4 Mon Sep 17 00:00:00 2001 +From: Juergen Arndt +Date: Sun, 3 Jun 2012 18:21:41 +0200 +Subject: [PATCH] paths and hostname in munin-node.conf.in + +--- + node/munin-node.conf.in | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/node/munin-node.conf.in b/node/munin-node.conf.in +index b2e2ed4..1fc1bed 100644 +--- a/node/munin-node.conf.in ++++ b/node/munin-node.conf.in +@@ -2,9 +2,9 @@ + # Example config-file for munin-node + # + +-log_level 4 +-log_file @@LOGDIR@@/munin-node.log +-pid_file @@STATEDIR@@/munin-node.pid ++log_level 1 ++log_file /var/opt/csw/munin/log/munin-node.log ++pid_file /var/opt/csw/munin/log/munin-node.pid + + background 1 + setsid 1 +@@ -25,7 +25,7 @@ ignore_file \.pod$ + # Set this if the client doesn't report the correct hostname when + # telnetting to localhost, port 4949 + # +-#host_name @@HOSTNAME@@ ++host_name yourhostname + + # A list of addresses that are allowed to connect. This must be a + # regular expression, since Net::Server does not understand CIDR-style +-- +1.7.10.3 + Added: csw/mgar/pkg/munin/trunk/files/0001-paths-in-Makefile.config.patch =================================================================== --- csw/mgar/pkg/munin/trunk/files/0001-paths-in-Makefile.config.patch (rev 0) +++ csw/mgar/pkg/munin/trunk/files/0001-paths-in-Makefile.config.patch 2012-06-07 07:13:31 UTC (rev 18242) @@ -0,0 +1,120 @@ +From da269418eb37e98fbe77b0b37c99c8f7783d09df Mon Sep 17 00:00:00 2001 +From: Juergen Arndt +Date: Sun, 3 Jun 2012 18:08:21 +0200 +Subject: [PATCH] paths in Makefile.config + +--- + Makefile.config | 38 +++++++++++++++++++------------------- + 1 file changed, 19 insertions(+), 19 deletions(-) + +diff --git a/Makefile.config b/Makefile.config +index 7cd0b84..1a971a4 100644 +--- a/Makefile.config ++++ b/Makefile.config +@@ -17,10 +17,10 @@ + # + # the base of the Munin installation. + # +-PREFIX = $(DESTDIR)/opt/munin ++PREFIX = /opt/csw + + # Where Munin keeps its configurations (server.conf, client.conf, ++) +-CONFDIR = $(DESTDIR)/etc/opt/munin ++CONFDIR = /etc/opt/csw/munin + + # Server only - where to put munin-cron + BINDIR = $(PREFIX)/bin +@@ -29,20 +29,20 @@ BINDIR = $(PREFIX)/bin + SBINDIR = $(PREFIX)/sbin + + # Where to put text and html documentation +-DOCDIR = $(PREFIX)/doc ++DOCDIR = $(PREFIX)/share/doc/munin + + # Where to put man pages +-MANDIR = $(PREFIX)/man ++MANDIR = $(PREFIX)/share/man + + # Where to put internal binaries and plugin repository +-LIBDIR = $(PREFIX)/lib ++LIBDIR = $(PREFIX)/libexec/munin + + # Server only - Output directory +-HTMLDIR = $(PREFIX)/www/docs +-CGIDIR = $(PREFIX)/www/cgi ++HTMLDIR = /var/opt/csw/munin/www ++CGIDIR = /var/opt/csw/munin/www/cgi + + # Where to put RRD files and other internal data, both master and node +-DBDIR = $(DESTDIR)/var/opt/munin ++DBDIR = /var/opt/csw/munin/db + + # Client only - Where the spool files are written. Must be writable by + # group "munin", and should be preserved between reboots +@@ -53,17 +53,17 @@ SPOOLDIR = $(DBDIR)/spool + PLUGSTATE = $(DBDIR)/plugin-state + + # Where Munin should place its logs. +-LOGDIR = $(PREFIX)/log/munin ++LOGDIR = /var/opt/csw/munin/log + + # Location of PID files and other statefiles. On the server, must be + # writable by the user "munin". +-STATEDIR = $(DESTDIR)/var/run/munin ++STATEDIR = /var/opt/csw/munin/run + + # The perl interpreter to use +-PERL := $(shell which perl) ++PERL := /opt/csw/bin/perl + + # The python interpreter to use (used by some plugins) +-PYTHON := /usr/bin/env python ++PYTHON := /opt/csw/bin/python + + # The ruby interpreter to use (used by some plugins) + RUBY := /usr/bin/env ruby +@@ -89,11 +89,11 @@ JAVALIBDIR:= $(LIBDIR) + GOODSH := $(shell PATH=`getconf PATH 2>/dev/null || echo $(PATH)` sh -c 'type sh | sed "s/.* //"') + + # Path of bash for bash specific plugins +-BASH := /bin/bash ++BASH := /usr/bin/bash + + # Server only - Where to install the perl libraries + PERLSITELIB := $(shell $(PERL) -V:sitelib | cut -d"'" -f2) +-PERLLIB = $(DESTDIR)$(PERLSITELIB) ++PERLLIB = $(shell $(PERL) -V:sitelib | cut -d"'" -f2) + + # Client only - Install plugins for this architecture + OSTYPE := $(shell uname | tr '[A-Z]' '[a-z]' | cut -f 1 -d _) +@@ -105,7 +105,7 @@ HOSTNAME := $(shell hostname) + # What is the safest way to create a tempfile. + # Default is to figure it out by testing various methods. + # Replace this with a known platform-specific method +-MKTEMP := $(shell ./test-mktemp) ++MKTEMP := $(shell mktemp) + + # Munin version number. + VERSION := $(shell ./getversion) +@@ -123,9 +123,9 @@ CGIUSER := nobody + # Which command to use to check if the USER and GROUP to run Munin as, exists. + # These will work on most modern OSes: + # +-GETENT := $(shell which getent || which true 2>/dev/null) +-CHECKUSER := $(shell $(GETENT) passwd $(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistent. Create the user and retry; exit 2")) +-CHECKGROUP := $(shell $(GETENT) group $(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistent. Create the group and retry; exit 2")) ++#GETENT := $(shell which getent || which true 2>/dev/null) ++#CHECKUSER := $(shell $(GETENT) passwd $(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistent. Create the user and retry; exit 2")) ++#CHECKGROUP := $(shell $(GETENT) group $(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistent. Create the group and retry; exit 2")) + + # For OSX, comment out the previous two lines and comment in these + # +@@ -160,4 +160,4 @@ JAR := jar + JCVALID = $(shell $(JC) -version >/dev/null 2>/dev/null && echo "yes") + + # Check whether setruid functionality can be used +-HASSETR := $(shell perl -e 'use Config; my @vars=("d_setruid", "d_setreuid", "d_setresuid"); foreach my $$var (@vars) { if ($$Config{$$var} eq "define") { print "1\n"; exit 0; } } print "0\n"; exit 0;' ) ++HASSETR := $(shell /opt/csw/bin/perl -e 'use Config; my @vars=("d_setruid", "d_setreuid", "d_setresuid"); foreach my $$var (@vars) { if ($$Config{$$var} eq "define") { print "1\n"; exit 0; } } print "0\n"; exit 0;' ) +-- +1.7.10.3 + Added: csw/mgar/pkg/munin/trunk/files/0001-paths-in-munin-htaccess.in.patch =================================================================== --- csw/mgar/pkg/munin/trunk/files/0001-paths-in-munin-htaccess.in.patch (rev 0) +++ csw/mgar/pkg/munin/trunk/files/0001-paths-in-munin-htaccess.in.patch 2012-06-07 07:13:31 UTC (rev 18242) @@ -0,0 +1,28 @@ +From 0e3ebcc0dab328d289f88b2bb07b4a3ecc68c377 Mon Sep 17 00:00:00 2001 +From: Juergen Arndt +Date: Sun, 3 Jun 2012 18:24:50 +0200 +Subject: [PATCH] paths in munin-htaccess.in + +--- + master/www/munin-htaccess.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/master/www/munin-htaccess.in b/master/www/munin-htaccess.in +index f6c6321..1838408 100644 +--- a/master/www/munin-htaccess.in ++++ b/master/www/munin-htaccess.in +@@ -7,9 +7,9 @@ + # + # As a config file enclose it in like so: + # +-# ++# + +-AuthUserFile @@CONFDIR@@/munin-htpasswd ++AuthUserFile /etc/opt/csw/munin/munin-htpasswd + AuthName "Munin" + AuthType Basic + require valid-user +-- +1.7.10.3 + Added: csw/mgar/pkg/munin/trunk/files/0001-replace-yourhostname-with-hostname-in-postinstall.patch =================================================================== --- csw/mgar/pkg/munin/trunk/files/0001-replace-yourhostname-with-hostname-in-postinstall.patch (rev 0) +++ csw/mgar/pkg/munin/trunk/files/0001-replace-yourhostname-with-hostname-in-postinstall.patch 2012-06-07 07:13:31 UTC (rev 18242) @@ -0,0 +1,25 @@ +From 63028d39bcad7a3b8fae5b04abf868039728d233 Mon Sep 17 00:00:00 2001 +From: Juergen Arndt +Date: Sun, 3 Jun 2012 18:17:35 +0200 +Subject: [PATCH] replace yourhostname with hostname in postinstall + +--- + master/munin.conf.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/master/munin.conf.in b/master/munin.conf.in +index f1852f5..4e55ffc 100644 +--- a/master/munin.conf.in ++++ b/master/munin.conf.in +@@ -87,7 +87,7 @@ includedir @@CONFDIR@@/munin-conf.d + #contact.nagios.command /usr/bin/send_nsca nagios.host.comm -c /etc/nsca.conf + + # a simple host tree +-[@@HOSTNAME@@] ++[yourhostname] + address 127.0.0.1 + use_node_name yes + +-- +1.7.10.3 + Deleted: csw/mgar/pkg/munin/trunk/files/Makefile.config.patch =================================================================== --- csw/mgar/pkg/munin/trunk/files/Makefile.config.patch 2012-06-07 01:06:44 UTC (rev 18241) +++ csw/mgar/pkg/munin/trunk/files/Makefile.config.patch 2012-06-07 07:13:31 UTC (rev 18242) @@ -1,130 +0,0 @@ -From 9cdc800db0243d4b6ab1464fbf5e989252e655e4 Mon Sep 17 00:00:00 2001 -From: Juergen Arndt -Date: Sun, 2 Jan 2011 20:43:45 +0100 -Subject: [PATCH] changed pathes for OpenCSW - ---- - Makefile.config | 40 ++++++++++++++++++++-------------------- - 1 files changed, 20 insertions(+), 20 deletions(-) - -diff --git a/Makefile.config b/Makefile.config -index 84f155b..2eb37ea 100644 ---- a/Makefile.config -+++ b/Makefile.config -@@ -17,10 +17,10 @@ - # - # the base of the Munin installation. - # --PREFIX = $(DESTDIR)/opt/munin -+PREFIX = /opt/csw - - # Where Munin keeps its configurations (server.conf, client.conf, ++) --CONFDIR = $(DESTDIR)/etc/opt/munin -+CONFDIR = /etc/opt/csw/munin - - # Server only - where to put munin-cron - BINDIR = $(PREFIX)/bin -@@ -29,47 +29,47 @@ BINDIR = $(PREFIX)/bin - SBINDIR = $(PREFIX)/sbin - - # Where to put text and html documentation --DOCDIR = $(PREFIX)/doc -+DOCDIR = $(PREFIX)/share/doc/munin - - # Where to put man pages --MANDIR = $(PREFIX)/man -+MANDIR = $(PREFIX)/share/man - - # Where to put internal binaries and plugin repository --LIBDIR = $(PREFIX)/lib -+LIBDIR = $(PREFIX)/libexec/munin - - # Server only - Output directory --HTMLDIR = $(PREFIX)/www/docs --CGIDIR = $(PREFIX)/www/cgi -+HTMLDIR = /var/opt/csw/munin/www -+CGIDIR = /var/opt/csw/munin/www/cgi - - # Server only - spool directory for data gathered from nodes by - # munin-gather - experimental. Place on ramdisk to make munin - # scale better. On many versions of Linux as well as on Solaris - # /tmp will be a ramdisk. - --SSPOOLDIR = $(PREFIX)/spool -+SSPOOLDIR = /tmp/muninspool - - # Suggested directory name for a pulic ramdisk based tmp directory. - # SSPOOLDIR := /tmp/muninspool - - # Client only - Where to put RRD files and other intenal data --DBDIR = $(DESTDIR)/var/opt/munin -+DBDIR = /var/opt/csw/munin/db - - # Client only - Where plugins should put their states. Must be writable by - # group "munin", and should be preserved between reboots - PLUGSTATE = $(DBDIR)/plugin-state - - # Where Munin should place its logs. --LOGDIR = $(PREFIX)/log/munin -+LOGDIR = /var/opt/csw/munin/log - - # Location of PID files and other statefiles. On the server, must be - # writable by the user "munin". --STATEDIR = $(DESTDIR)/var/run/munin -+STATEDIR = /var/opt/csw/munin/run - - # The perl interpreter to use --PERL := $(shell which perl) -+PERL := /opt/csw/bin/perl - - # The python interpreter to use (used by some plugins) --PYTHON := /usr/bin/env python -+PYTHON := /opt/csw/bin/python - - # The ruby interpreter to use (used by some plugins) - RUBY := /usr/bin/env ruby -@@ -95,11 +95,11 @@ JAVALIBDIR:= $(LIBDIR) - GOODSH := $(shell PATH=`getconf PATH` sh -c 'type sh | sed "s/.* //"') - - # Path of bash for bash specific plugins --BASH := /bin/bash -+BASH := /usr/bin/bash - - # Server only - Where to install the perl libraries - PERLSITELIB := $(shell $(PERL) -V:sitelib | cut -d"'" -f2) --PERLLIB = $(DESTDIR)$(PERLSITELIB) -+PERLLIB = $(shell $(PERL) -V:sitelib | cut -d"'" -f2) - - # Client only - Install plugins for this architecture - OSTYPE := $(shell uname | tr '[A-Z]' '[a-z]') -@@ -111,7 +111,7 @@ HOSTNAME := $(shell hostname) - # What is the safest way to create a tempfile. - # Default is to figure it out by testing various methods. - # Replace this with a known platform-specific method --MKTEMP := $(shell ./test-mktemp) -+MKTEMP := $(shell mktemp) - - # Munin version number. - VERSION := $(shell ./getversion) -@@ -126,9 +126,9 @@ PLUGINUSER := nobody - # Which command to use to check if the USER and GROUP to run Munin as, exists. - # These will work on most modern OSes: - # --GETENT := $(shell which getent || which true 2>/dev/null) --CHECKUSER := $(shell $(GETENT) passwd $(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistent. Create the user and retry; exit 2")) --CHECKGROUP := $(shell $(GETENT) group $(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistent. Create the group and retry; exit 2")) -+#GETENT := $(shell which getent || which true 2>/dev/null) -+#CHECKUSER := $(shell $(GETENT) passwd $(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistent. Create the user and retry; exit 2")) -+#CHECKGROUP := $(shell $(GETENT) group $(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistent. Create the group and retry; exit 2")) - - # For OSX, comment out the previous two lines and comment in these - # -@@ -159,4 +159,4 @@ JAR := jar - JCVALID := $(shell $(JC) -version >/dev/null 2>/dev/null && echo "yes") - - # Check whether setruid functionality can be used --HASSETR := $(shell perl -e 'use Config; my @vars=("d_setruid", "d_setreuid", "d_setresuid"); foreach my $$var (@vars) { if ($$Config{$$var} eq "define") { print "1\n"; exit 0; } } print "0\n"; exit 0;' ) -+HASSETR := $(shell /opt/csw/bin/perl -e 'use Config; my @vars=("d_setruid", "d_setreuid", "d_setresuid"); foreach my $$var (@vars) { if ($$Config{$$var} eq "define") { print "1\n"; exit 0; } } print "0\n"; exit 0;' ) --- -1.7.3.2 - Deleted: csw/mgar/pkg/munin/trunk/files/Makefile.patch =================================================================== --- csw/mgar/pkg/munin/trunk/files/Makefile.patch 2012-06-07 01:06:44 UTC (rev 18241) +++ csw/mgar/pkg/munin/trunk/files/Makefile.patch 2012-06-07 07:13:31 UTC (rev 18242) @@ -1,296 +0,0 @@ -From 1870ed31733cc218c7a308aea7f96b8f67c0e934 Mon Sep 17 00:00:00 2001 -From: Juergen Arndt -Date: Sun, 2 Jan 2011 20:49:51 +0100 -Subject: [PATCH] expanded pathes to $(DESTDIR) - ---- - Makefile | 179 ++++++++++++++++++++++++++++++------------------------------- - 1 files changed, 88 insertions(+), 91 deletions(-) - -diff --git a/Makefile b/Makefile -index 88f8952..0cc40f9 100644 ---- a/Makefile -+++ b/Makefile -@@ -9,6 +9,8 @@ - DEFAULTS = Makefile.config - CONFIG = Makefile.config - -+DESTDIR = -+ - include $(DEFAULTS) - include $(CONFIG) - -@@ -49,8 +51,8 @@ uninstall: - # This removes the installed config so that the next install-pass installs - # a new config. Target _only_ suitable for maintainers. - unconfig: -- rm -f $(HTMLDIR)/.htaccess -- rm -f $(CONFDIR)/munin.conf -+ rm -f $(DESTDIR)$(HTMLDIR)/.htaccess -+ rm -f $(DESTDIR)$(CONFDIR)/munin.conf - - tags: - -rm -f TAGS -@@ -66,52 +68,51 @@ endif - - install-pre: Makefile Makefile.config - @$(CHECKUSER) -- mkdir -p $(LOGDIR) -- mkdir -p $(STATEDIR) -- mkdir -p $(CONFDIR) -- $(CHOWN) $(USER) $(LOGDIR) $(STATEDIR) -+ mkdir -p $(DESTDIR)$(LOGDIR) -+ mkdir -p $(DESTDIR)$(STATEDIR) -+ mkdir -p $(DESTDIR)$(CONFDIR) - - install-master-prime: $(INFILES_MASTER) install-pre install-master -- mkdir -p $(CONFDIR)/templates -- mkdir -p $(CONFDIR)/templates/partial -- mkdir -p $(CONFDIR)/munin-conf.d -- mkdir -p $(LIBDIR) -- mkdir -p $(BINDIR) -- mkdir -p $(PERLLIB) -- mkdir -p $(PERLLIB)/Munin/Master -- mkdir -p $(HTMLDIR) -- mkdir -p $(DBDIR) -- mkdir -p $(CGIDIR) -- -- $(CHOWN) $(USER) $(HTMLDIR) $(DBDIR) -- $(CHMOD) 0755 $(DBDIR) -+ mkdir -p $(DESTDIR)$(CONFDIR)/templates -+ mkdir -p $(DESTDIR)$(CONFDIR)/templates/partial -+ mkdir -p $(DESTDIR)$(CONFDIR)/munin-conf.d -+ mkdir -p $(DESTDIR)$(LIBDIR) -+ mkdir -p $(DESTDIR)$(BINDIR) -+ mkdir -p $(DESTDIR)$(PERLLIB) -+ mkdir -p $(DESTDIR)$(PERLLIB)/Munin/Master -+ mkdir -p $(DESTDIR)$(HTMLDIR) -+ mkdir -p $(DESTDIR)$(DBDIR) -+ mkdir -p $(DESTDIR)$(CGIDIR) -+ -+ #$(CHOWN) $(USER) $(HTMLDIR) $(DBDIR) -+ $(CHMOD) 0755 $(DESTDIR)$(DBDIR) - - for p in master/www/*.tmpl master/www/*.png master/www/*.css resources/favicon.ico; do \ -- $(INSTALL) -m 0644 "$$p" $(CONFDIR)/templates/ ; \ -+ $(INSTALL) -m 0644 "$$p" $(DESTDIR)$(CONFDIR)/templates/ ; \ - done - - for p in master/www/partial/*.tmpl; do \ -- $(INSTALL) -m 0644 "$$p" $(CONFDIR)/templates/partial/ ; \ -+ $(INSTALL) -m 0644 "$$p" $(DESTDIR)$(CONFDIR)/templates/partial/ ; \ - done - -- $(INSTALL) -m 0644 master/www/definitions.html $(CONFDIR)/templates/ -- $(INSTALL) -m 0755 master/DejaVuSansMono.ttf $(LIBDIR)/ -- $(INSTALL) -m 0755 master/DejaVuSans.ttf $(LIBDIR)/ -+ $(INSTALL) -m 0644 master/www/definitions.html $(DESTDIR)$(CONFDIR)/templates/ -+ $(INSTALL) -m 0755 master/DejaVuSansMono.ttf $(DESTDIR)$(LIBDIR)/ -+ $(INSTALL) -m 0755 master/DejaVuSans.ttf $(DESTDIR)$(LIBDIR)/ - -- test -f $(HTMLDIR)/.htaccess || $(INSTALL) -m 0644 build/master/www/munin-htaccess $(HTMLDIR)/.htaccess -- test -f "$(CONFDIR)/munin.conf" || $(INSTALL) -m 0644 build/master/munin.conf $(CONFDIR)/ -+ test -f $(DESTDIR)$(HTMLDIR)/.htaccess || $(INSTALL) -m 0644 build/master/www/munin-htaccess $(DESTDIR)$(HTMLDIR)/.htaccess -+ test -f "$(DESTDIR)$(CONFDIR)/munin.conf" || $(INSTALL) -m 0644 build/master/munin.conf $(DESTDIR)$(CONFDIR)/ - -- $(INSTALL) -m 0755 build/master/_bin/munin-cron $(BINDIR)/ -- $(INSTALL) -m 0755 build/master/_bin/munin-check $(BINDIR)/ -- $(INSTALL) -m 0755 build/master/_bin/munin-update $(LIBDIR)/ -- $(INSTALL) -m 0755 build/master/_bin/munin-graph $(LIBDIR)/ -- $(INSTALL) -m 0755 build/master/_bin/munin-html $(LIBDIR)/ -- $(INSTALL) -m 0755 build/master/_bin/munin-limits $(LIBDIR)/ -- $(INSTALL) -m 0755 build/master/_bin/munin-cgi-graph $(CGIDIR)/ -- $(INSTALL) -m 0755 build/master/_bin/munin-fastcgi-graph $(CGIDIR)/ -+ $(INSTALL) -m 0755 build/master/_bin/munin-cron $(DESTDIR)$(BINDIR)/ -+ $(INSTALL) -m 0755 build/master/_bin/munin-check $(DESTDIR)$(BINDIR)/ -+ $(INSTALL) -m 0755 build/master/_bin/munin-update $(DESTDIR)$(LIBDIR)/ -+ $(INSTALL) -m 0755 build/master/_bin/munin-graph $(DESTDIR)$(LIBDIR)/ -+ $(INSTALL) -m 0755 build/master/_bin/munin-html $(DESTDIR)$(LIBDIR)/ -+ $(INSTALL) -m 0755 build/master/_bin/munin-limits $(DESTDIR)$(LIBDIR)/ -+ $(INSTALL) -m 0755 build/master/_bin/munin-cgi-graph $(DESTDIR)$(CGIDIR)/ -+ $(INSTALL) -m 0755 build/master/_bin/munin-fastcgi-graph $(DESTDIR)$(CGIDIR)/ - - # Not ready to be installed yet --# $(INSTALL) -m 0755 build/master/_bin/munin-gather $(LIBDIR)/ -+# $(INSTALL) -m 0755 build/master/_bin/munin-gather $(DESTDIR)$(LIBDIR)/ - - # ALWAYS DO THE OS SPECIFIC PLUGINS LAST! THAT WAY THEY OVERWRITE THE - # GENERIC ONES -@@ -122,28 +123,24 @@ install-node-plugins: install-plugins-prime - install-plugins-prime: install-plugins build $(PLUGINS) Makefile Makefile.config - @$(CHECKGROUP) - -- mkdir -p $(CONFDIR)/plugins -- mkdir -p $(CONFDIR)/plugin-conf.d -- mkdir -p $(LIBDIR)/plugins -- mkdir -p $(PLUGSTATE) -- -- $(CHOWN) $(PLUGINUSER):$(GROUP) $(PLUGSTATE) -- $(CHMOD) 0775 $(PLUGSTATE) -- $(CHMOD) 0755 $(CONFDIR)/plugin-conf.d -+ mkdir -p $(DESTDIR)$(CONFDIR)/plugins -+ mkdir -p $(DESTDIR)$(CONFDIR)/plugin-conf.d -+ mkdir -p $(DESTDIR)$(LIBDIR)/plugins -+ mkdir -p $(DESTDIR)$(PLUGSTATE) - - for p in build/plugins/node.d/* build/plugins/node.d.$(OSTYPE)/* ; do \ - if test -f "$$p" ; then \ - echo Installing $$p; \ -- $(INSTALL) -m 0755 $$p $(LIBDIR)/plugins/; \ -+ $(INSTALL) -m 0755 $$p $(DESTDIR)$(LIBDIR)/plugins/; \ - fi \ - done -- -mv $(LIBDIR)/plugins/*.adv $(LIBDIR) -- $(INSTALL) -m 0644 build/plugins/plugins.history $(LIBDIR)/plugins/ -- $(INSTALL) -m 0644 build/plugins/plugin.sh $(LIBDIR)/plugins/ -+ -mv $(LIBDIR)/plugins/*.adv $(DESTDIR)$(LIBDIR) -+ $(INSTALL) -m 0644 build/plugins/plugins.history $(DESTDIR)$(LIBDIR)/plugins/ -+ $(INSTALL) -m 0644 build/plugins/plugin.sh $(DESTDIR)$(LIBDIR)/plugins/ - - install-plugins-java: build-plugins-java -- mkdir -p $(JAVALIBDIR) -- $(INSTALL) -m 0644 build/plugins/javalib/munin-jmx-plugins.jar $(JAVALIBDIR)/ -+ mkdir -p $(DESTDIR)$(JAVALIBDIR) -+ $(INSTALL) -m 0644 build/plugins/javalib/munin-jmx-plugins.jar $(DESTDIR)$(JAVALIBDIR)/ - - #TODO: - # configure plugins. Or not. Better done under the direction of the installer -@@ -152,30 +149,30 @@ install-plugins-java: build-plugins-java - install-node-prime: install-node-pre install-node - - install-node-pre: build/node/munin-node.conf install-pre -- test -f "$(CONFDIR)/munin-node.conf" || $(INSTALL) -m 0644 build/node/munin-node.conf $(CONFDIR)/ -+ test -f "$(DESTDIR)$(CONFDIR)/munin-node.conf" || $(INSTALL) -m 0644 build/node/munin-node.conf $(DESTDIR)$(CONFDIR)/ - - - install-common-prime: build-common install-common - - - install-man: build-man Makefile Makefile.config -- mkdir -p $(MANDIR)/man1 $(MANDIR)/man5 $(MANDIR)/man8 -- $(INSTALL) -m 0644 build/doc/munin-node.conf.5 $(MANDIR)/man5/ -- $(INSTALL) -m 0644 build/doc/munin.conf.5 $(MANDIR)/man5/ -- $(INSTALL) -m 0644 build/doc/munin-graph.8 $(MANDIR)/man8/ -- $(INSTALL) -m 0644 build/doc/munin-update.8 $(MANDIR)/man8/ -- $(INSTALL) -m 0644 build/doc/munin-limits.8 $(MANDIR)/man8/ -- $(INSTALL) -m 0644 build/doc/munin-html.8 $(MANDIR)/man8/ -- $(INSTALL) -m 0644 build/doc/munin-cron.8 $(MANDIR)/man8/ -- $(INSTALL) -m 0644 build/doc/munin-check.8 $(MANDIR)/man8/ -- $(INSTALL) -m 0644 build/doc/munin.8 $(MANDIR)/man8/ -+ mkdir -p $(DESTDIR)$(MANDIR)/man1 $(DESTDIR)$(MANDIR)/man5 $(DESTDIR)$(MANDIR)/man8 -+ $(INSTALL) -m 0644 build/doc/munin-node.conf.5 $(DESTDIR)$(MANDIR)/man5/ -+ $(INSTALL) -m 0644 build/doc/munin.conf.5 $(DESTDIR)$(MANDIR)/man5/ -+ $(INSTALL) -m 0644 build/doc/munin-graph.8 $(DESTDIR)$(MANDIR)/man8/ -+ $(INSTALL) -m 0644 build/doc/munin-update.8 $(DESTDIR)$(MANDIR)/man8/ -+ $(INSTALL) -m 0644 build/doc/munin-limits.8 $(DESTDIR)$(MANDIR)/man8/ -+ $(INSTALL) -m 0644 build/doc/munin-html.8 $(DESTDIR)$(MANDIR)/man8/ -+ $(INSTALL) -m 0644 build/doc/munin-cron.8 $(DESTDIR)$(MANDIR)/man8/ -+ $(INSTALL) -m 0644 build/doc/munin-check.8 $(DESTDIR)$(MANDIR)/man8/ -+ $(INSTALL) -m 0644 build/doc/munin.8 $(DESTDIR)$(MANDIR)/man8/ - - - install-doc: build-doc -- mkdir -p $(DOCDIR)/resources -- $(INSTALL) -m 0644 README $(DOCDIR)/ -- $(INSTALL) -m 0644 COPYING $(DOCDIR)/ -- $(INSTALL) -m 0644 build/resources/* $(DOCDIR)/resources -+ mkdir -p $(DESTDIR)$(DOCDIR)/resources -+ $(INSTALL) -m 0644 README $(DESTDIR)$(DOCDIR)/ -+ $(INSTALL) -m 0644 COPYING $(DESTDIR)$(DOCDIR)/ -+ $(INSTALL) -m 0644 build/resources/* $(DESTDIR)$(DOCDIR)/resources - - ###################################################################### - -@@ -189,28 +186,28 @@ build/%: %.in - @echo "$< -> $@" - @mkdir -p build/`dirname $<` - @sed -e 's|@@PREFIX@@|$(PREFIX)|g' \ -- -e 's|@@CONFDIR@@|$(CONFDIR)|g' \ -- -e 's|@@BINDIR@@|$(BINDIR)|g' \ -- -e 's|@@SBINDIR@@|$(SBINDIR)|g' \ -- -e 's|@@DOCDIR@@|$(DOCDIR)|g' \ -- -e 's|@@LIBDIR@@|$(LIBDIR)|g' \ -+ -e 's|@@CONFDIR@@|$(DESTDIR)$(CONFDIR)|g' \ -+ -e 's|@@BINDIR@@|$(DESTDIR)$(BINDIR)|g' \ -+ -e 's|@@SBINDIR@@|$(DESTDIR)$(SBINDIR)|g' \ -+ -e 's|@@DOCDIR@@|$(DESTDIR)$(DOCDIR)|g' \ -+ -e 's|@@LIBDIR@@|$(DESTDIR)$(LIBDIR)|g' \ - -e 's|@@MANDIR@@|$(MANDIR)|g' \ -- -e 's|@@LOGDIR@@|$(LOGDIR)|g' \ -- -e 's|@@HTMLDIR@@|$(HTMLDIR)|g' \ -- -e 's|@@DBDIR@@|$(DBDIR)|g' \ -- -e 's|@@STATEDIR@@|$(STATEDIR)|g' \ -+ -e 's|@@LOGDIR@@|$(DESTDIR)$(LOGDIR)|g' \ -+ -e 's|@@HTMLDIR@@|$(DESTDIR)$(HTMLDIR)|g' \ -+ -e 's|@@DBDIR@@|$(DESTDIR)$(DBDIR)|g' \ -+ -e 's|@@STATEDIR@@|$(DESTDIR)$(STATEDIR)|g' \ - -e 's|@@PERL@@|$(PERL)|g' \ -- -e 's|@@PERLLIB@@|$(PERLLIB)|g' \ -+ -e 's|@@PERLLIB@@|$(DESTDIR)$(PERLLIB)|g' \ - -e 's|@@PYTHON@@|$(PYTHON)|g' \ - -e 's|@@RUBY@@|$(RUBY)|g' \ - -e 's|@@JAVARUN@@|$(JAVARUN)|g' \ -- -e 's|@@JAVALIBDIR@@|$(JAVALIBDIR)|g' \ -+ -e 's|@@JAVALIBDIR@@|$(DESTDIR)$(JAVALIBDIR)|g' \ - -e 's|@@OSTYPE@@|$(OSTYPE)|g' \ - -e 's|@@HOSTNAME@@|$(HOSTNAME)|g' \ - -e 's|@@MKTEMP@@|$(MKTEMP)|g' \ - -e 's|@@VERSION@@|$(VERSION)|g' \ -- -e 's|@@PLUGSTATE@@|$(PLUGSTATE)|g' \ -- -e 's|@@CGIDIR@@|$(CGIDIR)|g' \ -+ -e 's|@@PLUGSTATE@@|$(DESTDIR)$(PLUGSTATE)|g' \ -+ -e 's|@@CGIDIR@@|$(DESTDIR)$(CGIDIR)|g' \ - -e 's|@@USER@@|$(USER)|g' \ - -e 's|@@GROUP@@|$(GROUP)|g' \ - -e 's|@@PLUGINUSER@@|$(PLUGINUSER)|g' \ -@@ -354,20 +351,20 @@ old-test: t/*.t - $(MAKE) $@ CONFIG=t/Makefile.config - else - test_plugins = id_default id_root env --old-test: t/*.t t/install $(addprefix $(CONFDIR)/plugins/,$(test_plugins)) -+old-test: t/*.t t/install $(addprefix $(DESTDIR)$(CONFDIR)/plugins/,$(test_plugins)) - @for test in t/*.t; do \ - echo -n "$$test: "; \ -- PERL5LIB=$(PERLLIB) $(PERL) $$test;\ -+ PERL5LIB=$(DESTDIR)$(PERLLIB) $(PERL) $$test;\ - done - endif - - node-monkeywrench: install-node -- rm -rf $(CONFDIR)/plugins -- rm -rf $(LIBDIR)/plugins -- mkdir -p $(LIBDIR)/plugins -- mkdir -p $(CONFDIR)/plugins -- cp monkeywrench/plugin-break*_ $(LIBDIR)/plugins/ -- $(SBINDIR)/munin-node-configure --suggest -+ rm -rf $(DESTDIR)$(CONFDIR)/plugins -+ rm -rf $(DESTDIR)$(LIBDIR)/plugins -+ mkdir -p $(DESTDIR)$(LIBDIR)/plugins -+ mkdir -p $(DESTDIR)$(CONFDIR)/plugins -+ cp monkeywrench/plugin-break*_ $(DESTDIR)$(LIBDIR)/plugins/ -+ $(DESTDIR)$(SBINDIR)/munin-node-configure --suggest - echo 'Done?' - - t/install: -@@ -391,12 +388,12 @@ build-common: common/Build - # can't seem to find a way to persuade it to write otherwhere. - install-%: %/Build - cd $* && $(PERL) Build install \ -- --install_path lib=$(PERLLIB) \ -- --install_path bin=$(BINDIR) \ -- --install_path script=$(BINDIR) \ -- --install_path sbin=$(SBINDIR) \ -- --install_path bindoc=$(MANDIR)/man1 \ -- --install_path libdoc=$(MANDIR)/man3 \ -+ --install_path lib=$(DESTDIR)$(PERLLIB) \ -+ --install_path bin=$(DESTDIR)$(BINDIR) \ -+ --install_path script=$(DESTDIR)$(BINDIR) \ -+ --install_path sbin=$(DESTDIR)$(SBINDIR) \ -+ --install_path bindoc=$(DESTDIR)$(MANDIR)/man1 \ -+ --install_path libdoc=$(DESTDIR)$(MANDIR)/man3 \ - - test-%: %/Build - cd $* && $(PERL) Build test || true --- -1.7.3.2 - Deleted: csw/mgar/pkg/munin/trunk/files/munin-graph.in.patch =================================================================== --- csw/mgar/pkg/munin/trunk/files/munin-graph.in.patch 2012-06-07 01:06:44 UTC (rev 18241) +++ csw/mgar/pkg/munin/trunk/files/munin-graph.in.patch 2012-06-07 07:13:31 UTC (rev 18242) @@ -1,31 +0,0 @@ -From c7b05c6b5304a67c1b4226ba9473407a4953822d Mon Sep 17 00:00:00 2001 -From: Juergen Arndt -Date: Sun, 11 Jul 2010 15:21:09 +0200 -Subject: [PATCH] set path names to /var/opt/csw/munin - ---- - master/_bin/munin-graph.in | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/master/_bin/munin-graph.in b/master/_bin/munin-graph.in -index 804d2bd..1ea9ddc 100755 ---- a/master/_bin/munin-graph.in -+++ b/master/_bin/munin-graph.in -@@ -135,10 +135,10 @@ needed. To force redrawing of graphs (after setup-changes et alia), use - - =head1 FILES - -- @@CONFDIR@@/munin.conf -- @@DBDIR@@/* -- @@LOGDIR@@/munin-graph -- @@STATEDIR@@/* -+ /etc/opt/csw/munin/munin.conf -+ /var/opt/csw/munin/* -+ /var/opt/csw/munin/munin-graph -+ /var/opt/csw/munin/* - - =head1 AUTHORS - --- -1.7.1 - Deleted: csw/mgar/pkg/munin/trunk/files/munin-htaccess.in.patch =================================================================== --- csw/mgar/pkg/munin/trunk/files/munin-htaccess.in.patch 2012-06-07 01:06:44 UTC (rev 18241) +++ csw/mgar/pkg/munin/trunk/files/munin-htaccess.in.patch 2012-06-07 07:13:31 UTC (rev 18242) @@ -1,34 +0,0 @@ -From 52ea662193a0922aef3c4f82fe2b672e70e5ee13 Mon Sep 17 00:00:00 2001 -From: Juergen Arndt -Date: Mon, 12 Jul 2010 20:55:23 +0200 -Subject: [PATCH] munin-htaccess.in: set paths for OpenCSW - ---- - master/www/munin-htaccess.in | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/master/www/munin-htaccess.in b/master/www/munin-htaccess.in -index f6c6321..c5f355d 100644 ---- a/master/www/munin-htaccess.in -+++ b/master/www/munin-htaccess.in -@@ -2,14 +2,14 @@ - # config file. - # - # For the .htaccess file option to work the munin www directory --# (@@HTMLDIR@@) must have "AllowOverride all" or something close -+# (/var/opt/csw/munin/www) must have "AllowOverride all" or something close - # to that set. - # - # As a config file enclose it in like so: - # --# -+# - --AuthUserFile @@CONFDIR@@/munin-htpasswd -+AuthUserFile /etc/opt/csw/munin/munin-htpasswd - AuthName "Munin" - AuthType Basic - require valid-user --- -1.7.1 - Deleted: csw/mgar/pkg/munin/trunk/files/munin-node.conf.in.patch =================================================================== --- csw/mgar/pkg/munin/trunk/files/munin-node.conf.in.patch 2012-06-07 01:06:44 UTC (rev 18241) +++ csw/mgar/pkg/munin/trunk/files/munin-node.conf.in.patch 2012-06-07 07:13:31 UTC (rev 18242) @@ -1,38 +0,0 @@ -From 0ffc51f49ec0107bb5346871640a14f3f65b50bb Mon Sep 17 00:00:00 2001 -From: Juergen Arndt -Date: Wed, 14 Jul 2010 20:06:33 +0200 -Subject: [PATCH] munin-node.conf.in: set logfiles and log level, change hostname to "yourhostname" - ---- - node/munin-node.conf.in | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/node/munin-node.conf.in b/node/munin-node.conf.in -index 40793b2..d25e14d 100644 ---- a/node/munin-node.conf.in -+++ b/node/munin-node.conf.in -@@ -2,9 +2,9 @@ - # Example config-file for munin-node - # - --log_level 4 --log_file @@LOGDIR@@/munin-node.log --pid_file @@STATEDIR@@/munin-node.pid -+log_level 1 -+log_file /var/opt/csw/munin/log/munin-node.log -+pid_file /var/opt/csw/munin/run/munin-node.pid - - background 1 - setsid 1 -@@ -26,7 +26,7 @@ ignore_file \.pod$ - # Set this if the client doesn't report the correct hostname when - # telnetting to localhost, port 4949 - # --#host_name @@HOSTNAME@@ -+#host_name yourhostname - - # A list of addresses that are allowed to connect. This must be a - # regular expression, since Net::Server does not understand CIDR-style --- -1.7.1 - Deleted: csw/mgar/pkg/munin/trunk/files/munin.conf.in.patch =================================================================== --- csw/mgar/pkg/munin/trunk/files/munin.conf.in.patch 2012-06-07 01:06:44 UTC (rev 18241) +++ csw/mgar/pkg/munin/trunk/files/munin.conf.in.patch 2012-06-07 07:13:31 UTC (rev 18242) @@ -1,25 +0,0 @@ -From f94f6692eeb6875abf5e52ecf8a192ac3430c6e3 Mon Sep 17 00:00:00 2001 -From: Juergen Arndt -Date: Sun, 11 Jul 2010 15:25:17 +0200 -Subject: [PATCH] changed default hostname to "yourhostname" - ---- - master/munin.conf.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/master/munin.conf.in b/master/munin.conf.in -index 3688d88..79d9729 100644 ---- a/master/munin.conf.in -+++ b/master/munin.conf.in -@@ -57,7 +57,7 @@ includedir @@CONFDIR@@/munin-conf.d - #contact.nagios.command /usr/bin/send_nsca nagios.host.comm -c /etc/nsca.conf - - # a simple host tree --[@@HOSTNAME@@] -+[yourhostname] - address 127.0.0.1 - use_node_name yes - --- -1.7.1 - Deleted: csw/mgar/pkg/munin/trunk/files/sunos_memory.in.patch =================================================================== --- csw/mgar/pkg/munin/trunk/files/sunos_memory.in.patch 2012-06-07 01:06:44 UTC (rev 18241) +++ csw/mgar/pkg/munin/trunk/files/sunos_memory.in.patch 2012-06-07 07:13:31 UTC (rev 18242) @@ -1,34 +0,0 @@ -From fd284599a4d41b327f87750c92bbeb22935df8b6 Mon Sep 17 00:00:00 2001 -From: Juergen Arndt -Date: Sun, 11 Jul 2010 15:01:31 +0200 -Subject: [PATCH] use top from OpenCSW - ---- - plugins/node.d.sunos/memory.in | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/plugins/node.d.sunos/memory.in b/plugins/node.d.sunos/memory.in -index 7b9300e..eeabbcb 100755 ---- a/plugins/node.d.sunos/memory.in -+++ b/plugins/node.d.sunos/memory.in -@@ -17,7 +17,7 @@ top installed. - The following shows the default settings for this plugin: - - [memory] -- env.top /usr/local/bin/top -+ env.top /opt/csw/bin/top - - You can also set warning and critical limits with these env settings: - -@@ -61,7 +61,7 @@ Fixme: Using kstat would be much better - - . $MUNIN_LIBDIR/plugins/plugin.sh - --TOP=${top:-/usr/local/bin/top} -+TOP=${top:-/opt/csw/bin/top} - - if [ "$1" = "autoconf" ]; then - if [ -x $TOP ] ; then --- -1.7.1 - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Jun 7 10:26:45 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 07 Jun 2012 08:26:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[18243] csw/mgar/pkg/fluxbox/trunk Message-ID: Revision: 18243 http://gar.svn.sourceforge.net/gar/?rev=18243&view=rev Author: wahwah Date: 2012-06-07 08:26:45 +0000 (Thu, 07 Jun 2012) Log Message: ----------- fluxbox/trunk: Include patches from Phil Modified Paths: -------------- csw/mgar/pkg/fluxbox/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/fluxbox/trunk/files/0001-Solaris-userland-port-grep-whoami.patch Modified: csw/mgar/pkg/fluxbox/trunk/Makefile =================================================================== --- csw/mgar/pkg/fluxbox/trunk/Makefile 2012-06-07 07:13:31 UTC (rev 18242) +++ csw/mgar/pkg/fluxbox/trunk/Makefile 2012-06-07 08:26:45 UTC (rev 18243) @@ -20,11 +20,11 @@ EXTRA_CPPFLAGS = -features=extensions -D__FUNCTION__=__func__ EXTRA_LINKER_FLAGS = -norunpath -PATCHFILES += 0001-Use-gwhoami-from-CSWcoreutils.patch +# PATCHFILES += 0001-Use-gwhoami-from-CSWcoreutils.patch +PATCHFILES += 0001-Solaris-userland-port-grep-whoami.patch CONFIGURE_ARGS = $(DIRPATHS) -RUNTIME_DEP_PKGS_CSWfluxbox += CSWcoreutils RUNTIME_DEP_PKGS_CSWfluxbox += CSWimlib2 RUNTIME_DEP_PKGS_CSWfluxbox += CSWlibfontconfig1 RUNTIME_DEP_PKGS_CSWfluxbox += CSWlibfreetype6 @@ -38,7 +38,6 @@ CHECKPKG_OVERRIDES_CSWfluxbox += file-with-bad-content|/usr/share|root/opt/csw/bin/fluxbox-generate_menu CHECKPKG_OVERRIDES_CSWfluxbox += file-with-bad-content|/usr/local|root/opt/csw/bin/fluxbox-generate_menu CHECKPKG_OVERRIDES_CSWfluxbox += file-with-bad-content|/usr/local|root/opt/csw/bin/fbsetbg -CHECKPKG_OVERRIDES_CSWfluxbox += surplus-dependency|CSWcoreutils include gar/category.mk Added: csw/mgar/pkg/fluxbox/trunk/files/0001-Solaris-userland-port-grep-whoami.patch =================================================================== --- csw/mgar/pkg/fluxbox/trunk/files/0001-Solaris-userland-port-grep-whoami.patch (rev 0) +++ csw/mgar/pkg/fluxbox/trunk/files/0001-Solaris-userland-port-grep-whoami.patch 2012-06-07 08:26:45 UTC (rev 18243) @@ -0,0 +1,56 @@ +From f9e400a3cf8517ab4417dbe117a588b2e0669d4c Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Thu, 7 Jun 2012 10:23:16 +0200 +Subject: [PATCH] Solaris userland port: grep, whoami + +--- + util/fbsetbg | 4 ++-- + util/fluxbox-generate_menu.in | 7 ++++--- + 2 files changed, 6 insertions(+), 5 deletions(-) + +diff --git a/util/fbsetbg b/util/fbsetbg +index 0bdb804..bb96f7f 100644 +--- a/util/fbsetbg ++++ b/util/fbsetbg +@@ -47,8 +47,8 @@ + wpsetters="${wpsetters:=Esetroot wmsetbg feh hsetroot chbg display qiv xv xsri xli xsetbg}" # broken icewmbg' + lastwallpaper="${HOME}/.fluxbox/lastwallpaper" + +- +-WHOAMI=`whoami` ++PATH=/usr/xpg4/bin:$PATH # just for xpg4 'id'. Sol11 is fine with /bin/id ++WHOAMI=`id -u -n` + [ "$WHOAMI" = root ] && PATH=/bin:/usr/bin/:/usr/local/bin:/usr/X11R6/bin + + command="`basename \"$0\"`" +diff --git a/util/fluxbox-generate_menu.in b/util/fluxbox-generate_menu.in +index cecc3fe..54fd959 100755 +--- a/util/fluxbox-generate_menu.in ++++ b/util/fluxbox-generate_menu.in +@@ -330,7 +330,7 @@ searchForIcon(){ + # echo "^.${entry_exec}.[[:space:]]*<.*/${icon_base}\....>" + if [ -f "$entry_icon" ]; then + # if icon exists and entry does not already exists, add it +- if ! grep -q -m 1 "^.${entry_exec}.[[:space:]]*<.*/${icon_base}\....>" $ICONMAPPING 2> /dev/null; then ++ if ! grep -m 1 "^.${entry_exec}.[[:space:]]*<.*/${icon_base}\....>" $ICONMAPPING 2> /dev/null; then + echo -e "\"${entry_exec}\" \t <${entry_icon}>" >> $ICONMAPPING + else + : echo "# mapping already exists for ${entry_exec}" >> $ICONMAPPING +@@ -557,11 +557,12 @@ rm -f ${MENUFILENAME}.tmp + # End functions + + +-WHOAMI=`whoami` ++PATH=/usr/xpg4/bin:$PATH # just for xpg4 'id'. Sol11 is fine with /bin/id ++WHOAMI=`id -u -n` + [ "$WHOAMI" = root ] && PATH=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin + + # Check for Imlib2-support +-if @pkgprefix at fluxbox@pkgsuffix@ -info 2> /dev/null | grep -q "^IMLIB"; then ++if @pkgprefix at fluxbox@pkgsuffix@ -info 2> /dev/null | grep "^IMLIB"; then + PNG_ICONS="yes" + else + # better assume to assume "no" +-- +1.7.10 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Thu Jun 7 11:32:37 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Thu, 07 Jun 2012 09:32:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[18244] csw/mgar/pkg Message-ID: Revision: 18244 http://gar.svn.sourceforge.net/gar/?rev=18244&view=rev Author: pfelecan Date: 2012-06-07 09:32:37 +0000 (Thu, 07 Jun 2012) Log Message: ----------- migrated from a private recipe to a GAR based one; for the moment is one big, monolithic package, not suitable for release. Added Paths: ----------- csw/mgar/pkg/autogen/ csw/mgar/pkg/autogen/Makefile csw/mgar/pkg/autogen/branches/ csw/mgar/pkg/autogen/tags/ csw/mgar/pkg/autogen/trunk/ csw/mgar/pkg/autogen/trunk/Makefile csw/mgar/pkg/autogen/trunk/checksums csw/mgar/pkg/autogen/trunk/files/ Added: csw/mgar/pkg/autogen/Makefile =================================================================== --- csw/mgar/pkg/autogen/Makefile (rev 0) +++ csw/mgar/pkg/autogen/Makefile 2012-06-07 09:32:37 UTC (rev 18244) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/autogen/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/autogen/trunk/Makefile =================================================================== --- csw/mgar/pkg/autogen/trunk/Makefile (rev 0) +++ csw/mgar/pkg/autogen/trunk/Makefile 2012-06-07 09:32:37 UTC (rev 18244) @@ -0,0 +1,76 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = autogen +# Tried to package the last versions but encountered issues for which +# I didn't found a solution: +# +# 5.16: agen5/ag.c: zNotStr not defined +# 5.15: our guile is too old +# 5.14: syntax error in opts.c... +# 5.13: same issue as 5.14 +VERSION = 5.12 +GARTYPE = v2 +CATEGORIES = devel + +DESCRIPTION = The Automated Text and Program Generation Tool +define BLURB + AutoGen is a tool designed to simplify the creation and maintenance of + programs that contain large amounts of repetitious text. It is especially + valuable in programs that have several blocks of text that must be kept + synchronized. +endef + +MASTER_SITES = $(GNU_MIRROR)/rel$(VERSION)/ +DISTFILES = $(DISTNAME).tar.gz + +CONFIGURE_ARGS = $(DIRPATHS) +GARCOMPILER = GNU +#GCC4_VERSION = 4.7 + +BUILD_DEP_PKGS = CSWguile +BUILD_DEP_PKGS += CSWguilelib12 +BUILD_DEP_PKGS += CSWlibiconv-dev +BUILD_DEP_PKGS += CSWlibxml2-dev +BUILD_DEP_PKGS += CSWlibz-dev + +RUNTIME_DEP_PKGS = CSWguilelib12 +RUNTIME_DEP_PKGS += CSWlibgcc-s1 +RUNTIME_DEP_PKGS += CSWlibiconv2 +RUNTIME_DEP_PKGS += CSWlibxml2-2 +RUNTIME_DEP_PKGS += CSWlibz1 + +BUILD_SCRIPTS = nominal +BUILD_SCRIPTS += dvi +BUILD_SCRIPTS += ps +BUILD_SCRIPTS += pdf + +TEST_SCRIPTS = custom + +include gar/category.mk + +build-nominal: + PATH="/opt/csw/gnu:$$PATH" $(MAKE) -C $(WORKSRC) + $(MAKECOOKIE) + +build-dvi: + PATH="/opt/csw/gnu:$$PATH" $(MAKE) -C $(WORKSRC) $(subst build-,,$@) + $(MAKECOOKIE) + +build-ps: + PATH="/opt/csw/gnu:$$PATH" $(MAKE) -C $(WORKSRC) $(subst build-,,$@) + $(MAKECOOKIE) + +build-pdf: + PATH="/opt/csw/gnu:$$PATH" $(MAKE) -C $(WORKSRC) $(subst build-,,$@) + $(MAKECOOKIE) + +# there is one test failing (keyword.test) and I choose to ignore it +# as the remaining ones pass. +test-custom: + -$(MAKE) -k -C $(WORKSRC) check + $(MAKECOOKIE) + +# this is private and not available publicly +mydependencies: + $(HOME)/bin/ocswdeplist --package $(NAME) Property changes on: csw/mgar/pkg/autogen/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/autogen/trunk/checksums =================================================================== --- csw/mgar/pkg/autogen/trunk/checksums (rev 0) +++ csw/mgar/pkg/autogen/trunk/checksums 2012-06-07 09:32:37 UTC (rev 18244) @@ -0,0 +1 @@ +6c6671b76021fb30dd43b0d5fdb7180b autogen-5.12.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Thu Jun 7 13:49:46 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Thu, 07 Jun 2012 11:49:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[18245] csw/mgar/pkg/qt4-gcc/trunk/Makefile Message-ID: Revision: 18245 http://gar.svn.sourceforge.net/gar/?rev=18245&view=rev Author: cgrzemba Date: 2012-06-07 11:49:45 +0000 (Thu, 07 Jun 2012) Log Message: ----------- qt4-gcc/trunk: add ARCH depend runtime dependencies Modified Paths: -------------- csw/mgar/pkg/qt4-gcc/trunk/Makefile Modified: csw/mgar/pkg/qt4-gcc/trunk/Makefile =================================================================== --- csw/mgar/pkg/qt4-gcc/trunk/Makefile 2012-06-07 09:32:37 UTC (rev 18244) +++ csw/mgar/pkg/qt4-gcc/trunk/Makefile 2012-06-07 11:49:45 UTC (rev 18245) @@ -69,8 +69,9 @@ RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx += CSWlibqtcore4-gxx RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx += CSWlibgobject2-0-0 -RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx += CSWlibfontconfig1 -RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx_sparc += CSWlibfontconfig1 +RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx_sparc += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx += $(RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx_$(GARCH)) CHECKPKG_OVERRIDES_CSWlibqtgui4-gxx += file-with-bad-content|/usr/local|root/opt/csw/gxx/lib/libQtGui.so.4.8.0 CHECKPKG_OVERRIDES_CSWlibqtgui4-gxx += file-with-bad-content|/usr/share|root/opt/csw/gxx/lib/libQtGui.so.4.8.0 @@ -119,8 +120,9 @@ RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibpq5 RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibodbc2 RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibtiff3 -RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibfontconfig1 -RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWqt4-gxx-dev_sparc += CSWlibfontconfig1 +RUNTIME_DEP_PKGS_CSWqt4-gxx-dev_sparc += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += $(RUNTIME_DEP_PKGS_CSWqt4-gxx-dev_$(GARCH)) # These are code examples. CHECKPKG_OVERRIDES_CSWqt4-gxx-dev += binary-architecture-does-not-match-placement # REFINE this later! @@ -166,9 +168,11 @@ RUNTIME_DEP_PKGS_CSWlibqtopengl4-gxx += CSWlibstdc++6 RUNTIME_DEP_PKGS_CSWlibqtopengl4-gxx += CSWlibqtgui4-gxx RUNTIME_DEP_PKGS_CSWlibqtopengl4-gxx += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWlibqtopengl4-gxx += CSWlibfontconfig1 -RUNTIME_DEP_PKGS_CSWlibqtopengl4-gxx += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWlibqtopengl4-gxx_sparc += CSWlibfontconfig1 +RUNTIME_DEP_PKGS_CSWlibqtopengl4-gxx_sparc += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWlibqtopengl4-gxx += $(RUNTIME_DEP_PKGS_CSWlibqtopengl4-gxx_$(GARCH)) + PACKAGES += CSWlibqtscript4-gxx PKGFILES_CSWlibqtscript4-gxx += $(call baseisadirs,$(libdir),libQtScript\.so\.4(\.\d+)*) SPKG_DESC_CSWlibqtscript4-gxx += $(DESCRIPTION), libQtScript.so.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 Thu Jun 7 14:01:29 2012 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 07 Jun 2012 12:01:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[18246] csw/mgar/pkg/sendmail/trunk/Makefile Message-ID: Revision: 18246 http://gar.svn.sourceforge.net/gar/?rev=18246&view=rev Author: bonivart Date: 2012-06-07 12:01:29 +0000 (Thu, 07 Jun 2012) Log Message: ----------- sendmail/trunk: use libssl-1.0.0 Modified Paths: -------------- csw/mgar/pkg/sendmail/trunk/Makefile Modified: csw/mgar/pkg/sendmail/trunk/Makefile =================================================================== --- csw/mgar/pkg/sendmail/trunk/Makefile 2012-06-07 11:49:45 UTC (rev 18245) +++ csw/mgar/pkg/sendmail/trunk/Makefile 2012-06-07 12:01:29 UTC (rev 18246) @@ -4,7 +4,7 @@ # - Build separate 9/10 packages? # - One big "mta" switch in alternatives between sendmail/postfix -# + add symlink from /etc/opt/csw/mail/cf to /opt/csw/share/mail/cf/cf +# + add symlink from /etc/opt/csw/mail/cf to /opt/csw/share/sendmail/cf/cf # + add ostype solaris9csw.m4 # + add sendmail.mc in cf dir # + /opt/csw/lib/sendmail 2555 root smmsp (Rafael Ostertag) @@ -58,7 +58,7 @@ SPKG_DESC_CSWsendmail = $(DESCRIPTION) RUNTIME_DEP_PKGS_CSWsendmail += CSWbdb48 RUNTIME_DEP_PKGS_CSWsendmail += CSWlibwrap1 -RUNTIME_DEP_PKGS_CSWsendmail += CSWlibssl0-9-8 +RUNTIME_DEP_PKGS_CSWsendmail += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWsendmail += CSWlibsasl2-2 RUNTIME_DEP_PKGS_CSWsendmail += CSWliblber2-4-2 RUNTIME_DEP_PKGS_CSWsendmail += CSWlibldap2-4-2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Thu Jun 7 15:40:24 2012 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Thu, 07 Jun 2012 13:40:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[18247] csw/mgar/pkg/wireshark/trunk Message-ID: Revision: 18247 http://gar.svn.sourceforge.net/gar/?rev=18247&view=rev Author: janholzh Date: 2012-06-07 13:40:24 +0000 (Thu, 07 Jun 2012) Log Message: ----------- wireshark/trunk: Update to 1.6.8 and bind with new openssl 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 2012-06-07 12:01:29 UTC (rev 18246) +++ csw/mgar/pkg/wireshark/trunk/Makefile 2012-06-07 13:40:24 UTC (rev 18247) @@ -1,5 +1,5 @@ NAME = wireshark -VERSION = 1.6.4 +VERSION = 1.6.8 CATEGORIES = apps GARTYPE = v2 @@ -17,7 +17,7 @@ # Use patch until this is fixed: # https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6615 -PATCHFILES += 0002-Don-t-return-value-in-void-functions.patch +#PATCHFILES += 0002-Don-t-return-value-in-void-functions.patch VENDOR_URL = http://www.wireshark.org/ @@ -53,18 +53,18 @@ RUNTIME_DEP_PKGS_CSWwireshark += CSWlibcom-err3 RUNTIME_DEP_PKGS_CSWwireshark += CSWlibkrb5-3 RUNTIME_DEP_PKGS_CSWwireshark += CSWlibk5crypto3 -RUNTIME_DEP_PKGS_CSWwireshark += CSWosslrt RUNTIME_DEP_PKGS_CSWwireshark += CSWlibgnutls26 RUNTIME_DEP_PKGS_CSWwireshark += CSWlua -RUNTIME_DEP_PKGS_CSWwireshark += CSWftype2 -RUNTIME_DEP_PKGS_CSWwireshark += CSWlibatk RUNTIME_DEP_PKGS_CSWwireshark += CSWlibcairo2 -RUNTIME_DEP_PKGS_CSWwireshark += CSWgeoip -RUNTIME_DEP_PKGS_CSWwireshark += CSWfconfig +RUNTIME_DEP_PKGS_CSWwireshark += CSWlibgeoip1 +RUNTIME_DEP_PKGS_CSWwireshark += CSWlibfontconfig1 +RUNTIME_DEP_PKGS_CSWwireshark += CSWlibatk1-0-0 +RUNTIME_DEP_PKGS_CSWwireshark += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWwireshark += CSWlibssl1-0-0 # 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 +CHECKPKG_OVERRIDES_CSWwireshark += shared-lib-pkgname-mismatch # 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 Modified: csw/mgar/pkg/wireshark/trunk/checksums =================================================================== --- csw/mgar/pkg/wireshark/trunk/checksums 2012-06-07 12:01:29 UTC (rev 18246) +++ csw/mgar/pkg/wireshark/trunk/checksums 2012-06-07 13:40:24 UTC (rev 18247) @@ -1 +1 @@ -a348521c514fcdd890d974f2a0b59db3 wireshark-1.6.4.tar.bz2 +dcdc5f4904af5804b622c955a30974e2 wireshark-1.6.8.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Thu Jun 7 15:47:59 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Thu, 07 Jun 2012 13:47:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[18248] csw/mgar/pkg/autogen/trunk/Makefile Message-ID: Revision: 18248 http://gar.svn.sourceforge.net/gar/?rev=18248&view=rev Author: pfelecan Date: 2012-06-07 13:47:59 +0000 (Thu, 07 Jun 2012) Log Message: ----------- packages splitting Modified Paths: -------------- csw/mgar/pkg/autogen/trunk/Makefile Modified: csw/mgar/pkg/autogen/trunk/Makefile =================================================================== --- csw/mgar/pkg/autogen/trunk/Makefile 2012-06-07 13:40:24 UTC (rev 18247) +++ csw/mgar/pkg/autogen/trunk/Makefile 2012-06-07 13:47:59 UTC (rev 18248) @@ -34,12 +34,6 @@ BUILD_DEP_PKGS += CSWlibxml2-dev BUILD_DEP_PKGS += CSWlibz-dev -RUNTIME_DEP_PKGS = CSWguilelib12 -RUNTIME_DEP_PKGS += CSWlibgcc-s1 -RUNTIME_DEP_PKGS += CSWlibiconv2 -RUNTIME_DEP_PKGS += CSWlibxml2-2 -RUNTIME_DEP_PKGS += CSWlibz1 - BUILD_SCRIPTS = nominal BUILD_SCRIPTS += dvi BUILD_SCRIPTS += ps @@ -47,6 +41,47 @@ TEST_SCRIPTS = custom +INSTALL_SCRIPTS = nominal +INSTALL_SCRIPTS += dvi +INSTALL_SCRIPTS += ps +INSTALL_SCRIPTS += pdf + +PACKAGES = CSWautogen +CATALOGNAME_CSWautogen = autogen +SPKG_DESC_CSWautogen = $(DESCRIPTION) +RUNTIME_DEP_PKGS_CSWautogen = CSWautogen-dev +RUNTIME_DEP_PKGS_CSWautogen += CSWautogen-doc + +PACKAGES += CSWautogen-doc +CATALOGNAME_CSWautogen-doc = autogen_doc +SPKG_DESC_CSWautogen-doc += $(DESCRIPTION), documentation +PKGFILES_CSWautogen-doc += /opt/csw/share/info/.* +PKGFILES_CSWautogen-doc += /opt/csw/share/doc/$(NAME)/$(NAME)[.].* +OBSOLETED_BY_CSWautogen-doc = CSWautogendoc +CATALOGNAME_CSWautogendoc = autogen_doc_stub +ARCHALL_CSWautogen-doc = 1 + +PACKAGES += CSWlibopts25 +CATALOGNAME_CSWlibopts25 = libopts25 +PKGFILES_CSWlibopts25 += $(call baseisadirs,$(libdir),libopts\.so\.25\.10\.0) +PKGFILES_CSWlibopts25 += $(call baseisadirs,$(libdir),libopts\.so\.25(\.\d+)*) +SPKG_DESC_CSWlibopts25 += $(DESCRIPTION), libopts.so.25 +OBSOLETED_BY_CSWlibopts25 = CSWautogenrt +RUNTIME_DEP_PKGS_CSWlibopts25 = CSWguilelib12 +RUNTIME_DEP_PKGS_CSWlibopts25 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibopts25 += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWlibopts25 += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSWlibopts25 += CSWlibz1 + +PACKAGES += CSWautogen-dev +CATALOGNAME_CSWautogen-dev = autogen_dev +SPKG_DESC_CSWautogen-dev += $(DESCRIPTION), development files +PKGFILES_CSWautogen-dev += /opt/csw/lib/libopts.so +PKGFILES_CSWautogen-dev += $(PKGFILES_DEVEL) +PKGFILES_CSWautogen-dev += /opt/csw/share/pkgconfig/autoopts.pc +RUNTIME_DEP_PKGS_CSWautogen-dev = CSWlibopts25 +ARCHALL_CSWautogen-dev = 1 + include gar/category.mk build-nominal: @@ -71,6 +106,26 @@ -$(MAKE) -k -C $(WORKSRC) check $(MAKECOOKIE) +install-nominal: + PATH="/opt/csw/gnu:$$PATH" $(MAKE) -C $(WORKSRC) DESTDIR="$(DESTDIR)" install + rm -rf "$(DESTDIR)$(datadir)/$(NAME)/"*.tar.gz + $(MAKECOOKIE) + +install-dvi: + ginstall -d "$(DESTDIR)$(docdir)/$(NAME)" + PATH="/opt/csw/gnu:$$PATH" $(MAKE) -C $(WORKSRC) DESTDIR="$(DESTDIR)" $@ + $(MAKECOOKIE) + +install-ps: + ginstall -d "$(DESTDIR)$(docdir)/$(NAME)" + PATH="/opt/csw/gnu:$$PATH" $(MAKE) -C $(WORKSRC) DESTDIR="$(DESTDIR)" $@ + $(MAKECOOKIE) + +install-pdf: + ginstall -d "$(DESTDIR)$(docdir)/$(NAME)" + PATH="/opt/csw/gnu:$$PATH" $(MAKE) -C $(WORKSRC) DESTDIR="$(DESTDIR)" $@ + $(MAKECOOKIE) + # this is private and not available publicly mydependencies: $(HOME)/bin/ocswdeplist --package $(NAME) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Thu Jun 7 15:48:06 2012 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Thu, 07 Jun 2012 13:48:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[18249] csw/mgar/pkg/tcpdump/trunk/Makefile Message-ID: Revision: 18249 http://gar.svn.sourceforge.net/gar/?rev=18249&view=rev Author: janholzh Date: 2012-06-07 13:48:06 +0000 (Thu, 07 Jun 2012) Log Message: ----------- tcpdump/trunk: Update to bind with new openssl Modified Paths: -------------- csw/mgar/pkg/tcpdump/trunk/Makefile Modified: csw/mgar/pkg/tcpdump/trunk/Makefile =================================================================== --- csw/mgar/pkg/tcpdump/trunk/Makefile 2012-06-07 13:47:59 UTC (rev 18248) +++ csw/mgar/pkg/tcpdump/trunk/Makefile 2012-06-07 13:48:06 UTC (rev 18249) @@ -21,7 +21,7 @@ PACKAGES += CSWtcpdump SPKG_DESC_CSWtcpdump = Dump network traffic RUNTIME_DEP_PKGS_CSWtcpdump += CSWlibpcap1 -RUNTIME_DEP_PKGS_CSWtcpdump += CSWlibssl0-9-8 +RUNTIME_DEP_PKGS_CSWtcpdump += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWtcpdump += CSWlibsmi2 BUILD_DEP_PKGS += CSWlibpcap-dev This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Thu Jun 7 16:16:24 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Thu, 07 Jun 2012 14:16:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[18250] csw/mgar/pkg/autogen/trunk/Makefile Message-ID: Revision: 18250 http://gar.svn.sourceforge.net/gar/?rev=18250&view=rev Author: pfelecan Date: 2012-06-07 14:16:23 +0000 (Thu, 07 Jun 2012) Log Message: ----------- check overrides inserted and validated Modified Paths: -------------- csw/mgar/pkg/autogen/trunk/Makefile Modified: csw/mgar/pkg/autogen/trunk/Makefile =================================================================== --- csw/mgar/pkg/autogen/trunk/Makefile 2012-06-07 13:48:06 UTC (rev 18249) +++ csw/mgar/pkg/autogen/trunk/Makefile 2012-06-07 14:16:23 UTC (rev 18250) @@ -51,15 +51,25 @@ SPKG_DESC_CSWautogen = $(DESCRIPTION) RUNTIME_DEP_PKGS_CSWautogen = CSWautogen-dev RUNTIME_DEP_PKGS_CSWautogen += CSWautogen-doc +CHECKPKG_OVERRIDES_CSWautogen += missing-dependency|CSWlibopts25 +CHECKPKG_OVERRIDES_CSWautogen += missing-dependency|CSWguilelib12 +CHECKPKG_OVERRIDES_CSWautogen += missing-dependency|CSWlibiconv2 +CHECKPKG_OVERRIDES_CSWautogen += missing-dependency|CSWlibxml2-2 +CHECKPKG_OVERRIDES_CSWautogen += missing-dependency|CSWlibz1 +CHECKPKG_OVERRIDES_CSWautogen += surplus-dependency|CSWautogen-doc +CHECKPKG_OVERRIDES_CSWautogen += surplus-dependency|CSWautogen-dev -PACKAGES += CSWautogen-doc -CATALOGNAME_CSWautogen-doc = autogen_doc -SPKG_DESC_CSWautogen-doc += $(DESCRIPTION), documentation -PKGFILES_CSWautogen-doc += /opt/csw/share/info/.* -PKGFILES_CSWautogen-doc += /opt/csw/share/doc/$(NAME)/$(NAME)[.].* -OBSOLETED_BY_CSWautogen-doc = CSWautogendoc -CATALOGNAME_CSWautogendoc = autogen_doc_stub -ARCHALL_CSWautogen-doc = 1 +PACKAGES += CSWautogen-doc +CATALOGNAME_CSWautogen-doc = autogen_doc +SPKG_DESC_CSWautogen-doc += $(DESCRIPTION), documentation +PKGFILES_CSWautogen-doc += /opt/csw/share/info/.* +PKGFILES_CSWautogen-doc += /opt/csw/share/doc/$(NAME)/$(NAME)[.].* +OBSOLETED_BY_CSWautogen-doc = CSWautogendoc +CATALOGNAME_CSWautogendoc = autogen_doc_stub +CHECKPKG_OVERRIDES_CSWautogen-doc += file-with-bad-content|/usr/local|root/opt/csw/share/doc/autogen/autogen.ps +CHECKPKG_OVERRIDES_CSWautogen-doc += file-with-bad-content|/usr/local|root/opt/csw/share/doc/autogen/autogen.dvi +CHECKPKG_OVERRIDES_CSWautogen-doc += file-with-bad-content|/usr/local|root/opt/csw/share/info/autogen.info-1 +ARCHALL_CSWautogen-doc = 1 PACKAGES += CSWlibopts25 CATALOGNAME_CSWlibopts25 = libopts25 @@ -72,15 +82,19 @@ RUNTIME_DEP_PKGS_CSWlibopts25 += CSWlibiconv2 RUNTIME_DEP_PKGS_CSWlibopts25 += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSWlibopts25 += CSWlibz1 +CHECKPKG_OVERRIDES_CSWlibopts25 += surplus-dependency|CSWlibxml2-2 +CHECKPKG_OVERRIDES_CSWlibopts25 += surplus-dependency|CSWlibz1 +CHECKPKG_OVERRIDES_CSWlibopts25 += surplus-dependency|CSWlibiconv2 -PACKAGES += CSWautogen-dev -CATALOGNAME_CSWautogen-dev = autogen_dev -SPKG_DESC_CSWautogen-dev += $(DESCRIPTION), development files -PKGFILES_CSWautogen-dev += /opt/csw/lib/libopts.so -PKGFILES_CSWautogen-dev += $(PKGFILES_DEVEL) -PKGFILES_CSWautogen-dev += /opt/csw/share/pkgconfig/autoopts.pc -RUNTIME_DEP_PKGS_CSWautogen-dev = CSWlibopts25 -ARCHALL_CSWautogen-dev = 1 +PACKAGES += CSWautogen-dev +CATALOGNAME_CSWautogen-dev = autogen_dev +SPKG_DESC_CSWautogen-dev += $(DESCRIPTION), development files +PKGFILES_CSWautogen-dev += /opt/csw/lib/libopts.so +PKGFILES_CSWautogen-dev += $(PKGFILES_DEVEL) +PKGFILES_CSWautogen-dev += /opt/csw/share/pkgconfig/autoopts.pc +RUNTIME_DEP_PKGS_CSWautogen-dev = CSWlibopts25 +CHECKPKG_OVERRIDES_CSWautogen-dev += archall-devel-package +ARCHALL_CSWautogen-dev = 1 include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Thu Jun 7 16:27:00 2012 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Thu, 07 Jun 2012 14:27:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[18251] csw/mgar/pkg/wireshark/trunk/Makefile Message-ID: Revision: 18251 http://gar.svn.sourceforge.net/gar/?rev=18251&view=rev Author: janholzh Date: 2012-06-07 14:26:59 +0000 (Thu, 07 Jun 2012) Log Message: ----------- wireshark/trunk: needs to be build on Solaris 10 now Modified Paths: -------------- csw/mgar/pkg/wireshark/trunk/Makefile Modified: csw/mgar/pkg/wireshark/trunk/Makefile =================================================================== --- csw/mgar/pkg/wireshark/trunk/Makefile 2012-06-07 14:16:23 UTC (rev 18250) +++ csw/mgar/pkg/wireshark/trunk/Makefile 2012-06-07 14:26:59 UTC (rev 18251) @@ -13,12 +13,16 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(NAME)-$(VERSION).tar.bz2 -PATCHFILES += 0001-Solaris-9-doesn-t-have-stdint.h.patch +#PATCHFILES += 0001-Solaris-9-doesn-t-have-stdint.h.patch # Use patch until this is fixed: # https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6615 #PATCHFILES += 0002-Don-t-return-value-in-void-functions.patch +#new glib2 only on Solaris 10 +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + + VENDOR_URL = http://www.wireshark.org/ BUILD_DEP_PKGS += CSWlibgcrypt-dev @@ -41,9 +45,7 @@ SPKG_DESC_CSWwireshark = Wireshark (was Ethereal) is a free network protocol analyzer # PKGFILES is catchall RUNTIME_DEP_PKGS_CSWwireshark += CSWlibgcrypt11 -RUNTIME_DEP_PKGS_CSWwireshark += CSWglib2 RUNTIME_DEP_PKGS_CSWwireshark += CSWlibgpg-error0 -RUNTIME_DEP_PKGS_CSWwireshark += CSWgtk2 RUNTIME_DEP_PKGS_CSWwireshark += CSWpango RUNTIME_DEP_PKGS_CSWwireshark += CSWlibz1 RUNTIME_DEP_PKGS_CSWwireshark += CSWlibintl8 @@ -61,6 +63,14 @@ RUNTIME_DEP_PKGS_CSWwireshark += CSWlibatk1-0-0 RUNTIME_DEP_PKGS_CSWwireshark += CSWlibfreetype6 RUNTIME_DEP_PKGS_CSWwireshark += CSWlibssl1-0-0 +RUNTIME_DEP_PKGS_CSWwireshark += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWwireshark += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWwireshark += CSWlibgdk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWwireshark += CSWlibgdk-pixbuf2-0-0 +RUNTIME_DEP_PKGS_CSWwireshark += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWwireshark += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWwireshark += CSWlibgtk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWwireshark += CSWlibglib2-0-0 # No more library splitting unless absolutely necessary CHECKPKG_OVERRIDES_CSWwireshark += shared-lib-package-contains-so-symlink This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Thu Jun 7 16:44:37 2012 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Thu, 07 Jun 2012 14:44:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[18252] csw/mgar/pkg/rtmpdump/trunk/Makefile Message-ID: Revision: 18252 http://gar.svn.sourceforge.net/gar/?rev=18252&view=rev Author: janholzh Date: 2012-06-07 14:44:36 +0000 (Thu, 07 Jun 2012) Log Message: ----------- rtmpdump/trunk: Update to bind against new openssl Modified Paths: -------------- csw/mgar/pkg/rtmpdump/trunk/Makefile Modified: csw/mgar/pkg/rtmpdump/trunk/Makefile =================================================================== --- csw/mgar/pkg/rtmpdump/trunk/Makefile 2012-06-07 14:26:59 UTC (rev 18251) +++ csw/mgar/pkg/rtmpdump/trunk/Makefile 2012-06-07 14:44:36 UTC (rev 18252) @@ -21,9 +21,10 @@ PACKAGES += CSWlibrtmp0 SPKG_DESC_CSWlibrtmp0 = A toolkit for RTMP streams, librtmp.so.0 PKGFILES_CSWlibrtmp0 += $(call pkgfiles_lib,librtmp.so.0) -RUNTIME_DEP_PKGS_CSWlibrtmp0 += CSWosslrt -RUNTIME_DEP_PKGS_CSWlibrtmp0 += CSWzlib +RUNTIME_DEP_PKGS_CSWlibrtmp0 += CSWlibssl1-0-0 +RUNTIME_DEP_PKGS_CSWlibrtmp0 += CSWlibz1 + PACKAGES += CSWlibrtmp-dev SPKG_DESC_CSWlibrtmp-dev = Development files for librtmp.so.0 PKGFILES_CSWlibrtmp-dev += $(PKGFILES_DEVEL) @@ -33,8 +34,8 @@ SPKG_DESC_CSWrtmpdump = A toolkit for RTMP streams # PKGFILES is catchall RUNTIME_DEP_PKGS_CSWrtmpdump += CSWlibgnugetopt0 -RUNTIME_DEP_PKGS_CSWrtmpdump += CSWosslrt -RUNTIME_DEP_PKGS_CSWrtmpdump += CSWzlib +RUNTIME_DEP_PKGS_CSWrtmpdump += CSWlibssl1-0-0 +RUNTIME_DEP_PKGS_CSWrtmpdump += CSWlibz1 BUILD64_LIBS_ONLY = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Thu Jun 7 16:54:17 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Thu, 07 Jun 2012 14:54:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[18253] csw/mgar/pkg Message-ID: Revision: 18253 http://gar.svn.sourceforge.net/gar/?rev=18253&view=rev Author: pfelecan Date: 2012-06-07 14:54:17 +0000 (Thu, 07 Jun 2012) Log Message: ----------- migrated from a private recipe to a GAR based one Added Paths: ----------- csw/mgar/pkg/bibtex2html/ csw/mgar/pkg/bibtex2html/Makefile csw/mgar/pkg/bibtex2html/branches/ csw/mgar/pkg/bibtex2html/tags/ csw/mgar/pkg/bibtex2html/trunk/ csw/mgar/pkg/bibtex2html/trunk/Makefile csw/mgar/pkg/bibtex2html/trunk/checksums csw/mgar/pkg/bibtex2html/trunk/files/ csw/mgar/pkg/bibtex2html/trunk/files/0001-installation-desination-directories.patch Added: csw/mgar/pkg/bibtex2html/Makefile =================================================================== --- csw/mgar/pkg/bibtex2html/Makefile (rev 0) +++ csw/mgar/pkg/bibtex2html/Makefile 2012-06-07 14:54:17 UTC (rev 18253) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/bibtex2html/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/bibtex2html/trunk/Makefile =================================================================== --- csw/mgar/pkg/bibtex2html/trunk/Makefile (rev 0) +++ csw/mgar/pkg/bibtex2html/trunk/Makefile 2012-06-07 14:54:17 UTC (rev 18253) @@ -0,0 +1,71 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = bibtex2html +VERSION = 1.97 +GARTYPE = v2 +CATEGORIES = apps + +DESCRIPTION = a collection of tools for translating from BibTeX to HTML +define BLURB + bibtex2html is a collection of tools for translating from BibTeX to + HTML. They allow to produce, from a set of bibliography files in + BibTeX format, a bibliography in HTML format. Here are some + features: + + - Handle any BibTeX style (even those producing multiple bibliographies); + - Use additional fields like abstract, url, ps, etc. to insert web links; + - Crossrefs are also replaced by links; + - Sort by dates or authors, in increasing or decreasing order; + - Read simple macros in TeX or LaTeX files; + - Show syntax errors in BibTeX files; + - Extract from one or several BibTeX files the set of entries + satisfying a given criterion. +endef + +MASTER_SITES = http://www.lri.fr/~filliatr/ftp/bibtex2html/ +DISTFILES = $(DISTNAME).tar.gz + +BUILD_DEP_PKGS = CSWocaml +BUILD_DEP_PKGS += CSWtetex +BUILD_DEP_PKGS += CSWhevea + +RUNTIME_DEP_PKGS = CSWtetex +RUNTIME_DEP_PKGS += CSWperl + +PATCHFILES += 0001-installation-desination-directories.patch + +CONFIGURE_ARGS = $(DIRPATHS) + +BUILD_SCRIPTS = nominal +BUILD_SCRIPTS += doc + +INSTALL_SCRIPTS = nominal +INSTALL_SCRIPTS += doc + +# there is no check: +SKIPTEST = 1 + +include gar/category.mk + +build-nominal: + PATH="/opt/csw/gnu:$$PATH" $(MAKE) -C $(WORKSRC) + $(MAKECOOKIE) + +build-doc: + PATH="/opt/csw/gnu:$$PATH" $(MAKE) -C $(WORKSRC) $(subst build-,,$@) + $(MAKECOOKIE) + +install-nominal: + PATH="/opt/csw/gnu:$$PATH" $(MAKE) -C $(WORKSRC) DESTDIR="$(DESTDIR)" install + rm -rf "$(DESTDIR)$(datadir)/$(NAME)/"*.tar.gz + $(MAKECOOKIE) + +install-doc: + ginstall -d "$(DESTDIR)$(docdir)/$(NAME)" + PATH="/opt/csw/gnu:$$PATH" $(MAKE) -C $(WORKSRC) DESTDIR="$(DESTDIR)" $@ + $(MAKECOOKIE) + +# this is private and not available publicly +mydependencies: + $(HOME)/bin/ocswdeplist --package $(NAME) Property changes on: csw/mgar/pkg/bibtex2html/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/bibtex2html/trunk/checksums =================================================================== --- csw/mgar/pkg/bibtex2html/trunk/checksums (rev 0) +++ csw/mgar/pkg/bibtex2html/trunk/checksums 2012-06-07 14:54:17 UTC (rev 18253) @@ -0,0 +1 @@ +d20d0d607be3f6aa770554f3eee0dde1 bibtex2html-1.97.tar.gz Added: csw/mgar/pkg/bibtex2html/trunk/files/0001-installation-desination-directories.patch =================================================================== --- csw/mgar/pkg/bibtex2html/trunk/files/0001-installation-desination-directories.patch (rev 0) +++ csw/mgar/pkg/bibtex2html/trunk/files/0001-installation-desination-directories.patch 2012-06-07 14:54:17 UTC (rev 18253) @@ -0,0 +1,34 @@ +From d8ce9faee3770b4e3cca9fe6e2af4b29a287c5c2 Mon Sep 17 00:00:00 2001 +From: Peter Felecan +Date: Thu, 7 Jun 2012 16:43:26 +0200 +Subject: [PATCH] installation desination directories + +--- + Makefile.in | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index 7679ad8..a8e00a8 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -21,14 +21,14 @@ + # where to put executable files + prefix=@prefix@ + exec_prefix=@exec_prefix@ +-BINDIR=@bindir@ ++BINDIR=$(DESTDIR)@bindir@ + EXE=@EXE@ + + # where to install the man pages +-MANDIR = @mandir@ ++MANDIR = $(DESTDIR)@mandir@ + + # where to install the doc +-DOCDIR = $(prefix)/doc/bibtex2html ++DOCDIR = $(DESTDIR)$(prefix)/doc/bibtex2html + + ######################################### + # End of configuration part +-- +1.7.10.3 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Thu Jun 7 17:02:40 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Thu, 07 Jun 2012 15:02:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[18254] csw/mgar/pkg/qt4-gcc/trunk/Makefile Message-ID: Revision: 18254 http://gar.svn.sourceforge.net/gar/?rev=18254&view=rev Author: cgrzemba Date: 2012-06-07 15:02:40 +0000 (Thu, 07 Jun 2012) Log Message: ----------- qt4-gcc/trunk: refine runtime dependencies Modified Paths: -------------- csw/mgar/pkg/qt4-gcc/trunk/Makefile Modified: csw/mgar/pkg/qt4-gcc/trunk/Makefile =================================================================== --- csw/mgar/pkg/qt4-gcc/trunk/Makefile 2012-06-07 14:54:17 UTC (rev 18253) +++ csw/mgar/pkg/qt4-gcc/trunk/Makefile 2012-06-07 15:02:40 UTC (rev 18254) @@ -68,7 +68,7 @@ RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx += CSWlibqtcore4-gxx -RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx_sparc += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx_sparc += CSWlibfontconfig1 RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx_sparc += CSWlibfreetype6 RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx += $(RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx_$(GARCH)) 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 Thu Jun 7 17:06:01 2012 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Thu, 07 Jun 2012 15:06:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[18255] csw/mgar/pkg/munin/trunk Message-ID: Revision: 18255 http://gar.svn.sourceforge.net/gar/?rev=18255&view=rev Author: j_arndt Date: 2012-06-07 15:06:01 +0000 (Thu, 07 Jun 2012) Log Message: ----------- munin/trunk: removed some patches, use of REINPLACE instead Modified Paths: -------------- csw/mgar/pkg/munin/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/munin/trunk/files/0001-Use-CSWtop-in-memory.in.patch csw/mgar/pkg/munin/trunk/files/0001-changed-shebang-in-files.patch csw/mgar/pkg/munin/trunk/files/0001-paths-in-munin-htaccess.in.patch Modified: csw/mgar/pkg/munin/trunk/Makefile =================================================================== --- csw/mgar/pkg/munin/trunk/Makefile 2012-06-07 15:02:40 UTC (rev 18254) +++ csw/mgar/pkg/munin/trunk/Makefile 2012-06-07 15:06:01 UTC (rev 18255) @@ -21,13 +21,34 @@ PATCHFILES += 0001-Expand-paths-with-DESTDIR.patch PATCHFILES += 0001-paths-in-Makefile.config.patch -PATCHFILES += 0001-Use-CSWtop-in-memory.in.patch +#PATCHFILES += 0001-Use-CSWtop-in-memory.in.patch PATCHFILES += 0001-paths-and-hostname-in-munin-node.conf.in.patch PATCHFILES += 0001-replace-yourhostname-with-hostname-in-postinstall.patch -PATCHFILES += 0001-paths-in-munin-htaccess.in.patch +#PATCHFILES += 0001-paths-in-munin-htaccess.in.patch #PATCHFILES += munin-graph.in.patch # match some paths to /{etc|var}/opt/csw/munin -PATCHFILES += 0001-changed-shebang-in-files.patch +#PATCHFILES += 0001-changed-shebang-in-files.patch +# +# Reinplacements +# + +# bad file content ... + +REINPLACE_USRLOCAL += plugins/node.d/* +REINPLACE_USRLOCAL += plugins/node.d.sunos/* + +# put the right shebang into perl files + +REINPLACEMENTS += perl +REINPLACE_MATCH_perl = \#!/usr/bin/perl +REINPLACE_WITH_perl = \#!/opt/csw/bin/perl +REINPLACE_FILES_perl += node/bin/* +REINPLACE_FILES_perl += node/sbin/* + +# +# +# + PACKAGES = CSWmunin-master CSWmunin-node CSWmunin-common CATALOGNAME_CSWmunin-master = munin_master CATALOGNAME_CSWmunin-node = munin_node Deleted: csw/mgar/pkg/munin/trunk/files/0001-Use-CSWtop-in-memory.in.patch =================================================================== --- csw/mgar/pkg/munin/trunk/files/0001-Use-CSWtop-in-memory.in.patch 2012-06-07 15:02:40 UTC (rev 18254) +++ csw/mgar/pkg/munin/trunk/files/0001-Use-CSWtop-in-memory.in.patch 2012-06-07 15:06:01 UTC (rev 18255) @@ -1,34 +0,0 @@ -From 02a69c5ed4cd96c71068e1cb1b2f0a2006321396 Mon Sep 17 00:00:00 2001 -From: Juergen Arndt -Date: Sun, 3 Jun 2012 18:11:50 +0200 -Subject: [PATCH] Use CSWtop in memory.in - ---- - plugins/node.d.sunos/memory.in | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/plugins/node.d.sunos/memory.in b/plugins/node.d.sunos/memory.in -index 98f4bce..fea0a31 100644 ---- a/plugins/node.d.sunos/memory.in -+++ b/plugins/node.d.sunos/memory.in -@@ -17,7 +17,7 @@ top installed. - The following shows the default settings for this plugin: - - [memory] -- env.top /usr/local/bin/top -+ env.top /opt/csw/bin/top - - You can also set warning and critical limits with these env settings: - -@@ -61,7 +61,7 @@ Fixme: Using kstat would be much better - - . $MUNIN_LIBDIR/plugins/plugin.sh - --TOP=${top:-/usr/local/bin/top} -+TOP=${top:-/opt/csw/bin/top} - - if [ "$1" = "autoconf" ]; then - if [ -x $TOP ] ; then --- -1.7.10.3 - Deleted: csw/mgar/pkg/munin/trunk/files/0001-changed-shebang-in-files.patch =================================================================== --- csw/mgar/pkg/munin/trunk/files/0001-changed-shebang-in-files.patch 2012-06-07 15:02:40 UTC (rev 18254) +++ csw/mgar/pkg/munin/trunk/files/0001-changed-shebang-in-files.patch 2012-06-07 15:06:01 UTC (rev 18255) @@ -1,55 +0,0 @@ -From 88101738efc1d7b5e46de77f7a21eae0f4b7f838 Mon Sep 17 00:00:00 2001 -From: Juergen Arndt -Date: Sun, 3 Jun 2012 18:32:04 +0200 -Subject: [PATCH] changed shebang in files - ---- - node/bin/munindoc | 2 +- - node/sbin/munin-node | 2 +- - node/sbin/munin-node-configure | 2 +- - node/sbin/munin-run | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/node/bin/munindoc b/node/bin/munindoc -index e36f87b..e2334a1 100755 ---- a/node/bin/munindoc -+++ b/node/bin/munindoc -@@ -1,4 +1,4 @@ --#!/usr/bin/perl -w -+#!/opt/csw/bin/perl -w - # -*- perl -*- - # - # This script provides the basis for a plugin documentation system for -diff --git a/node/sbin/munin-node b/node/sbin/munin-node -index e664074..6d88caf 100755 ---- a/node/sbin/munin-node -+++ b/node/sbin/munin-node -@@ -1,4 +1,4 @@ --#!/usr/bin/perl -wT -+#!/opt/csw/bin/perl -wT - # -*- cperl -*- - # - # Copyright (C) 2002-2009 Audun Ytterdal, Jimmy Olsen, Tore Anderson, -diff --git a/node/sbin/munin-node-configure b/node/sbin/munin-node-configure -index 3002ea1..86fac19 100755 ---- a/node/sbin/munin-node-configure -+++ b/node/sbin/munin-node-configure -@@ -1,4 +1,4 @@ --#!/usr/bin/perl -w -+#!/opt/csw/bin/perl -w - # -*- cperl -*- - # - # Copyright (C) 2003-2006 Jimmy Olsen, Nicolai Langfeldt. -diff --git a/node/sbin/munin-run b/node/sbin/munin-run -index cd47952..097df9d 100755 ---- a/node/sbin/munin-run -+++ b/node/sbin/munin-run -@@ -1,4 +1,4 @@ --#!/usr/bin/perl -T -+#!/opt/csw/bin/perl -T - # -*- perl -*- - # - # Copyright (C) 2004-2009 --- -1.7.10.3 - Deleted: csw/mgar/pkg/munin/trunk/files/0001-paths-in-munin-htaccess.in.patch =================================================================== --- csw/mgar/pkg/munin/trunk/files/0001-paths-in-munin-htaccess.in.patch 2012-06-07 15:02:40 UTC (rev 18254) +++ csw/mgar/pkg/munin/trunk/files/0001-paths-in-munin-htaccess.in.patch 2012-06-07 15:06:01 UTC (rev 18255) @@ -1,28 +0,0 @@ -From 0e3ebcc0dab328d289f88b2bb07b4a3ecc68c377 Mon Sep 17 00:00:00 2001 -From: Juergen Arndt -Date: Sun, 3 Jun 2012 18:24:50 +0200 -Subject: [PATCH] paths in munin-htaccess.in - ---- - master/www/munin-htaccess.in | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/master/www/munin-htaccess.in b/master/www/munin-htaccess.in -index f6c6321..1838408 100644 ---- a/master/www/munin-htaccess.in -+++ b/master/www/munin-htaccess.in -@@ -7,9 +7,9 @@ - # - # As a config file enclose it in like so: - # --# -+# - --AuthUserFile @@CONFDIR@@/munin-htpasswd -+AuthUserFile /etc/opt/csw/munin/munin-htpasswd - AuthName "Munin" - AuthType Basic - require valid-user --- -1.7.10.3 - 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 7 18:31:36 2012 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 07 Jun 2012 16:31:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[18256] csw/mgar/pkg/cfengine/trunk/Makefile Message-ID: Revision: 18256 http://gar.svn.sourceforge.net/gar/?rev=18256&view=rev Author: bonivart Date: 2012-06-07 16:31:35 +0000 (Thu, 07 Jun 2012) Log Message: ----------- cfengine/trunk: use libssl-1.0.0 Modified Paths: -------------- csw/mgar/pkg/cfengine/trunk/Makefile Modified: csw/mgar/pkg/cfengine/trunk/Makefile =================================================================== --- csw/mgar/pkg/cfengine/trunk/Makefile 2012-06-07 15:06:01 UTC (rev 18255) +++ csw/mgar/pkg/cfengine/trunk/Makefile 2012-06-07 16:31:35 UTC (rev 18256) @@ -14,24 +14,23 @@ scripts. You can also use it as a netwide front-end for `cron'. endef -MASTER_SITES = http://www.cfengine.org/tarballs/ -DISTFILES = $(NAME)-$(VERSION).tar.gz +SPKG_SOURCEURL = http://www.cfengine.org +MASTER_SITES = http://www.cfengine.org/tarballs/ +DISTFILES = $(NAME)-$(VERSION).tar.gz -PACKAGES = CSWcfengine CSWcfenginedoc -PKGFILES_CSWcfenginedoc = .*/share/info/.* -PKGFILES_CSWcfenginedoc += .*/share/cfengine/.* +PACKAGES = CSWcfengine +CATALOGNAME_CSWcfengine = cfengine +SPKG_DESC_CSWcfengine = A tool for administering Networks of Diverse Machines +RUNTIME_DEP_PKGS_CSWcfengine = CSWlibssl1-0-0 CSWbdb3 -CATALOGNAME_CSWcfengine = cfengine -SPKG_DESC_CSWcfengine = A tool for administering Networks of Diverse Machines -RUNTIME_DEP_PKGS_CSWcfengine = CSWosslrt CSWbdb3 +PACKAGES += CSWcfengine-doc +CATALOGNAME_CSWcfengine-doc = cfengine_doc +SPKG_DESC_CSWcfengine-doc = Cfengine documentation +ARCHALL_CSWcfengine-doc = 1 +PKGFILES_CSWcfengine-doc = .*/share/info/.* +PKGFILES_CSWcfengine-doc += .*/share/cfengine/.* +OBSOLETED_BY_CSWcfengine-doc = CSWcfenginedoc -CATALOGNAME_CSWcfenginedoc = cfengine_doc -SPKG_DESC_CSWcfenginedoc = Cfengine documentation -ARCHALL_CSWcfenginedoc = 1 - -# 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) CONFIGURE_ARGS += --enable-DCE CONFIGURE_ARGS += --with-docs @@ -39,4 +38,12 @@ GARCOMPILER = GCC3 +CHECKPKG_OVERRIDES += missing-dependency|CSWemacscommon +CHECKPKG_OVERRIDES += file-with-bad-content + include gar/category.mk + +post-install-modulated: + echo post-install $(DESTDIR) + rm -rf $(DESTDIR)/opt/csw/share/info + @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Jun 7 22:25:51 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 07 Jun 2012 20:25:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[18257] csw/mgar/pkg/ldapvi/trunk/Makefile Message-ID: Revision: 18257 http://gar.svn.sourceforge.net/gar/?rev=18257&view=rev Author: dmichelsen Date: 2012-06-07 20:25:51 +0000 (Thu, 07 Jun 2012) Log Message: ----------- ldapvi/trunk: Update to library split Modified Paths: -------------- csw/mgar/pkg/ldapvi/trunk/Makefile Modified: csw/mgar/pkg/ldapvi/trunk/Makefile =================================================================== --- csw/mgar/pkg/ldapvi/trunk/Makefile 2012-06-07 16:31:35 UTC (rev 18256) +++ csw/mgar/pkg/ldapvi/trunk/Makefile 2012-06-07 20:25:51 UTC (rev 18257) @@ -19,8 +19,8 @@ BUILD_DEP_PKGS += CSWlibpopt-dev BUILD_DEP_PKGS += CSWggettext-dev BUILD_DEP_PKGS += CSWlibreadline-dev -BUILD_DEP_PKGS += CSWossldevel -BUILD_DEP_PKGS += CSWoldapdevel +BUILD_DEP_PKGS += CSWlibssl-dev +BUILD_DEP_PKGS += CSWopenldap-dev BUILD_DEP_PKGS += CSWlibglib2-dev # Because new glib is only available on Solaris 10 @@ -31,8 +31,9 @@ RUNTIME_DEP_PKGS_CSWldapvi += CSWlibpopt0 RUNTIME_DEP_PKGS_CSWldapvi += CSWlibintl8 RUNTIME_DEP_PKGS_CSWldapvi += CSWlibreadline6 -RUNTIME_DEP_PKGS_CSWldapvi += CSWosslrt -RUNTIME_DEP_PKGS_CSWldapvi += CSWoldaprt +RUNTIME_DEP_PKGS_CSWldapvi += CSWliblber2-4-2 +RUNTIME_DEP_PKGS_CSWldapvi += CSWlibldap2-4-2 +RUNTIME_DEP_PKGS_CSWldapvi += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWldapvi += CSWlibglib2-0-0 TEST_TARGET = test 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 Thu Jun 7 23:49:55 2012 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Thu, 07 Jun 2012 21:49:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[18258] csw/mgar/pkg/munin/trunk/Makefile Message-ID: Revision: 18258 http://gar.svn.sourceforge.net/gar/?rev=18258&view=rev Author: j_arndt Date: 2012-06-07 21:49:55 +0000 (Thu, 07 Jun 2012) Log Message: ----------- munin/trunk: more REINPLACEMENTS, fixede dependencies Modified Paths: -------------- csw/mgar/pkg/munin/trunk/Makefile Modified: csw/mgar/pkg/munin/trunk/Makefile =================================================================== --- csw/mgar/pkg/munin/trunk/Makefile 2012-06-07 20:25:51 UTC (rev 18257) +++ csw/mgar/pkg/munin/trunk/Makefile 2012-06-07 21:49:55 UTC (rev 18258) @@ -3,10 +3,6 @@ CATEGORIES = apps GARTYPE = v2 -SPKG_DESC_CSWmunin-master = Master component of the graphical network and system monitoring Munin -SPKG_DESC_CSWmunin-node = Node component of the graphical network and system monitoring Munin -SPKG_DESC_CSWmunin-common = Common files for Munin node and master - define BLURB Munin the monitoring tool surveys all your computers and remembers what it saw. It presents all the information in graphs through a web interface. endef @@ -21,12 +17,8 @@ PATCHFILES += 0001-Expand-paths-with-DESTDIR.patch PATCHFILES += 0001-paths-in-Makefile.config.patch -#PATCHFILES += 0001-Use-CSWtop-in-memory.in.patch PATCHFILES += 0001-paths-and-hostname-in-munin-node.conf.in.patch PATCHFILES += 0001-replace-yourhostname-with-hostname-in-postinstall.patch -#PATCHFILES += 0001-paths-in-munin-htaccess.in.patch -#PATCHFILES += munin-graph.in.patch # match some paths to /{etc|var}/opt/csw/munin -#PATCHFILES += 0001-changed-shebang-in-files.patch # # Reinplacements @@ -34,9 +26,22 @@ # bad file content ... -REINPLACE_USRLOCAL += plugins/node.d/* +REINPLACE_USRLOCAL += plugins/node.d*/* REINPLACE_USRLOCAL += plugins/node.d.sunos/* +REINPLACE_USRLOCAL += master/*lib/lib/Munin/Master/* +REINPLACE_USRLOCAL += master/lib/Munin/Master/* +REINPLACE_USRSHARE += plugins/node.d*/* +REINPLACE_USRSHARE += node/*lib/* +REINPLACE_USRSHARE += master/*lib/* +REINPLACE_USRSHARE += master/*lib/lib/Munin/Master/* +REINPLACE_USRSHARE += master/lib/Munin/Master/* +REINPLACE_USRSHARE += plugins/blib/lib/Munin/* +REINPLACE_USRSHARE += plugins/lib/Munin/* +REINPLACE_USRSHARE += node/lib/Munin/Node/Configure/* +REINPLACE_USRSHARE += node/blib/lib/Munin/Node/Configure/* + + # put the right shebang into perl files REINPLACEMENTS += perl @@ -45,25 +50,51 @@ REINPLACE_FILES_perl += node/bin/* REINPLACE_FILES_perl += node/sbin/* +# replace cgi-bin with cgi + +REINPLACEMENTS += cgi +REINPLACE_MATCH_cgi = cgi-bin +REINPLACE_WITH_cgi = cgi +REINPLACE_FILES_cgi += master/static/dynazoom.html + # +# Package definitions # -# PACKAGES = CSWmunin-master CSWmunin-node CSWmunin-common -CATALOGNAME_CSWmunin-master = munin_master -CATALOGNAME_CSWmunin-node = munin_node -CATALOGNAME_CSWmunin-common = munin_common -ARCHALL_CSWmunin-master = 1 -ARCHALL_CSWmunin-node = 1 -ARCHALL_CSWmunin-common = 1 +CATALOGNAME_CSWmunin-master = munin_master +CATALOGNAME_CSWmunin-node = munin_node +CATALOGNAME_CSWmunin-common = munin_common +SPKG_DESC_CSWmunin-master = Master component of the graphical network and system monitoring Munin +SPKG_DESC_CSWmunin-node = Node component of the graphical network and system monitoring Munin +SPKG_DESC_CSWmunin-common = Common files for Munin node and master + +ARCHALL_CSWmunin-master = 1 +ARCHALL_CSWmunin-node = 1 +ARCHALL_CSWmunin-common = 1 + +OBSOLETED_BY_CSWmunin-master = CSWmuninmaster +SPKG_CATALOG_NAME_CSWmuninmaster = munin_master_stub + +OBSOLETED_BY_CSWmunin-node = CSWmuninnode +SPKG_CATALOG_NAME_CSWmuninnode = munin_node_stub + +# +# Dependencies +# + RUNTIME_DEP_PKGS_CSWmunin-common = CSWperl -RUNTIME_DEP_PKGS_CSWmunin-master = CSWperl CSWpmhtmltmpl CSWpmprmsvldt CSWpmlog4perl CSWmunin-common -RUNTIME_DEP_PKGS_CSWmunin-master += CSWpm-rrdtool CSWapache2 +RUNTIME_DEP_PKGS_CSWmunin-master = CSWperl CSWpmhtmltmpl CSWpmprmsvldt CSWpm-log-log4perl CSWmunin-common +RUNTIME_DEP_PKGS_CSWmunin-master += CSWpm-rrdtool CSWapache2 CSWpmfcgi CSWpmfilecpyrecurs +RUNTIME_DEP_PKGS_CSWmunin-master += CSWpmdatemanip +RUNTIME_DEP_PKGS_CSWmunin-master += CSWpm-io-socket-inet6 +RUNTIME_DEP_PKGS_CSWmunin-master += CSWpmsocket6 +RUNTIME_DEP_PKGS_CSWmunin-master += CSWpm-uri -RUNTIME_DEP_PKGS_CSWmunin-node = CSWperl CSWpmnetsnmp CSWpmnetserver CSWmunin-common +RUNTIME_DEP_PKGS_CSWmunin-node = CSWperl CSWpmnetsnmp CSWpmnetserver CSWmunin-common RUNTIME_DEP_PKGS_CSWmunin-node += CSWpmnetssleay ############### Prototype filters for the different packages ############### @@ -143,65 +174,33 @@ POSTMSG += $(MUNINMASTER_POSTMSG) CRONTABS += $(MUNINMASTER_CRONTABS) -#SPKG_CLASSES_CSWmunin-master = none cswusergroup ugfiles cswcrontab cswcptemplates cswpostmsg -#SPKG_CLASSES_CSWmunin-node = none cswusergroup ugfiles cswcptemplates cswinitsmf -#SPKG_CLASSES_CSWmunin-common = none - -OBSOLETED_BY_CSWmunin-master = CSWmuninmaster -SPKG_CATALOG_NAME_CSWmuninmaster = munin_master_stub - -OBSOLETED_BY_CSWmunin-node = CSWmuninnode -SPKG_CATALOG_NAME_CSWmuninnode = munin_node_stub - - # # checkpkg overrides # -# the following files contain "/usr/local" and "/usr/share" - these strings appear in perldoc or as fallback path values -# so it's uncritical to leave them unpatched -# - -CHECKPKG_OVERRIDES_CSWmunin-node += file-with-bad-content|/usr/local|root/opt/csw/libexec/munin/plugins/hddtemp_smartctl -CHECKPKG_OVERRIDES_CSWmunin-node += file-with-bad-content|/usr/local|root/opt/csw/libexec/munin/plugins/lpstat -CHECKPKG_OVERRIDES_CSWmunin-node += file-with-bad-content|/usr/local|root/opt/csw/libexec/munin/plugins/foldingathome -CHECKPKG_OVERRIDES_CSWmunin-node += file-with-bad-content|/usr/local|root/opt/csw/libexec/munin/plugins/mhttping -CHECKPKG_OVERRIDES_CSWmunin-node += file-with-bad-content|/usr/local|root/opt/csw/libexec/munin/plugins/ejabberd_ -CHECKPKG_OVERRIDES_CSWmunin-node += file-with-bad-content|/usr/local|root/opt/csw/libexec/munin/plugins/smart_ -CHECKPKG_OVERRIDES_CSWmunin-node += file-with-bad-content|/usr/local|root/opt/csw/libexec/munin/plugins/squeezebox_ -CHECKPKG_OVERRIDES_CSWmunin-node += file-with-bad-content|/usr/local|root/opt/csw/libexec/munin/plugins/sybase_space -CHECKPKG_OVERRIDES_CSWmunin-node += file-with-bad-content|/usr/share|root/opt/csw/libexec/munin/plugins/if_err_ -CHECKPKG_OVERRIDES_CSWmunin-node += file-with-bad-content|/usr/share|root/opt/csw/share/perl/site_perl/Munin/Plugin.pm -CHECKPKG_OVERRIDES_CSWmunin-node += file-with-bad-content|/usr/share|root/opt/csw/share/man/man3/Munin::Node::Configure::PluginList.3perl -CHECKPKG_OVERRIDES_CSWmunin-node += file-with-bad-content|/usr/share|root/opt/csw/share/man/man3/Munin::Plugin.3perl -CHECKPKG_OVERRIDES_CSWmunin-node += file-with-bad-content|/usr/share|root/opt/csw/libexec/munin/plugins/if_ -CHECKPKG_OVERRIDES_CSWmunin-node += file-with-bad-content|/usr/share|root/opt/csw/libexec/munin/plugins/ps_ -CHECKPKG_OVERRIDES_CSWmunin-node += file-with-bad-content|/usr/share|root/opt/csw/libexec/munin/plugins/squeezebox_ -CHECKPKG_OVERRIDES_CSWmunin-node += file-with-bad-content|/usr/share|root/opt/csw/libexec/munin/plugins/smart_ -CHECKPKG_OVERRIDES_CSWmunin-node += file-with-bad-content|/usr/share|root/opt/csw/libexec/munin/plugins/io_busy_ -CHECKPKG_OVERRIDES_CSWmunin-node += file-with-bad-content|/usr/share|root/opt/csw/libexec/munin/plugins/io_bytes_ -CHECKPKG_OVERRIDES_CSWmunin-node += file-with-bad-content|/usr/share|root/opt/csw/libexec/munin/plugins/nvidia_ -CHECKPKG_OVERRIDES_CSWmunin-node += file-with-bad-content|/usr/share|root/opt/csw/libexec/munin/plugins/io_ops_ -CHECKPKG_OVERRIDES_CSWmunin-node += file-with-bad-content|/usr/share|root/opt/csw/share/perl/site_perl/Munin/Node/Configure/PluginList.pm -CHECKPKG_OVERRIDES_CSWmunin-master += file-with-bad-content|/usr/local|root/opt/csw/share/perl/site_perl/Munin/Master/HTMLOld.pm - -# -# checkpkg overrides -# # yes, we need these dependencies # CHECKPKG_OVERRIDES_CSWmunin-master += surplus-dependency|CSWmunin-common CHECKPKG_OVERRIDES_CSWmunin-master += surplus-dependency|CSWapache2 CHECKPKG_OVERRIDES_CSWmunin-master += surplus-dependency|CSWpmhtmltmpl -CHECKPKG_OVERRIDES_CSWmunin-master += surplus-dependency|CSWpmlog4perl CHECKPKG_OVERRIDES_CSWmunin-master += surplus-dependency|CSWpm-rrdtool CHECKPKG_OVERRIDES_CSWmunin-master += surplus-dependency|CSWpmprmsvldt +CHECKPKG_OVERRIDES_CSWmunin-master += surplus-dependency|CSWpmsocket6 +CHECKPKG_OVERRIDES_CSWmunin-master += surplus-dependency|CSWpmfilecpyrecurs +CHECKPKG_OVERRIDES_CSWmunin-master += surplus-dependency|CSWpm-log-log4perl +CHECKPKG_OVERRIDES_CSWmunin-master += surplus-dependency|CSWpm-io-socket-inet6 +CHECKPKG_OVERRIDES_CSWmunin-master += surplus-dependency|CSWpm-uri +CHECKPKG_OVERRIDES_CSWmunin-master += surplus-dependency|CSWpmdatemanip +CHECKPKG_OVERRIDES_CSWmunin-master += surplus-dependency|CSWpmfcgi CHECKPKG_OVERRIDES_CSWmunin-node += surplus-dependency|CSWmunin-common CHECKPKG_OVERRIDES_CSWmunin-node += surplus-dependency|CSWpmnetsnmp CHECKPKG_OVERRIDES_CSWmunin-node += surplus-dependency|CSWpmnetssleay CHECKPKG_OVERRIDES_CSWmunin-node += surplus-dependency|CSWpmnetserver +# +# +# CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_SCRIPTS = This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Fri Jun 8 04:55:10 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 08 Jun 2012 02:55:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[18259] csw/mgar/pkg/gdal/trunk/Makefile Message-ID: Revision: 18259 http://gar.svn.sourceforge.net/gar/?rev=18259&view=rev Author: bdwalton Date: 2012-06-08 02:55:10 +0000 (Fri, 08 Jun 2012) Log Message: ----------- gdal/trunk: update ssl dependency for project-openssl Modified Paths: -------------- csw/mgar/pkg/gdal/trunk/Makefile Modified: csw/mgar/pkg/gdal/trunk/Makefile =================================================================== --- csw/mgar/pkg/gdal/trunk/Makefile 2012-06-07 21:49:55 UTC (rev 18258) +++ csw/mgar/pkg/gdal/trunk/Makefile 2012-06-08 02:55:10 UTC (rev 18259) @@ -27,7 +27,7 @@ RUNTIME_DEP_PKGS_CSWgdal += CSWlibjpeg7 RUNTIME_DEP_PKGS_CSWgdal += CSWlibidn11 RUNTIME_DEP_PKGS_CSWgdal += CSWlibsqlite3-0 -RUNTIME_DEP_PKGS_CSWgdal += CSWlibssl0-9-8 +RUNTIME_DEP_PKGS_CSWgdal += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWgdal += CSWlibpng12-0 RUNTIME_DEP_PKGS_CSWgdal += CSWlibtiff3 RUNTIME_DEP_PKGS_CSWgdal += CSWlibz1 @@ -47,7 +47,7 @@ RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibjpeg7 RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibidn11 RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibsqlite3-0 -RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibssl0-9-8 +RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibpng12-0 RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibtiff3 RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibz1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Fri Jun 8 09:07:59 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Fri, 08 Jun 2012 07:07:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[18260] csw/mgar/pkg/bibtex2html/trunk/Makefile Message-ID: Revision: 18260 http://gar.svn.sourceforge.net/gar/?rev=18260&view=rev Author: pfelecan Date: 2012-06-08 07:07:58 +0000 (Fri, 08 Jun 2012) Log Message: ----------- insepected and set overrides. Modified Paths: -------------- csw/mgar/pkg/bibtex2html/trunk/Makefile Modified: csw/mgar/pkg/bibtex2html/trunk/Makefile =================================================================== --- csw/mgar/pkg/bibtex2html/trunk/Makefile 2012-06-08 02:55:10 UTC (rev 18259) +++ csw/mgar/pkg/bibtex2html/trunk/Makefile 2012-06-08 07:07:58 UTC (rev 18260) @@ -6,7 +6,7 @@ GARTYPE = v2 CATEGORIES = apps -DESCRIPTION = a collection of tools for translating from BibTeX to HTML +DESCRIPTION = A collection of tools for translating from BibTeX to HTML define BLURB bibtex2html is a collection of tools for translating from BibTeX to HTML. They allow to produce, from a set of bibliography files in @@ -46,6 +46,12 @@ # there is no check: SKIPTEST = 1 +REINPLACE_USRSHARE += $(mandir)/man1/aux2bib.1 +REINPLACE_WHEN_USRSHARE = postinstall + +CHECKPKG_OVERRIDES_CSWbibtex2html += surplus-dependency|CSWperl +CHECKPKG_OVERRIDES_CSWbibtex2html += surplus-dependency|CSWtetex + include gar/category.mk build-nominal: 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 8 11:23:11 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 08 Jun 2012 09:23:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[18261] csw/mgar/pkg/gimp/trunk Message-ID: Revision: 18261 http://gar.svn.sourceforge.net/gar/?rev=18261&view=rev Author: dmichelsen Date: 2012-06-08 09:23:11 +0000 (Fri, 08 Jun 2012) Log Message: ----------- gimp: Intermediate commit of existing effort for 2.6 Modified Paths: -------------- csw/mgar/pkg/gimp/trunk/Makefile csw/mgar/pkg/gimp/trunk/checksums Modified: csw/mgar/pkg/gimp/trunk/Makefile =================================================================== --- csw/mgar/pkg/gimp/trunk/Makefile 2012-06-08 07:07:58 UTC (rev 18260) +++ csw/mgar/pkg/gimp/trunk/Makefile 2012-06-08 09:23:11 UTC (rev 18261) @@ -1,8 +1,9 @@ NAME = gimp -GARTYPE = v1 +VERSION = 2.6.11 +GARTYPE = v2 CATEGORIES = gnome -DESCRIPTION = The GNU Image Manipulation Program. +DESCRIPTION = The GNU Image Manipulation Program define BLURB The GIMP is the GNU Image Manipulation Program. It is a freely distributed piece of software suitable for such tasks as photo retouching, image @@ -11,36 +12,206 @@ system, a mass production image renderer, a image format converter, etc. endef -# v2.0+ requires Glib/Gtk+ >= 2.2.0 -BUILD_V20 = 1 +MASTER_SITES = ftp://ftp.gimp.org/pub/gimp/v$(shell echo $(VERSION) | cut -d . -f 1,2)/ -ifeq ($(BUILD_V20),1) -VERSION = 2.0.1 -MASTER_SITES = ftp://ftp.gimp.org/pub/gimp/v2.0/ -else -VERSION = 1.2.5 -MASTER_SITES = ftp://ftp.gimp.org/pub/gimp/v1.2/v$(VERSION)/ -endif - DISTFILES = $(NAME)-$(VERSION).tar.bz2 -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --disable-print -CONFIGURE_ARGS += --enable-perl=$(PERL) +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 -ifeq ($(BUILD_V20),1) -CONFIGURE_ARGS += --disable-devel-docs -CONFIGURE_ARGS += --without-aa -# This requires pygtk -#CONFIGURE_ARGS += --enable-python -endif +VENDOR_URL = http://www.gimp.org/ -# Use this instead of EXTRA_LIB/EXTRA_INC -LIBJPEG = -I/usr/sfw/include -L/usr/sfw/lib -ljpeg -LIBTIFF = -I/usr/sfw/include -L/usr/sfw/lib -ltiff -ljpeg -lz -LIBPNG = -I/usr/sfw/include -L/usr/sfw/lib -lpng12 -lz -lm -export LIBTIFF LIBJPEG LIBPNG +PACKAGES += CSWgimp +SPKG_DESC_CSWgimp = The GNU Image Manipulation Program +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWgimp += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWgimp += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWgimp += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWgimp += CSWlibwmflite0-2-7 +RUNTIME_DEP_PKGS_CSWgimp += CSWgtk2 +RUNTIME_DEP_PKGS_CSWgimp += CSWlibgimpconfig2-0-0 +RUNTIME_DEP_PKGS_CSWgimp += CSWlibgimpbase2-0-0 +RUNTIME_DEP_PKGS_CSWgimp += CSWlibgimpmath2-0-0 +RUNTIME_DEP_PKGS_CSWgimp += CSWlibexif12 +RUNTIME_DEP_PKGS_CSWgimp += CSWlibjpeg7 +RUNTIME_DEP_PKGS_CSWgimp += CSWlibgimpcolor2-0-0 +RUNTIME_DEP_PKGS_CSWgimp += CSWlibgegl0-1-0 +RUNTIME_DEP_PKGS_CSWgimp += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWgimp += CSWlibwmf0-2-7 +RUNTIME_DEP_PKGS_CSWgimp += CSWxpm +RUNTIME_DEP_PKGS_CSWgimp += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWgimp += CSWlibdbus1-3 +RUNTIME_DEP_PKGS_CSWgimp += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSWgimp += CSWlibdbus-glib1-2 +RUNTIME_DEP_PKGS_CSWgimp += CSWfconfig +RUNTIME_DEP_PKGS_CSWgimp += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWgimp += CSWlibz1 +RUNTIME_DEP_PKGS_CSWgimp += CSWpython +RUNTIME_DEP_PKGS_CSWgimp += CSWlibbabl0-1-0 +RUNTIME_DEP_PKGS_CSWgimp += CSWlibatk1-0-0 +RUNTIME_DEP_PKGS_CSWgimp += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWgimp += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWgimp += CSWpango +RUNTIME_DEP_PKGS_CSWgimp += CSWlibgimpui2-0-0 +RUNTIME_DEP_PKGS_CSWgimp += CSWlibgimpmodule2-0-0 +RUNTIME_DEP_PKGS_CSWgimp += CSWlibgimpwidgets2-0-0 +RUNTIME_DEP_PKGS_CSWgimp += CSWliblcms1 +RUNTIME_DEP_PKGS_CSWgimp += CSWlibrsvg2-2 +RUNTIME_DEP_PKGS_CSWgimp += CSWlibpng12-0 +RUNTIME_DEP_PKGS_CSWgimp += CSWlibncurses5 +RUNTIME_DEP_PKGS_CSWgimp += CSWftype2 +RUNTIME_DEP_PKGS_CSWgimp += CSWlibtiff3 +RUNTIME_DEP_PKGS_CSWgimp += CSWaalib +RUNTIME_DEP_PKGS_CSWgimp += CSWlibgimpthumb2-0-0 +OBSOLETED_BY_CSWgimp += CSWgimpminimal +OBSOLETED_BY_CSWgimp += CSWgimpi18n +OBSOLETED_BY_CSWgimp += CSWgimplibsdoc -# Tests don't quite work properly -TEST_SCRIPTS = +PACKAGES += CSWlibgimp-dev +SPKG_DESC_CSWlibgimp-dev = Development files for libgimp*-2.0.so.0 libraries +PKGFILES_CSWlibgimp-dev += $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWlibgimp-dev += CSWlibgimpcolor2-0-0 +RUNTIME_DEP_PKGS_CSWlibgimp-dev += CSWlibgimpbase2-0-0 +RUNTIME_DEP_PKGS_CSWlibgimp-dev += CSWlibgimpconfig2-0-0 +RUNTIME_DEP_PKGS_CSWlibgimp-dev += CSWlibgimpthumb2-0-0 +RUNTIME_DEP_PKGS_CSWlibgimp-dev += CSWlibgimpmath2-0-0 +RUNTIME_DEP_PKGS_CSWlibgimp-dev += CSWlibgimpui2-0-0 +RUNTIME_DEP_PKGS_CSWlibgimp-dev += CSWlibgimpmodule2-0-0 +RUNTIME_DEP_PKGS_CSWlibgimp-dev += CSWlibgimpwidgets2-0-0 +RUNTIME_DEP_PKGS_CSWlibgimp-dev += CSWgimp + +PACKAGES += CSWlibgimp2-0-0 +SPKG_DESC_CSWlibgimp2-0-0 = GIMP library, libgimp-2.0.so.0 +PKGFILES_CSWlibgimp2-0-0 += $(call pkgfiles_lib,libgimp-2.0.so.0) +OBSOLETED_BY_CSWlibgimp2-0-0 += CSWgimplibs + +PACKAGES += CSWlibgimpbase2-0-0 +SPKG_DESC_CSWlibgimpbase2-0-0 = GIMP library, libgimpbase-2.0.so.0 +PKGFILES_CSWlibgimpbase2-0-0 += $(call pkgfiles_lib,libgimpbase-2.0.so.0) +OBSOLETED_BY_CSWlibgimpbase2-0-0 += CSWgimplibs +RUNTIME_DEP_PKGS_CSWlibgimpbase2-0-0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibgimpbase2-0-0 += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWlibgimpbase2-0-0 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibgimpbase2-0-0 += CSWlibglib2-0-0 + +PACKAGES += CSWlibgimpcolor2-0-0 +SPKG_DESC_CSWlibgimpcolor2-0-0 = GIMP library, libgimpcolor-2.0.so.0 +PKGFILES_CSWlibgimpcolor2-0-0 += $(call pkgfiles_lib,libgimpcolor-2.0.so.0) +RUNTIME_DEP_PKGS_CSWlibgimpcolor2-0-0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibgimpcolor2-0-0 += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWlibgimpcolor2-0-0 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibgimpcolor2-0-0 += CSWlibglib2-0-0 +OBSOLETED_BY_CSWlibgimpcolor2-0-0 += CSWgimplibs + +PACKAGES += CSWlibgimpconfig2-0-0 +SPKG_DESC_CSWlibgimpconfig2-0-0 = GIMP library, libgimpconfig-2.0.so.0 +PKGFILES_CSWlibgimpconfig2-0-0 += $(call pkgfiles_lib,libgimpconfig-2.0.so.0) +RUNTIME_DEP_PKGS_CSWlibgimpconfig2-0-0 += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWlibgimpconfig2-0-0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibgimpconfig2-0-0 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibgimpconfig2-0-0 += CSWlibgimpbase2-0-0 +RUNTIME_DEP_PKGS_CSWlibgimpconfig2-0-0 += CSWlibgimpmath2-0-0 +RUNTIME_DEP_PKGS_CSWlibgimpconfig2-0-0 += CSWlibgimpcolor2-0-0 +RUNTIME_DEP_PKGS_CSWlibgimpconfig2-0-0 += CSWlibglib2-0-0 +OBSOLETED_BY_CSWlibgimpconfig2-0-0 += CSWgimplibs + +PACKAGES += CSWlibgimpmath2-0-0 +SPKG_DESC_CSWlibgimpmath2-0-0 = GIMP library, libgimpmath-2.0.so.0 +PKGFILES_CSWlibgimpmath2-0-0 += $(call pkgfiles_lib,libgimpmath-2.0.so.0) +RUNTIME_DEP_PKGS_CSWlibgimpmath2-0-0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibgimpmath2-0-0 += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWlibgimpmath2-0-0 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibgimpmath2-0-0 += CSWlibglib2-0-0 +OBSOLETED_BY_CSWlibgimpmath2-0-0 += CSWgimplibs + +PACKAGES += CSWlibgimpmodule2-0-0 +SPKG_DESC_CSWlibgimpmodule2-0-0 = GIMP library, libgimpmodule-2.0.so.0 +PKGFILES_CSWlibgimpmodule2-0-0 += $(call pkgfiles_lib,libgimpmodule-2.0.so.0) +RUNTIME_DEP_PKGS_CSWlibgimpmodule2-0-0 += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWlibgimpmodule2-0-0 += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWlibgimpmodule2-0-0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibgimpmodule2-0-0 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibgimpmodule2-0-0 += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibgimpmodule2-0-0 += CSWlibgimpbase2-0-0 +OBSOLETED_BY_CSWlibgimpmodule2-0-0 += CSWgimplibs + +PACKAGES += CSWlibgimpthumb2-0-0 +SPKG_DESC_CSWlibgimpthumb2-0-0 = GIMP library, libgimpthumb-2.0.so.0 +PKGFILES_CSWlibgimpthumb2-0-0 += $(call pkgfiles_lib,libgimpthumb-2.0.so.0) +RUNTIME_DEP_PKGS_CSWlibgimpthumb2-0-0 += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWlibgimpthumb2-0-0 += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWlibgimpthumb2-0-0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibgimpthumb2-0-0 += CSWgtk2 +RUNTIME_DEP_PKGS_CSWlibgimpthumb2-0-0 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibgimpthumb2-0-0 += CSWlibglib2-0-0 +OBSOLETED_BY_CSWlibgimpthumb2-0-0 += CSWgimplibs + +PACKAGES += CSWlibgimpui2-0-0 +SPKG_DESC_CSWlibgimpui2-0-0 = GIMP library, libgimpui-2.0.so.0 +PKGFILES_CSWlibgimpui2-0-0 += $(call pkgfiles_lib,libgimpui-2.0.so.0) +RUNTIME_DEP_PKGS_CSWlibgimpui2-0-0 += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWlibgimpui2-0-0 += CSWlibgimpcolor2-0-0 +RUNTIME_DEP_PKGS_CSWlibgimpui2-0-0 += CSWfconfig +RUNTIME_DEP_PKGS_CSWlibgimpui2-0-0 += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWlibgimpui2-0-0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibgimpui2-0-0 += CSWlibgimpbase2-0-0 +RUNTIME_DEP_PKGS_CSWlibgimpui2-0-0 += CSWftype2 +RUNTIME_DEP_PKGS_CSWlibgimpui2-0-0 += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWlibgimpui2-0-0 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibgimpui2-0-0 += CSWgtk2 +RUNTIME_DEP_PKGS_CSWlibgimpui2-0-0 += CSWlibatk1-0-0 +RUNTIME_DEP_PKGS_CSWlibgimpui2-0-0 += CSWpango +RUNTIME_DEP_PKGS_CSWlibgimpui2-0-0 += CSWlibgimpmodule2-0-0 +RUNTIME_DEP_PKGS_CSWlibgimpui2-0-0 += CSWgimp +RUNTIME_DEP_PKGS_CSWlibgimpui2-0-0 += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibgimpui2-0-0 += CSWlibgimpwidgets2-0-0 +RUNTIME_DEP_PKGS_CSWlibgimpui2-0-0 += CSWlibgio2-0-0 +OBSOLETED_BY_CSWlibgimpui2-0-0 += CSWgimplibs + +PACKAGES += CSWlibgimpwidgets2-0-0 +SPKG_DESC_CSWlibgimpwidgets2-0-0 = GIMP library, libgimpwidgets-2.0.so.0 +PKGFILES_CSWlibgimpwidgets2-0-0 += $(call pkgfiles_lib,libgimpwidgets-2.0.so.0) +RUNTIME_DEP_PKGS_CSWlibgimpwidgets2-0-0 += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWlibgimpwidgets2-0-0 += CSWlibgimpcolor2-0-0 +RUNTIME_DEP_PKGS_CSWlibgimpwidgets2-0-0 += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWlibgimpwidgets2-0-0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibgimpwidgets2-0-0 += CSWlibgimpbase2-0-0 +RUNTIME_DEP_PKGS_CSWlibgimpwidgets2-0-0 += CSWgtk2 +RUNTIME_DEP_PKGS_CSWlibgimpwidgets2-0-0 += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWlibgimpwidgets2-0-0 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibgimpwidgets2-0-0 += CSWlibgimpconfig2-0-0 +RUNTIME_DEP_PKGS_CSWlibgimpwidgets2-0-0 += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibgimpwidgets2-0-0 += CSWpango +RUNTIME_DEP_PKGS_CSWlibgimpwidgets2-0-0 += CSWfconfig +RUNTIME_DEP_PKGS_CSWlibgimpwidgets2-0-0 += CSWftype2 +RUNTIME_DEP_PKGS_CSWlibgimpwidgets2-0-0 += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWlibgimpwidgets2-0-0 += CSWlibatk1-0-0 +OBSOLETED_BY_CSWlibgimpwidgets2-0-0 += CSWgimplibs + +BUILD64 = 1 +ISAEXEC = 1 + +CONFIGURE_ARGS += $(DIRPATHS) + +# No 64 bit Python yet +CONFIGURE_ARGS-64 += --disable-python + +CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL)) + +CONFFILES += controllerrc +CONFFILES += gimprc +CONFFILES += gtkrc +CONFFILES += menurc +CONFFILES += ps-menurc +CONFFILES += sessionrc +CONFFILES += templaterc +CONFFILES += unitrc + +PRESERVECONF = $(addprefix $(sysconfdir)/gimp/2.0/,$(CONFFILES)) + +PYCOMPILE = 1 +# EXTRA_MERGE_EXCLUDE_FILES += .*.pyo .*.pyc + include gar/category.mk + +# For /opt/csw/gnu/xgettext +PATH := /opt/csw/gnu:$(PATH) Modified: csw/mgar/pkg/gimp/trunk/checksums =================================================================== --- csw/mgar/pkg/gimp/trunk/checksums 2012-06-08 07:07:58 UTC (rev 18260) +++ csw/mgar/pkg/gimp/trunk/checksums 2012-06-08 09:23:11 UTC (rev 18261) @@ -1 +1 @@ -fb7f0d3dcde6c77dc7960c0986a6e0f5 download/gimp-2.0.1.tar.bz2 +bb2939fe13e54fc7255cef5d097bb5dd gimp-2.6.11.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Fri Jun 8 16:35:50 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Fri, 08 Jun 2012 14:35:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[18262] csw/mgar/pkg Message-ID: Revision: 18262 http://gar.svn.sourceforge.net/gar/?rev=18262&view=rev Author: pfelecan Date: 2012-06-08 14:35:49 +0000 (Fri, 08 Jun 2012) Log Message: ----------- migrated from a private recipe to a GAR based one. Added Paths: ----------- csw/mgar/pkg/grip/ csw/mgar/pkg/grip/Makefile csw/mgar/pkg/grip/branches/ csw/mgar/pkg/grip/tags/ csw/mgar/pkg/grip/trunk/ csw/mgar/pkg/grip/trunk/Makefile csw/mgar/pkg/grip/trunk/checksums csw/mgar/pkg/grip/trunk/files/ csw/mgar/pkg/grip/trunk/files/0001-Fix-sendmail-path.patch csw/mgar/pkg/grip/trunk/files/0002-Fix-auto-tools-suggested-by-libtoolize.patch csw/mgar/pkg/grip/trunk/files/README.CSW Added: csw/mgar/pkg/grip/Makefile =================================================================== --- csw/mgar/pkg/grip/Makefile (rev 0) +++ csw/mgar/pkg/grip/Makefile 2012-06-08 14:35:49 UTC (rev 18262) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/grip/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/grip/trunk/Makefile =================================================================== --- csw/mgar/pkg/grip/trunk/Makefile (rev 0) +++ csw/mgar/pkg/grip/trunk/Makefile 2012-06-08 14:35:49 UTC (rev 18262) @@ -0,0 +1,129 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = grip +VERSION = 3.3.1 +GARTYPE = v2 +CATEGORIES = apps + +DESCRIPTION = CD-player and CD-ripper for the Gnome desktop +define BLURB + Grip is a GTK-based CD-player and CD-ripper / MP3 encoder. + It has the ripping capabilities of cdparanoia built in, but can also use + external rippers (such as cdda2wav). + Encoder presets are provided for lame, bladeenc, l3enc, xingmp3enc, + mp3encode, gogo) +endef + +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(DISTNAME).tar.gz +DISTFILES += README.CSW + +PACKAGING_PLATFORMS = solaris10-sparc +PACKAGING_PLATFORMS += solaris10-i386 + +BUILD_DEP_PKGS += CSWfconfig-dev +BUILD_DEP_PKGS += CSWggettext-dev +BUILD_DEP_PKGS += CSWgnomekeyring-dev +BUILD_DEP_PKGS += CSWgnomevfs2-dev +BUILD_DEP_PKGS += CSWlibart +BUILD_DEP_PKGS += CSWlibatk-dev +BUILD_DEP_PKGS += CSWlibaudiofile-dev +BUILD_DEP_PKGS += CSWlibbonobo2 +BUILD_DEP_PKGS += CSWlibbonoboui +BUILD_DEP_PKGS += CSWlibcairo-dev +BUILD_DEP_PKGS += CSWlibcurl-dev +BUILD_DEP_PKGS += CSWlibdbus-glib-dev +BUILD_DEP_PKGS += CSWlibesd-dev +BUILD_DEP_PKGS += CSWlibexpat-dev +BUILD_DEP_PKGS += CSWlibfreetype-dev +BUILD_DEP_PKGS += CSWlibgconf-dev +BUILD_DEP_PKGS += CSWlibgdk-pixbuf-dev +BUILD_DEP_PKGS += CSWlibglib2-dev +BUILD_DEP_PKGS += CSWlibgnomeui-devel +BUILD_DEP_PKGS += CSWlibgtk2-dev +BUILD_DEP_PKGS += CSWlibiconv-dev +BUILD_DEP_PKGS += CSWlibid3-dev +BUILD_DEP_PKGS += CSWlibidn-dev +BUILD_DEP_PKGS += CSWlibpixman-dev +BUILD_DEP_PKGS += CSWlibpng-dev +BUILD_DEP_PKGS += CSWlibssl-dev +BUILD_DEP_PKGS += CSWlibxft2devel +BUILD_DEP_PKGS += CSWlibxml2-dev +BUILD_DEP_PKGS += CSWlibz-dev +BUILD_DEP_PKGS += CSWorbit2 +BUILD_DEP_PKGS += CSWpangodevel +BUILD_DEP_PKGS += CSWvte + +RUNTIME_DEP_PKGS += CSWgnomevfs2 +RUNTIME_DEP_PKGS += CSWlibart +RUNTIME_DEP_PKGS += CSWlibatk1-0-0 +RUNTIME_DEP_PKGS += CSWlibaudiofile0 +RUNTIME_DEP_PKGS += CSWlibbonobo2 +RUNTIME_DEP_PKGS += CSWlibbonoboui +RUNTIME_DEP_PKGS += CSWlibbz2-1-0 +RUNTIME_DEP_PKGS += CSWlibcairo2 +RUNTIME_DEP_PKGS += CSWlibcurl4 +RUNTIME_DEP_PKGS += CSWlibdbus-glib1-2 +RUNTIME_DEP_PKGS += CSWlibdbus1-3 +RUNTIME_DEP_PKGS += CSWlibesd0 +RUNTIME_DEP_PKGS += CSWlibexpat1 +RUNTIME_DEP_PKGS += CSWlibfontconfig1 +RUNTIME_DEP_PKGS += CSWlibfreetype6 +RUNTIME_DEP_PKGS += CSWlibgailutil18 +RUNTIME_DEP_PKGS += CSWlibgcc-s1 +RUNTIME_DEP_PKGS += CSWlibgconf2-4 +RUNTIME_DEP_PKGS += CSWlibgdk-pixbuf2-0-0 +RUNTIME_DEP_PKGS += CSWlibgdk-x11-2-0-0 +RUNTIME_DEP_PKGS += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS += CSWlibgnome +RUNTIME_DEP_PKGS += CSWlibgnome-keyring0 +RUNTIME_DEP_PKGS += CSWlibgnomecanvas +RUNTIME_DEP_PKGS += CSWlibgnomeui2-0 +RUNTIME_DEP_PKGS += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS += CSWlibgtk-x11-2-0-0 +RUNTIME_DEP_PKGS += CSWlibiconv2 +RUNTIME_DEP_PKGS += CSWlibid3-3-8-3 +RUNTIME_DEP_PKGS += CSWlibidn11 +RUNTIME_DEP_PKGS += CSWlibintl3 +RUNTIME_DEP_PKGS += CSWlibintl8 +RUNTIME_DEP_PKGS += CSWlibpixman1-0 +RUNTIME_DEP_PKGS += CSWlibpng12-0 +RUNTIME_DEP_PKGS += CSWlibpopt0 +RUNTIME_DEP_PKGS += CSWlibssl0-9-8 +RUNTIME_DEP_PKGS += CSWlibssl1-0-0 +RUNTIME_DEP_PKGS += CSWlibstdc++6 +RUNTIME_DEP_PKGS += CSWlibxft2 +RUNTIME_DEP_PKGS += CSWlibxml2-2 +RUNTIME_DEP_PKGS += CSWlibxrender +RUNTIME_DEP_PKGS += CSWlibz1 +RUNTIME_DEP_PKGS += CSWorbit2 +RUNTIME_DEP_PKGS += CSWpango +RUNTIME_DEP_PKGS += CSWsunmath +RUNTIME_DEP_PKGS += CSWvte + +PATCHFILES += 0001-Fix-sendmail-path.patch +PATCHFILES += 0002-Fix-auto-tools-suggested-by-libtoolize.patch + +CONFIGURE_ARGS = $(DIRPATHS) +GARCOMPILER = GNU +GCC4_VERSION = 4.7 + +STRIP_LIBTOOL = 1 + +include gar/category.mk + +pre-configure-modulated: + @echo "executing $@" + cd $(WORKSRC) && libtoolize + cd $(WORKSRC) && aclocal + cd $(WORKSRC) && automake -a + cd $(WORKSRC) && autoconf + $(MAKECOOKIE) + +# this is private and not available publicly +mydependencies: + $(HOME)/bin/ocswdeplist --package $(NAME) Property changes on: csw/mgar/pkg/grip/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/grip/trunk/checksums =================================================================== --- csw/mgar/pkg/grip/trunk/checksums (rev 0) +++ csw/mgar/pkg/grip/trunk/checksums 2012-06-08 14:35:49 UTC (rev 18262) @@ -0,0 +1 @@ +4b4233999b9f2bc85c711092553ea9aa grip-3.3.1.tar.gz Added: csw/mgar/pkg/grip/trunk/files/0001-Fix-sendmail-path.patch =================================================================== --- csw/mgar/pkg/grip/trunk/files/0001-Fix-sendmail-path.patch (rev 0) +++ csw/mgar/pkg/grip/trunk/files/0001-Fix-sendmail-path.patch 2012-06-08 14:35:49 UTC (rev 18262) @@ -0,0 +1,25 @@ +From 984c530b86ae2ed6853c7316b2d4dc062855b99f Mon Sep 17 00:00:00 2001 +From: Peter Felecan +Date: Fri, 8 Jun 2012 10:13:33 +0200 +Subject: [PATCH] Fix sendmail path + +--- + src/grip.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/grip.h b/src/grip.h +index 9141237..35eb58f 100644 +--- a/src/grip.h ++++ b/src/grip.h +@@ -53,7 +53,7 @@ + + #define MAILER "/usr/sbin/sendmail -i -t" + +-#elif defined(__sparc__) ++#elif defined(__sun__) + + #define MAILER "/usr/lib/sendmail -i -t" + +-- +1.7.10.3 + Added: csw/mgar/pkg/grip/trunk/files/0002-Fix-auto-tools-suggested-by-libtoolize.patch =================================================================== --- csw/mgar/pkg/grip/trunk/files/0002-Fix-auto-tools-suggested-by-libtoolize.patch (rev 0) +++ csw/mgar/pkg/grip/trunk/files/0002-Fix-auto-tools-suggested-by-libtoolize.patch 2012-06-08 14:35:49 UTC (rev 18262) @@ -0,0 +1,35 @@ +From 190056620224bca152198862bf76bf225b069ae6 Mon Sep 17 00:00:00 2001 +From: Peter Felecan +Date: Fri, 8 Jun 2012 11:33:37 +0200 +Subject: [PATCH] Fix auto-tools suggested by libtoolize + +--- + Makefile.am | 2 ++ + configure.in | 1 + + 2 files changed, 3 insertions(+) + +diff --git a/Makefile.am b/Makefile.am +index fdf3a60..8d86c48 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,3 +1,5 @@ ++ACLOCAL_AMFLAGS = -I m4 ++ + SUBDIRS = po src pixmaps doc contrib + + EXTRA_DIST = \ +diff --git a/configure.in b/configure.in +index ab8be14..970d9a0 100644 +--- a/configure.in ++++ b/configure.in +@@ -2,6 +2,7 @@ AC_PREREQ(2.52) + + AC_INIT(grip, 3.3.1, http://sf.net/tracker/?group_id=3714&atid=103714) + AC_CONFIG_SRCDIR(src/main.c) ++AC_CONFIG_MACRO_DIR([m4]) + AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) + + AM_MAINTAINER_MODE +-- +1.7.10.3 + Added: csw/mgar/pkg/grip/trunk/files/README.CSW =================================================================== --- csw/mgar/pkg/grip/trunk/files/README.CSW (rev 0) +++ csw/mgar/pkg/grip/trunk/files/README.CSW 2012-06-08 14:35:49 UTC (rev 18262) @@ -0,0 +1,31 @@ +$Id$ + +- CD ROM raw device + + Grip needs to access to the raw/character device of the CD ROM to + extract the track informations. For this, the device needs to be + readable for the current user --- usually this is taken care of by + the GUI startup process, however, if you are not using such an + environment, you need to take care of it yourself. In the following + example, the CD ROM is /dev/rdsk/c0t1d0s2, linked to + /devices/pci at 1f,0/ide at d/sd at 1,0:c,raw. Consequently, you need to + apply the following procedure: + + su - root + chmod u+r /devices/pci at 1f,0/ide at d/sd at 1,0:c,raw + chown user /devices/pci at 1f,0/ide at d/sd at 1,0:c,raw + + 'user' being your account name. + +- Grip Configuration + + There are 2 things to configure in Grip, at least: + + 1. Change the raw device in Config/CD/CDRom device --- in the + example above: /dev/rdsk/c0t1d0s2; this will enable the gathering + of the track information. + + 2. Change the encoding of the ID3 tags from UTF-8 to ISO_8859_1 in + Config/Id3/ID3v1 Character set encoding. + +CSW Team Property changes on: csw/mgar/pkg/grip/trunk/files/README.CSW ___________________________________________________________________ Added: svn:keywords + Author Date HeadURL Id Revision 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 8 20:10:56 2012 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 08 Jun 2012 18:10:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[18263] csw/mgar/pkg/cpan/WWW-Curl/trunk/Makefile Message-ID: Revision: 18263 http://gar.svn.sourceforge.net/gar/?rev=18263&view=rev Author: bonivart Date: 2012-06-08 18:10:56 +0000 (Fri, 08 Jun 2012) Log Message: ----------- cpan/WWW-Curl/trunk: update deps Modified Paths: -------------- csw/mgar/pkg/cpan/WWW-Curl/trunk/Makefile Modified: csw/mgar/pkg/cpan/WWW-Curl/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/WWW-Curl/trunk/Makefile 2012-06-08 14:35:49 UTC (rev 18262) +++ csw/mgar/pkg/cpan/WWW-Curl/trunk/Makefile 2012-06-08 18:10:56 UTC (rev 18263) @@ -17,16 +17,14 @@ OBSOLETED_BY_CSWpm-www-curl = CSWpmwwwcurl CATALOGNAME_CSWpmwwwcurl = pm_wwwcurl -RUNTIME_DEP_PKGS += CSWcurlrt -RUNTIME_DEP_PKGS += CSWlibidn -RUNTIME_DEP_PKGS += CSWoldaprt -RUNTIME_DEP_PKGS += CSWosslrt -RUNTIME_DEP_PKGS += CSWzlib -RUNTIME_DEP_PKGS += CSWlibcares +RUNTIME_DEP_PKGS_CSWpm-www-curl += CSWlibidn11 +RUNTIME_DEP_PKGS_CSWpm-www-curl += CSWlibz1 +RUNTIME_DEP_PKGS_CSWpm-www-curl += CSWlibcurl4 +RUNTIME_DEP_PKGS_CSWpm-www-curl += CSWlibssl1-0-0 CONFIGURE_ARGS = # Note that 08ssl.t fails (probably due to connection issues) -#TEST_SCRIPTS = +TEST_SCRIPTS = include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Fri Jun 8 20:53:55 2012 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 08 Jun 2012 18:53:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[18264] csw/mgar/pkg/cpan/Crypt-OpenSSL-Bignum/trunk/ Makefile Message-ID: Revision: 18264 http://gar.svn.sourceforge.net/gar/?rev=18264&view=rev Author: bonivart Date: 2012-06-08 18:53:55 +0000 (Fri, 08 Jun 2012) Log Message: ----------- cpan/Crypt-OpenSSL-Bignum/trunk: update deps Modified Paths: -------------- csw/mgar/pkg/cpan/Crypt-OpenSSL-Bignum/trunk/Makefile Modified: csw/mgar/pkg/cpan/Crypt-OpenSSL-Bignum/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Crypt-OpenSSL-Bignum/trunk/Makefile 2012-06-08 18:10:56 UTC (rev 18263) +++ csw/mgar/pkg/cpan/Crypt-OpenSSL-Bignum/trunk/Makefile 2012-06-08 18:53:55 UTC (rev 18264) @@ -14,9 +14,14 @@ Crypt::OpenSSL::RSA. endef -PACKAGES = CSWpmcryptosslbignum -CATALOGNAME = pm_cryptosslbignum +LICENSE = LICENSE -RUNTIME_DEP_PKGS = CSWosslrt +PACKAGES = CSWpm-crypt-openssl-bignum +CATALOGNAME = pm_crypt_openssl_bignum +SPKG_DESC_CSWpm-crypt-openssl-bignum = $(DESCRIPTION) +OBSOLETED_BY_CSWpm-crypt-openssl-bignum = CSWpmcryptosslbignum +CATALOGNAME_CSWpmcryptosslbignum = pm_cryptosslbignum +RUNTIME_DEP_PKGS_CSWpm-crypt-openssl-bignum += CSWlibssl1-0-0 + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dam at opencsw.org Fri Jun 8 21:23:16 2012 From: dam at opencsw.org (Dagobert Michelsen) Date: Fri, 8 Jun 2012 21:23:16 +0200 Subject: [csw-devel] SF.net SVN: gar:[18264] csw/mgar/pkg/cpan/Crypt-OpenSSL-Bignum/trunk/ Makefile In-Reply-To: References: Message-ID: <98E6EA15-66A1-49CB-B319-4E7ABA89A8CE@opencsw.org> Hi Peter, Am 08.06.2012 um 20:53 schrieb bonivart at users.sourceforge.net: > Revision: 18264 > http://gar.svn.sourceforge.net/gar/?rev=18264&view=rev > Author: bonivart > Date: 2012-06-08 18:53:55 +0000 (Fri, 08 Jun 2012) > Log Message: > ----------- > cpan/Crypt-OpenSSL-Bignum/trunk: update deps > > Modified Paths: > -------------- > csw/mgar/pkg/cpan/Crypt-OpenSSL-Bignum/trunk/Makefile > > Modified: csw/mgar/pkg/cpan/Crypt-OpenSSL-Bignum/trunk/Makefile > =================================================================== > --- csw/mgar/pkg/cpan/Crypt-OpenSSL-Bignum/trunk/Makefile 2012-06-08 18:10:56 UTC (rev 18263) > +++ csw/mgar/pkg/cpan/Crypt-OpenSSL-Bignum/trunk/Makefile 2012-06-08 18:53:55 UTC (rev 18264) > @@ -14,9 +14,14 @@ > Crypt::OpenSSL::RSA. > endef > > -PACKAGES = CSWpmcryptosslbignum > -CATALOGNAME = pm_cryptosslbignum > +LICENSE = LICENSE > > -RUNTIME_DEP_PKGS = CSWosslrt > +PACKAGES = CSWpm-crypt-openssl-bignum > +CATALOGNAME = pm_crypt_openssl_bignum > +SPKG_DESC_CSWpm-crypt-openssl-bignum = $(DESCRIPTION) > +OBSOLETED_BY_CSWpm-crypt-openssl-bignum = CSWpmcryptosslbignum > +CATALOGNAME_CSWpmcryptosslbignum = pm_cryptosslbignum I guess that should better be CATALOGNAME_CSWpmcryptosslbignum = pm_cryptosslbignum_stub Best regards -- Dago > > +RUNTIME_DEP_PKGS_CSWpm-crypt-openssl-bignum += CSWlibssl1-0-0 > + > include gar/category.mk > > 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 From bonivart at users.sourceforge.net Fri Jun 8 22:22:28 2012 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 08 Jun 2012 20:22:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[18265] csw/mgar/pkg/cpan/Crypt-OpenSSL-Bignum/trunk/ Makefile Message-ID: Revision: 18265 http://gar.svn.sourceforge.net/gar/?rev=18265&view=rev Author: bonivart Date: 2012-06-08 20:22:28 +0000 (Fri, 08 Jun 2012) Log Message: ----------- cpan/Crypt-OpenSSL-Bignum/trunk: fix stub name Modified Paths: -------------- csw/mgar/pkg/cpan/Crypt-OpenSSL-Bignum/trunk/Makefile Modified: csw/mgar/pkg/cpan/Crypt-OpenSSL-Bignum/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Crypt-OpenSSL-Bignum/trunk/Makefile 2012-06-08 18:53:55 UTC (rev 18264) +++ csw/mgar/pkg/cpan/Crypt-OpenSSL-Bignum/trunk/Makefile 2012-06-08 20:22:28 UTC (rev 18265) @@ -20,7 +20,7 @@ CATALOGNAME = pm_crypt_openssl_bignum SPKG_DESC_CSWpm-crypt-openssl-bignum = $(DESCRIPTION) OBSOLETED_BY_CSWpm-crypt-openssl-bignum = CSWpmcryptosslbignum -CATALOGNAME_CSWpmcryptosslbignum = pm_cryptosslbignum +CATALOGNAME_CSWpmcryptosslbignum = pm_cryptosslbignum_stub RUNTIME_DEP_PKGS_CSWpm-crypt-openssl-bignum += CSWlibssl1-0-0 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 9 00:34:50 2012 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 08 Jun 2012 22:34:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[18266] csw/mgar/pkg/cpan/Crypt-SSLeay/trunk Message-ID: Revision: 18266 http://gar.svn.sourceforge.net/gar/?rev=18266&view=rev Author: bonivart Date: 2012-06-08 22:34:49 +0000 (Fri, 08 Jun 2012) Log Message: ----------- cpan/Crypt-SSLeay/trunk: update deps Modified Paths: -------------- csw/mgar/pkg/cpan/Crypt-SSLeay/trunk/Makefile csw/mgar/pkg/cpan/Crypt-SSLeay/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/Crypt-SSLeay/trunk/files/COPYING Modified: csw/mgar/pkg/cpan/Crypt-SSLeay/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Crypt-SSLeay/trunk/Makefile 2012-06-08 20:22:28 UTC (rev 18265) +++ csw/mgar/pkg/cpan/Crypt-SSLeay/trunk/Makefile 2012-06-08 22:34:49 UTC (rev 18266) @@ -1,8 +1,8 @@ NAME = Crypt-SSLeay -VERSION = 0.57 +VERSION = 0.58 CATEGORIES = cpan GARTYPE = v2 -AUTHOR = DLAND +AUTHOR = NANIS DESCRIPTION = OpenSSL glue that provides LWP https support define BLURB @@ -11,12 +11,20 @@ perldoc LWP for more information on POST requests. endef -PACKAGES = CSWpmcryptssleay -CATALOGNAME = pm_cryptssleay +DISTFILES += COPYING -RUNTIME_DEP_PKGS = CSWosslrt -BUILD_DEP_PKGS = CSWosslrt CSWpmmimebase64 +PACKAGES = CSWpm-crypt-ssleay +CATALOGNAME = pm_crypt_ssleay +SPKG_DESC_CSWpm-crypt-ssleay = $(DESCRIPTION) +OBSOLETED_BY_CSWpm-crypt-ssleay = CSWpmcryptssleay +CATALOGNAME_CSWpmcryptssleay = pm_cryptssleay_stub +RUNTIME_DEP_PKGS_CSWpm-crypt-ssleay += CSWlibssl1-0-0 + +# Documentation only +CHECKPKG_OVERRIDES_CSWpm-crypt-ssleay += file-with-bad-content|/usr/local|root/opt/csw/lib/perl/csw/Crypt/SSLeay.pm +CHECKPKG_OVERRIDES_CSWpm-crypt-ssleay += file-with-bad-content|/usr/local|root/opt/csw/share/man/man3/Crypt::SSLeay.3perl + CONFIGURE_ARGS = --lib=$(prefix) # unset https_proxy, otherwise 1 test will fail as non root user CONFIGURE_ENV += https_proxy= Modified: csw/mgar/pkg/cpan/Crypt-SSLeay/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Crypt-SSLeay/trunk/checksums 2012-06-08 20:22:28 UTC (rev 18265) +++ csw/mgar/pkg/cpan/Crypt-SSLeay/trunk/checksums 2012-06-08 22:34:49 UTC (rev 18266) @@ -1 +1 @@ -82264180f5911dce33dbd85e24b1f36b Crypt-SSLeay-0.57.tar.gz +fbf3d12e58462cee00ea63239c0b13c7 Crypt-SSLeay-0.58.tar.gz Added: csw/mgar/pkg/cpan/Crypt-SSLeay/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/Crypt-SSLeay/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/Crypt-SSLeay/trunk/files/COPYING 2012-06-08 22:34:49 UTC (rev 18266) @@ -0,0 +1,12 @@ +COPYRIGHT + Copyright (c) 2010 A. Sinan Unur + + Copyright (c) 2006-2007 David Landgren + + Copyright (c) 1999-2003 Joshua Chamas + + Copyright (c) 1998 Gisle Aas + +LICENSE + This program is free software; you can redistribute it and/or modify it + under the same terms as Perl itself. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sat Jun 9 00:52:22 2012 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 08 Jun 2012 22:52:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[18267] csw/mgar/pkg/cpan/Crypt-OpenSSL-Random/trunk Message-ID: Revision: 18267 http://gar.svn.sourceforge.net/gar/?rev=18267&view=rev Author: bonivart Date: 2012-06-08 22:52:22 +0000 (Fri, 08 Jun 2012) Log Message: ----------- cpan/Crypt-OpenSSL-Random/trunk: update deps Modified Paths: -------------- csw/mgar/pkg/cpan/Crypt-OpenSSL-Random/trunk/Makefile csw/mgar/pkg/cpan/Crypt-OpenSSL-Random/trunk/checksums Modified: csw/mgar/pkg/cpan/Crypt-OpenSSL-Random/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Crypt-OpenSSL-Random/trunk/Makefile 2012-06-08 22:34:49 UTC (rev 18266) +++ csw/mgar/pkg/cpan/Crypt-OpenSSL-Random/trunk/Makefile 2012-06-08 22:52:22 UTC (rev 18267) @@ -10,9 +10,14 @@ library's pseudo-random number generator endef -PACKAGES = CSWpmcryptosslrandom -CATALOGNAME = pm_osslrandom +LICENSE = LICENSE -RUNTIME_DEP_PKGS = CSWosslrt +PACKAGES = CSWpm-crypt-openssl-random +CATALOGNAME = pm_crypt_openssl_random +SPKG_DESC_CSWpm-crypt-openssl-random = $(DESCRIPTION) +OBSOLETED_BY_CSWpm-crypt-openssl-random = CSWpmcryptosslrandom +CATALOGNAME_CSWpmcryptosslrandom = pm_cryptosslrandom_stub +RUNTIME_DEP_PKGS_CSWpm-crypt-openssl-random += CSWlibssl1-0-0 + include gar/category.mk Modified: csw/mgar/pkg/cpan/Crypt-OpenSSL-Random/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Crypt-OpenSSL-Random/trunk/checksums 2012-06-08 22:34:49 UTC (rev 18266) +++ csw/mgar/pkg/cpan/Crypt-OpenSSL-Random/trunk/checksums 2012-06-08 22:52:22 UTC (rev 18267) @@ -1 +1,2 @@ +608826974d5644ee7967a713fa72cf36 COPYING c56ac5dbdd46122eb9b8da59613b7b0a Crypt-OpenSSL-Random-0.04.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 9 01:08:35 2012 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 08 Jun 2012 23:08:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[18268] csw/mgar/pkg/cpan/Crypt-OpenSSL-RSA/trunk Message-ID: Revision: 18268 http://gar.svn.sourceforge.net/gar/?rev=18268&view=rev Author: bonivart Date: 2012-06-08 23:08:35 +0000 (Fri, 08 Jun 2012) Log Message: ----------- cpan/Crypt-OpenSSL-RSA/trunk: update deps Modified Paths: -------------- csw/mgar/pkg/cpan/Crypt-OpenSSL-RSA/trunk/Makefile csw/mgar/pkg/cpan/Crypt-OpenSSL-RSA/trunk/checksums Modified: csw/mgar/pkg/cpan/Crypt-OpenSSL-RSA/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Crypt-OpenSSL-RSA/trunk/Makefile 2012-06-08 22:52:22 UTC (rev 18267) +++ csw/mgar/pkg/cpan/Crypt-OpenSSL-RSA/trunk/Makefile 2012-06-08 23:08:35 UTC (rev 18268) @@ -1,8 +1,8 @@ NAME = Crypt-OpenSSL-RSA -VERSION = 0.25 +VERSION = 0.28 CATEGORIES = cpan GARTYPE = v2 -AUTHOR = IROBERTS +AUTHOR = PERLER DESCRIPTION = RSA encoding and decoding, using the openSSL libraries define BLURB @@ -11,10 +11,15 @@ decryption, signatures and signature verification. endef -PACKAGES = CSWpmcryptosslrsa -CATALOGNAME = pm_osslrsa +LICENSE = LICENSE -RUNTIME_DEP_PKGS = CSWpmcryptosslrandom -BUILD_DEP_PKGS = CSWpmcryptosslrandom +PACKAGES = CSWpm-crypt-openssl-rsa +CATALOGNAME = pm_crypt_openssl_rsa +SPKG_DESC_CSWpm-crypt-openssl-rsa = $(DESCRIPTION) +OBSOLETED_BY_CSWpm-crypt-openssl-rsa = CSWpmcryptosslrsa +CATALOGNAME_CSWpmcryptosslrsa = pm_crypt_openssl_rsa_stub +RUNTIME_DEP_PKGS_CSWpm-crypt-openssl-rsa = CSWpm-crypt-openssl-random +RUNTIME_DEP_PKGS_CSWpm-crypt-openssl-rsa += CSWlibssl1-0-0 + include gar/category.mk Modified: csw/mgar/pkg/cpan/Crypt-OpenSSL-RSA/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Crypt-OpenSSL-RSA/trunk/checksums 2012-06-08 22:52:22 UTC (rev 18267) +++ csw/mgar/pkg/cpan/Crypt-OpenSSL-RSA/trunk/checksums 2012-06-08 23:08:35 UTC (rev 18268) @@ -1 +1 @@ -fdf19c9093f47cffb851ae937d053c14 Crypt-OpenSSL-RSA-0.25.tar.gz +86217a5036fc63779c30420b5fd84129 Crypt-OpenSSL-RSA-0.28.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 9 01:11:15 2012 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 08 Jun 2012 23:11:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[18269] csw/mgar/pkg/cpan/Crypt-OpenSSL-RSA/trunk/Makefile Message-ID: Revision: 18269 http://gar.svn.sourceforge.net/gar/?rev=18269&view=rev Author: bonivart Date: 2012-06-08 23:11:15 +0000 (Fri, 08 Jun 2012) Log Message: ----------- cpan/Crypt-OpenSSL-RSA/trunk: add override about unknown dep Modified Paths: -------------- csw/mgar/pkg/cpan/Crypt-OpenSSL-RSA/trunk/Makefile Modified: csw/mgar/pkg/cpan/Crypt-OpenSSL-RSA/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Crypt-OpenSSL-RSA/trunk/Makefile 2012-06-08 23:08:35 UTC (rev 18268) +++ csw/mgar/pkg/cpan/Crypt-OpenSSL-RSA/trunk/Makefile 2012-06-08 23:11:15 UTC (rev 18269) @@ -22,4 +22,7 @@ RUNTIME_DEP_PKGS_CSWpm-crypt-openssl-rsa = CSWpm-crypt-openssl-random RUNTIME_DEP_PKGS_CSWpm-crypt-openssl-rsa += CSWlibssl1-0-0 +# Will be released at same time as this package, remove this override next time +CHECKPKG_OVERRIDES_CSWpm-crypt-openssl-rsa += unidentified-dependency|CSWpm-crypt-openssl-random + 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 Sat Jun 9 09:24:42 2012 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sat, 09 Jun 2012 07:24:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[18270] csw/mgar/pkg/cpan/Crypt-OpenSSL-Random/trunk/ Makefile Message-ID: Revision: 18270 http://gar.svn.sourceforge.net/gar/?rev=18270&view=rev Author: bonivart Date: 2012-06-09 07:24:41 +0000 (Sat, 09 Jun 2012) Log Message: ----------- cpan/Crypt-OpenSSL-Random/trunk: change stub name Modified Paths: -------------- csw/mgar/pkg/cpan/Crypt-OpenSSL-Random/trunk/Makefile Modified: csw/mgar/pkg/cpan/Crypt-OpenSSL-Random/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Crypt-OpenSSL-Random/trunk/Makefile 2012-06-08 23:11:15 UTC (rev 18269) +++ csw/mgar/pkg/cpan/Crypt-OpenSSL-Random/trunk/Makefile 2012-06-09 07:24:41 UTC (rev 18270) @@ -16,7 +16,7 @@ CATALOGNAME = pm_crypt_openssl_random SPKG_DESC_CSWpm-crypt-openssl-random = $(DESCRIPTION) OBSOLETED_BY_CSWpm-crypt-openssl-random = CSWpmcryptosslrandom -CATALOGNAME_CSWpmcryptosslrandom = pm_cryptosslrandom_stub +CATALOGNAME_CSWpmcryptosslrandom = pm_crypt_openssl_random_stub RUNTIME_DEP_PKGS_CSWpm-crypt-openssl-random += CSWlibssl1-0-0 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 9 09:30:57 2012 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sat, 09 Jun 2012 07:30:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[18271] csw/mgar/pkg/cpan/Crypt-SSLeay/trunk/Makefile Message-ID: Revision: 18271 http://gar.svn.sourceforge.net/gar/?rev=18271&view=rev Author: bonivart Date: 2012-06-09 07:30:56 +0000 (Sat, 09 Jun 2012) Log Message: ----------- cpan/Crypt-SSLeay/trunk: change stub name Modified Paths: -------------- csw/mgar/pkg/cpan/Crypt-SSLeay/trunk/Makefile Modified: csw/mgar/pkg/cpan/Crypt-SSLeay/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Crypt-SSLeay/trunk/Makefile 2012-06-09 07:24:41 UTC (rev 18270) +++ csw/mgar/pkg/cpan/Crypt-SSLeay/trunk/Makefile 2012-06-09 07:30:56 UTC (rev 18271) @@ -17,7 +17,7 @@ CATALOGNAME = pm_crypt_ssleay SPKG_DESC_CSWpm-crypt-ssleay = $(DESCRIPTION) OBSOLETED_BY_CSWpm-crypt-ssleay = CSWpmcryptssleay -CATALOGNAME_CSWpmcryptssleay = pm_cryptssleay_stub +CATALOGNAME_CSWpmcryptssleay = pm_crypt_ssleay_stub RUNTIME_DEP_PKGS_CSWpm-crypt-ssleay += CSWlibssl1-0-0 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 9 09:37:57 2012 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sat, 09 Jun 2012 07:37:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[18272] csw/mgar/pkg/cpan/Crypt-OpenSSL-Bignum/trunk/ Makefile Message-ID: Revision: 18272 http://gar.svn.sourceforge.net/gar/?rev=18272&view=rev Author: bonivart Date: 2012-06-09 07:37:57 +0000 (Sat, 09 Jun 2012) Log Message: ----------- cpan/Crypt-OpenSSL-Bignum/trunk: change stub name Modified Paths: -------------- csw/mgar/pkg/cpan/Crypt-OpenSSL-Bignum/trunk/Makefile Modified: csw/mgar/pkg/cpan/Crypt-OpenSSL-Bignum/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Crypt-OpenSSL-Bignum/trunk/Makefile 2012-06-09 07:30:56 UTC (rev 18271) +++ csw/mgar/pkg/cpan/Crypt-OpenSSL-Bignum/trunk/Makefile 2012-06-09 07:37:57 UTC (rev 18272) @@ -20,7 +20,7 @@ CATALOGNAME = pm_crypt_openssl_bignum SPKG_DESC_CSWpm-crypt-openssl-bignum = $(DESCRIPTION) OBSOLETED_BY_CSWpm-crypt-openssl-bignum = CSWpmcryptosslbignum -CATALOGNAME_CSWpmcryptosslbignum = pm_cryptosslbignum_stub +CATALOGNAME_CSWpmcryptosslbignum = pm_crypt_openssl_bignum_stub RUNTIME_DEP_PKGS_CSWpm-crypt-openssl-bignum += CSWlibssl1-0-0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Sat Jun 9 09:45:18 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Sat, 09 Jun 2012 07:45:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[18273] csw/mgar/pkg/irssi/trunk/Makefile Message-ID: Revision: 18273 http://gar.svn.sourceforge.net/gar/?rev=18273&view=rev Author: wilbury Date: 2012-06-09 07:45:18 +0000 (Sat, 09 Jun 2012) Log Message: ----------- irssi/trunk: Adjust dependencies. Modified Paths: -------------- csw/mgar/pkg/irssi/trunk/Makefile Modified: csw/mgar/pkg/irssi/trunk/Makefile =================================================================== --- csw/mgar/pkg/irssi/trunk/Makefile 2012-06-09 07:37:57 UTC (rev 18272) +++ csw/mgar/pkg/irssi/trunk/Makefile 2012-06-09 07:45:18 UTC (rev 18273) @@ -35,8 +35,9 @@ RUNTIME_DEP_PKGS += CSWlibintl8 RUNTIME_DEP_PKGS += CSWlibsocks -RUNTIME_DEP_PKGS += CSWglib2 RUNTIME_DEP_PKGS += CSWlibssl1-0-0 +RUNTIME_DEP_PKGS += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS += CSWlibgmodule2-0-0 RUNTIME_DEP_PKGS += CSWperl REINPLACE_USRLOCAL += docs/perl.txt 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 9 10:04:17 2012 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sat, 09 Jun 2012 08:04:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[18274] csw/mgar/pkg/cpan/WWW-Curl/trunk/Makefile Message-ID: Revision: 18274 http://gar.svn.sourceforge.net/gar/?rev=18274&view=rev Author: bonivart Date: 2012-06-09 08:04:17 +0000 (Sat, 09 Jun 2012) Log Message: ----------- cpan/WWW-Curl/trunk: change stub name Modified Paths: -------------- csw/mgar/pkg/cpan/WWW-Curl/trunk/Makefile Modified: csw/mgar/pkg/cpan/WWW-Curl/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/WWW-Curl/trunk/Makefile 2012-06-09 07:45:18 UTC (rev 18273) +++ csw/mgar/pkg/cpan/WWW-Curl/trunk/Makefile 2012-06-09 08:04:17 UTC (rev 18274) @@ -15,7 +15,7 @@ CATALOGNAME = pm_www_curl SPKG_DESC_CSWpm-www-curl = $(DESCRIPTION) OBSOLETED_BY_CSWpm-www-curl = CSWpmwwwcurl -CATALOGNAME_CSWpmwwwcurl = pm_wwwcurl +CATALOGNAME_CSWpmwwwcurl = pm_www_curl_stub RUNTIME_DEP_PKGS_CSWpm-www-curl += CSWlibidn11 RUNTIME_DEP_PKGS_CSWpm-www-curl += CSWlibz1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Sat Jun 9 10:28:43 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Sat, 09 Jun 2012 08:28:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[18275] csw/mgar/pkg/irssi/trunk/Makefile Message-ID: Revision: 18275 http://gar.svn.sourceforge.net/gar/?rev=18275&view=rev Author: wilbury Date: 2012-06-09 08:28:43 +0000 (Sat, 09 Jun 2012) Log Message: ----------- irssi/trunk: Adjust dependencies. Modified Paths: -------------- csw/mgar/pkg/irssi/trunk/Makefile Modified: csw/mgar/pkg/irssi/trunk/Makefile =================================================================== --- csw/mgar/pkg/irssi/trunk/Makefile 2012-06-09 08:04:17 UTC (rev 18274) +++ csw/mgar/pkg/irssi/trunk/Makefile 2012-06-09 08:28:43 UTC (rev 18275) @@ -36,8 +36,7 @@ RUNTIME_DEP_PKGS += CSWlibintl8 RUNTIME_DEP_PKGS += CSWlibsocks RUNTIME_DEP_PKGS += CSWlibssl1-0-0 -RUNTIME_DEP_PKGS += CSWlibglib2-0-0 -RUNTIME_DEP_PKGS += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS += CSWglib2 RUNTIME_DEP_PKGS += CSWperl REINPLACE_USRLOCAL += docs/perl.txt This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sat Jun 9 10:41:33 2012 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 09 Jun 2012 08:41:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[18276] csw/mgar/pkg/openssl1/trunk/Makefile Message-ID: Revision: 18276 http://gar.svn.sourceforge.net/gar/?rev=18276&view=rev Author: chninkel Date: 2012-06-09 08:41:32 +0000 (Sat, 09 Jun 2012) Log Message: ----------- openssl1/trunk: added solaris11-i386 build Modified Paths: -------------- csw/mgar/pkg/openssl1/trunk/Makefile Modified: csw/mgar/pkg/openssl1/trunk/Makefile =================================================================== --- csw/mgar/pkg/openssl1/trunk/Makefile 2012-06-09 08:28:43 UTC (rev 18275) +++ csw/mgar/pkg/openssl1/trunk/Makefile 2012-06-09 08:41:32 UTC (rev 18276) @@ -178,7 +178,7 @@ endif ifdef T4 -PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 solaris10-sparc solaris10-i386 solaris11-sparc +PACKAGING_PLATFORMS += solaris11-sparc solaris11-i386 endif 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 9 10:58:34 2012 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sat, 09 Jun 2012 08:58:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[18277] csw/mgar/pkg/cpan/Net-SSH2/trunk Message-ID: Revision: 18277 http://gar.svn.sourceforge.net/gar/?rev=18277&view=rev Author: bonivart Date: 2012-06-09 08:58:34 +0000 (Sat, 09 Jun 2012) Log Message: ----------- cpan/Net-SSH2/trunk: update to 0.45 Modified Paths: -------------- csw/mgar/pkg/cpan/Net-SSH2/trunk/Makefile csw/mgar/pkg/cpan/Net-SSH2/trunk/checksums Modified: csw/mgar/pkg/cpan/Net-SSH2/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Net-SSH2/trunk/Makefile 2012-06-09 08:41:32 UTC (rev 18276) +++ csw/mgar/pkg/cpan/Net-SSH2/trunk/Makefile 2012-06-09 08:58:34 UTC (rev 18277) @@ -1,5 +1,5 @@ NAME = Net-SSH2 -VERSION = 0.40 +VERSION = 0.45 CATEGORIES = cpan GARTYPE = v2 AUTHOR = RKITOVER @@ -16,8 +16,10 @@ OBSOLETED_BY_CSWpm-net-ssh2 = CSWpmnetssh2 CATALOGNAME_CSWpmnetssh2 = pm_netssh2 -RUNTIME_DEP_PKGS_CSWpm-net-ssh2 = CSWosslrt RUNTIME_DEP_PKGS_CSWpm-net-ssh2 += CSWlibssh2-1 +RUNTIME_DEP_PKGS_CSWpm-net-ssh2 += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWpm-net-ssh2 += CSWlibz1 +CONFIGURE_ARGS = lib=/opt/csw/bdb48/lib include=/opt/csw/bdb48/include + include gar/category.mk Modified: csw/mgar/pkg/cpan/Net-SSH2/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Net-SSH2/trunk/checksums 2012-06-09 08:41:32 UTC (rev 18276) +++ csw/mgar/pkg/cpan/Net-SSH2/trunk/checksums 2012-06-09 08:58:34 UTC (rev 18277) @@ -1 +1 @@ -fbc06247d999b24489ef1b8384420c03 Net-SSH2-0.40.tar.gz +5e18086347bc2099d1c67f898805841e Net-SSH2-0.45.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 9 11:04:47 2012 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sat, 09 Jun 2012 09:04:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[18278] csw/mgar/pkg/cpan/Net-SSH2/trunk/Makefile Message-ID: Revision: 18278 http://gar.svn.sourceforge.net/gar/?rev=18278&view=rev Author: bonivart Date: 2012-06-09 09:04:47 +0000 (Sat, 09 Jun 2012) Log Message: ----------- cpan/Net-SSH2/trunk: change stub name Modified Paths: -------------- csw/mgar/pkg/cpan/Net-SSH2/trunk/Makefile Modified: csw/mgar/pkg/cpan/Net-SSH2/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Net-SSH2/trunk/Makefile 2012-06-09 08:58:34 UTC (rev 18277) +++ csw/mgar/pkg/cpan/Net-SSH2/trunk/Makefile 2012-06-09 09:04:47 UTC (rev 18278) @@ -14,7 +14,7 @@ PACKAGES = CSWpm-net-ssh2 SPKG_DESC_CSWpm-net-ssh2 = $(DESCRIPTION) OBSOLETED_BY_CSWpm-net-ssh2 = CSWpmnetssh2 -CATALOGNAME_CSWpmnetssh2 = pm_netssh2 +CATALOGNAME_CSWpmnetssh2 = pm_net_ssh2_stub RUNTIME_DEP_PKGS_CSWpm-net-ssh2 += CSWlibssh2-1 RUNTIME_DEP_PKGS_CSWpm-net-ssh2 += CSWlibssl1-0-0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dam at opencsw.org Sat Jun 9 11:14:03 2012 From: dam at opencsw.org (Dagobert Michelsen) Date: Sat, 9 Jun 2012 11:14:03 +0200 Subject: [csw-devel] SF.net SVN: gar:[18278] csw/mgar/pkg/cpan/Net-SSH2/trunk/Makefile In-Reply-To: References: Message-ID: <4AA4E353-E63B-4C8A-A0D0-565AD62ABFAC@opencsw.org> Hi Peter, Am 09.06.2012 um 11:04 schrieb bonivart at users.sourceforge.net: > Revision: 18278 > http://gar.svn.sourceforge.net/gar/?rev=18278&view=rev > Author: bonivart > Date: 2012-06-09 09:04:47 +0000 (Sat, 09 Jun 2012) > Log Message: > ----------- > cpan/Net-SSH2/trunk: change stub name > > Modified Paths: > -------------- > csw/mgar/pkg/cpan/Net-SSH2/trunk/Makefile > > Modified: csw/mgar/pkg/cpan/Net-SSH2/trunk/Makefile > =================================================================== > --- csw/mgar/pkg/cpan/Net-SSH2/trunk/Makefile 2012-06-09 08:58:34 UTC (rev 18277) > +++ csw/mgar/pkg/cpan/Net-SSH2/trunk/Makefile 2012-06-09 09:04:47 UTC (rev 18278) > @@ -14,7 +14,7 @@ > PACKAGES = CSWpm-net-ssh2 > SPKG_DESC_CSWpm-net-ssh2 = $(DESCRIPTION) > OBSOLETED_BY_CSWpm-net-ssh2 = CSWpmnetssh2 > -CATALOGNAME_CSWpmnetssh2 = pm_netssh2 > +CATALOGNAME_CSWpmnetssh2 = pm_net_ssh2_stub Afaik The New catalogname should be the old catalog name, just with stub attached, so like pm_netssh2_stub Best regards -- Dago > > RUNTIME_DEP_PKGS_CSWpm-net-ssh2 += CSWlibssh2-1 > RUNTIME_DEP_PKGS_CSWpm-net-ssh2 += CSWlibssl1-0-0 > > 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 From bonivart at users.sourceforge.net Sat Jun 9 12:27:35 2012 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sat, 09 Jun 2012 10:27:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[18279] csw/mgar/pkg/cpan/Net-SSH2/trunk/Makefile Message-ID: Revision: 18279 http://gar.svn.sourceforge.net/gar/?rev=18279&view=rev Author: bonivart Date: 2012-06-09 10:27:35 +0000 (Sat, 09 Jun 2012) Log Message: ----------- cpan/Net-SSH2/trunk: change stub name Modified Paths: -------------- csw/mgar/pkg/cpan/Net-SSH2/trunk/Makefile Modified: csw/mgar/pkg/cpan/Net-SSH2/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Net-SSH2/trunk/Makefile 2012-06-09 09:04:47 UTC (rev 18278) +++ csw/mgar/pkg/cpan/Net-SSH2/trunk/Makefile 2012-06-09 10:27:35 UTC (rev 18279) @@ -14,7 +14,7 @@ PACKAGES = CSWpm-net-ssh2 SPKG_DESC_CSWpm-net-ssh2 = $(DESCRIPTION) OBSOLETED_BY_CSWpm-net-ssh2 = CSWpmnetssh2 -CATALOGNAME_CSWpmnetssh2 = pm_net_ssh2_stub +CATALOGNAME_CSWpmnetssh2 = pm_netssh2_stub RUNTIME_DEP_PKGS_CSWpm-net-ssh2 += CSWlibssh2-1 RUNTIME_DEP_PKGS_CSWpm-net-ssh2 += CSWlibssl1-0-0 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 9 12:32:57 2012 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sat, 09 Jun 2012 10:32:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[18280] csw/mgar/pkg/cpan/WWW-Curl/trunk/Makefile Message-ID: Revision: 18280 http://gar.svn.sourceforge.net/gar/?rev=18280&view=rev Author: bonivart Date: 2012-06-09 10:32:57 +0000 (Sat, 09 Jun 2012) Log Message: ----------- cpan/WWW-Curl/trunk: change stub name Modified Paths: -------------- csw/mgar/pkg/cpan/WWW-Curl/trunk/Makefile Modified: csw/mgar/pkg/cpan/WWW-Curl/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/WWW-Curl/trunk/Makefile 2012-06-09 10:27:35 UTC (rev 18279) +++ csw/mgar/pkg/cpan/WWW-Curl/trunk/Makefile 2012-06-09 10:32:57 UTC (rev 18280) @@ -15,7 +15,7 @@ CATALOGNAME = pm_www_curl SPKG_DESC_CSWpm-www-curl = $(DESCRIPTION) OBSOLETED_BY_CSWpm-www-curl = CSWpmwwwcurl -CATALOGNAME_CSWpmwwwcurl = pm_www_curl_stub +CATALOGNAME_CSWpmwwwcurl = pm_wwwcurl_stub RUNTIME_DEP_PKGS_CSWpm-www-curl += CSWlibidn11 RUNTIME_DEP_PKGS_CSWpm-www-curl += CSWlibz1 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 9 12:39:59 2012 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sat, 09 Jun 2012 10:39:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[18281] csw/mgar/pkg/cpan/Crypt-OpenSSL-Bignum/trunk/ Makefile Message-ID: Revision: 18281 http://gar.svn.sourceforge.net/gar/?rev=18281&view=rev Author: bonivart Date: 2012-06-09 10:39:59 +0000 (Sat, 09 Jun 2012) Log Message: ----------- cpan/Crypt-OpenSSL-Bignum/trunk: change stub name Modified Paths: -------------- csw/mgar/pkg/cpan/Crypt-OpenSSL-Bignum/trunk/Makefile Modified: csw/mgar/pkg/cpan/Crypt-OpenSSL-Bignum/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Crypt-OpenSSL-Bignum/trunk/Makefile 2012-06-09 10:32:57 UTC (rev 18280) +++ csw/mgar/pkg/cpan/Crypt-OpenSSL-Bignum/trunk/Makefile 2012-06-09 10:39:59 UTC (rev 18281) @@ -20,7 +20,7 @@ CATALOGNAME = pm_crypt_openssl_bignum SPKG_DESC_CSWpm-crypt-openssl-bignum = $(DESCRIPTION) OBSOLETED_BY_CSWpm-crypt-openssl-bignum = CSWpmcryptosslbignum -CATALOGNAME_CSWpmcryptosslbignum = pm_crypt_openssl_bignum_stub +CATALOGNAME_CSWpmcryptosslbignum = pm_cryptosslbignum_stub RUNTIME_DEP_PKGS_CSWpm-crypt-openssl-bignum += CSWlibssl1-0-0 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 9 12:45:27 2012 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sat, 09 Jun 2012 10:45:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[18282] csw/mgar/pkg/cpan/Crypt-SSLeay/trunk/Makefile Message-ID: Revision: 18282 http://gar.svn.sourceforge.net/gar/?rev=18282&view=rev Author: bonivart Date: 2012-06-09 10:45:26 +0000 (Sat, 09 Jun 2012) Log Message: ----------- cpan/Crypt-SSLeay/trunk: change stub name Modified Paths: -------------- csw/mgar/pkg/cpan/Crypt-SSLeay/trunk/Makefile Modified: csw/mgar/pkg/cpan/Crypt-SSLeay/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Crypt-SSLeay/trunk/Makefile 2012-06-09 10:39:59 UTC (rev 18281) +++ csw/mgar/pkg/cpan/Crypt-SSLeay/trunk/Makefile 2012-06-09 10:45:26 UTC (rev 18282) @@ -17,7 +17,7 @@ CATALOGNAME = pm_crypt_ssleay SPKG_DESC_CSWpm-crypt-ssleay = $(DESCRIPTION) OBSOLETED_BY_CSWpm-crypt-ssleay = CSWpmcryptssleay -CATALOGNAME_CSWpmcryptssleay = pm_crypt_ssleay_stub +CATALOGNAME_CSWpmcryptssleay = pm_cryptssleay_stub RUNTIME_DEP_PKGS_CSWpm-crypt-ssleay += CSWlibssl1-0-0 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 9 12:50:47 2012 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sat, 09 Jun 2012 10:50:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[18283] csw/mgar/pkg/cpan/Crypt-OpenSSL-Random/trunk/ Makefile Message-ID: Revision: 18283 http://gar.svn.sourceforge.net/gar/?rev=18283&view=rev Author: bonivart Date: 2012-06-09 10:50:47 +0000 (Sat, 09 Jun 2012) Log Message: ----------- cpan/Crypt-OpenSSL-Random/trunk: change stub name Modified Paths: -------------- csw/mgar/pkg/cpan/Crypt-OpenSSL-Random/trunk/Makefile Modified: csw/mgar/pkg/cpan/Crypt-OpenSSL-Random/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Crypt-OpenSSL-Random/trunk/Makefile 2012-06-09 10:45:26 UTC (rev 18282) +++ csw/mgar/pkg/cpan/Crypt-OpenSSL-Random/trunk/Makefile 2012-06-09 10:50:47 UTC (rev 18283) @@ -16,7 +16,7 @@ CATALOGNAME = pm_crypt_openssl_random SPKG_DESC_CSWpm-crypt-openssl-random = $(DESCRIPTION) OBSOLETED_BY_CSWpm-crypt-openssl-random = CSWpmcryptosslrandom -CATALOGNAME_CSWpmcryptosslrandom = pm_crypt_openssl_random_stub +CATALOGNAME_CSWpmcryptosslrandom = pm_osslrandom_stub RUNTIME_DEP_PKGS_CSWpm-crypt-openssl-random += CSWlibssl1-0-0 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 9 12:57:27 2012 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sat, 09 Jun 2012 10:57:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[18284] csw/mgar/pkg/cpan/Crypt-OpenSSL-RSA/trunk/Makefile Message-ID: Revision: 18284 http://gar.svn.sourceforge.net/gar/?rev=18284&view=rev Author: bonivart Date: 2012-06-09 10:57:26 +0000 (Sat, 09 Jun 2012) Log Message: ----------- cpan/Crypt-OpenSSL-RSA/trunk: change stub name Modified Paths: -------------- csw/mgar/pkg/cpan/Crypt-OpenSSL-RSA/trunk/Makefile Modified: csw/mgar/pkg/cpan/Crypt-OpenSSL-RSA/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Crypt-OpenSSL-RSA/trunk/Makefile 2012-06-09 10:50:47 UTC (rev 18283) +++ csw/mgar/pkg/cpan/Crypt-OpenSSL-RSA/trunk/Makefile 2012-06-09 10:57:26 UTC (rev 18284) @@ -17,7 +17,7 @@ CATALOGNAME = pm_crypt_openssl_rsa SPKG_DESC_CSWpm-crypt-openssl-rsa = $(DESCRIPTION) OBSOLETED_BY_CSWpm-crypt-openssl-rsa = CSWpmcryptosslrsa -CATALOGNAME_CSWpmcryptosslrsa = pm_crypt_openssl_rsa_stub +CATALOGNAME_CSWpmcryptosslrsa = pm_osslrsa_stub RUNTIME_DEP_PKGS_CSWpm-crypt-openssl-rsa = CSWpm-crypt-openssl-random RUNTIME_DEP_PKGS_CSWpm-crypt-openssl-rsa += CSWlibssl1-0-0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Sat Jun 9 14:22:52 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Sat, 09 Jun 2012 12:22:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[18285] csw/mgar/pkg/irssi/trunk/Makefile Message-ID: Revision: 18285 http://gar.svn.sourceforge.net/gar/?rev=18285&view=rev Author: wilbury Date: 2012-06-09 12:22:52 +0000 (Sat, 09 Jun 2012) Log Message: ----------- irssi/trunk: Build for Solaris 10 only. Modified Paths: -------------- csw/mgar/pkg/irssi/trunk/Makefile Modified: csw/mgar/pkg/irssi/trunk/Makefile =================================================================== --- csw/mgar/pkg/irssi/trunk/Makefile 2012-06-09 10:57:26 UTC (rev 18284) +++ csw/mgar/pkg/irssi/trunk/Makefile 2012-06-09 12:22:52 UTC (rev 18285) @@ -17,6 +17,8 @@ DISTFILES = $(NAME)-$(VERSION).tar.gz UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +PACKAING_PLATFORMS = solaris10-i386 solaris10-sparc + SAMPLECONF = .*/irssi.conf CONFIGURE_ARGS += $(DIRPATHS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sat Jun 9 16:44:02 2012 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 09 Jun 2012 14:44:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[18286] csw/mgar/pkg Message-ID: Revision: 18286 http://gar.svn.sourceforge.net/gar/?rev=18286&view=rev Author: chninkel Date: 2012-06-09 14:44:02 +0000 (Sat, 09 Jun 2012) Log Message: ----------- links/trunk: a gar recipe for links Added Paths: ----------- csw/mgar/pkg/links/ csw/mgar/pkg/links/Makefile csw/mgar/pkg/links/branches/ csw/mgar/pkg/links/tags/ csw/mgar/pkg/links/trunk/ csw/mgar/pkg/links/trunk/Makefile csw/mgar/pkg/links/trunk/checksums csw/mgar/pkg/links/trunk/files/ csw/mgar/pkg/links/trunk/files/changelog.CSW Added: csw/mgar/pkg/links/Makefile =================================================================== --- csw/mgar/pkg/links/Makefile (rev 0) +++ csw/mgar/pkg/links/Makefile 2012-06-09 14:44:02 UTC (rev 18286) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/links/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/links/trunk/Makefile =================================================================== --- csw/mgar/pkg/links/trunk/Makefile (rev 0) +++ csw/mgar/pkg/links/trunk/Makefile 2012-06-09 14:44:02 UTC (rev 18286) @@ -0,0 +1,43 @@ +##################################################################### +# OpenCSW build recipe for links +# +# Author: Yann Rouillard +# +# Redistribution and/or use, with or without modification, is +# permitted. This software is without warranty of any kind. The +# author(s) shall not be liable in the event that use of the +# software causes damage. +##################################################################### + +###### Package information ####### + +NAME = links +VERSION = 1.03 +CATEGORIES = net +GARTYPE = v2 + +DESCRIPTION = Text-based WWW browser +define BLURB + Textbased browser with frames, ssl, and menus +endef + +PACKAGES = CSWlinks + +RUNTIME_DEP_PKGS_CSWlinks += CSWlibssl1-0-0 +RUNTIME_DEP_PKGS_CSWlinks += CSWlibz1 + +###### Upstream and opencsw files information ####### + +MASTER_SITES = http://www.jikos.cz/~mikulas/links/download/ + +DISTFILES = $(NAME)-$(VERSION).tar.gz +DISTFILES += changelog.CSW + + +##### Build and installation information ##### + +CONFIGURE_ARGS = $(DIRPATHS) + + +include gar/category.mk + Property changes on: csw/mgar/pkg/links/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/links/trunk/checksums =================================================================== --- csw/mgar/pkg/links/trunk/checksums (rev 0) +++ csw/mgar/pkg/links/trunk/checksums 2012-06-09 14:44:02 UTC (rev 18286) @@ -0,0 +1 @@ +41ab5dd9ffdd5b8dbed2214eee2bc23c links-1.03.tar.gz Added: csw/mgar/pkg/links/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/links/trunk/files/changelog.CSW (rev 0) +++ csw/mgar/pkg/links/trunk/files/changelog.CSW 2012-06-09 14:44:02 UTC (rev 18286) @@ -0,0 +1,6 @@ +links (1.03,REV=2012.06.09) unstable + + * New upstream release + * Rebuilt against libssl 1.0 + + -- Yann Rouillard Sat, 09 Jun 2012 16:25:36 +0200 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 Sat Jun 9 17:07:27 2012 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Sat, 09 Jun 2012 15:07:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[18287] csw/mgar/pkg/munin/trunk Message-ID: Revision: 18287 http://gar.svn.sourceforge.net/gar/?rev=18287&view=rev Author: j_arndt Date: 2012-06-09 15:07:26 +0000 (Sat, 09 Jun 2012) Log Message: ----------- munin/trunk: fixed path issues, added postinstall messages and default configs Modified Paths: -------------- csw/mgar/pkg/munin/trunk/Makefile csw/mgar/pkg/munin/trunk/files/0001-paths-in-Makefile.config.patch Added Paths: ----------- csw/mgar/pkg/munin/trunk/files/CSWmunin-master.README.CSW csw/mgar/pkg/munin/trunk/files/CSWmunin-master.preinstall csw/mgar/pkg/munin/trunk/files/CSWmunin-node.README.CSW csw/mgar/pkg/munin/trunk/files/apache-munin-cgi.conf Removed Paths: ------------- csw/mgar/pkg/munin/trunk/files/README.CSW csw/mgar/pkg/munin/trunk/files/apache-munin-cgi.conf.CSW csw/mgar/pkg/munin/trunk/files/apache-munin.conf.CSW Modified: csw/mgar/pkg/munin/trunk/Makefile =================================================================== --- csw/mgar/pkg/munin/trunk/Makefile 2012-06-09 14:44:02 UTC (rev 18286) +++ csw/mgar/pkg/munin/trunk/Makefile 2012-06-09 15:07:26 UTC (rev 18287) @@ -12,8 +12,10 @@ DISTFILES = $(NAME)-$(VERSION).tar.gz DISTFILES += cswmuninnode DISTFILES += cswusergroup -DISTFILES += apache-munin.conf.CSW apache-munin-cgi.conf.CSW -DISTFILES += README.CSW +DISTFILES += apache-munin-cgi.conf +DISTFILES += CSWmunin-master.preinstall +DISTFILES += CSWmunin-master.README.CSW +DISTFILES += CSWmunin-node.README.CSW PATCHFILES += 0001-Expand-paths-with-DESTDIR.patch PATCHFILES += 0001-paths-in-Makefile.config.patch @@ -50,13 +52,6 @@ REINPLACE_FILES_perl += node/bin/* REINPLACE_FILES_perl += node/sbin/* -# replace cgi-bin with cgi - -REINPLACEMENTS += cgi -REINPLACE_MATCH_cgi = cgi-bin -REINPLACE_WITH_cgi = cgi -REINPLACE_FILES_cgi += master/static/dynazoom.html - # # Package definitions # @@ -116,6 +111,7 @@ MUNINNODE_USERGROUP = /opt/csw/etc/pkg/CSWmunin-node/cswusergroup MUNINNODE_EXECS = .*munin-node .*munin-node-configure.* .*munindoc.* .*munin-run.* .*munin-sched.* MUNINNODE_CONF = .*munin-node.conf .*munin-node.conf.5 .*munin-node.1 /etc/opt/csw/munin/munin-conf.d /etc/opt/csw/munin/plugin-conf.d +MUNINNODE_POSTMSG = /opt/csw/share/doc/munin_node/CSWmunin-node.README.CSW PKGFILES_CSWmunin-node += .*muninnode.* .*CSWmunin-node.* PKGFILES_CSWmunin-node += .*plugins.* @@ -143,12 +139,13 @@ MUNINMASTER_UGFILES = /var/opt/csw/munin.* /etc/opt/csw/munin/apache.* /etc/opt/csw/munin/templates.* MUNINMASTER_UGFILES += /etc/opt/csw/munin/static.* +MUNINMASTER_UGFILES += /etc/opt/csw/munin/munin.conf MUNINMASTER_USERGROUP = /opt/csw/etc/pkg/CSWmunin-master/cswusergroup MUNINMASTER_EXECS = .*munin-check.* .*munin-cron.* .*munin-graph.* .*munin-html.* .*munin-limits.* .*munin-update.* MUNINMASTER_EXECS += .*munin-datafile2storable.* .*munin-storable2datafile.* .*munin-cgi-graph.* .*munin-cgi-html.* MUNINMASTER_FONTS = .*ttf.* MUNINMASTER_CRONTABS = /etc/opt/csw/pkg/CSWmunin-master/crontabs/munin -MUNINMASTER_POSTMSG = /opt/csw/share/doc/munin_master/README.CSW +MUNINMASTER_POSTMSG = /opt/csw/share/doc/munin_master/CSWmunin-master.README.CSW PKGFILES_CSWmunin-master += .*muninmaster.* PKGFILES_CSWmunin-master += .*Munin::Master.* @@ -166,12 +163,20 @@ PROTOTYPE_GROUP_muninmaster_ugfiles = munin PROTOTYPE_CLASS_muninmaster_ugfiles = ugfiles +PROTOTYPE_MODIFIERS += munin_log_dir +PROTOTYPE_FILES_munin_log_dir = /var/opt/csw/munin/log /var/opt/csw/munin/db/cgi-tmp +PROTOTYPE_PERMS_munin_log_dir = 0775 +PROTOTYPE_USER_munin_log_dir = munin +PROTOTYPE_GROUP_munin_log_dir = munin +PROTOTYPE_CLASS_munin_log_dir = ugfiles + ############### End of prototype filters for the different packages ############### INITSMF += $(MUNINNODE_SMF) USERGROUP += $(MUNINNODE_USERGROUP) USERGROUP += $(MUNINMASTER_USERGROUP) POSTMSG += $(MUNINMASTER_POSTMSG) +POSTMSG += $(MUNINNODE_POSTMSG) CRONTABS += $(MUNINMASTER_CRONTABS) # @@ -227,9 +232,7 @@ @ginstall -d $(DESTDIR)/opt/csw/etc/templates/CSWmunin-master/var/opt/csw/munin/www @mv $(DESTDIR)/etc/opt/csw/munin/munin-node.conf $(DESTDIR)/opt/csw/etc/templates/CSWmunin-node/etc/opt/csw/munin/ @mv $(DESTDIR)/etc/opt/csw/munin/munin.conf $(DESTDIR)/opt/csw/etc/templates/CSWmunin-master/etc/opt/csw/munin/ - @ginstall -m 644 $(FILEDIR)/apache-munin.conf.CSW \ - $(DESTDIR)/opt/csw/etc/templates/CSWmunin-master/etc/opt/csw/munin/apache/apache-munin.conf - @ginstall -m 644 $(FILEDIR)/apache-munin-cgi.conf.CSW \ + @ginstall -m 644 $(FILEDIR)/apache-munin-cgi.conf \ $(DESTDIR)/opt/csw/etc/templates/CSWmunin-master/etc/opt/csw/munin/apache/apache-munin-cgi.conf @mv $(DESTDIR)/var/opt/csw/munin/www/.htaccess $(DESTDIR)/opt/csw/etc/templates/CSWmunin-master/var/opt/csw/munin/www/ @# @@ -259,7 +262,9 @@ @# @ginstall -d $(DESTDIR)/opt/csw/share/doc @ginstall -d $(DESTDIR)/opt/csw/share/doc/munin_master - @ginstall -m 644 $(FILEDIR)/README.CSW $(DESTDIR)/opt/csw/share/doc/munin_master/README.CSW + @ginstall -m 644 $(FILEDIR)/CSWmunin-master.README.CSW $(DESTDIR)/opt/csw/share/doc/munin_master/CSWmunin-master.README.CSW + @ginstall -d $(DESTDIR)/opt/csw/share/doc/munin_node + @ginstall -m 644 $(FILEDIR)/CSWmunin-node.README.CSW $(DESTDIR)/opt/csw/share/doc/munin_node/CSWmunin-node.README.CSW @# @# handle some other files @# Modified: csw/mgar/pkg/munin/trunk/files/0001-paths-in-Makefile.config.patch =================================================================== --- csw/mgar/pkg/munin/trunk/files/0001-paths-in-Makefile.config.patch 2012-06-09 14:44:02 UTC (rev 18286) +++ csw/mgar/pkg/munin/trunk/files/0001-paths-in-Makefile.config.patch 2012-06-09 15:07:26 UTC (rev 18287) @@ -43,7 +43,7 @@ -HTMLDIR = $(PREFIX)/www/docs -CGIDIR = $(PREFIX)/www/cgi +HTMLDIR = /var/opt/csw/munin/www -+CGIDIR = /var/opt/csw/munin/www/cgi ++CGIDIR = /var/opt/csw/munin/www/cgi-bin # Where to put RRD files and other internal data, both master and node -DBDIR = $(DESTDIR)/var/opt/munin Added: csw/mgar/pkg/munin/trunk/files/CSWmunin-master.README.CSW =================================================================== --- csw/mgar/pkg/munin/trunk/files/CSWmunin-master.README.CSW (rev 0) +++ csw/mgar/pkg/munin/trunk/files/CSWmunin-master.README.CSW 2012-06-09 15:07:26 UTC (rev 18287) @@ -0,0 +1,35 @@ + +======================================================================= + +To get Munin running, please follow these steps: + +(1) Edit the Apache configuration for Munin: + + /etc/opt/csw/munin/apache/apache-munin-cgi.conf + +(2) Add the following line to your Apache configuration: + + Include /etc/opt/csw/munin/apache/apache-munin-cgi.conf + +(3) Add the user your webserver is running under (nobody for Apache) to + the group "munin", i.e.: + + munin::100:nobody + +(4) Restart your webserver: + + svcadm restart cswapache2 + +(5) When upgrading from a Munin version 1.4 or earlier to 2.0 or later + you need to merge your existing master configuration with the + master configuration delivered with the package: + + /etc/opt/csw/munin/munin.conf + /opt/csw/etc/templates/CSWmunin-master/etc/opt/csw/munin/munin.conf + + The new config file includes some new options regarding the graph + generation via cgi. It's reasonable preconfigured, so all in all + you should need only some copy and paste. + +======================================================================= + Added: csw/mgar/pkg/munin/trunk/files/CSWmunin-master.preinstall =================================================================== --- csw/mgar/pkg/munin/trunk/files/CSWmunin-master.preinstall (rev 0) +++ csw/mgar/pkg/munin/trunk/files/CSWmunin-master.preinstall 2012-06-09 15:07:26 UTC (rev 18287) @@ -0,0 +1,23 @@ +echo "Executing preinstall" + +cat << EOF + +======================================================================= + +If you are about to upgrade Munin from a version 1.4 or earlier to +the current version 2.x.x be sure to have a backup of your RRD data +base files. The upgrade shouldn't cause data loss, but you never know. + + The installation will proceed in 15 seconds. + Press CTRL+C if you want to stop now. + +======================================================================= +EOF + +for i in 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1 +do + printf "$i " + sleep 1 +done + +echo Added: csw/mgar/pkg/munin/trunk/files/CSWmunin-node.README.CSW =================================================================== --- csw/mgar/pkg/munin/trunk/files/CSWmunin-node.README.CSW (rev 0) +++ csw/mgar/pkg/munin/trunk/files/CSWmunin-node.README.CSW 2012-06-09 15:07:26 UTC (rev 18287) @@ -0,0 +1,16 @@ + +======================================================================= + +To get the Munin node running, please follow these steps: + +(1) Edit the local config file /etc/opt/csw/munin/munin-node.conf + + Point "host_name" to your host name + Change "allow" to the IP address of your munin master + +(2) Restart the node + + svcadm restart cswmuninnode + +======================================================================= + Deleted: csw/mgar/pkg/munin/trunk/files/README.CSW =================================================================== --- csw/mgar/pkg/munin/trunk/files/README.CSW 2012-06-09 14:44:02 UTC (rev 18286) +++ csw/mgar/pkg/munin/trunk/files/README.CSW 2012-06-09 15:07:26 UTC (rev 18287) @@ -1,25 +0,0 @@ - -======================================================================= - -To get Munin running, please follow these steps: - -(1) Edit the Apache configuration for Munin: - "Normal" mode: /etc/opt/csw/munin/apache/apache-munin.conf - CGI mode: /etc/opt/csw/munin/apache/apache-munin-cgi.conf - - (These files should work by default) - -(2) Add the following line to your Apache configuration: - - "Normal" mode: Include /etc/opt/csw/munin/apache/apache-munin.conf - CGI mode: Include /etc/opt/csw/munin/apache/apache-munin-cgi.conf - -(3) Add the user your webserver is running under (nobody for Apache) to - the group "munin" - -(4) Restart your webserver: - - svcadm restart cswapache2 - -======================================================================= - Added: csw/mgar/pkg/munin/trunk/files/apache-munin-cgi.conf =================================================================== --- csw/mgar/pkg/munin/trunk/files/apache-munin-cgi.conf (rev 0) +++ csw/mgar/pkg/munin/trunk/files/apache-munin-cgi.conf 2012-06-09 15:07:26 UTC (rev 18287) @@ -0,0 +1,58 @@ + + ServerName munin + + ServerAdmin root at munin + + DocumentRoot /var/opt/csw/munin/www + + ErrorLog /opt/csw/apache2/var/log/munin-error.log + CustomLog /opt/csw/apache2/var/log/munin-access.log Combined + + ServerSignature Off + + Alias /static /etc/opt/csw/munin/static + + # + # Rewrite definitions + # + + RewriteEngine On + + # Rewrites for HTML + + RewriteCond %{REQUEST_URI} !^/static + RewriteCond %{REQUEST_URI} .html$ [or] + RewriteCond %{REQUEST_URI} =/ + RewriteRule ^/(.*) /var/opt/csw/munin/www/cgi-bin/munin-cgi-html/$1 [L] + + # Rewrites for Images + + RewriteRule ^/cgi-bin/munin-cgi-graph/(.*) /$1 + + RewriteCond %{REQUEST_URI} !^/static + RewriteCond %{REQUEST_URI} .png$ + RewriteRule ^/(.*) /var/opt/csw/munin/www/cgi-bin/munin-cgi-graph/$1 [L] + + # + # Ensure we can run (fast)cgi scripts + # + + + Order allow,deny + Allow from all + + Options +ExecCGI + + + SetHandler fcgid-script + + + SetHandler cgi-script + + + + + Order allow,deny + Allow from all + + Deleted: csw/mgar/pkg/munin/trunk/files/apache-munin-cgi.conf.CSW =================================================================== --- csw/mgar/pkg/munin/trunk/files/apache-munin-cgi.conf.CSW 2012-06-09 14:44:02 UTC (rev 18286) +++ csw/mgar/pkg/munin/trunk/files/apache-munin-cgi.conf.CSW 2012-06-09 15:07:26 UTC (rev 18287) @@ -1,17 +0,0 @@ -# Apache configuration to support munin-cgi-graph -# -# In addition, the Munin log files and html area should be writable -# to the web server. Therefor add the apache user to the munin group. -# -# Documentation for this is in http://munin.projects.linpro.no/wiki/CgiHowto - -ScriptAlias /munin/dyn/ /var/opt/csw/munin/www/cgi/ - - - AllowOverride None - Options ExecCGI -MultiViews +SymLinksIfOwnerMatch - Order allow,deny - Allow from all - - - Deleted: csw/mgar/pkg/munin/trunk/files/apache-munin.conf.CSW =================================================================== --- csw/mgar/pkg/munin/trunk/files/apache-munin.conf.CSW 2012-06-09 14:44:02 UTC (rev 18286) +++ csw/mgar/pkg/munin/trunk/files/apache-munin.conf.CSW 2012-06-09 15:07:26 UTC (rev 18287) @@ -1,10 +0,0 @@ -# Apache configurations for accessing munin - -Alias /munin/ "/var/opt/csw/munin/www/" - - - Options None - AllowOverride None - Order allow,deny - Allow from all - 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 9 19:59:00 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 09 Jun 2012 17:59:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[18288] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 18288 http://gar.svn.sourceforge.net/gar/?rev=18288&view=rev Author: bdwalton Date: 2012-06-09 17:59:00 +0000 (Sat, 09 Jun 2012) Log Message: ----------- bacula/trunk: update ssl/mysql deps, tweak a few build args Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2012-06-09 15:07:26 UTC (rev 18287) +++ csw/mgar/pkg/bacula/trunk/Makefile 2012-06-09 17:59:00 UTC (rev 18288) @@ -26,7 +26,7 @@ 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 = CSWmysql-dev CSWiconv CSWtcpwrap CSWlibssl-dev BUILD_DEP_PKGS += CSWreadline CSWggettext-dev CSWlibcairo-dev PACKAGES = CSWbacula-common CSWbacula-fd CSWbacula-sd @@ -54,7 +54,7 @@ RUNTIME_DEP_PKGS_CSWbacula-console += CSWzlib RUNTIME_DEP_PKGS_CSWbacula-console += CSWlibintl8 RUNTIME_DEP_PKGS_CSWbacula-console += CSWreadline -RUNTIME_DEP_PKGS_CSWbacula-console += CSWosslrt +RUNTIME_DEP_PKGS_CSWbacula-console += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWbacula-console += CSWgcc4corert RUNTIME_DEP_PKGS_CSWbacula-console += CSWgcc4g++rt PKGFILES_CSWbacula-console = .*sbin/bconsole .*man8/bconsole.* .*bconsole.conf.CSW @@ -89,7 +89,7 @@ RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWgcc4g++rt RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWgcc4corert RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWtcpwrap -RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWosslrt +RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWlibintl8 RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWftype2 RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWzlib @@ -105,10 +105,10 @@ SPKG_DESC_CSWbacula-common = $(DESCRIPTION) - shared files RUNTIME_DEP_PKGS_CSWbacula-common += CSWgcc4g++rt RUNTIME_DEP_PKGS_CSWbacula-common += CSWgcc4corert -RUNTIME_DEP_PKGS_CSWbacula-common += CSWmysql5rt +RUNTIME_DEP_PKGS_CSWbacula-common += CSWlibmysqlclient18 RUNTIME_DEP_PKGS_CSWbacula-common += CSWlibintl8 RUNTIME_DEP_PKGS_CSWbacula-common += CSWtcpwrap -RUNTIME_DEP_PKGS_CSWbacula-common += CSWosslrt +RUNTIME_DEP_PKGS_CSWbacula-common += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWbacula-common += CSWzlib RUNTIME_DEP_PKGS_CSWbacula-common += CSWlibpython2-6-1-0 PKGFILES_CSWbacula-common += .*libbac-$(VERSION).so .*libbac.so @@ -131,7 +131,7 @@ RUNTIME_DEP_PKGS_CSWbacula-fd += CSWlibintl8 RUNTIME_DEP_PKGS_CSWbacula-fd += CSWzlib RUNTIME_DEP_PKGS_CSWbacula-fd += CSWlibpython2-6-1-0 -RUNTIME_DEP_PKGS_CSWbacula-fd += CSWosslrt +RUNTIME_DEP_PKGS_CSWbacula-fd += CSWlibssl1-0-0 PKGFILES_CSWbacula-fd += .*init.d/cswbacula-fd PKGFILES_CSWbacula-fd += .*/bpipe-fd.so .*sbin/bacula-fd .*bacula/working PKGFILES_CSWbacula-fd += .*man8/bacula-fd.8 .*bacula/bacula-fd.conf.CSW @@ -145,12 +145,12 @@ RUNTIME_DEP_PKGS_CSWbacula-sd = CSWbacula-common RUNTIME_DEP_PKGS_CSWbacula-sd += CSWgcc4g++rt RUNTIME_DEP_PKGS_CSWbacula-sd += CSWgcc4corert -RUNTIME_DEP_PKGS_CSWbacula-sd += CSWmysql5rt +RUNTIME_DEP_PKGS_CSWbacula-sd += CSWlibmysqlclient18 RUNTIME_DEP_PKGS_CSWbacula-sd += CSWtcpwrap RUNTIME_DEP_PKGS_CSWbacula-sd += CSWlibintl8 RUNTIME_DEP_PKGS_CSWbacula-sd += CSWzlib RUNTIME_DEP_PKGS_CSWbacula-sd += CSWlibpython2-6-1-0 -RUNTIME_DEP_PKGS_CSWbacula-sd += CSWosslrt +RUNTIME_DEP_PKGS_CSWbacula-sd += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWbacula-sd += CSWmtx PKGFILES_CSWbacula-sd += .*init.d/cswbacula-sd PKGFILES_CSWbacula-sd += /etc/opt/csw/bacula/.*disk-changer.CSW @@ -175,12 +175,12 @@ RUNTIME_DEP_PKGS_CSWbacula-director = CSWbacula-common RUNTIME_DEP_PKGS_CSWbacula-director += CSWgcc4g++rt RUNTIME_DEP_PKGS_CSWbacula-director += CSWgcc4corert -RUNTIME_DEP_PKGS_CSWbacula-director += CSWmysql5rt +RUNTIME_DEP_PKGS_CSWbacula-director += CSWlibmysqlclient18 RUNTIME_DEP_PKGS_CSWbacula-director += CSWtcpwrap RUNTIME_DEP_PKGS_CSWbacula-director += CSWlibintl8 RUNTIME_DEP_PKGS_CSWbacula-director += CSWzlib RUNTIME_DEP_PKGS_CSWbacula-director += CSWlibpython2-6-1-0 -RUNTIME_DEP_PKGS_CSWbacula-director += CSWosslrt +RUNTIME_DEP_PKGS_CSWbacula-director += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWbacula-director += CSWperl PKGFILES_CSWbacula-director += .*init.d/cswbacula-dir PKGFILES_CSWbacula-director += .*sbin/bregex .*sbin/bwild .*sbin/bacula-dir @@ -217,7 +217,7 @@ CONFIGURE_ARGS += --with-python=$(prefix) CONFIGURE_ARGS += --with-tcp-wrappers=$(prefix) CONFIGURE_ARGS += --with-openssl=$(prefix) -CONFIGURE_ARGS += --with-mysql=$(prefix)/mysql5 +CONFIGURE_ARGS += --with-mysql=$(prefix) CONFIGURE_ARGS += --with-scriptdir=$(sysconfdir)/scripts CONFIGURE_ARGS += --with-logdir=$(localstatedir)/log/$(NAME) CONFIGURE_ARGS += --with-pid-dir=$(localstatedir)/run @@ -237,8 +237,8 @@ CONFIGURE_ARGS += --with-sd-group=bacula EXTRA_INC += $(includedir)/ncursesw -EXTRA_LIB += $(prefix)/lib/ncursesw $(prefix)/mysql5/lib/mysql -EXTRA_LINKER_FLAGS = -norunpath +EXTRA_LIB += $(prefix)/lib/ncursesw +#EXTRA_LINKER_FLAGS = -norunpath # no tests supplied. TEST_SCRIPTS = This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sat Jun 9 20:58:51 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 09 Jun 2012 18:58:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[18289] csw/mgar/pkg/ruby18/trunk/Makefile Message-ID: Revision: 18289 http://gar.svn.sourceforge.net/gar/?rev=18289&view=rev Author: bdwalton Date: 2012-06-09 18:58:51 +0000 (Sat, 09 Jun 2012) Log Message: ----------- ruby18/trunk: update ssl dependency Modified Paths: -------------- csw/mgar/pkg/ruby18/trunk/Makefile Modified: csw/mgar/pkg/ruby18/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby18/trunk/Makefile 2012-06-09 17:59:00 UTC (rev 18288) +++ csw/mgar/pkg/ruby18/trunk/Makefile 2012-06-09 18:58:51 UTC (rev 18289) @@ -41,7 +41,7 @@ LICENSE = COPYING RUNTIME_DEP_PKGS_CSWruby18 = CSWbdb48 CSWlibgdbm4 CSWlibiconv2 CSWlibruby18-1 -RUNTIME_DEP_PKGS_CSWruby18 += CSWlibncurses5 CSWlibssl0-9-8 +RUNTIME_DEP_PKGS_CSWruby18 += CSWlibncurses5 CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWruby18 += CSWlibreadline6 CSWlibz1 RUNTIME_DEP_PKGS_CSWruby18-gcc4 = CSWruby18 CSWgcc4core 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 9 21:27:26 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 09 Jun 2012 19:27:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[18290] csw/mgar/pkg/imap-c-client/trunk/Makefile Message-ID: Revision: 18290 http://gar.svn.sourceforge.net/gar/?rev=18290&view=rev Author: bdwalton Date: 2012-06-09 19:27:26 +0000 (Sat, 09 Jun 2012) Log Message: ----------- imap-c-client/trunk: update to gar v2 Modified Paths: -------------- csw/mgar/pkg/imap-c-client/trunk/Makefile Modified: csw/mgar/pkg/imap-c-client/trunk/Makefile =================================================================== --- csw/mgar/pkg/imap-c-client/trunk/Makefile 2012-06-09 18:58:51 UTC (rev 18289) +++ csw/mgar/pkg/imap-c-client/trunk/Makefile 2012-06-09 19:27:26 UTC (rev 18290) @@ -3,7 +3,7 @@ DISTRELEASE = g DISTVERSION = $(VERSION)$(DISTRELEASE) DISTNAME = $(NAME)-$(VERSION)$(DISTRELEASE) -GARTYPE = v1 +GARTYPE = v2 CATEGORIES = lib DESCRIPTION = UW IMAP C-Client 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 9 21:30:56 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 09 Jun 2012 19:30:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[18291] csw/mgar/pkg/imap-c-client/trunk/Makefile Message-ID: Revision: 18291 http://gar.svn.sourceforge.net/gar/?rev=18291&view=rev Author: bdwalton Date: 2012-06-09 19:30:56 +0000 (Sat, 09 Jun 2012) Log Message: ----------- imap-c-client/trunk: discontinue use of admfiles now that we are v2 Modified Paths: -------------- csw/mgar/pkg/imap-c-client/trunk/Makefile Modified: csw/mgar/pkg/imap-c-client/trunk/Makefile =================================================================== --- csw/mgar/pkg/imap-c-client/trunk/Makefile 2012-06-09 19:27:26 UTC (rev 18290) +++ csw/mgar/pkg/imap-c-client/trunk/Makefile 2012-06-09 19:30:56 UTC (rev 18291) @@ -17,8 +17,6 @@ MASTER_SITES = ftp://ftp.cac.washington.edu/imap/ DISTFILES = $(DISTNAME).tar.Z -DISTFILES += $(call admfiles,CSWimap-devel,depend prototype) -DISTFILES += $(call admfiles,CSWimaprt,depend prototype) PATCHDIR = $(WORKDIR) PATCHDIRLEVEL = 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 Sat Jun 9 21:33:50 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 09 Jun 2012 19:33:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[18292] csw/mgar/pkg/imap-c-client/trunk/Makefile Message-ID: Revision: 18292 http://gar.svn.sourceforge.net/gar/?rev=18292&view=rev Author: bdwalton Date: 2012-06-09 19:33:50 +0000 (Sat, 09 Jun 2012) Log Message: ----------- imap-c-client/trunk: update version Modified Paths: -------------- csw/mgar/pkg/imap-c-client/trunk/Makefile Modified: csw/mgar/pkg/imap-c-client/trunk/Makefile =================================================================== --- csw/mgar/pkg/imap-c-client/trunk/Makefile 2012-06-09 19:30:56 UTC (rev 18291) +++ csw/mgar/pkg/imap-c-client/trunk/Makefile 2012-06-09 19:33:50 UTC (rev 18292) @@ -1,6 +1,6 @@ NAME = imap -VERSION = 2004 -DISTRELEASE = g +VERSION = 2007 +DISTRELEASE = f DISTVERSION = $(VERSION)$(DISTRELEASE) DISTNAME = $(NAME)-$(VERSION)$(DISTRELEASE) GARTYPE = v2 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 9 21:35:08 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 09 Jun 2012 19:35:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[18293] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 18293 http://gar.svn.sourceforge.net/gar/?rev=18293&view=rev Author: bdwalton Date: 2012-06-09 19:35:07 +0000 (Sat, 09 Jun 2012) Log Message: ----------- bacula/trunk: update several library deps to modern naming Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2012-06-09 19:33:50 UTC (rev 18292) +++ csw/mgar/pkg/bacula/trunk/Makefile 2012-06-09 19:35:07 UTC (rev 18293) @@ -26,7 +26,7 @@ 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 = CSWmysql-dev CSWiconv CSWtcpwrap CSWlibssl-dev +BUILD_DEP_PKGS = CSWmysql-dev CSWiconv CSWlibwrap1 CSWlibssl-dev BUILD_DEP_PKGS += CSWreadline CSWggettext-dev CSWlibcairo-dev PACKAGES = CSWbacula-common CSWbacula-fd CSWbacula-sd @@ -49,14 +49,15 @@ SPKG_DESC_CSWbacula-console = $(DESCRIPTION) - Console OBSOLETED_BY_CSWbacula-console = CSWbaculaclient RUNTIME_DEP_PKGS_CSWbacula-console = CSWbacula-common -RUNTIME_DEP_PKGS_CSWbacula-console += CSWtcpwrap -RUNTIME_DEP_PKGS_CSWbacula-console += CSWncurses -RUNTIME_DEP_PKGS_CSWbacula-console += CSWzlib +RUNTIME_DEP_PKGS_CSWbacula-console += CSWlibwrap1 +RUNTIME_DEP_PKGS_CSWbacula-console += CSWlibncurses5 +RUNTIME_DEP_PKGS_CSWbacula-console += CSWlibz1 RUNTIME_DEP_PKGS_CSWbacula-console += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWbacula-console += CSWreadline +RUNTIME_DEP_PKGS_CSWbacula-console += CSWlibhistory6 +RUNTIME_DEP_PKGS_CSWbacula-console += CSWlibreadline6 RUNTIME_DEP_PKGS_CSWbacula-console += CSWlibssl1-0-0 -RUNTIME_DEP_PKGS_CSWbacula-console += CSWgcc4corert -RUNTIME_DEP_PKGS_CSWbacula-console += CSWgcc4g++rt +RUNTIME_DEP_PKGS_CSWbacula-console += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWbacula-console += CSWlibgcc-s1 PKGFILES_CSWbacula-console = .*sbin/bconsole .*man8/bconsole.* .*bconsole.conf.CSW PKGFILES_CSWbacula-console += /etc/opt/csw/bacula/scripts/bconsole.CSW @@ -86,30 +87,30 @@ SPKG_DESC_CSWbacula-tray-monitor = $(DESCRIPTION) - Tray monitor OBSOLETED_BY_CSWbacula-tray-monitor = CSWbaculaclient RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWbacula-common -RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWgcc4g++rt -RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWgcc4corert -RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWtcpwrap +RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWlibwrap1 RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWftype2 -RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWzlib +RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWlibz1 RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWgtk2 -RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWlibatk +RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWlibatk1-0-0 RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWpango RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWlibcairo2 -RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWfconfig +RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWlibfontconfig1 RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWglib2 PKGFILES_CSWbacula-tray-monitor = .*tray-monitor.* CATALOGNAME_CSWbacula-common = bacula_common SPKG_DESC_CSWbacula-common = $(DESCRIPTION) - shared files -RUNTIME_DEP_PKGS_CSWbacula-common += CSWgcc4g++rt -RUNTIME_DEP_PKGS_CSWbacula-common += CSWgcc4corert -RUNTIME_DEP_PKGS_CSWbacula-common += CSWlibmysqlclient18 +RUNTIME_DEP_PKGS_CSWbacula-common += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWbacula-common += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWbacula-common += CSWlibmysqlclient-r15 RUNTIME_DEP_PKGS_CSWbacula-common += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWbacula-common += CSWtcpwrap +RUNTIME_DEP_PKGS_CSWbacula-common += CSWlibwrap1 RUNTIME_DEP_PKGS_CSWbacula-common += CSWlibssl1-0-0 -RUNTIME_DEP_PKGS_CSWbacula-common += CSWzlib +RUNTIME_DEP_PKGS_CSWbacula-common += CSWlibz1 RUNTIME_DEP_PKGS_CSWbacula-common += CSWlibpython2-6-1-0 PKGFILES_CSWbacula-common += .*libbac-$(VERSION).so .*libbac.so PKGFILES_CSWbacula-common += .*libbaccfg-$(VERSION).so .*libbaccfg.so @@ -125,11 +126,11 @@ CATALOGNAME_CSWbacula-fd = bacula_fd SPKG_DESC_CSWbacula-fd = $(DESCRIPTION) - File Daemon RUNTIME_DEP_PKGS_CSWbacula-fd = CSWbacula-common -RUNTIME_DEP_PKGS_CSWbacula-fd += CSWgcc4g++rt -RUNTIME_DEP_PKGS_CSWbacula-fd += CSWgcc4corert -RUNTIME_DEP_PKGS_CSWbacula-fd += CSWtcpwrap +RUNTIME_DEP_PKGS_CSWbacula-fd += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWbacula-fd += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWbacula-fd += CSWlibwrap1 RUNTIME_DEP_PKGS_CSWbacula-fd += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWbacula-fd += CSWzlib +RUNTIME_DEP_PKGS_CSWbacula-fd += CSWlibz1 RUNTIME_DEP_PKGS_CSWbacula-fd += CSWlibpython2-6-1-0 RUNTIME_DEP_PKGS_CSWbacula-fd += CSWlibssl1-0-0 PKGFILES_CSWbacula-fd += .*init.d/cswbacula-fd @@ -143,12 +144,12 @@ CATALOGNAME_CSWbacula-sd = bacula_sd SPKG_DESC_CSWbacula-sd = $(DESCRIPTION) - Storage Daemon RUNTIME_DEP_PKGS_CSWbacula-sd = CSWbacula-common -RUNTIME_DEP_PKGS_CSWbacula-sd += CSWgcc4g++rt -RUNTIME_DEP_PKGS_CSWbacula-sd += CSWgcc4corert -RUNTIME_DEP_PKGS_CSWbacula-sd += CSWlibmysqlclient18 -RUNTIME_DEP_PKGS_CSWbacula-sd += CSWtcpwrap +RUNTIME_DEP_PKGS_CSWbacula-sd += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWbacula-sd += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWbacula-sd += CSWlibmysqlclient-r15 +RUNTIME_DEP_PKGS_CSWbacula-sd += CSWlibwrap1 RUNTIME_DEP_PKGS_CSWbacula-sd += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWbacula-sd += CSWzlib +RUNTIME_DEP_PKGS_CSWbacula-sd += CSWlibz1 RUNTIME_DEP_PKGS_CSWbacula-sd += CSWlibpython2-6-1-0 RUNTIME_DEP_PKGS_CSWbacula-sd += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWbacula-sd += CSWmtx @@ -173,12 +174,12 @@ CATALOGNAME_CSWbacula-director = bacula_director SPKG_DESC_CSWbacula-director = $(DESCRIPTION) - Director RUNTIME_DEP_PKGS_CSWbacula-director = CSWbacula-common -RUNTIME_DEP_PKGS_CSWbacula-director += CSWgcc4g++rt -RUNTIME_DEP_PKGS_CSWbacula-director += CSWgcc4corert -RUNTIME_DEP_PKGS_CSWbacula-director += CSWlibmysqlclient18 -RUNTIME_DEP_PKGS_CSWbacula-director += CSWtcpwrap +RUNTIME_DEP_PKGS_CSWbacula-director += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWbacula-director += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWbacula-director += CSWlibmysqlclient-r15 +RUNTIME_DEP_PKGS_CSWbacula-director += CSWlibwrap1 RUNTIME_DEP_PKGS_CSWbacula-director += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWbacula-director += CSWzlib +RUNTIME_DEP_PKGS_CSWbacula-director += CSWlibz1 RUNTIME_DEP_PKGS_CSWbacula-director += CSWlibpython2-6-1-0 RUNTIME_DEP_PKGS_CSWbacula-director += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWbacula-director += CSWperl 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 9 21:37:28 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 09 Jun 2012 19:37:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[18294] csw/mgar/pkg/imap-c-client/trunk/checksums Message-ID: Revision: 18294 http://gar.svn.sourceforge.net/gar/?rev=18294&view=rev Author: bdwalton Date: 2012-06-09 19:37:28 +0000 (Sat, 09 Jun 2012) Log Message: ----------- imap-c-client/trunk: update checksums after version bump Modified Paths: -------------- csw/mgar/pkg/imap-c-client/trunk/checksums Modified: csw/mgar/pkg/imap-c-client/trunk/checksums =================================================================== --- csw/mgar/pkg/imap-c-client/trunk/checksums 2012-06-09 19:35:07 UTC (rev 18293) +++ csw/mgar/pkg/imap-c-client/trunk/checksums 2012-06-09 19:37:28 UTC (rev 18294) @@ -1,9 +1 @@ -9a80f58d8d6a0979c13714ae69050020 download/imap-2004g.tar.Z -8abd6b9bb3cbd2d73492d9525d9e4613 download/CSWimap-devel.gspec -2c53993b4aad2c1115b9982b5df4d43d download/CSWimap-devel.depend -ee76ad6fbdb0d7512236d2326d071db5 download/CSWimap-devel.prototype -7b819451eac28edda5d44cbda5833d1d download/CSWimaprt.gspec -9cce9e28dda7a7aac80070064210969d download/CSWimaprt.depend -06762bf26b6f5e7ca9693bda3b9e2f04 download/CSWimaprt.prototype -013adc7d1e4631f1c5b394b3253d55b7 download/shared.diff -97b4a2970e89ce7047d1cede76878ac8 download/authmd5.diff +d9f7fd4e1d93ad9fca1df8717a79d1c5 imap-2007f.tar.Z 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 9 22:24:15 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 09 Jun 2012 20:24:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[18295] csw/mgar/pkg/imap-c-client/trunk/Makefile Message-ID: Revision: 18295 http://gar.svn.sourceforge.net/gar/?rev=18295&view=rev Author: bdwalton Date: 2012-06-09 20:24:15 +0000 (Sat, 09 Jun 2012) Log Message: ----------- imap-c-client/trunk: drop some legacy cruft from the v1 recipe Modified Paths: -------------- csw/mgar/pkg/imap-c-client/trunk/Makefile Modified: csw/mgar/pkg/imap-c-client/trunk/Makefile =================================================================== --- csw/mgar/pkg/imap-c-client/trunk/Makefile 2012-06-09 19:37:28 UTC (rev 18294) +++ csw/mgar/pkg/imap-c-client/trunk/Makefile 2012-06-09 20:24:15 UTC (rev 18295) @@ -36,9 +36,6 @@ include gar/category.mk -SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(DISTRELEASE) -WORKSRC = $(WORKDIR)/$(DISTNAME) - build-custom: @( cd $(WORKSRC) ; $(BUILD_ENV) DISTVERSION=$(DISTVERSION) make soc ) @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sat Jun 9 22:29:22 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 09 Jun 2012 20:29:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[18296] csw/mgar/pkg/imap-c-client/trunk/files Message-ID: Revision: 18296 http://gar.svn.sourceforge.net/gar/?rev=18296&view=rev Author: bdwalton Date: 2012-06-09 20:29:22 +0000 (Sat, 09 Jun 2012) Log Message: ----------- imap-c-client/trunk: update patches for new version Modified Paths: -------------- csw/mgar/pkg/imap-c-client/trunk/files/authmd5.diff csw/mgar/pkg/imap-c-client/trunk/files/shared.diff Modified: csw/mgar/pkg/imap-c-client/trunk/files/authmd5.diff =================================================================== --- csw/mgar/pkg/imap-c-client/trunk/files/authmd5.diff 2012-06-09 20:24:15 UTC (rev 18295) +++ csw/mgar/pkg/imap-c-client/trunk/files/authmd5.diff 2012-06-09 20:29:22 UTC (rev 18296) @@ -1,6 +1,6 @@ -diff --speed-large-files --minimal -Nru imap-2004g.orig/src/c-client/auth_md5.c imap-2004g/src/c-client/auth_md5.c ---- imap-2004g.orig/src/c-client/auth_md5.c 2005-01-04 21:52:53.000000000 -0500 -+++ imap-2004g/src/c-client/auth_md5.c 2006-09-02 18:36:34.051502000 -0400 +diff --speed-large-files --minimal -Nru imap-2007f.orig/src/c-client/auth_md5.c imap-2007f/src/c-client/auth_md5.c +--- imap-2007f.orig/src/c-client/auth_md5.c 2005-01-04 21:52:53.000000000 -0500 ++++ imap-2007f/src/c-client/auth_md5.c 2006-09-02 18:36:34.051502000 -0400 @@ -34,17 +34,17 @@ /* Prototypes */ Modified: csw/mgar/pkg/imap-c-client/trunk/files/shared.diff =================================================================== --- csw/mgar/pkg/imap-c-client/trunk/files/shared.diff 2012-06-09 20:24:15 UTC (rev 18295) +++ csw/mgar/pkg/imap-c-client/trunk/files/shared.diff 2012-06-09 20:29:22 UTC (rev 18296) @@ -1,6 +1,6 @@ -diff --speed-large-files --minimal -Nru imap-2004g.orig/src/osdep/unix/Makefile imap-2004g/src/osdep/unix/Makefile ---- imap-2004g.orig/src/osdep/unix/Makefile 2005-04-30 16:51:13.000000000 -0400 -+++ imap-2004g/src/osdep/unix/Makefile 2006-09-01 20:35:47.667329000 -0400 +diff --speed-large-files --minimal -Nru imap-2007f.orig/src/osdep/unix/Makefile imap-2007f/src/osdep/unix/Makefile +--- imap-2007f.orig/src/osdep/unix/Makefile 2005-04-30 16:51:13.000000000 -0400 ++++ imap-2007f/src/osdep/unix/Makefile 2006-09-01 20:35:47.667329000 -0400 @@ -26,6 +26,11 @@ SSLTYPE=nopwd IP=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 Sat Jun 9 22:35:16 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 09 Jun 2012 20:35:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[18297] csw/mgar/pkg/imapfilter/trunk/Makefile Message-ID: Revision: 18297 http://gar.svn.sourceforge.net/gar/?rev=18297&view=rev Author: bdwalton Date: 2012-06-09 20:35:16 +0000 (Sat, 09 Jun 2012) Log Message: ----------- imapfilter/trunk: change to v2; drop some v1 cruft Modified Paths: -------------- csw/mgar/pkg/imapfilter/trunk/Makefile Modified: csw/mgar/pkg/imapfilter/trunk/Makefile =================================================================== --- csw/mgar/pkg/imapfilter/trunk/Makefile 2012-06-09 20:29:22 UTC (rev 18296) +++ csw/mgar/pkg/imapfilter/trunk/Makefile 2012-06-09 20:35:16 UTC (rev 18297) @@ -1,6 +1,6 @@ NAME = imapfilter VERSION = 1.2.2 -GARTYPE = v1 +GARTYPE = v2 CATEGORIES = net DESCRIPTION = IMAP mail filtering utility @@ -15,14 +15,10 @@ MASTER_SITES = http://imapfilter.hellug.gr/source/ DISTFILES = $(NAME)-$(VERSION).tar.bz2 -DISTFILES += CSWimapfilter.gspec CSWimapfilter.depend CSWimapfilter.prototype -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2 +# # Remove anti-social makeflags +# PATCHFILES += make.diff -# Remove anti-social makeflags -PATCHFILES += make.diff - #LIBDEPS += lib/openssl CONFIGURE_ARGS = -d $(prefix) -m $(mandir) 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 9 22:43:48 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 09 Jun 2012 20:43:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[18298] csw/mgar/pkg/imapfilter/trunk Message-ID: Revision: 18298 http://gar.svn.sourceforge.net/gar/?rev=18298&view=rev Author: bdwalton Date: 2012-06-09 20:43:48 +0000 (Sat, 09 Jun 2012) Log Message: ----------- imapfilter/trunk: version bump Modified Paths: -------------- csw/mgar/pkg/imapfilter/trunk/Makefile csw/mgar/pkg/imapfilter/trunk/checksums Modified: csw/mgar/pkg/imapfilter/trunk/Makefile =================================================================== --- csw/mgar/pkg/imapfilter/trunk/Makefile 2012-06-09 20:35:16 UTC (rev 18297) +++ csw/mgar/pkg/imapfilter/trunk/Makefile 2012-06-09 20:43:48 UTC (rev 18298) @@ -1,5 +1,5 @@ NAME = imapfilter -VERSION = 1.2.2 +VERSION = 2.2.2 GARTYPE = v2 CATEGORIES = net Modified: csw/mgar/pkg/imapfilter/trunk/checksums =================================================================== --- csw/mgar/pkg/imapfilter/trunk/checksums 2012-06-09 20:35:16 UTC (rev 18297) +++ csw/mgar/pkg/imapfilter/trunk/checksums 2012-06-09 20:43:48 UTC (rev 18298) @@ -1,5 +1 @@ -cb2329943edcac1f839acd320f906e13 download/imapfilter-1.2.2.tar.bz2 -aefc8da94fdbe4d837f0277d84d031bf download/CSWimapfilter.gspec -9cce9e28dda7a7aac80070064210969d download/CSWimapfilter.depend -452cfce0fe5baa36ddeb7a658695be72 download/CSWimapfilter.prototype -c31f6cfe841aca0aa49ac30b8c8e711b download/make.diff +09c6ffb085a5a244dc9f3e798259f341 imapfilter-2.2.2.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Sat Jun 9 23:53:13 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Sat, 09 Jun 2012 21:53:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[18299] csw/mgar/pkg/irssi/trunk/Makefile Message-ID: Revision: 18299 http://gar.svn.sourceforge.net/gar/?rev=18299&view=rev Author: wilbury Date: 2012-06-09 21:53:13 +0000 (Sat, 09 Jun 2012) Log Message: ----------- irssi/trunk: Fix typo. Modified Paths: -------------- csw/mgar/pkg/irssi/trunk/Makefile Modified: csw/mgar/pkg/irssi/trunk/Makefile =================================================================== --- csw/mgar/pkg/irssi/trunk/Makefile 2012-06-09 20:43:48 UTC (rev 18298) +++ csw/mgar/pkg/irssi/trunk/Makefile 2012-06-09 21:53:13 UTC (rev 18299) @@ -17,7 +17,7 @@ DISTFILES = $(NAME)-$(VERSION).tar.gz UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz -PACKAING_PLATFORMS = solaris10-i386 solaris10-sparc +PACKAGING_PLATFORMS = solaris10-i386 solaris10-sparc SAMPLECONF = .*/irssi.conf This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Sun Jun 10 00:02:55 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Sat, 09 Jun 2012 22:02:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[18300] csw/mgar/pkg/irssi/trunk/Makefile Message-ID: Revision: 18300 http://gar.svn.sourceforge.net/gar/?rev=18300&view=rev Author: wilbury Date: 2012-06-09 22:02:55 +0000 (Sat, 09 Jun 2012) Log Message: ----------- irssi/trunk: Fix deps for Solaris 10 Modified Paths: -------------- csw/mgar/pkg/irssi/trunk/Makefile Modified: csw/mgar/pkg/irssi/trunk/Makefile =================================================================== --- csw/mgar/pkg/irssi/trunk/Makefile 2012-06-09 21:53:13 UTC (rev 18299) +++ csw/mgar/pkg/irssi/trunk/Makefile 2012-06-09 22:02:55 UTC (rev 18300) @@ -38,8 +38,9 @@ RUNTIME_DEP_PKGS += CSWlibintl8 RUNTIME_DEP_PKGS += CSWlibsocks RUNTIME_DEP_PKGS += CSWlibssl1-0-0 -RUNTIME_DEP_PKGS += CSWglib2 RUNTIME_DEP_PKGS += CSWperl +RUNTIME_DEP_PKGS += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS += CSWlibgmodule2-0-0 REINPLACE_USRLOCAL += docs/perl.txt REINPLACE_USRLOCAL += docs/help/load 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 10 01:45:42 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 09 Jun 2012 23:45:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[18301] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 18301 http://gar.svn.sourceforge.net/gar/?rev=18301&view=rev Author: bdwalton Date: 2012-06-09 23:45:42 +0000 (Sat, 09 Jun 2012) Log Message: ----------- php5/trunk: update t1 lib dep Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2012-06-09 22:02:55 UTC (rev 18300) +++ csw/mgar/pkg/php5/trunk/Makefile 2012-06-09 23:45:42 UTC (rev 18301) @@ -1,3 +1,4 @@ + NAME = php5 VERSION = 5.3.13 CATEGORIES = lang @@ -149,7 +150,7 @@ PKGFILES_CSWphp5-dom += .*include/php/ext/dom.* $(eval $(call php5_subpackage,exif,CSWlibz1)) $(eval $(call php5_subpackage,ftp,CSWlibssl1-0-0 CSWlibz1)) -$(eval $(call php5_subpackage,gd,CSWlibfreetype6 CSWlibgd2 CSWlibjpeg7 CSWlibpng12-0 CSWt1lib CSWxpm CSWlibz1)) +$(eval $(call php5_subpackage,gd,CSWlibfreetype6 CSWlibgd2 CSWlibjpeg7 CSWlibpng12-0 CSWlibt1-5 CSWxpm CSWlibz1)) PKGFILES_CSWphp5-gd += .*/include/php/ext/gd.* $(eval $(call php5_subpackage,gettext,CSWlibintl8 CSWlibz1)) $(eval $(call php5_subpackage,gmp,CSWlibgmp10 CSWlibz1)) 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 10 02:04:45 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 10 Jun 2012 00:04:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[18302] csw/mgar/pkg/imapfilter/trunk Message-ID: Revision: 18302 http://gar.svn.sourceforge.net/gar/?rev=18302&view=rev Author: bdwalton Date: 2012-06-10 00:04:45 +0000 (Sun, 10 Jun 2012) Log Message: ----------- imapfilter/trunk: bludgeon the build system to do what we need it to do Modified Paths: -------------- csw/mgar/pkg/imapfilter/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/imapfilter/trunk/files/0001-Bludgeon-the-build-system-to-do-what-we-need.patch Removed Paths: ------------- csw/mgar/pkg/imapfilter/trunk/files/make.diff Modified: csw/mgar/pkg/imapfilter/trunk/Makefile =================================================================== --- csw/mgar/pkg/imapfilter/trunk/Makefile 2012-06-09 23:45:42 UTC (rev 18301) +++ csw/mgar/pkg/imapfilter/trunk/Makefile 2012-06-10 00:04:45 UTC (rev 18302) @@ -16,10 +16,9 @@ MASTER_SITES = http://imapfilter.hellug.gr/source/ DISTFILES = $(NAME)-$(VERSION).tar.bz2 -# # Remove anti-social makeflags -# PATCHFILES += make.diff +PATCHFILES += 0001-Bludgeon-the-build-system-to-do-what-we-need.patch -#LIBDEPS += lib/openssl +GARCOMPILER = GNU CONFIGURE_ARGS = -d $(prefix) -m $(mandir) @@ -27,3 +26,5 @@ TEST_SCRIPTS = include gar/category.mk + +PATH := /opt/csw/gnu:/opt/csw/bin:$(PATH) Added: csw/mgar/pkg/imapfilter/trunk/files/0001-Bludgeon-the-build-system-to-do-what-we-need.patch =================================================================== --- csw/mgar/pkg/imapfilter/trunk/files/0001-Bludgeon-the-build-system-to-do-what-we-need.patch (rev 0) +++ csw/mgar/pkg/imapfilter/trunk/files/0001-Bludgeon-the-build-system-to-do-what-we-need.patch 2012-06-10 00:04:45 UTC (rev 18302) @@ -0,0 +1,42 @@ +From 7ad082705998d94a16c0ecd58e1a3db0e8d4936c Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Sun, 10 Jun 2012 01:59:08 +0200 +Subject: [PATCH] Bludgeon the build system to do what we need + +Signed-off-by: Ben Walton +--- + configure | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +diff --git a/configure b/configure +index 6b5b0d5..bc69d56 100755 +--- a/configure ++++ b/configure +@@ -10,13 +10,13 @@ mandir="$prefix/man" + ssltls="yes" + crammd5="yes" + +-incdirs="-I/usr/local/include" +-libdirs="-L/usr/local/lib" ++incdirs="-I/opt/csw/include" ++libdirs="-L/opt/csw/lib" + + mycflags="$CFLAGS -Wall -O" + myldflags="$LDFLAGS" + +-libs="-lm -llua -lpcre" ++libs="-lm -llua -lpcre -lnsl -lsocket" + libssl="-lssl" + libcrypto="-lcrypto" + +@@ -140,7 +140,6 @@ if [ ! -f .Makefile ]; then cp -f Makefile .Makefile; fi + mv -f Makefile Makefile~ + + cat > Makefile << EOF +-DESTDIR = + BINDIR = $bindir + SHAREDIR = $sharedir + MANDIR = $mandir +-- +1.7.10 + Deleted: csw/mgar/pkg/imapfilter/trunk/files/make.diff =================================================================== --- csw/mgar/pkg/imapfilter/trunk/files/make.diff 2012-06-09 23:45:42 UTC (rev 18301) +++ csw/mgar/pkg/imapfilter/trunk/files/make.diff 2012-06-10 00:04:45 UTC (rev 18302) @@ -1,58 +0,0 @@ -diff --speed-large-files --minimal -Nru imapfilter-1.1.1.orig/configure imapfilter-1.1.1/configure ---- imapfilter-1.1.1.orig/configure 2005-11-11 14:42:17.992451000 -0500 -+++ imapfilter-1.1.1/configure 2005-11-11 14:41:50.415788000 -0500 -@@ -13,10 +13,10 @@ - incdirs="-I/usr/local/include" - libdirs="-L/usr/local/lib" - --mycflags="-Wall -O" --myldflags="" -+mycflags="$CFLAGS" -+myldflags="$LDFLAGS" - --libs="-lm -llua -llualib" -+libs="-lsocket -lnsl -lm -llua -llualib" - libssl="-lssl" - libcrypto="-lcrypto" - -@@ -184,24 +184,24 @@ - imapfilter.o: version.h - - install: \$(BIN) -- if test ! -d \$(BINDIR); then mkdir -p \$(BINDIR); fi -- cp -f \$(BIN) \$(BINDIR) && chmod 0755 \$(BINDIR)/\$(BIN) -- if test ! -d \$(SHAREDIR); then mkdir -p \$(SHAREDIR); fi -- cp -f \$(INTERFACE_LUA) \$(SHAREDIR) && \\ -- chmod 0644 \$(SHAREDIR)/\$(INTERFACE_LUA) -- cp -f \$(AUXILIARY_LUA) \$(SHAREDIR) && \\ -- chmod 0644 \$(SHAREDIR)/\$(AUXILIARY_LUA) -- if test ! -d \$(MANDIR)/man1; then mkdir -p \$(MANDIR)/man1; fi -- cp -f \$(MAN_BIN) \$(MANDIR)/man1 && \\ -- chmod 0644 \$(MANDIR)/man1/\$(MAN_BIN) -- if test ! -d \$(MANDIR)/man5; then mkdir -p \$(MANDIR)/man5; fi -- cp -f \$(MAN_CONFIG) \$(MANDIR)/man5 && \\ -- chmod 0644 \$(MANDIR)/man5/\$(MAN_CONFIG) -+ if test ! -d \$(DESTDIR)\$(BINDIR); then mkdir -p \$(DESTDIR)\$(BINDIR); fi -+ cp -f \$(BIN) \$(DESTDIR)\$(BINDIR) && chmod 0755 \$(DESTDIR)\$(BINDIR)/\$(BIN) -+ if test ! -d \$(DESTDIR)\$(SHAREDIR); then mkdir -p \$(DESTDIR)\$(SHAREDIR); fi -+ cp -f \$(INTERFACE_LUA) \$(DESTDIR)\$(SHAREDIR) && \\ -+ chmod 0644 \$(DESTDIR)\$(SHAREDIR)/\$(INTERFACE_LUA) -+ cp -f \$(AUXILIARY_LUA) \$(DESTDIR)\$(SHAREDIR) && \\ -+ chmod 0644 \$(DESTDIR)\$(SHAREDIR)/\$(AUXILIARY_LUA) -+ if test ! -d \$(DESTDIR)\$(MANDIR)/man1; then mkdir -p \$(DESTDIR)\$(MANDIR)/man1; fi -+ cp -f \$(MAN_BIN) \$(DESTDIR)\$(MANDIR)/man1 && \\ -+ chmod 0644 \$(DESTDIR)\$(MANDIR)/man1/\$(MAN_BIN) -+ if test ! -d \$(DESTDIR)\$(MANDIR)/man5; then mkdir -p \$(DESTDIR)\$(MANDIR)/man5; fi -+ cp -f \$(MAN_CONFIG) \$(DESTDIR)\$(MANDIR)/man5 && \\ -+ chmod 0644 \$(DESTDIR)\$(MANDIR)/man5/\$(MAN_CONFIG) - - deinstall: -- rm -f \$(BINDIR)/\$(BIN) \$(SHAREDIR)/\$(INTERFACE_LUA) \\ -- \$(SHAREDIR)/\$(AUXILIARY_LUA) \$(MANDIR)/man1/\$(MAN_BIN) \\ -- \$(MANDIR)/man5/\$(MAN_CONFIG) -+ rm -f \$(DESTDIR)\$(BINDIR)/\$(BIN) \$(DESTDIR)\$(SHAREDIR)/\$(INTERFACE_LUA) \\ -+ \$(DESTDIR)\$(SHAREDIR)/\$(AUXILIARY_LUA) \$(DESTDIR)\$(MANDIR)/man1/\$(MAN_BIN) \\ -+ \$(DESTDIR)\$(MANDIR)/man5/\$(MAN_CONFIG) - - uninstall: deinstall - 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 10 02:06:27 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 10 Jun 2012 00:06:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[18303] csw/mgar/pkg/imapfilter/trunk/files Message-ID: Revision: 18303 http://gar.svn.sourceforge.net/gar/?rev=18303&view=rev Author: bdwalton Date: 2012-06-10 00:06:27 +0000 (Sun, 10 Jun 2012) Log Message: ----------- imapfilter/trunk: drop gar v1 manual prototype, depend and gspec files Removed Paths: ------------- csw/mgar/pkg/imapfilter/trunk/files/CSWimapfilter.depend csw/mgar/pkg/imapfilter/trunk/files/CSWimapfilter.gspec csw/mgar/pkg/imapfilter/trunk/files/CSWimapfilter.prototype Deleted: csw/mgar/pkg/imapfilter/trunk/files/CSWimapfilter.depend =================================================================== --- csw/mgar/pkg/imapfilter/trunk/files/CSWimapfilter.depend 2012-06-10 00:04:45 UTC (rev 18302) +++ csw/mgar/pkg/imapfilter/trunk/files/CSWimapfilter.depend 2012-06-10 00:06:27 UTC (rev 18303) @@ -1 +0,0 @@ -P CSWosslrt openssl_rt - Openssl runtime libraries Deleted: csw/mgar/pkg/imapfilter/trunk/files/CSWimapfilter.gspec =================================================================== --- csw/mgar/pkg/imapfilter/trunk/files/CSWimapfilter.gspec 2012-06-10 00:04:45 UTC (rev 18302) +++ csw/mgar/pkg/imapfilter/trunk/files/CSWimapfilter.gspec 2012-06-10 00:06:27 UTC (rev 18303) @@ -1,4 +0,0 @@ -%var bitname imapfilter -%var pkgname CSWimapfilter -%include url file://%{PKGLIB}/csw_standard.gspec -%copyright url file://%{WORKSRC}/LICENSE Deleted: csw/mgar/pkg/imapfilter/trunk/files/CSWimapfilter.prototype =================================================================== --- csw/mgar/pkg/imapfilter/trunk/files/CSWimapfilter.prototype 2012-06-10 00:04:45 UTC (rev 18302) +++ csw/mgar/pkg/imapfilter/trunk/files/CSWimapfilter.prototype 2012-06-10 00:06:27 UTC (rev 18303) @@ -1,11 +0,0 @@ -d none /opt/csw/bin 0755 root bin -f none /opt/csw/bin/imapfilter 0755 root bin -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/imapfilter 0755 root bin -f none /opt/csw/share/imapfilter/auxiliary.lua 0644 root bin -f none /opt/csw/share/imapfilter/interface.lua 0644 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man1 0755 root bin -f none /opt/csw/share/man/man1/imapfilter.1 0644 root bin -d none /opt/csw/share/man/man5 0755 root bin -f none /opt/csw/share/man/man5/imapfilter_config.5 0644 root bin 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 10 02:09:28 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 10 Jun 2012 00:09:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[18304] csw/mgar/pkg/imapfilter/trunk/Makefile Message-ID: Revision: 18304 http://gar.svn.sourceforge.net/gar/?rev=18304&view=rev Author: bdwalton Date: 2012-06-10 00:09:28 +0000 (Sun, 10 Jun 2012) Log Message: ----------- imapfilter/trunk: add build and runtime deps Modified Paths: -------------- csw/mgar/pkg/imapfilter/trunk/Makefile Modified: csw/mgar/pkg/imapfilter/trunk/Makefile =================================================================== --- csw/mgar/pkg/imapfilter/trunk/Makefile 2012-06-10 00:06:27 UTC (rev 18303) +++ csw/mgar/pkg/imapfilter/trunk/Makefile 2012-06-10 00:09:28 UTC (rev 18304) @@ -16,6 +16,14 @@ MASTER_SITES = http://imapfilter.hellug.gr/source/ DISTFILES = $(NAME)-$(VERSION).tar.bz2 +BUILD_DEP_PKGS += CSWlibssl-dev +BUILD_DEP_PKGS += CSWlua +BUILD_DEP_PKGS += CSWlibpcre-dev + +RUNTIME_DEP_PKGS_CSWimapfilter += CSWlua +RUNTIME_DEP_PKGS_CSWimapfilter += CSWlibpcre1 +RUNTIME_DEP_PKGS_CSWimapfilter += CSWlibssl1-0-0 + PATCHFILES += 0001-Bludgeon-the-build-system-to-do-what-we-need.patch GARCOMPILER = GNU This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Jun 10 02:15:34 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 10 Jun 2012 00:15:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[18305] csw/mgar/pkg/imapfilter/trunk/Makefile Message-ID: Revision: 18305 http://gar.svn.sourceforge.net/gar/?rev=18305&view=rev Author: bdwalton Date: 2012-06-10 00:15:33 +0000 (Sun, 10 Jun 2012) Log Message: ----------- imapfilter/trunk: specify which file in the source tree is the license file Modified Paths: -------------- csw/mgar/pkg/imapfilter/trunk/Makefile Modified: csw/mgar/pkg/imapfilter/trunk/Makefile =================================================================== --- csw/mgar/pkg/imapfilter/trunk/Makefile 2012-06-10 00:09:28 UTC (rev 18304) +++ csw/mgar/pkg/imapfilter/trunk/Makefile 2012-06-10 00:15:33 UTC (rev 18305) @@ -16,6 +16,8 @@ MASTER_SITES = http://imapfilter.hellug.gr/source/ DISTFILES = $(NAME)-$(VERSION).tar.bz2 +LICENSE = LICENSE + BUILD_DEP_PKGS += CSWlibssl-dev BUILD_DEP_PKGS += CSWlua BUILD_DEP_PKGS += CSWlibpcre-dev 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 10 03:23:19 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 10 Jun 2012 01:23:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[18306] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 18306 http://gar.svn.sourceforge.net/gar/?rev=18306&view=rev Author: bdwalton Date: 2012-06-10 01:23:19 +0000 (Sun, 10 Jun 2012) Log Message: ----------- bacula/trunk: build on sol10 only now (deps between 9/10 have diverged) Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2012-06-10 00:15:33 UTC (rev 18305) +++ csw/mgar/pkg/bacula/trunk/Makefile 2012-06-10 01:23:19 UTC (rev 18306) @@ -4,6 +4,8 @@ CATEGORIES = apps GARTYPE = v2 +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + DESCRIPTION = The Open Source Network Backup Solution define BLURB Bacula is a set of Open Source, enterprise ready, computer programs that permit you (or the system administrator) to manage backup, recovery, and verification of computer data across a network of computers of different kinds. Bacula is relatively easy to use and efficient, while offering many advanced storage management features that make it easy to find and recover lost or damaged files. In technical terms, it is an Open Source, enterprise ready, network based backup program. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Sun Jun 10 12:25:52 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Sun, 10 Jun 2012 10:25:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[18307] csw/mgar/pkg/grip/trunk/Makefile Message-ID: Revision: 18307 http://gar.svn.sourceforge.net/gar/?rev=18307&view=rev Author: pfelecan Date: 2012-06-10 10:25:51 +0000 (Sun, 10 Jun 2012) Log Message: ----------- use default gcc on the build farm Modified Paths: -------------- csw/mgar/pkg/grip/trunk/Makefile Modified: csw/mgar/pkg/grip/trunk/Makefile =================================================================== --- csw/mgar/pkg/grip/trunk/Makefile 2012-06-10 01:23:19 UTC (rev 18306) +++ csw/mgar/pkg/grip/trunk/Makefile 2012-06-10 10:25:51 UTC (rev 18307) @@ -110,7 +110,7 @@ CONFIGURE_ARGS = $(DIRPATHS) GARCOMPILER = GNU -GCC4_VERSION = 4.7 +#GCC4_VERSION = 4.7 STRIP_LIBTOOL = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Sun Jun 10 13:02:18 2012 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_=28Matchek=29_Blizi=C5=84ski?=) Date: Sun, 10 Jun 2012 12:02:18 +0100 Subject: [csw-devel] SF.net SVN: gar:[18307] csw/mgar/pkg/grip/trunk/Makefile In-Reply-To: References: Message-ID: 2012/6/10 : > -GCC4_VERSION ? ? ? ? ? = ? ? ? 4.7 > +#GCC4_VERSION ? ? ? ? ?= ? ? ? 4.7 You can set this in ~/.garrc on your private buildfarm. This way it won't leak to build recipes, which will work in both places (provided that the upstream compiles with both 4.6 and 4.7). From maciej at opencsw.org Sun Jun 10 13:03:44 2012 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_=28Matchek=29_Blizi=C5=84ski?=) Date: Sun, 10 Jun 2012 12:03:44 +0100 Subject: [csw-devel] SF.net SVN: gar:[18299] csw/mgar/pkg/irssi/trunk/Makefile In-Reply-To: References: Message-ID: 2012/6/9 : > -PACKAING_PLATFORMS = solaris10-i386 solaris10-sparc > +PACKAGING_PLATFORMS = solaris10-i386 solaris10-sparc I always suggest building first, committing later. From maciej at opencsw.org Sun Jun 10 13:05:36 2012 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_=28Matchek=29_Blizi=C5=84ski?=) Date: Sun, 10 Jun 2012 12:05:36 +0100 Subject: [csw-devel] SF.net SVN: gar:[18275] csw/mgar/pkg/irssi/trunk/Makefile In-Reply-To: References: Message-ID: 2012/6/9 : > -RUNTIME_DEP_PKGS += CSWlibglib2-0-0 > -RUNTIME_DEP_PKGS += CSWlibgmodule2-0-0 > +RUNTIME_DEP_PKGS += CSWglib2 Try this: RUNTIME_DEP_PKGS_CSWsvn-5.9 += CSWglib2 RUNTIME_DEP_PKGS_CSWsvn-5.10 += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWsvn-5.10 += CSWlibgmodule2-0-0 RUNTIME_DEP_PKGS_CSWsvn += $(RUNTIME_DEP_PKGS_CSWsvn-$(GAROSREL)) From guengel at users.sourceforge.net Sun Jun 10 13:25:11 2012 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sun, 10 Jun 2012 11:25:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[18308] csw/mgar/pkg/postgresql/branches/postgresql-8.3 Message-ID: Revision: 18308 http://gar.svn.sourceforge.net/gar/?rev=18308&view=rev Author: guengel Date: 2012-06-10 11:25:10 +0000 (Sun, 10 Jun 2012) Log Message: ----------- postgresql/branches/postgresql-8.3: New upstream release 8.3.19 Modified Paths: -------------- csw/mgar/pkg/postgresql/branches/postgresql-8.3/Makefile csw/mgar/pkg/postgresql/branches/postgresql-8.3/files/changelog.CSW Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.3/Makefile =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.3/Makefile 2012-06-10 10:25:51 UTC (rev 18307) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.3/Makefile 2012-06-10 11:25:10 UTC (rev 18308) @@ -90,7 +90,7 @@ BASE_VERSION = 8.3 VERSION_NODOT = $(subst .,_,$(BASE_VERSION)) BASE_VERSION_NODOT = $(subst .,,$(BASE_VERSION)) -PATCHLEVEL = 18 +PATCHLEVEL = 19 VERSION = $(BASE_VERSION).$(PATCHLEVEL) CATEGORIES = apps Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.3/files/changelog.CSW =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.3/files/changelog.CSW 2012-06-10 10:25:51 UTC (rev 18307) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.3/files/changelog.CSW 2012-06-10 11:25:10 UTC (rev 18308) @@ -1,3 +1,10 @@ +postgresql83 (8.3.19,REV=2012.06.10) + + * New upstream release 8.3.19. + + -- Rafael Ostertag Tue, 10 June 2012 13:22:57+0200 + + postgresql83 (8.3.18,REV=2012.05.01) * New upstream release 8.3.18. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sun Jun 10 13:27:20 2012 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sun, 10 Jun 2012 11:27:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[18309] csw/mgar/pkg/postgresql/branches/postgresql-8.3/ checksums Message-ID: Revision: 18309 http://gar.svn.sourceforge.net/gar/?rev=18309&view=rev Author: guengel Date: 2012-06-10 11:27:20 +0000 (Sun, 10 Jun 2012) Log Message: ----------- postgresql/branches/postgresql-8.3: Updated checksum Modified Paths: -------------- csw/mgar/pkg/postgresql/branches/postgresql-8.3/checksums Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.3/checksums =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.3/checksums 2012-06-10 11:25:10 UTC (rev 18308) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.3/checksums 2012-06-10 11:27:20 UTC (rev 18309) @@ -1 +1 @@ -3819e3b687287879e2821a1c0da18520 postgresql-8.3.18.tar.bz2 +333cd3667b28f7dbc26cd2d03837527f postgresql-8.3.19.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sun Jun 10 13:34:06 2012 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sun, 10 Jun 2012 11:34:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[18310] csw/mgar/pkg/postgresql/branches/postgresql-8.4 Message-ID: Revision: 18310 http://gar.svn.sourceforge.net/gar/?rev=18310&view=rev Author: guengel Date: 2012-06-10 11:34:06 +0000 (Sun, 10 Jun 2012) Log Message: ----------- postgresql/branches/postgresql-8.4: New upstream release 8.4.12. Modified Paths: -------------- csw/mgar/pkg/postgresql/branches/postgresql-8.4/Makefile csw/mgar/pkg/postgresql/branches/postgresql-8.4/checksums csw/mgar/pkg/postgresql/branches/postgresql-8.4/files/changelog.CSW Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.4/Makefile =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.4/Makefile 2012-06-10 11:27:20 UTC (rev 18309) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.4/Makefile 2012-06-10 11:34:06 UTC (rev 18310) @@ -90,7 +90,7 @@ BASE_VERSION = 8.4 VERSION_NODOT = $(subst .,_,$(BASE_VERSION)) BASE_VERSION_NODOT = $(subst .,,$(BASE_VERSION)) -PATCHLEVEL = 11 +PATCHLEVEL = 12 VERSION = $(BASE_VERSION).$(PATCHLEVEL) CATEGORIES = apps Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.4/checksums =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.4/checksums 2012-06-10 11:27:20 UTC (rev 18309) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.4/checksums 2012-06-10 11:34:06 UTC (rev 18310) @@ -1 +1 @@ -f9b731a1162b177a173640efab2275d0 postgresql-8.4.11.tar.bz2 +e071c48d21379809542fbbe48b8414c2 postgresql-8.4.12.tar.bz2 Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.4/files/changelog.CSW =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.4/files/changelog.CSW 2012-06-10 11:27:20 UTC (rev 18309) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.4/files/changelog.CSW 2012-06-10 11:34:06 UTC (rev 18310) @@ -1,3 +1,10 @@ +postgresql83 (8.4.12,REV=2012.06.10) + + * New upstream release 8.4.12. + + -- Rafael Ostertag Sun, 10 June 2012 13:22:57+0200 + + postgresql84 (8.4.11,REV=2012.05.01) * New upstream release 8.4.11. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sun Jun 10 13:38:16 2012 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sun, 10 Jun 2012 11:38:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[18311] csw/mgar/pkg/postgresql/branches/postgresql-8.4/ files/changelog.CSW Message-ID: Revision: 18311 http://gar.svn.sourceforge.net/gar/?rev=18311&view=rev Author: guengel Date: 2012-06-10 11:38:16 +0000 (Sun, 10 Jun 2012) Log Message: ----------- postgresql/branches/postgresql-8.4: Fixed typo in changelog Modified Paths: -------------- csw/mgar/pkg/postgresql/branches/postgresql-8.4/files/changelog.CSW Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.4/files/changelog.CSW =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.4/files/changelog.CSW 2012-06-10 11:34:06 UTC (rev 18310) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.4/files/changelog.CSW 2012-06-10 11:38:16 UTC (rev 18311) @@ -1,4 +1,4 @@ -postgresql83 (8.4.12,REV=2012.06.10) +postgresql84 (8.4.12,REV=2012.06.10) * New upstream release 8.4.12. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sun Jun 10 13:42:30 2012 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sun, 10 Jun 2012 11:42:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[18312] csw/mgar/pkg/postgresql/branches/postgresql-9.0 Message-ID: Revision: 18312 http://gar.svn.sourceforge.net/gar/?rev=18312&view=rev Author: guengel Date: 2012-06-10 11:42:30 +0000 (Sun, 10 Jun 2012) Log Message: ----------- postgresql/branches/postgresql-9.0: New upstream release 9.0.8. Modified Paths: -------------- csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile csw/mgar/pkg/postgresql/branches/postgresql-9.0/checksums csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/changelog.CSW Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile 2012-06-10 11:38:16 UTC (rev 18311) +++ csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile 2012-06-10 11:42:30 UTC (rev 18312) @@ -90,7 +90,7 @@ BASE_VERSION = 9.0 VERSION_NODOT = $(subst .,_,$(BASE_VERSION)) BASE_VERSION_NODOT = $(subst .,,$(BASE_VERSION)) -PATCHLEVEL = 7 +PATCHLEVEL = 8 VERSION = $(BASE_VERSION).$(PATCHLEVEL) CATEGORIES = apps Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.0/checksums =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-9.0/checksums 2012-06-10 11:38:16 UTC (rev 18311) +++ csw/mgar/pkg/postgresql/branches/postgresql-9.0/checksums 2012-06-10 11:42:30 UTC (rev 18312) @@ -1 +1 @@ -27e67f48607c29df8ca6aab2a6fdf0b8 postgresql-9.0.7.tar.bz2 +0e830b0f6538e04b788c3208060256ef postgresql-9.0.8.tar.bz2 Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/changelog.CSW =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/changelog.CSW 2012-06-10 11:38:16 UTC (rev 18311) +++ csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/changelog.CSW 2012-06-10 11:42:30 UTC (rev 18312) @@ -1,3 +1,10 @@ +postgresql90 (9.0.8,REV=2012.06.10) + + * New upstream release 9.0.8. + + -- Rafael Ostertag Sun, 10 June 2012 13:22:57+0200 + + postgresql90 (9.0.7,REV=2012.05.01) * New upstream release 9.0.7. 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 10 13:56:19 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 10 Jun 2012 11:56:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[18313] csw/mgar/pkg/gdal/trunk/Makefile Message-ID: Revision: 18313 http://gar.svn.sourceforge.net/gar/?rev=18313&view=rev Author: bdwalton Date: 2012-06-10 11:56:19 +0000 (Sun, 10 Jun 2012) Log Message: ----------- gdal/trunk: update the way we find postgres Modified Paths: -------------- csw/mgar/pkg/gdal/trunk/Makefile Modified: csw/mgar/pkg/gdal/trunk/Makefile =================================================================== --- csw/mgar/pkg/gdal/trunk/Makefile 2012-06-10 11:42:30 UTC (rev 18312) +++ csw/mgar/pkg/gdal/trunk/Makefile 2012-06-10 11:56:19 UTC (rev 18313) @@ -77,6 +77,7 @@ CONFIGURE_ARGS += --with-expat=$(prefix) CONFIGURE_ARGS += --with-mysql=/opt/csw/bin/mysql_config CONFIGURE_ARGS += --with-sqlite3=$(prefix) +CONFIGURE_ARGS += --with-pg=/opt/csw/bin/pg_config # doesn't have tests? TEST_TARGET = @@ -87,11 +88,8 @@ include gar/category.mk -ifeq ($(GARCH),sparc) -CONFIGURE_ARGS += --with-pg=/opt/csw/postgresql/bin/sparcv8/pg_config -else -CONFIGURE_ARGS += --with-pg=/opt/csw/postgresql/bin/pg_config -endif + + # to avoid the __sync_fetch_and_add4 issue (must be after including category) ARCHFLAGS_GCC4_sparcvv8 = -m32 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 10 13:58:27 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 10 Jun 2012 11:58:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[18314] csw/mgar/pkg/gdal/trunk/Makefile Message-ID: Revision: 18314 http://gar.svn.sourceforge.net/gar/?rev=18314&view=rev Author: bdwalton Date: 2012-06-10 11:58:26 +0000 (Sun, 10 Jun 2012) Log Message: ----------- gdal/trunk: add two new library deps to the gdal package Modified Paths: -------------- csw/mgar/pkg/gdal/trunk/Makefile Modified: csw/mgar/pkg/gdal/trunk/Makefile =================================================================== --- csw/mgar/pkg/gdal/trunk/Makefile 2012-06-10 11:56:19 UTC (rev 18313) +++ csw/mgar/pkg/gdal/trunk/Makefile 2012-06-10 11:58:26 UTC (rev 18314) @@ -18,6 +18,8 @@ PACKAGES += CSWgdal CATALOGNAME_CSWgdal = gdal SPKG_DESC_CSWgdal = $(DESCRIPTION) +RUNTIME_DEP_PKGS_CSWgdal += CSWlibgif4 +RUNTIME_DEP_PKGS_CSWgdal += CSWlibgeos-c1 RUNTIME_DEP_PKGS_CSWgdal += CSWlibgdal1 RUNTIME_DEP_PKGS_CSWgdal += CSWlibcurl4 RUNTIME_DEP_PKGS_CSWgdal += CSWlibexpat1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Sun Jun 10 21:29:03 2012 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Sun, 10 Jun 2012 19:29:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[18315] csw/mgar/pkg/libldns/trunk Message-ID: Revision: 18315 http://gar.svn.sourceforge.net/gar/?rev=18315&view=rev Author: idogan23 Date: 2012-06-10 19:29:03 +0000 (Sun, 10 Jun 2012) Log Message: ----------- libldns/trunk: libldns bump version to 1.6.13, drop Solaris 9 support, enable OpenSSL 1.0 features, cleanup Modified Paths: -------------- csw/mgar/pkg/libldns/trunk/Makefile csw/mgar/pkg/libldns/trunk/checksums Modified: csw/mgar/pkg/libldns/trunk/Makefile =================================================================== --- csw/mgar/pkg/libldns/trunk/Makefile 2012-06-10 11:58:26 UTC (rev 18314) +++ csw/mgar/pkg/libldns/trunk/Makefile 2012-06-10 19:29:03 UTC (rev 18315) @@ -1,5 +1,5 @@ NAME = ldns -VERSION = 1.6.12 +VERSION = 1.6.13 CATEGORIES = lib GARTYPE = v2 @@ -16,7 +16,7 @@ DISTFILES = $(NAME)-$(VERSION).tar.gz DISTFILES += CSWldns.doxyparse.diff -PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 PACKAGES = CSWlibldns1 CSWlibldns-devel CATALOGNAME_CSWlibldns1 = libldns1 @@ -24,7 +24,6 @@ SPKG_DESC_CSWlibldns1 = $(DESCRIPTION) SPKG_DESC_CSWlibldns-devel = $(DESCRIPTION) development package -#CHECKPKG_OVERRIDES_CSWlibldns-devel += surplus-dependency|CSWlibldns1 SPKG_SOURCEURL = http://www.nlnetlabs.nl/projects/ldns/ @@ -42,7 +41,7 @@ EXTRA_BUILD_ISAS_sparc = sparcv8plus EXTRA_BUILD_ISAS_sparc += sparcv8plus+vis -RUNTIME_DEP_PKGS_CSWlibldns1 += CSWlibssl0-9-8 +RUNTIME_DEP_PKGS_CSWlibldns1 += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWlibldns-devel += CSWlibldns1 INCOMPATIBLE_PKGS_CSWlibldns1 = CSWldns @@ -54,9 +53,6 @@ CONFIGURE_ARGS += --with-ssl=/opt/csw CONFIGURE_ARGS += --enable-sha2 -# Gost requiers OpenSSL 1.0 -CONFIGURE_ARGS += --disable-gost - MERGE_DIRS_isa-sparcv9 = $(libdir) MERGE_DIRS_isa-sparcv8plus = $(libdir) MERGE_DIRS_isa-amd64 = $(libdir) @@ -67,7 +63,4 @@ PKGFILES_CSWlibldns-devel = $(PKGFILES_DEVEL) PKGFILES_CSWlibldnsrt = $(PKGFILES_RT) -# CSWlibldnsdevel is replaced by CSWlibldns-devel -OBSOLETED_BY_CSWlibldns-devel = CSWlibldnsdevel - include gar/category.mk Modified: csw/mgar/pkg/libldns/trunk/checksums =================================================================== --- csw/mgar/pkg/libldns/trunk/checksums 2012-06-10 11:58:26 UTC (rev 18314) +++ csw/mgar/pkg/libldns/trunk/checksums 2012-06-10 19:29:03 UTC (rev 18315) @@ -1 +1 @@ -e7428ed0d19baed02459e2c55660c9b3 ldns-1.6.12.tar.gz +bcada4f2e62aa40fcdd5d73aec46f284 ldns-1.6.13.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Mon Jun 11 09:09:57 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Mon, 11 Jun 2012 07:09:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[18316] csw/mgar/pkg/grip/trunk Message-ID: Revision: 18316 http://gar.svn.sourceforge.net/gar/?rev=18316&view=rev Author: pfelecan Date: 2012-06-11 07:09:56 +0000 (Mon, 11 Jun 2012) Log Message: ----------- overrides verified and validated Modified Paths: -------------- csw/mgar/pkg/grip/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/grip/trunk/files/0003-Adapt-binaries-search-path.patch Modified: csw/mgar/pkg/grip/trunk/Makefile =================================================================== --- csw/mgar/pkg/grip/trunk/Makefile 2012-06-10 19:29:03 UTC (rev 18315) +++ csw/mgar/pkg/grip/trunk/Makefile 2012-06-11 07:09:56 UTC (rev 18316) @@ -107,6 +107,7 @@ PATCHFILES += 0001-Fix-sendmail-path.patch PATCHFILES += 0002-Fix-auto-tools-suggested-by-libtoolize.patch +PATCHFILES += 0003-Adapt-binaries-search-path.patch CONFIGURE_ARGS = $(DIRPATHS) GARCOMPILER = GNU @@ -114,6 +115,22 @@ STRIP_LIBTOOL = 1 +CHECKPKG_OVERRIDES_CSWgrip += surplus-dependency|CSWlibpng12-0 +CHECKPKG_OVERRIDES_CSWgrip += surplus-dependency|CSWlibdbus-glib1-2 +CHECKPKG_OVERRIDES_CSWgrip += surplus-dependency|CSWlibiconv2 +CHECKPKG_OVERRIDES_CSWgrip += surplus-dependency|CSWlibgailutil18 +CHECKPKG_OVERRIDES_CSWgrip += surplus-dependency|CSWlibintl3 +CHECKPKG_OVERRIDES_CSWgrip += surplus-dependency|CSWlibssl0-9-8 +CHECKPKG_OVERRIDES_CSWgrip += surplus-dependency|CSWlibxml2-2 +CHECKPKG_OVERRIDES_CSWgrip += surplus-dependency|CSWlibpixman1-0 +CHECKPKG_OVERRIDES_CSWgrip += surplus-dependency|CSWlibgnome-keyring0 +CHECKPKG_OVERRIDES_CSWgrip += surplus-dependency|CSWlibbz2-1-0 +CHECKPKG_OVERRIDES_CSWgrip += surplus-dependency|CSWlibexpat1 +CHECKPKG_OVERRIDES_CSWgrip += surplus-dependency|CSWlibesd0 +CHECKPKG_OVERRIDES_CSWgrip += surplus-dependency|CSWlibaudiofile0 +CHECKPKG_OVERRIDES_CSWgrip += surplus-dependency|CSWlibdbus1-3 +CHECKPKG_OVERRIDES_CSWgrip += surplus-dependency|CSWsunmath + include gar/category.mk pre-configure-modulated: Added: csw/mgar/pkg/grip/trunk/files/0003-Adapt-binaries-search-path.patch =================================================================== --- csw/mgar/pkg/grip/trunk/files/0003-Adapt-binaries-search-path.patch (rev 0) +++ csw/mgar/pkg/grip/trunk/files/0003-Adapt-binaries-search-path.patch 2012-06-11 07:09:56 UTC (rev 18316) @@ -0,0 +1,25 @@ +From 1dcf405f37714f396d6efa43cab4b5d2dce0525b Mon Sep 17 00:00:00 2001 +From: Peter Felecan +Date: Mon, 11 Jun 2012 09:00:29 +0200 +Subject: [PATCH] Adapt binaries search path + +--- + src/gripcfg.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/gripcfg.c b/src/gripcfg.c +index 8f8ea75..0781d96 100644 +--- a/src/gripcfg.c ++++ b/src/gripcfg.c +@@ -898,7 +898,7 @@ void FindExeInPath(char *exename, char *buf, int bsize) + if(!PATH) { + const char *env = g_getenv("PATH"); + +- PATH = g_strsplit(env ? env : "/usr/local/bin:/usr/bin:/bin", ":", 0); ++ PATH = g_strsplit(env ? env : "/opt/csw/bin:/usr/bin:/bin", ":", 0); + } + + path = FindExe(exename, PATH); +-- +1.7.10.3 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Mon Jun 11 10:08:12 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Mon, 11 Jun 2012 08:08:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[18317] csw/mgar/pkg/grip/trunk/Makefile Message-ID: Revision: 18317 http://gar.svn.sourceforge.net/gar/?rev=18317&view=rev Author: pfelecan Date: 2012-06-11 08:08:12 +0000 (Mon, 11 Jun 2012) Log Message: ----------- new dependencies (on binaries executed from within the application) and afferent overrides. Modified Paths: -------------- csw/mgar/pkg/grip/trunk/Makefile Modified: csw/mgar/pkg/grip/trunk/Makefile =================================================================== --- csw/mgar/pkg/grip/trunk/Makefile 2012-06-11 07:09:56 UTC (rev 18316) +++ csw/mgar/pkg/grip/trunk/Makefile 2012-06-11 08:08:12 UTC (rev 18317) @@ -55,7 +55,9 @@ BUILD_DEP_PKGS += CSWpangodevel BUILD_DEP_PKGS += CSWvte +RUNTIME_DEP_PKGS += CSWcdrtools RUNTIME_DEP_PKGS += CSWgnomevfs2 +RUNTIME_DEP_PKGS += CSWlame RUNTIME_DEP_PKGS += CSWlibart RUNTIME_DEP_PKGS += CSWlibatk1-0-0 RUNTIME_DEP_PKGS += CSWlibaudiofile0 @@ -111,10 +113,11 @@ CONFIGURE_ARGS = $(DIRPATHS) GARCOMPILER = GNU -#GCC4_VERSION = 4.7 STRIP_LIBTOOL = 1 +CHECKPKG_OVERRIDES_CSWgrip += surplus-dependency|CSWcdrtools +CHECKPKG_OVERRIDES_CSWgrip += surplus-dependency|CSWlame CHECKPKG_OVERRIDES_CSWgrip += surplus-dependency|CSWlibpng12-0 CHECKPKG_OVERRIDES_CSWgrip += surplus-dependency|CSWlibdbus-glib1-2 CHECKPKG_OVERRIDES_CSWgrip += surplus-dependency|CSWlibiconv2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Mon Jun 11 11:10:21 2012 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Mon, 11 Jun 2012 09:10:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[18318] csw/mgar/pkg/ffmpeg/trunk Message-ID: Revision: 18318 http://gar.svn.sourceforge.net/gar/?rev=18318&view=rev Author: janholzh Date: 2012-06-11 09:10:20 +0000 (Mon, 11 Jun 2012) Log Message: ----------- ffmpeg/trunk: Update to 0.11.1 Modified Paths: -------------- csw/mgar/pkg/ffmpeg/trunk/Makefile csw/mgar/pkg/ffmpeg/trunk/checksums Modified: csw/mgar/pkg/ffmpeg/trunk/Makefile =================================================================== --- csw/mgar/pkg/ffmpeg/trunk/Makefile 2012-06-11 08:08:12 UTC (rev 18317) +++ csw/mgar/pkg/ffmpeg/trunk/Makefile 2012-06-11 09:10:20 UTC (rev 18318) @@ -8,7 +8,7 @@ # Another thing is to see if it can be build with suncc see http://ftp.jaist.ac.jp/pub/pkgsrc/current/pkgsrc/multimedia/ffmpeg/Makefile.common NAME = ffmpeg -VERSION = 0.11 +VERSION = 0.11.1 CATEGORIES = lib GARTYPE = v2 Modified: csw/mgar/pkg/ffmpeg/trunk/checksums =================================================================== --- csw/mgar/pkg/ffmpeg/trunk/checksums 2012-06-11 08:08:12 UTC (rev 18317) +++ csw/mgar/pkg/ffmpeg/trunk/checksums 2012-06-11 09:10:20 UTC (rev 18318) @@ -1 +1 @@ -101e1092582bbfca8f2a204cbcecb8fc ffmpeg-0.11.tar.bz2 +ff8cb914f657e164dd60ea1008b555a8 ffmpeg-0.11.1.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Mon Jun 11 11:43:59 2012 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Mon, 11 Jun 2012 09:43:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[18319] csw/mgar/pkg/ffmpeg/trunk/Makefile Message-ID: Revision: 18319 http://gar.svn.sourceforge.net/gar/?rev=18319&view=rev Author: janholzh Date: 2012-06-11 09:43:59 +0000 (Mon, 11 Jun 2012) Log Message: ----------- ffmpeg/trunk: remove a lib not used anymore Modified Paths: -------------- csw/mgar/pkg/ffmpeg/trunk/Makefile Modified: csw/mgar/pkg/ffmpeg/trunk/Makefile =================================================================== --- csw/mgar/pkg/ffmpeg/trunk/Makefile 2012-06-11 09:10:20 UTC (rev 18318) +++ csw/mgar/pkg/ffmpeg/trunk/Makefile 2012-06-11 09:43:59 UTC (rev 18319) @@ -90,7 +90,6 @@ RUNTIME_DEP_PKGS_CSWlibavfilter2 += CSWlibspeex1 RUNTIME_DEP_PKGS_CSWlibavfilter2 += CSWlibtheoraenc1 RUNTIME_DEP_PKGS_CSWlibavfilter2 += CSWlibx264-125 -RUNTIME_DEP_PKGS_CSWlibavfilter2 += CSWlibavresample0 RUNTIME_DEP_PKGS_CSWlibavfilter2 += CSWlibpostproc52 PACKAGES += CSWlibavformat54 @@ -178,23 +177,6 @@ RUNTIME_DEP_PKGS_CSWlibswresample0 += CSWlibspeex1 RUNTIME_DEP_PKGS_CSWlibswresample0 += CSWlibx264-125 -PACKAGES += CSWlibavresample0 -SPKG_DESC_CSWlibavresample0 = FFMPEG library libavresample.so.0 -PKGFILES_CSWlibavresample0 += $(call pkgfiles_lib,libavresample.so.0) -RUNTIME_DEP_PKGS_CSWlibavresample0 += CSWlibbz2-1-0 -RUNTIME_DEP_PKGS_CSWlibavresample0 += CSWlibvorbisenc2 -RUNTIME_DEP_PKGS_CSWlibavresample0 += CSWlibavutil51 -RUNTIME_DEP_PKGS_CSWlibavresample0 += CSWlibz1 -RUNTIME_DEP_PKGS_CSWlibavresample0 += CSWlibogg0 -RUNTIME_DEP_PKGS_CSWlibavresample0 += CSWlibspeex1 -RUNTIME_DEP_PKGS_CSWlibavresample0 += CSWlibfreetype6 -RUNTIME_DEP_PKGS_CSWlibavresample0 += CSWlibvorbis0 -RUNTIME_DEP_PKGS_CSWlibavresample0 += CSWlibsdl1-2-0 -RUNTIME_DEP_PKGS_CSWlibavresample0 += CSWlibmp3lame0 -RUNTIME_DEP_PKGS_CSWlibavresample0 += CSWlibtheoradec1 -RUNTIME_DEP_PKGS_CSWlibavresample0 += CSWlibx264-125 -RUNTIME_DEP_PKGS_CSWlibavresample0 += CSWlibtheoraenc1 - PACKAGES += CSWffmpeg-dev SPKG_DESC_CSWffmpeg-dev = Development files for several FFMPEG shared libraries PKGFILES_CSWffmpeg-dev += $(PKGFILES_DEVEL) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Mon Jun 11 11:45:00 2012 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Mon, 11 Jun 2012 09:45:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[18320] csw/mgar/pkg/ffmpeg/trunk/Makefile Message-ID: Revision: 18320 http://gar.svn.sourceforge.net/gar/?rev=18320&view=rev Author: janholzh Date: 2012-06-11 09:45:00 +0000 (Mon, 11 Jun 2012) Log Message: ----------- ffmpeg/trunk: remove few more RUNTIME_DEP Modified Paths: -------------- csw/mgar/pkg/ffmpeg/trunk/Makefile Modified: csw/mgar/pkg/ffmpeg/trunk/Makefile =================================================================== --- csw/mgar/pkg/ffmpeg/trunk/Makefile 2012-06-11 09:43:59 UTC (rev 18319) +++ csw/mgar/pkg/ffmpeg/trunk/Makefile 2012-06-11 09:45:00 UTC (rev 18320) @@ -188,7 +188,6 @@ RUNTIME_DEP_PKGS_CSWffmpeg-dev += CSWlibpostproc52 RUNTIME_DEP_PKGS_CSWffmpeg-dev += CSWlibswscale2 RUNTIME_DEP_PKGS_CSWffmpeg-dev += CSWlibswresample0 -RUNTIME_DEP_PKGS_CSWffmpeg-dev += CSWlibavresample0 PACKAGES += CSWffmpeg @@ -206,7 +205,6 @@ RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibfreetype6 RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibavdevice54 RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibswresample0 -RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibavresample0 RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibvorbis0 RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibmp3lame0 RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibtheoradec1 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 11 12:25:08 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 11 Jun 2012 10:25:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[18321] csw/mgar/gar/v2/lib/python/csw_upload_pkg.py Message-ID: Revision: 18321 http://gar.svn.sourceforge.net/gar/?rev=18321&view=rev Author: wahwah Date: 2012-06-11 10:25:08 +0000 (Mon, 11 Jun 2012) Log Message: ----------- csw-upload-pkg: Don't skip Solaris 11 checks Thanks to Yann's code, we have indexed the Solaris 11 system files and can check packages against Solaris 11 catalogs explicitly. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/csw_upload_pkg.py Modified: csw/mgar/gar/v2/lib/python/csw_upload_pkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/csw_upload_pkg.py 2012-06-11 09:45:00 UTC (rev 18320) +++ csw/mgar/gar/v2/lib/python/csw_upload_pkg.py 2012-06-11 10:25:08 UTC (rev 18321) @@ -518,9 +518,6 @@ checks_failed_for_catalogs = [] args_by_cat = {} for arch, osrel in checkpkg_sets: - if "5.11" in osrel: - logging.debug("Skipping Solaris 11 checks") - continue print ("Checking %s package(s) against catalog %s %s %s" % (len(checkpkg_sets[(arch, osrel)]), DEFAULT_CATREL, arch, osrel)) md5_sums = [] This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Mon Jun 11 13:51:16 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Mon, 11 Jun 2012 11:51:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[18322] csw/mgar/pkg Message-ID: Revision: 18322 http://gar.svn.sourceforge.net/gar/?rev=18322&view=rev Author: pfelecan Date: 2012-06-11 11:51:15 +0000 (Mon, 11 Jun 2012) Log Message: ----------- migrated from a private recipe to a GAR based one. Added Paths: ----------- csw/mgar/pkg/emacs_template/ csw/mgar/pkg/emacs_template/Makefile csw/mgar/pkg/emacs_template/branches/ csw/mgar/pkg/emacs_template/tags/ csw/mgar/pkg/emacs_template/trunk/ csw/mgar/pkg/emacs_template/trunk/Makefile csw/mgar/pkg/emacs_template/trunk/checksums csw/mgar/pkg/emacs_template/trunk/files/ csw/mgar/pkg/emacs_template/trunk/files/README.CSW Added: csw/mgar/pkg/emacs_template/Makefile =================================================================== --- csw/mgar/pkg/emacs_template/Makefile (rev 0) +++ csw/mgar/pkg/emacs_template/Makefile 2012-06-11 11:51:15 UTC (rev 18322) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/emacs_template/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/emacs_template/trunk/Makefile =================================================================== --- csw/mgar/pkg/emacs_template/trunk/Makefile (rev 0) +++ csw/mgar/pkg/emacs_template/trunk/Makefile 2012-06-11 11:51:15 UTC (rev 18322) @@ -0,0 +1,68 @@ +# $Id$ + +NAME = emacs_template +VERSION = 3.1c +GARTYPE = v2 +CATEGORIES = xtra + +DESCRIPTION = Templates for Emacs +define BLURB + Template Package for Emacs +endef + +DISTNAME = template +MASTER_SITES = http://downloads.sourceforge.net/emacs-template/$(DISTNAME)/$(VERSION)/ +DISTFILES = $(DISTNAME)-$(VERSION).tar.gz +DISTFILES += README.CSW +VENDOR_URL = http://emacs-template.sourceforge.net/ + +BUILD_DEP_PKGS += CSWemacs + +RUNTIME_DEP_PKGS += CSWemacs + +PACKAGES = CSWemacs-template +SPKG_DESC_CSWemacs-template = $(DESCRIPTION) +CATALOGNAME_CSWemacs-template = emacs_template +OBSOLETED_BY_CSWemacs-template = CSWemacstemplate +CATALOGNAME_CSWemacstemplate = emacs_template_stub +ARCHALL_CSWemacs-template = 1 + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = custom +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +include gar/category.mk + +prefix = /opt/csw +sharedir = $(prefix)/share +lispdir = $(sharedir)/emacs/site-lisp +docdir = $(sharedir)/doc/$(NAME) +tpldir = $(docdir)/templates + +build-custom: \ + $(WORKSRC)/lisp/template.elc + $(MAKECOOKIE) + +$(WORKSRC)/lisp/template.elc: $(WORKSRC)/lisp/template.el + cd $(WORKSRC) && emacs --batch --funcall batch-byte-compile lisp/template.el + +install-custom: + ginstall --directory --mode=u=rwx,go=rx $(DESTDIR)/$(lispdir) + ginstall --preserve-timestamps --mode=u=rwx,go=r $(WORKSRC)/lisp/template.el $(DESTDIR)/$(lispdir) + ginstall --preserve-timestamps --mode=u=rwx,go=r $(WORKSRC)/lisp/template.elc $(DESTDIR)/$(lispdir) + ginstall --directory --mode=u=rwx,go=rx $(DESTDIR)/$(docdir) + ginstall --preserve-timestamps --mode=u=rwx,go=r $(WORKSRC)/lisp/ChangeLog $(DESTDIR)/$(docdir) + ginstall --directory --mode=u=rwx,go=rx $(DESTDIR)/$(tpldir) + ginstall --preserve-timestamps --mode=u=rwx,go=r $(WORKSRC)/templates/DEFAULT.tpl $(DESTDIR)/$(tpldir) + ginstall --preserve-timestamps --mode=u=rwx,go=r $(WORKSRC)/templates/Makefile.tpl $(DESTDIR)/$(tpldir) + ginstall --preserve-timestamps --mode=u=rwx,go=r $(WORKSRC)/templates/README.tpl $(DESTDIR)/$(tpldir) + ginstall --preserve-timestamps --mode=u=rwx,go=r $(WORKSRC)/templates/TEMPLATE.c.tpl $(DESTDIR)/$(tpldir) + ginstall --preserve-timestamps --mode=u=rwx,go=r $(WORKSRC)/templates/TEMPLATE.cls.tpl $(DESTDIR)/$(tpldir) + ginstall --preserve-timestamps --mode=u=rwx,go=r $(WORKSRC)/templates/TEMPLATE.el.tpl $(DESTDIR)/$(tpldir) + ginstall --preserve-timestamps --mode=u=rwx,go=r $(WORKSRC)/templates/TEMPLATE.h.tpl $(DESTDIR)/$(tpldir) + ginstall --preserve-timestamps --mode=u=rwx,go=r $(WORKSRC)/templates/TEMPLATE.html.tpl $(DESTDIR)/$(tpldir) + ginstall --preserve-timestamps --mode=u=rwx,go=r $(WORKSRC)/templates/TEMPLATE.java.tpl $(DESTDIR)/$(tpldir) + ginstall --preserve-timestamps --mode=u=rwx,go=r $(WORKSRC)/templates/TEMPLATE.sty.tpl $(DESTDIR)/$(tpldir) + ginstall --preserve-timestamps --mode=u=rwx,go=r $(WORKSRC)/templates/TEMPLATE.tex.tpl $(DESTDIR)/$(tpldir) + $(MAKECOOKIE) Property changes on: csw/mgar/pkg/emacs_template/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/emacs_template/trunk/checksums =================================================================== --- csw/mgar/pkg/emacs_template/trunk/checksums (rev 0) +++ csw/mgar/pkg/emacs_template/trunk/checksums 2012-06-11 11:51:15 UTC (rev 18322) @@ -0,0 +1 @@ +c17c8346535f3056f2005a0eaf2d16f5 template-3.1c.tar.gz Added: csw/mgar/pkg/emacs_template/trunk/files/README.CSW =================================================================== --- csw/mgar/pkg/emacs_template/trunk/files/README.CSW (rev 0) +++ csw/mgar/pkg/emacs_template/trunk/files/README.CSW 2012-06-11 11:51:15 UTC (rev 18322) @@ -0,0 +1,22 @@ +$Id$ + +To use the the templates packaged by CSW you need to: + +1. Add to your ~/.emacs file the following lines: + +(require 'template) +(template-initialize) + +2. Restart your emacs session. + +4. Copy the templates from /opt/csw/share/doc/emacs_template/templates + to ~/.templates + +4. Enjoy! + +CSW Team + +# Local Variables: +# mode: text +# mode: font-lock +# End: Property changes on: csw/mgar/pkg/emacs_template/trunk/files/README.CSW ___________________________________________________________________ Added: svn:keywords + Author Date HeadURL Id Revision This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Mon Jun 11 14:05:30 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Mon, 11 Jun 2012 12:05:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[18323] csw/mgar/pkg/emacs_template/trunk/Makefile Message-ID: Revision: 18323 http://gar.svn.sourceforge.net/gar/?rev=18323&view=rev Author: pfelecan Date: 2012-06-11 12:05:29 +0000 (Mon, 11 Jun 2012) Log Message: ----------- verified and validated overrides. Modified Paths: -------------- csw/mgar/pkg/emacs_template/trunk/Makefile Modified: csw/mgar/pkg/emacs_template/trunk/Makefile =================================================================== --- csw/mgar/pkg/emacs_template/trunk/Makefile 2012-06-11 11:51:15 UTC (rev 18322) +++ csw/mgar/pkg/emacs_template/trunk/Makefile 2012-06-11 12:05:29 UTC (rev 18323) @@ -27,6 +27,14 @@ CATALOGNAME_CSWemacstemplate = emacs_template_stub ARCHALL_CSWemacs-template = 1 +# this is by desing overriden because I wish to depend on a common +# named package in both Solaris 9 and Solaris 10 when 23.1 is the +# current version for the former and 23.4 is the current version for +# the later. Note that when packaging 23.4, the CSWemacscommon became +# CSWemacs-common. +CHECKPKG_OVERRIDES_CSWemacs-template += missing-dependency|CSWemacscommon +CHECKPKG_OVERRIDES_CSWemacs-template += surplus-dependency|CSWemacs + CONFIGURE_SCRIPTS = BUILD_SCRIPTS = custom TEST_SCRIPTS = This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Mon Jun 11 14:45:01 2012 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Mon, 11 Jun 2012 12:45:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[18324] csw/mgar/pkg/postgresql/branches/postgresql-8.3/ files/changelog.CSW Message-ID: Revision: 18324 http://gar.svn.sourceforge.net/gar/?rev=18324&view=rev Author: guengel Date: 2012-06-11 12:45:01 +0000 (Mon, 11 Jun 2012) Log Message: ----------- postgresql/branches/postgresql-8.3: Updated Modified Paths: -------------- csw/mgar/pkg/postgresql/branches/postgresql-8.3/files/changelog.CSW Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.3/files/changelog.CSW =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.3/files/changelog.CSW 2012-06-11 12:05:29 UTC (rev 18323) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.3/files/changelog.CSW 2012-06-11 12:45:01 UTC (rev 18324) @@ -1,8 +1,8 @@ -postgresql83 (8.3.19,REV=2012.06.10) +postgresql83 (8.3.19,REV=2012.06.11) * New upstream release 8.3.19. - -- Rafael Ostertag Tue, 10 June 2012 13:22:57+0200 + -- Rafael Ostertag Mon, 11 June 2012 09:32:57+0200 postgresql83 (8.3.18,REV=2012.05.01) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Mon Jun 11 14:48:39 2012 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Mon, 11 Jun 2012 12:48:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[18325] csw/mgar/pkg/postgresql/branches/postgresql-8.4/ files/changelog.CSW Message-ID: Revision: 18325 http://gar.svn.sourceforge.net/gar/?rev=18325&view=rev Author: guengel Date: 2012-06-11 12:48:39 +0000 (Mon, 11 Jun 2012) Log Message: ----------- postgresql/branches/postgresql-8.4: Updated Modified Paths: -------------- csw/mgar/pkg/postgresql/branches/postgresql-8.4/files/changelog.CSW Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.4/files/changelog.CSW =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.4/files/changelog.CSW 2012-06-11 12:45:01 UTC (rev 18324) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.4/files/changelog.CSW 2012-06-11 12:48:39 UTC (rev 18325) @@ -1,8 +1,8 @@ -postgresql84 (8.4.12,REV=2012.06.10) +postgresql84 (8.4.12,REV=2012.06.11) * New upstream release 8.4.12. - -- Rafael Ostertag Sun, 10 June 2012 13:22:57+0200 + -- Rafael Ostertag Mon, 11 June 2012 14:48:57+0200 postgresql84 (8.4.11,REV=2012.05.01) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Mon Jun 11 15:42:34 2012 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Mon, 11 Jun 2012 13:42:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[18326] csw/mgar/pkg/postgresql/branches/postgresql-9.0/ files/changelog.CSW Message-ID: Revision: 18326 http://gar.svn.sourceforge.net/gar/?rev=18326&view=rev Author: guengel Date: 2012-06-11 13:42:34 +0000 (Mon, 11 Jun 2012) Log Message: ----------- postgresql/branches/postgresql-9.0: Updated Modified Paths: -------------- csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/changelog.CSW Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/changelog.CSW =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/changelog.CSW 2012-06-11 12:48:39 UTC (rev 18325) +++ csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/changelog.CSW 2012-06-11 13:42:34 UTC (rev 18326) @@ -1,8 +1,8 @@ -postgresql90 (9.0.8,REV=2012.06.10) +postgresql90 (9.0.8,REV=2012.06.11) * New upstream release 9.0.8. - -- Rafael Ostertag Sun, 10 June 2012 13:22:57+0200 + -- Rafael Ostertag Mon, 11 June 2012 15:42:57+0200 postgresql90 (9.0.7,REV=2012.05.01) 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 11 15:54:46 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 11 Jun 2012 13:54:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[18327] csw/mgar/pkg/glew/trunk Message-ID: Revision: 18327 http://gar.svn.sourceforge.net/gar/?rev=18327&view=rev Author: dmichelsen Date: 2012-06-11 13:54:46 +0000 (Mon, 11 Jun 2012) Log Message: ----------- glew: Update to 1.7.0 Modified Paths: -------------- csw/mgar/pkg/glew/trunk/Makefile csw/mgar/pkg/glew/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/glew/trunk/files/0001-Use-inttypes-also-for-Solaris.patch Modified: csw/mgar/pkg/glew/trunk/Makefile =================================================================== --- csw/mgar/pkg/glew/trunk/Makefile 2012-06-11 13:42:34 UTC (rev 18326) +++ csw/mgar/pkg/glew/trunk/Makefile 2012-06-11 13:54:46 UTC (rev 18327) @@ -1,12 +1,8 @@ # $Id$ # -# TBD: -# - Split package -# - Fixup soname (current: none, packages exist linking libGLEW.so, Linux has libGLEW.so.x.y -# http://rpmfind.net//linux/RPM/mandriva/devel/cooker/sparc/media/main/release/libglew1.3-1.3.4-3mdv2007.0.sparc.html NAME = glew -VERSION = 1.6.0 +VERSION = 1.7.0 CATEGORIES = lib GARTYPE = v2 @@ -22,25 +18,19 @@ MASTER_SITES = $(SF_MIRROR) DISTFILES = $(NAME)-$(VERSION).tgz -# Use patch until this is fixed: -# http://sourceforge.net/tracker/?func=detail&aid=3376260&group_id=67586&atid=523274 -PATCHFILES = 0001-Use-inttypes-also-for-Solaris.patch - LICENSE = LICENSE.txt BUILD_DEP_PKGS = CSWmesa -PACKAGES += CSWlibglew1-6 -SPKG_DESC_CSWlibglew1-6 = OpenGL extension wrangler library (GLEW), libGLEW.so.1.6 -PKGFILES_CSWlibglew1-6 = $(call pkgfiles_lib,libGLEW.so.1.6) -RUNTIME_DEP_PKGS_CSWlibglew1-6 += CSWmesa +PACKAGES += CSWlibglew1-7 +SPKG_DESC_CSWlibglew1-7 = OpenGL extension wrangler library (GLEW), libGLEW.so.1.7 +PKGFILES_CSWlibglew1-7 = $(call pkgfiles_lib,libGLEW.so.1.7) +RUNTIME_DEP_PKGS_CSWlibglew1-7 += CSWmesa PACKAGES += CSWlibglew-dev -SPKG_DESC_CSWlibglew-dev = Development files for libGLEW.so.1.6 +SPKG_DESC_CSWlibglew-dev = Development files for libGLEW.so.1.7 # PKGFILES is catchall -RUNTIME_DEP_PKGS_CSWlibglew-dev += CSWlibglew1-6 -# Existing packages are linked against SONAME libGLEW.so only in this package -OBSOLETED_BY_CSWlibglew-dev = CSWglew +RUNTIME_DEP_PKGS_CSWlibglew-dev += CSWlibglew1-7 NOISALIST = 1 BUILD64_LIBS_ONLY = 1 @@ -51,7 +41,7 @@ BUILD_OVERRIDE_VARS = CC CFLAGS.EXTRA OPT LDFLAGS.SO LDFLAGS.EXTRA BUILD_OVERRIDE_VAR_CC = $(CC) BUILD_OVERRIDE_VAR_CFLAGS.EXTRA = $(CFLAGS) $(CPPFLAGS) $(EXTRA_CFLAGS-$(GARCH)) -BUILD_OVERRIDE_VAR_LDFLAGS.SO = -G $(LDOPT-$(MEMORYMODEL)) -h libGLEW.so.1.6 +BUILD_OVERRIDE_VAR_LDFLAGS.SO = -G $(LDOPT-$(MEMORYMODEL)) -h libGLEW.so.1.7 # -ldl for dlsym/dlopen in glew.mx BUILD_OVERRIDE_VAR_LDFLAGS.EXTRA = -L$(libdir) -ldl Modified: csw/mgar/pkg/glew/trunk/checksums =================================================================== --- csw/mgar/pkg/glew/trunk/checksums 2012-06-11 13:42:34 UTC (rev 18326) +++ csw/mgar/pkg/glew/trunk/checksums 2012-06-11 13:54:46 UTC (rev 18327) @@ -1 +1 @@ -7dfbb444b5a4e125bc5dba0aef403082 glew-1.6.0.tgz +fb7a8bb79187ac98a90b57f0f27a3e84 glew-1.7.0.tgz Deleted: csw/mgar/pkg/glew/trunk/files/0001-Use-inttypes-also-for-Solaris.patch =================================================================== --- csw/mgar/pkg/glew/trunk/files/0001-Use-inttypes-also-for-Solaris.patch 2012-06-11 13:42:34 UTC (rev 18326) +++ csw/mgar/pkg/glew/trunk/files/0001-Use-inttypes-also-for-Solaris.patch 2012-06-11 13:54:46 UTC (rev 18327) @@ -1,25 +0,0 @@ -From 7da2f65f28296c3755478f2060609a7247a65801 Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Wed, 29 Sep 2010 12:49:48 +0200 -Subject: [PATCH] Use inttypes also for Solaris - ---- - include/GL/glew.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/include/GL/glew.h b/include/GL/glew.h -index 5105a20..9f82d40 100644 ---- a/include/GL/glew.h -+++ b/include/GL/glew.h -@@ -200,7 +200,7 @@ typedef _W64 int ptrdiff_t; - - /* SGI MIPSPro doesn't like stdint.h in C++ mode */ - --#if defined(__sgi) && !defined(__GNUC__) -+#if defined(__sun) || defined(__sgi) && !defined(__GNUC__) - #include - #else - #include --- -1.7.3 - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Mon Jun 11 15:59:33 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Mon, 11 Jun 2012 13:59:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[18328] csw/mgar/pkg Message-ID: Revision: 18328 http://gar.svn.sourceforge.net/gar/?rev=18328&view=rev Author: pfelecan Date: 2012-06-11 13:59:32 +0000 (Mon, 11 Jun 2012) Log Message: ----------- migrated from a private recipe to a GAR based one. Added Paths: ----------- csw/mgar/pkg/hevea/ csw/mgar/pkg/hevea/Makefile csw/mgar/pkg/hevea/branches/ csw/mgar/pkg/hevea/tags/ csw/mgar/pkg/hevea/trunk/ csw/mgar/pkg/hevea/trunk/Makefile csw/mgar/pkg/hevea/trunk/checksums csw/mgar/pkg/hevea/trunk/files/ csw/mgar/pkg/hevea/trunk/files/0001-Fix-installation-paths.patch csw/mgar/pkg/hevea/trunk/files/CSWhevea.postinstall Added: csw/mgar/pkg/hevea/Makefile =================================================================== --- csw/mgar/pkg/hevea/Makefile (rev 0) +++ csw/mgar/pkg/hevea/Makefile 2012-06-11 13:59:32 UTC (rev 18328) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/hevea/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/hevea/trunk/Makefile =================================================================== --- csw/mgar/pkg/hevea/trunk/Makefile (rev 0) +++ csw/mgar/pkg/hevea/trunk/Makefile 2012-06-11 13:59:32 UTC (rev 18328) @@ -0,0 +1,61 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = hevea +VERSION = 1.10 +GARTYPE = v2 +CATEGORIES = apps + +DESCRIPTION = A fast LaTeX to HTML translator +define BLURB + HEVEA is a LaTeX to HTML translator. The input language is a fairly + complete subset of LaTeX2e (old LaTeX style is also accepted) and the + output language is HTML that is (hopefully) correct with respect to + version 4.0 (transitional) + + Exotic symbols are translated into the so-called HTML 'entities', + in other words into references to UNICODE chararacters. + + HEVEA understands LaTeX macro definitions. Simple user style + files are understood with little or no modifications. + Furthermore, HEVEA customization is done by writing LaTeX code. + + HEVEA is written in Objective Caml, as many lexers. It is quite fast + and flexible. Using HEVEA it is possible to translate large documents + such as manuals, books, etc. very quickly. All documents are + translated as one single HTML file. Then, the output file can be cut + into smaller files, using the companion program HACHA. +endef + +MASTER_SITES = http://hevea.inria.fr/distri/ +DISTFILES = $(DISTNAME).tar.gz +DISTFILES += CSWhevea.postinstall + +LICENSE = LICENSE + +BUILD_DEP_PKGS = CSWocaml +BUILD_DEP_PKGS += CSWtetex + +RUNTIME_DEP_PKGS = CSWtetex +RUNTIME_DEP_PKGS += CSWnetpbm + +PATCHFILES = 0001-Fix-installation-paths.patch + +CONFIGURE_SCRIPTS = + +SKIPTEST = 1 + +# these are overrides for binaries called internally: +CHECKPKG_OVERRIDES_CSWhevea += missing-dependency|CSWtetex +CHECKPKG_OVERRIDES_CSWhevea += surplus-dependency|CSWnetpbm + +include gar/category.mk + +pre-install-modulated: + cd $(WORKSRC) && gsed -i 's:^DESTDIR=$$:DESTDIR=$(DESTDIR):' config.sh + $(MAKECOOKIE) + +post-install-modulated: + cd $(WORKSRC) && ginstall -d $(DESTDIR)$(docdir)/$(NAME) + cd $(WORKSRC) && ginstall README $(DESTDIR)$(docdir)/$(NAME) + $(MAKECOOKIE) Property changes on: csw/mgar/pkg/hevea/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/hevea/trunk/checksums =================================================================== --- csw/mgar/pkg/hevea/trunk/checksums (rev 0) +++ csw/mgar/pkg/hevea/trunk/checksums 2012-06-11 13:59:32 UTC (rev 18328) @@ -0,0 +1 @@ +24a631570bee3cc4b8350e9db39be62b hevea-1.10.tar.gz Added: csw/mgar/pkg/hevea/trunk/files/0001-Fix-installation-paths.patch =================================================================== --- csw/mgar/pkg/hevea/trunk/files/0001-Fix-installation-paths.patch (rev 0) +++ csw/mgar/pkg/hevea/trunk/files/0001-Fix-installation-paths.patch 2012-06-11 13:59:32 UTC (rev 18328) @@ -0,0 +1,34 @@ +From ba2ad3d8fe7ba4fadfaccfa708e38cc541702bd0 Mon Sep 17 00:00:00 2001 +From: Peter Felecan +Date: Mon, 11 Jun 2012 15:37:21 +0200 +Subject: [PATCH] Fix installation paths + +--- + Makefile | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/Makefile b/Makefile +index dd90bcb..fc69107 100644 +--- a/Makefile ++++ b/Makefile +@@ -2,15 +2,14 @@ + # Compile using ocamlopt, to use ocamlc set TARGET=byte + TARGET=opt + # Install prefix +-PREFIX=/usr/local ++PREFIX=$(prefix) + # Library directory of hevea + LIBDIR=$(PREFIX)/lib/hevea + # Where to install programms + BINDIR=$(PREFIX)/bin + # Install prefix prefix +-DESTDIR= + #Where to install hevea.sty +-LATEXLIBDIR=$(PREFIX)/lib/hevea ++LATEXLIBDIR=$(PREFIX)/share/texmf-local/tex/latex/hevea + ##### Advanced configuration parameters + SUF= + DIR= +-- +1.7.10.3 + Added: csw/mgar/pkg/hevea/trunk/files/CSWhevea.postinstall =================================================================== --- csw/mgar/pkg/hevea/trunk/files/CSWhevea.postinstall (rev 0) +++ csw/mgar/pkg/hevea/trunk/files/CSWhevea.postinstall 2012-06-11 13:59:32 UTC (rev 18328) @@ -0,0 +1,32 @@ +# $Id$ + +Error() +{ + echo "postinstall: anomaly : $1" >&2 + exit 1 +} + +Warning() +{ + echo "warning:" "$1" >&2 +} + +if [ -x /opt/csw/bin/mktexlsr ] +then +{ + echo "Running mktexlsr. This may take some time..." + bash /opt/csw/bin/mktexlsr || + Warning "mktexlsr failed! You need to run mktexlsr again" +} +else +{ + Warning "cannot update TeX hash: /opt/csw/bin/mktexlsr is not an executable!" +} +fi + +exit 0 + +# Local Variables: +# mode: shell-script +# mode: font-lock +# End: Property changes on: csw/mgar/pkg/hevea/trunk/files/CSWhevea.postinstall ___________________________________________________________________ Added: svn:keywords + Author Date HeadURL Id Revision This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Mon Jun 11 16:10:08 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Mon, 11 Jun 2012 14:10:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[18329] csw/mgar/pkg/hevea/trunk/Makefile Message-ID: Revision: 18329 http://gar.svn.sourceforge.net/gar/?rev=18329&view=rev Author: pfelecan Date: 2012-06-11 14:10:08 +0000 (Mon, 11 Jun 2012) Log Message: ----------- corrected previous override and verified and validated a new override. Modified Paths: -------------- csw/mgar/pkg/hevea/trunk/Makefile Modified: csw/mgar/pkg/hevea/trunk/Makefile =================================================================== --- csw/mgar/pkg/hevea/trunk/Makefile 2012-06-11 13:59:32 UTC (rev 18328) +++ csw/mgar/pkg/hevea/trunk/Makefile 2012-06-11 14:10:08 UTC (rev 18329) @@ -46,9 +46,10 @@ SKIPTEST = 1 # these are overrides for binaries called internally: -CHECKPKG_OVERRIDES_CSWhevea += missing-dependency|CSWtetex +CHECKPKG_OVERRIDES_CSWhevea += surplus-dependency|CSWtetex CHECKPKG_OVERRIDES_CSWhevea += surplus-dependency|CSWnetpbm - +# innocuous: +CHECKPKG_OVERRIDES_CSWhevea += file-with-bad-content|/usr/local|root/opt/csw/share/doc/hevea/README include gar/category.mk pre-install-modulated: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Mon Jun 11 16:48:51 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Mon, 11 Jun 2012 14:48:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[18330] csw/mgar/pkg/hevea/trunk/Makefile Message-ID: Revision: 18330 http://gar.svn.sourceforge.net/gar/?rev=18330&view=rev Author: pfelecan Date: 2012-06-11 14:48:51 +0000 (Mon, 11 Jun 2012) Log Message: ----------- cosmetics Modified Paths: -------------- csw/mgar/pkg/hevea/trunk/Makefile Modified: csw/mgar/pkg/hevea/trunk/Makefile =================================================================== --- csw/mgar/pkg/hevea/trunk/Makefile 2012-06-11 14:10:08 UTC (rev 18329) +++ csw/mgar/pkg/hevea/trunk/Makefile 2012-06-11 14:48:51 UTC (rev 18330) @@ -50,6 +50,7 @@ CHECKPKG_OVERRIDES_CSWhevea += surplus-dependency|CSWnetpbm # innocuous: CHECKPKG_OVERRIDES_CSWhevea += file-with-bad-content|/usr/local|root/opt/csw/share/doc/hevea/README + include gar/category.mk pre-install-modulated: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Jun 11 18:15:40 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 11 Jun 2012 16:15:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[18331] csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw Message-ID: Revision: 18331 http://gar.svn.sourceforge.net/gar/?rev=18331&view=rev Author: wahwah Date: 2012-06-11 16:15:40 +0000 (Mon, 11 Jun 2012) Log Message: ----------- dependency updates Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/Makefile csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/files/CSWmysql51.postinstall Modified: csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/Makefile 2012-06-11 14:48:51 UTC (rev 18330) +++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/Makefile 2012-06-11 16:15:40 UTC (rev 18331) @@ -1,4 +1,4 @@ -# Copyright 2009 OpenCSW +# Copyright 2009-2012 OpenCSW # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -43,7 +43,7 @@ PKGFILES_CSWmysql-dev += $(foreach bin_name,$(CSWmysql-dev_programs),$(mandir)/man1/$(bin_name)\.1-$(BASE_VERSION)) PKGFILES_CSWmysql-dev += $(foreach bin_name,$(CSWmysql-dev_programs),/opt/csw/bin/$(bin_name)-$(BASE_VERSION)) PKGFILES_CSWmysql-dev += $(foreach bin_name,$(CSWmysql-dev_programs),/opt/csw/sbin/$(bin_name)-$(BASE_VERSION)) -PKGFILES_CSWmysql-dev += $(mandir)/man1/mysql_config.* +PKGFILES_CSWmysql-dev += $(mandir)/man1/mysql_config\.1 PKGFILES_CSWmysql-dev += $(prefix)/include.* PKGFILES_CSWmysql-dev += /opt/csw/include/mysql OBSOLETED_BY_CSWmysql-dev = CSWmysql5devel @@ -59,14 +59,14 @@ PKGFILES_CSWlibmysqlclient$(MYSQL_LIB_VER) += $(call baseisadirs,$(libdir),libmysqlclient\.so\.$(MYSQL_LIB_VER)(\.\d+)*) SPKG_DESC_CSWlibmysqlclient$(MYSQL_LIB_VER) += MySQL $(BASE_VERSION) client library, libmysqlclient.so.$(MYSQL_LIB_VER) RUNTIME_DEP_PKGS_CSWlibmysqlclient$(MYSQL_LIB_VER) += CSWlibz1 -RUNTIME_DEP_PKGS_CSWlibmysqlclient$(MYSQL_LIB_VER) += CSWosslrt +RUNTIME_DEP_PKGS_CSWlibmysqlclient$(MYSQL_LIB_VER) += CSWlibssl1-0-0 OBSOLETED_BY_CSWlibmysqlclient$(MYSQL_LIB_VER) += CSW$(NAME)rt PACKAGES += CSWlibmysqlclient-r$(MYSQL_LIB_VER) PKGFILES_CSWlibmysqlclient-r$(MYSQL_LIB_VER) += $(call baseisadirs,$(libdir),libmysqlclient_r\.so\.$(MYSQL_LIB_VER)(\.\d+)*) SPKG_DESC_CSWlibmysqlclient-r$(MYSQL_LIB_VER) += MySQL $(BASE_VERSION) client library, libmysqlclient_r.so.$(MYSQL_LIB_VER) RUNTIME_DEP_PKGS_CSWlibmysqlclient-r$(MYSQL_LIB_VER) += CSWlibz1 -RUNTIME_DEP_PKGS_CSWlibmysqlclient-r$(MYSQL_LIB_VER) += CSWosslrt +RUNTIME_DEP_PKGS_CSWlibmysqlclient-r$(MYSQL_LIB_VER) += CSWlibssl1-0-0 OBSOLETED_BY_CSWlibmysqlclient-r$(MYSQL_LIB_VER) += CSW$(NAME)rt # Defining the client programs, which are going to pick up the 32- and 64-bit @@ -99,7 +99,7 @@ RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibmysqlclient-r$(MYSQL_LIB_VER) RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibncursesw5 RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibz1 -RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWosslrt +RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibssl1-0-0 CHECKPKG_OVERRIDES_CSW$(NAME)client += bad-rpath-entry PACKAGES += CSW$(NAME) @@ -109,7 +109,7 @@ RUNTIME_DEP_PKGS_CSW$(NAME) += CSW$(NAME)client RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibwrap1 RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibz1 -RUNTIME_DEP_PKGS_CSW$(NAME) += CSWosslrt +RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibssl1-0-0 CHECKPKG_OVERRIDES_CSW$(NAME) += bad-rpath-entry CHECKPKG_OVERRIDES_CSW$(NAME) += file-with-bad-content @@ -129,6 +129,14 @@ # Enable 64 bits build BUILD64 = 1 +# EXTRA_CFLAGS = $(EXTRA_CFLAGS_$(GARCH)) +# EXTRA_CFLAGS_sparc = -xO4 -xstrconst $(COMMON_CFLAGS) +# EXTRA_CFLAGS_i386 = -xO3 -nofstore -xregs=no%frameptr $(COMMON_CFLAGS) +# EXTRA_CXXFLAGS = $(EXTRA_CXXFLAGS_$(GARCH)) +# EXTRA_CXXFLAGS_sparc = -xO4 $(COMMON_CFLAGS) +# EXTRA_CXXFLAGS_i386 = -xO3 -nofstore -xregs=no%frameptr $(COMMON_CFLAGS) +# COMMON_CFLAGS = -mt -fsimple=1 -ftrap=%none -xbuiltin=%all -xlibmil -xlibmopt +# EXTRA_CFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ EXTRA_CXXFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ Modified: csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/files/CSWmysql51.postinstall =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/files/CSWmysql51.postinstall 2012-06-11 14:48:51 UTC (rev 18330) +++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/files/CSWmysql51.postinstall 2012-06-11 16:15:40 UTC (rev 18331) @@ -8,13 +8,17 @@ # This script creates a default database with the small-memory footprint. # Input may be provided for DATADIR and DEFAULTS_FILE # -BASEDIR=/opt/csw -MYSQL_VAR=/var/opt/csw/mysql51 -DEFAULTS_FILE=$BASEDIR/etc/my.cnf -SAVE_DEFAULTS_FILE=$MYSQL_VAR/my.cnf -MYSQLD_USER=mysql +prefix="/opt/csw" +BASEDIR="${prefix}" +MYSQL_HOME="/var${prefix}/mysql51" +sysconfdir="/etc${prefix}" +# https://www.opencsw.org/mantis/view.php?id=4646 +# MYSQL_VAR="${MYSQL_HOME}" +DEFAULTS_FILE="${sysconfdir}/my.cnf" +# SAVE_DEFAULTS_FILE=$MYSQL_VAR/my.cnf +MYSQLD_USER="mysql" # Provide the default data directory -MYSQLD_DATADIR=$MYSQL_VAR +MYSQLD_DATADIR="${MYSQL_HOME}" # http://bugs.mysql.com/bug.php?id=31164 # ERROR: 1004 Can't create file '/var/tmp//installRJaiQ3/#sql6fee_1_0.frm' (errno: 13) @@ -53,7 +57,7 @@ echo "Creating MySQL core database in $MYSQLD_DATADIR" echo echo "### The following messages are from mysql_install_db." -$BASEDIR/bin/mysql_install_db \ +"$BASEDIR/bin/mysql_install_db-5.1" \ --defaults-extra-file="$DEFAULTS_FILE" \ --user="$MYSQLD_USER" \ --basedir="$BASEDIR" \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at opencsw.org Mon Jun 11 19:23:56 2012 From: pfelecan at opencsw.org (Peter FELECAN) Date: Mon, 11 Jun 2012 19:23:56 +0200 Subject: [csw-devel] SF.net SVN: gar:[18307] csw/mgar/pkg/grip/trunk/Makefile In-Reply-To: ("Maciej (Matchek) =?utf-8?Q?Blizi=C5=84ski=22's?= message of "Sun, 10 Jun 2012 12:02:18 +0100") References: Message-ID: "Maciej (Matchek) Blizi?ski" writes: > 2012/6/10 : >> -GCC4_VERSION ? ? ? ? ? = ? ? ? 4.7 >> +#GCC4_VERSION ? ? ? ? ?= ? ? ? 4.7 > > You can set this in ~/.garrc on your private buildfarm. This way it > won't leak to build recipes, which will work in both places (provided > that the upstream compiles with both 4.6 and 4.7). Indeed. I ended doing exactly that but it kind of annoying. Will correct all the recipes where I put a provisional comment for GCC because on my build-farm I'm at 4.7 when on the "official" build-farm we were still at 4.6. -- Peter From guengel at users.sourceforge.net Mon Jun 11 19:27:49 2012 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Mon, 11 Jun 2012 17:27:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[18332] csw/mgar/pkg/postgresql/branches/postgresql-8.3/ Makefile Message-ID: Revision: 18332 http://gar.svn.sourceforge.net/gar/?rev=18332&view=rev Author: guengel Date: 2012-06-11 17:27:49 +0000 (Mon, 11 Jun 2012) Log Message: ----------- postgresql/branches/postgresql-8.3: Updated libssl dependencies to openssl 1.0.0 Modified Paths: -------------- csw/mgar/pkg/postgresql/branches/postgresql-8.3/Makefile Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.3/Makefile =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.3/Makefile 2012-06-11 16:15:40 UTC (rev 18331) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.3/Makefile 2012-06-11 17:27:49 UTC (rev 18332) @@ -270,7 +270,7 @@ PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += .*/CSW$(NAME)$(BASE_VERSION_NODOT)-server.postmsg PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += .*$(docdir)/$(NAME)$(BASE_VERSION_NODOT)_server/README.CSW RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibreadline6 -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibssl0-9-8 +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibz1 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibpq5 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibgnugetopt0 @@ -291,7 +291,7 @@ PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-client += .*/CSW$(NAME)$(BASE_VERSION_NODOT)-client.postmsg PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-client += .*$(docdir)/$(NAME)$(BASE_VERSION_NODOT)_client/README.CSW RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibreadline6 -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibssl0-9-8 +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibz1 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibpq5 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibgnugetopt0 @@ -309,7 +309,7 @@ PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += .*/alternatives/$(NAME)$(BASE_VERSION_NODOT)_contrib.* PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += .*/CSW$(NAME)$(BASE_VERSION_NODOT)-contrib.postmsg PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += .*$(docdir)/$(NAME)$(BASE_VERSION_NODOT)_contrib/README.CSW -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibssl0-9-8 +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibz1 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibpq5 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibgnugetopt0 @@ -341,7 +341,7 @@ RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibxslt1 RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibreadline6 -RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibssl0-9-8 +RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibssl1-0-0 # Those '/usr/local' are ok, they are in a HPUX section of the file CHECKPKG_OVERRIDES_CSW$(NAME)-dev += $(foreach i,$(NEEDED_ISAS), $(subst $(ISA_DEFAULT)/,,file-with-bad-content|/usr/local|root$(libdir)/$(i)/$(NAME)/$(BASE_VERSION_NODOT)/pgxs/src/Makefile.shlib) ) # That's ok too, it's docbook stuff which we don't use in this build @@ -376,7 +376,7 @@ PACKAGES += CSWlibpq5 SPKG_DESC_CSWlibpq5 = PostgreSQL $(VERSION), libpq PKGFILES_CSWlibpq5 = $(call pkgfiles_lib,libpq.so.5) -RUNTIME_DEP_PKGS_CSWlibpq5 = CSWlibssl0-9-8 +RUNTIME_DEP_PKGS_CSWlibpq5 = CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWlibpq5 += CSWlibgssapi-krb5-2 BUILD_DEP_PKGS = CSWlibxml2-dev This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Mon Jun 11 19:30:13 2012 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Mon, 11 Jun 2012 17:30:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[18333] csw/mgar/pkg/postgresql/branches/postgresql-9.0/ Makefile Message-ID: Revision: 18333 http://gar.svn.sourceforge.net/gar/?rev=18333&view=rev Author: guengel Date: 2012-06-11 17:30:13 +0000 (Mon, 11 Jun 2012) Log Message: ----------- postgresql/branches/postgresql-9.0: Updated libssl dependencies to ssl 1.0.0 Modified Paths: -------------- csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile 2012-06-11 17:27:49 UTC (rev 18332) +++ csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile 2012-06-11 17:30:13 UTC (rev 18333) @@ -274,7 +274,7 @@ PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += .*/CSW$(NAME)$(BASE_VERSION_NODOT)-server.postmsg PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += .*$(docdir)/$(NAME)$(BASE_VERSION_NODOT)_server/README.CSW RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibreadline6 -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibssl0-9-8 +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibz1 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibpq5 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibgnugetopt0 @@ -292,7 +292,7 @@ PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-client += .*/CSW$(NAME)$(BASE_VERSION_NODOT)-client.postmsg PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-client += .*$(docdir)/$(NAME)$(BASE_VERSION_NODOT)_client/README.CSW RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibreadline6 -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibssl0-9-8 +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibz1 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibpq5 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibgnugetopt0 @@ -310,7 +310,7 @@ PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += .*/alternatives/$(NAME)$(BASE_VERSION_NODOT)_contrib.* PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += .*/CSW$(NAME)$(BASE_VERSION_NODOT)-contrib.postmsg PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += .*$(docdir)/$(NAME)$(BASE_VERSION_NODOT)_contrib/README.CSW -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibssl0-9-8 +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibz1 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibpq5 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibgnugetopt0 @@ -340,7 +340,7 @@ RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibxslt1 RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibreadline6 -RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibssl0-9-8 +RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibssl1-0-0 # Those '/usr/local' are ok, they are in a HPUX section of the file CHECKPKG_OVERRIDES_CSW$(NAME)-dev += $(foreach i,$(NEEDED_ISAS), $(subst $(ISA_DEFAULT)/,,file-with-bad-content|/usr/local|root$(libdir)/$(i)/$(NAME)/$(BASE_VERSION_NODOT)/pgxs/src/Makefile.shlib) ) # That's ok too, it's docbook stuff which we don't use in this build @@ -375,7 +375,7 @@ PACKAGES += CSWlibpq5 SPKG_DESC_CSWlibpq5 = PostgreSQL $(VERSION), libpq PKGFILES_CSWlibpq5 = $(call pkgfiles_lib,libpq.so.5) -RUNTIME_DEP_PKGS_CSWlibpq5 = CSWlibssl0-9-8 +RUNTIME_DEP_PKGS_CSWlibpq5 = CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWlibpq5 += CSWlibgssapi-krb5-2 BUILD_DEP_PKGS = CSWlibxml2-dev This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Mon Jun 11 19:33:16 2012 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Mon, 11 Jun 2012 17:33:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[18334] csw/mgar/pkg/postgresql/trunk Message-ID: Revision: 18334 http://gar.svn.sourceforge.net/gar/?rev=18334&view=rev Author: guengel Date: 2012-06-11 17:33:16 +0000 (Mon, 11 Jun 2012) Log Message: ----------- postgresql/trunk: Updated libssl dependencies to ssl 1.0.0 Modified Paths: -------------- csw/mgar/pkg/postgresql/trunk/Makefile csw/mgar/pkg/postgresql/trunk/checksums csw/mgar/pkg/postgresql/trunk/files/changelog.CSW Modified: csw/mgar/pkg/postgresql/trunk/Makefile =================================================================== --- csw/mgar/pkg/postgresql/trunk/Makefile 2012-06-11 17:30:13 UTC (rev 18333) +++ csw/mgar/pkg/postgresql/trunk/Makefile 2012-06-11 17:33:16 UTC (rev 18334) @@ -90,7 +90,7 @@ BASE_VERSION = 9.1 VERSION_NODOT = $(subst .,_,$(BASE_VERSION)) BASE_VERSION_NODOT = $(subst .,,$(BASE_VERSION)) -PATCHLEVEL = 3 +PATCHLEVEL = 4 VERSION = $(BASE_VERSION).$(PATCHLEVEL) CATEGORIES = apps GARTYPE = v2 Modified: csw/mgar/pkg/postgresql/trunk/checksums =================================================================== --- csw/mgar/pkg/postgresql/trunk/checksums 2012-06-11 17:30:13 UTC (rev 18333) +++ csw/mgar/pkg/postgresql/trunk/checksums 2012-06-11 17:33:16 UTC (rev 18334) @@ -1 +1 @@ -641e1915f7ebfdc9f138e4c55b6aec0e postgresql-9.1.3.tar.bz2 +a8035688dba988b782725ac1aec60186 postgresql-9.1.4.tar.bz2 Modified: csw/mgar/pkg/postgresql/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/postgresql/trunk/files/changelog.CSW 2012-06-11 17:30:13 UTC (rev 18333) +++ csw/mgar/pkg/postgresql/trunk/files/changelog.CSW 2012-06-11 17:33:16 UTC (rev 18334) @@ -1,3 +1,10 @@ +postgresql91 (9.1.4,REV=2012.06.11) + + * New upstream release 9.1.4. + + -- Rafael Ostertag Mon, 11 June 2012 16:23:57+0200 + + postgresql91 (9.1.3,REV=2012.05.01) * New upstream release 9.1.3. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Mon Jun 11 19:46:33 2012 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Mon, 11 Jun 2012 17:46:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[18335] csw/mgar/pkg/postgresql/branches/postgresql-8.4/ Makefile Message-ID: Revision: 18335 http://gar.svn.sourceforge.net/gar/?rev=18335&view=rev Author: guengel Date: 2012-06-11 17:46:33 +0000 (Mon, 11 Jun 2012) Log Message: ----------- postgresql/branches/postgresql-8.4: Updated libssl dependencies to libssl 1.0.0 Modified Paths: -------------- csw/mgar/pkg/postgresql/branches/postgresql-8.4/Makefile Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.4/Makefile =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.4/Makefile 2012-06-11 17:33:16 UTC (rev 18334) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.4/Makefile 2012-06-11 17:46:33 UTC (rev 18335) @@ -272,7 +272,7 @@ PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += .*/CSW$(NAME)$(BASE_VERSION_NODOT)-server.postmsg PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += .*$(docdir)/$(NAME)$(BASE_VERSION_NODOT)_server/README.CSW RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibreadline6 -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibssl0-9-8 +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibz1 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibpq5 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibgnugetopt0 @@ -293,7 +293,7 @@ PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-client += .*/CSW$(NAME)$(BASE_VERSION_NODOT)-client.postmsg PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-client += .*$(docdir)/$(NAME)$(BASE_VERSION_NODOT)_client/README.CSW RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibreadline6 -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibssl0-9-8 +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibz1 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibpq5 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibgnugetopt0 @@ -311,7 +311,7 @@ PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += .*/alternatives/$(NAME)$(BASE_VERSION_NODOT)_contrib.* PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += .*/CSW$(NAME)$(BASE_VERSION_NODOT)-contrib.postmsg PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += .*$(docdir)/$(NAME)$(BASE_VERSION_NODOT)_contrib/README.CSW -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibssl0-9-8 +RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibz1 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibpq5 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibgnugetopt0 @@ -343,7 +343,7 @@ RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibxslt1 RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibreadline6 -RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibssl0-9-8 +RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibssl1-0-0 # Those '/usr/local' are ok, they are in a HPUX section of the file CHECKPKG_OVERRIDES_CSW$(NAME)-dev += $(foreach i,$(NEEDED_ISAS), $(subst $(ISA_DEFAULT)/,,file-with-bad-content|/usr/local|root$(libdir)/$(i)/$(NAME)/$(BASE_VERSION_NODOT)/pgxs/src/Makefile.shlib) ) # That's ok too, it's docbook stuff which we don't use in this build @@ -378,7 +378,7 @@ PACKAGES += CSWlibpq5 SPKG_DESC_CSWlibpq5 = PostgreSQL $(VERSION), libpq PKGFILES_CSWlibpq5 = $(call pkgfiles_lib,libpq.so.5) -RUNTIME_DEP_PKGS_CSWlibpq5 = CSWlibssl0-9-8 +RUNTIME_DEP_PKGS_CSWlibpq5 = CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWlibpq5 += CSWlibgssapi-krb5-2 BUILD_DEP_PKGS = CSWlibxml2-dev This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Mon Jun 11 20:06:17 2012 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Mon, 11 Jun 2012 18:06:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[18336] csw/mgar/pkg/yapet/trunk/Makefile Message-ID: Revision: 18336 http://gar.svn.sourceforge.net/gar/?rev=18336&view=rev Author: guengel Date: 2012-06-11 18:06:17 +0000 (Mon, 11 Jun 2012) Log Message: ----------- yapet/trunk: Updated libssl dependency to libssl 1.0.0 Modified Paths: -------------- csw/mgar/pkg/yapet/trunk/Makefile Modified: csw/mgar/pkg/yapet/trunk/Makefile =================================================================== --- csw/mgar/pkg/yapet/trunk/Makefile 2012-06-11 17:46:33 UTC (rev 18335) +++ csw/mgar/pkg/yapet/trunk/Makefile 2012-06-11 18:06:17 UTC (rev 18336) @@ -25,11 +25,11 @@ # uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES # UPSTREAM_MASTER_SITES = -RUNTIME_DEP_PKGS = CSWosslrt +RUNTIME_DEP_PKGS = CSWlibssl1-0-0 RUNTIME_DEP_PKGS += CSWlibncurses5 RUNTIME_DEP_PKGS += CSWlibintl8 -BUILD_DEP_PKGS = CSWossldevel +BUILD_DEP_PKGS = CSWlibssl-dev BUILD_DEP_PKGS += CSWlibncurses-dev BUILD_DEP_PKGS += CSWggettext-dev 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 11 21:51:46 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 11 Jun 2012 19:51:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[18337] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 18337 http://gar.svn.sourceforge.net/gar/?rev=18337&view=rev Author: bdwalton Date: 2012-06-11 19:51:46 +0000 (Mon, 11 Jun 2012) Log Message: ----------- bacula/trunk: add new lib deps for tray-monitor that are specific to sol10 Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2012-06-11 18:06:17 UTC (rev 18336) +++ csw/mgar/pkg/bacula/trunk/Makefile 2012-06-11 19:51:46 UTC (rev 18337) @@ -102,6 +102,14 @@ RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWlibcairo2 RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWlibfontconfig1 RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWglib2 +RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWlibgdk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWlibgdk-pixbuf2-0-0 +RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWlibgtk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWlibgio2-0-0 PKGFILES_CSWbacula-tray-monitor = .*tray-monitor.* CATALOGNAME_CSWbacula-common = bacula_common 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 11 23:00:27 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 11 Jun 2012 21:00:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[18338] csw/mgar/pkg/binutils/trunk Message-ID: Revision: 18338 http://gar.svn.sourceforge.net/gar/?rev=18338&view=rev Author: wahwah Date: 2012-06-11 21:00:26 +0000 (Mon, 11 Jun 2012) Log Message: ----------- binutils/trunk: version bump to 2.22 Modified Paths: -------------- csw/mgar/pkg/binutils/trunk/Makefile csw/mgar/pkg/binutils/trunk/checksums Modified: csw/mgar/pkg/binutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/binutils/trunk/Makefile 2012-06-11 19:51:46 UTC (rev 18337) +++ csw/mgar/pkg/binutils/trunk/Makefile 2012-06-11 21:00:26 UTC (rev 18338) @@ -1,5 +1,5 @@ NAME = binutils -VERSION = 2.21.1 +VERSION = 2.22 CATEGORIES = utils GARTYPE = v2 Modified: csw/mgar/pkg/binutils/trunk/checksums =================================================================== --- csw/mgar/pkg/binutils/trunk/checksums 2012-06-11 19:51:46 UTC (rev 18337) +++ csw/mgar/pkg/binutils/trunk/checksums 2012-06-11 21:00:26 UTC (rev 18338) @@ -1 +1 @@ -a22801a9cad45c85e9ff6afc10537d72 binutils-2.21.1.tar.bz2 +ee0f10756c84979622b992a4a61ea3f5 binutils-2.22.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Jun 11 23:06:55 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 11 Jun 2012 21:06:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[18339] csw/mgar/pkg/gcc4/trunk/Makefile Message-ID: Revision: 18339 http://gar.svn.sourceforge.net/gar/?rev=18339&view=rev Author: wahwah Date: 2012-06-11 21:06:55 +0000 (Mon, 11 Jun 2012) Log Message: ----------- gcc4/trunk: updated build dependencies Modified Paths: -------------- csw/mgar/pkg/gcc4/trunk/Makefile Modified: csw/mgar/pkg/gcc4/trunk/Makefile =================================================================== --- csw/mgar/pkg/gcc4/trunk/Makefile 2012-06-11 21:00:26 UTC (rev 18338) +++ csw/mgar/pkg/gcc4/trunk/Makefile 2012-06-11 21:06:55 UTC (rev 18339) @@ -35,12 +35,14 @@ ## Copyright File LICENSE = COPYING3 -BUILD_DEP_PKGS += CSWlibz-dev +BUILD_DEP_PKGS += CSWbinutils +BUILD_DEP_PKGS += CSWcloog-dev +BUILD_DEP_PKGS += CSWgnulinks BUILD_DEP_PKGS += CSWlibgmp-dev BUILD_DEP_PKGS += CSWlibmpc-dev BUILD_DEP_PKGS += CSWlibmpfr-dev BUILD_DEP_PKGS += CSWlibppl-dev -BUILD_DEP_PKGS += CSWcloog-dev +BUILD_DEP_PKGS += CSWlibz-dev # Could be used to break out of the /opt/csw/$(PKG_VERSION_TOKEN) prefix PROGRAM_SUFFIX = -$(BASE_VERSION) 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 11 23:11:59 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 11 Jun 2012 21:11:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[18340] csw/mgar/pkg/zlib/trunk Message-ID: Revision: 18340 http://gar.svn.sourceforge.net/gar/?rev=18340&view=rev Author: wahwah Date: 2012-06-11 21:11:59 +0000 (Mon, 11 Jun 2012) Log Message: ----------- zlib/trunk: version bump to 1.2.7 Modified Paths: -------------- csw/mgar/pkg/zlib/trunk/Makefile csw/mgar/pkg/zlib/trunk/checksums Modified: csw/mgar/pkg/zlib/trunk/Makefile =================================================================== --- csw/mgar/pkg/zlib/trunk/Makefile 2012-06-11 21:06:55 UTC (rev 18339) +++ csw/mgar/pkg/zlib/trunk/Makefile 2012-06-11 21:11:59 UTC (rev 18340) @@ -1,7 +1,7 @@ # $Id$ NAME = zlib -VERSION = 1.2.6 +VERSION = 1.2.7 CATEGORIES = lib GARTYPE = v2 @@ -18,7 +18,7 @@ in compression endef -MASTER_SITES = http://www.zlib.net/ +MASTER_SITES = http://zlib.net/ DISTFILES = $(DISTNAME).tar.bz2 DISTFILES += COPYING Modified: csw/mgar/pkg/zlib/trunk/checksums =================================================================== --- csw/mgar/pkg/zlib/trunk/checksums 2012-06-11 21:06:55 UTC (rev 18339) +++ csw/mgar/pkg/zlib/trunk/checksums 2012-06-11 21:11:59 UTC (rev 18340) @@ -1 +1 @@ -dc2cfa0d2313ca77224b4d932b2911e9 zlib-1.2.6.tar.bz2 +2ab442d169156f34c379c968f3f482dd zlib-1.2.7.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Jun 11 23:31:39 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 11 Jun 2012 21:31:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[18341] csw/mgar/pkg/zlib/trunk/Makefile Message-ID: Revision: 18341 http://gar.svn.sourceforge.net/gar/?rev=18341&view=rev Author: wahwah Date: 2012-06-11 21:31:38 +0000 (Mon, 11 Jun 2012) Log Message: ----------- zlib/trunk: Add SourceForge mirrors Modified Paths: -------------- csw/mgar/pkg/zlib/trunk/Makefile Modified: csw/mgar/pkg/zlib/trunk/Makefile =================================================================== --- csw/mgar/pkg/zlib/trunk/Makefile 2012-06-11 21:11:59 UTC (rev 18340) +++ csw/mgar/pkg/zlib/trunk/Makefile 2012-06-11 21:31:38 UTC (rev 18341) @@ -18,7 +18,9 @@ in compression endef -MASTER_SITES = http://zlib.net/ +MASTER_SITES = http://zlib.net/ +MASTER_SITES += $(SF_MIRROR) +SF_PROJ = libpng DISTFILES = $(DISTNAME).tar.bz2 DISTFILES += COPYING 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 12 00:34:31 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 11 Jun 2012 22:34:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[18342] csw/mgar/pkg/binutils/trunk/Makefile Message-ID: Revision: 18342 http://gar.svn.sourceforge.net/gar/?rev=18342&view=rev Author: wahwah Date: 2012-06-11 22:34:31 +0000 (Mon, 11 Jun 2012) Log Message: ----------- binutils/trunk: Add a dependency Modified Paths: -------------- csw/mgar/pkg/binutils/trunk/Makefile Modified: csw/mgar/pkg/binutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/binutils/trunk/Makefile 2012-06-11 21:31:38 UTC (rev 18341) +++ csw/mgar/pkg/binutils/trunk/Makefile 2012-06-11 22:34:31 UTC (rev 18342) @@ -33,6 +33,7 @@ GARCOMPILER = GNU +RUNTIME_DEP_PKGS_CSWbinutils += CSWlibiconv2 RUNTIME_DEP_PKGS_CSWbinutils += CSWlibintl8 RUNTIME_DEP_PKGS_CSWbinutils += CSWlibz1 CHECKPKG_OVERRIDES_CSWbinutils += file-with-bad-content 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 12 02:22:55 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 12 Jun 2012 00:22:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[18343] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 18343 http://gar.svn.sourceforge.net/gar/?rev=18343&view=rev Author: bdwalton Date: 2012-06-12 00:22:55 +0000 (Tue, 12 Jun 2012) Log Message: ----------- bacula/trunk: drop legacy gtk/glib dependencies from the tray-monitor package Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2012-06-11 22:34:31 UTC (rev 18342) +++ csw/mgar/pkg/bacula/trunk/Makefile 2012-06-12 00:22:55 UTC (rev 18343) @@ -96,12 +96,10 @@ RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWlibintl8 RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWlibfreetype6 RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWlibz1 -RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWgtk2 RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWlibatk1-0-0 RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWpango RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWlibcairo2 RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWlibfontconfig1 -RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWglib2 RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWlibgthread2-0-0 RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWlibgmodule2-0-0 RUNTIME_DEP_PKGS_CSWbacula-tray-monitor += CSWlibgdk-x11-2-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 Tue Jun 12 02:25:10 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 12 Jun 2012 00:25:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[18344] csw/mgar/pkg/gdal/trunk/Makefile Message-ID: Revision: 18344 http://gar.svn.sourceforge.net/gar/?rev=18344&view=rev Author: bdwalton Date: 2012-06-12 00:25:09 +0000 (Tue, 12 Jun 2012) Log Message: ----------- gdal/trunk: note libgif4 dep for the library package Modified Paths: -------------- csw/mgar/pkg/gdal/trunk/Makefile Modified: csw/mgar/pkg/gdal/trunk/Makefile =================================================================== --- csw/mgar/pkg/gdal/trunk/Makefile 2012-06-12 00:22:55 UTC (rev 18343) +++ csw/mgar/pkg/gdal/trunk/Makefile 2012-06-12 00:25:09 UTC (rev 18344) @@ -57,6 +57,7 @@ RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibmysqlclient15 RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibpq5 RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibgif4 PKGFILES_CSWlibgdal1 += $(call baseisadirs,$(libdir),libgdal\.so\.1\.15\.0) PKGFILES_CSWlibgdal1 += $(call baseisadirs,$(libdir),libgdal\.so\.1(\.\d+)*) 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 12 03:09:34 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 12 Jun 2012 01:09:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[18345] csw/mgar/pkg/bacula/trunk/Makefile Message-ID: Revision: 18345 http://gar.svn.sourceforge.net/gar/?rev=18345&view=rev Author: bdwalton Date: 2012-06-12 01:09:34 +0000 (Tue, 12 Jun 2012) Log Message: ----------- bacula/trunk: update mysql dependency Modified Paths: -------------- csw/mgar/pkg/bacula/trunk/Makefile Modified: csw/mgar/pkg/bacula/trunk/Makefile =================================================================== --- csw/mgar/pkg/bacula/trunk/Makefile 2012-06-12 00:25:09 UTC (rev 18344) +++ csw/mgar/pkg/bacula/trunk/Makefile 2012-06-12 01:09:34 UTC (rev 18345) @@ -114,7 +114,7 @@ SPKG_DESC_CSWbacula-common = $(DESCRIPTION) - shared files RUNTIME_DEP_PKGS_CSWbacula-common += CSWlibstdc++6 RUNTIME_DEP_PKGS_CSWbacula-common += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWbacula-common += CSWlibmysqlclient-r15 +RUNTIME_DEP_PKGS_CSWbacula-common += CSWlibmysqlclient18 RUNTIME_DEP_PKGS_CSWbacula-common += CSWlibintl8 RUNTIME_DEP_PKGS_CSWbacula-common += CSWlibwrap1 RUNTIME_DEP_PKGS_CSWbacula-common += CSWlibssl1-0-0 @@ -154,7 +154,7 @@ RUNTIME_DEP_PKGS_CSWbacula-sd = CSWbacula-common RUNTIME_DEP_PKGS_CSWbacula-sd += CSWlibstdc++6 RUNTIME_DEP_PKGS_CSWbacula-sd += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWbacula-sd += CSWlibmysqlclient-r15 +RUNTIME_DEP_PKGS_CSWbacula-sd += CSWlibmysqlclient18 RUNTIME_DEP_PKGS_CSWbacula-sd += CSWlibwrap1 RUNTIME_DEP_PKGS_CSWbacula-sd += CSWlibintl8 RUNTIME_DEP_PKGS_CSWbacula-sd += CSWlibz1 @@ -184,7 +184,7 @@ RUNTIME_DEP_PKGS_CSWbacula-director = CSWbacula-common RUNTIME_DEP_PKGS_CSWbacula-director += CSWlibstdc++6 RUNTIME_DEP_PKGS_CSWbacula-director += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWbacula-director += CSWlibmysqlclient-r15 +RUNTIME_DEP_PKGS_CSWbacula-director += CSWlibmysqlclient18 RUNTIME_DEP_PKGS_CSWbacula-director += CSWlibwrap1 RUNTIME_DEP_PKGS_CSWbacula-director += CSWlibintl8 RUNTIME_DEP_PKGS_CSWbacula-director += CSWlibz1 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 12 03:12:44 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 12 Jun 2012 01:12:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[18346] csw/mgar/pkg/imap-c-client/trunk/Makefile Message-ID: Revision: 18346 http://gar.svn.sourceforge.net/gar/?rev=18346&view=rev Author: bdwalton Date: 2012-06-12 01:12:44 +0000 (Tue, 12 Jun 2012) Log Message: ----------- imap-c-client/trunk: initial package splits and obsoletions Modified Paths: -------------- csw/mgar/pkg/imap-c-client/trunk/Makefile Modified: csw/mgar/pkg/imap-c-client/trunk/Makefile =================================================================== --- csw/mgar/pkg/imap-c-client/trunk/Makefile 2012-06-12 01:09:34 UTC (rev 18345) +++ csw/mgar/pkg/imap-c-client/trunk/Makefile 2012-06-12 01:12:44 UTC (rev 18346) @@ -27,6 +27,19 @@ # Make more md5 functions static to reduce namespace pollution PATCHFILES += authmd5.diff +PACKAGES += CSWlibc-client2007f +SPKG_DESC_CSWlibc-client2007f += $(DESCRIPTION), libc-client.2007f.so +PKGFILES_CSWlibc-client2007f += $(call baseisadirs,$(libdir),libc-client\.2007f\.so) +PKGFILES_CSWlibc-client2007f += $(call baseisadirs,$(libdir),libc-client\.2007f\.so(\.\d+)*) +RUNTIME_DEP_PKGS_CSWlibc-client2007f += CSWlibssl1-0-0 +OBSOLETED_BY_CSWlibc-client2007f = CSWimaprt + +PACKAGES += CSWlibc-client2007f-dev +SPKG_DESC_CSWlibc-client2007f-dev = Development files for $(NAME) $(DISTVERSION) +PKGFILES_CSWlibc-client2007f-dev = $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWlibc-client2007f-dev += CSWlibc-client2007f +OBSOLETED_BY_CSWlibc-client2007f-dev = CSWimap-devel + CONFIGURE_SCRIPTS = BUILD_SCRIPTS = custom INSTALL_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 Tue Jun 12 03:30:28 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 12 Jun 2012 01:30:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[18347] csw/mgar/pkg/imap-c-client/trunk/Makefile Message-ID: Revision: 18347 http://gar.svn.sourceforge.net/gar/?rev=18347&view=rev Author: bdwalton Date: 2012-06-12 01:30:27 +0000 (Tue, 12 Jun 2012) Log Message: ----------- imap-c-client/trunk: handle poorly named .so file wrt pkgfiles splitting and dev package Modified Paths: -------------- csw/mgar/pkg/imap-c-client/trunk/Makefile Modified: csw/mgar/pkg/imap-c-client/trunk/Makefile =================================================================== --- csw/mgar/pkg/imap-c-client/trunk/Makefile 2012-06-12 01:12:44 UTC (rev 18346) +++ csw/mgar/pkg/imap-c-client/trunk/Makefile 2012-06-12 01:30:27 UTC (rev 18347) @@ -29,14 +29,13 @@ PACKAGES += CSWlibc-client2007f SPKG_DESC_CSWlibc-client2007f += $(DESCRIPTION), libc-client.2007f.so -PKGFILES_CSWlibc-client2007f += $(call baseisadirs,$(libdir),libc-client\.2007f\.so) -PKGFILES_CSWlibc-client2007f += $(call baseisadirs,$(libdir),libc-client\.2007f\.so(\.\d+)*) +PKGFILES_CSWlibc-client2007f += $(call pkgfiles_lib,libc-client.2007f.so) RUNTIME_DEP_PKGS_CSWlibc-client2007f += CSWlibssl1-0-0 OBSOLETED_BY_CSWlibc-client2007f = CSWimaprt PACKAGES += CSWlibc-client2007f-dev SPKG_DESC_CSWlibc-client2007f-dev = Development files for $(NAME) $(DISTVERSION) -PKGFILES_CSWlibc-client2007f-dev = $(PKGFILES_DEVEL) +PKGFILES_CSWlibc-client2007f-dev = $(PKGFILES_DEVEL_INCLUDEDIR) RUNTIME_DEP_PKGS_CSWlibc-client2007f-dev += CSWlibc-client2007f OBSOLETED_BY_CSWlibc-client2007f-dev = CSWimap-devel This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Tue Jun 12 03:41:51 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 12 Jun 2012 01:41:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[18348] csw/mgar/pkg/imap-c-client/trunk/Makefile Message-ID: Revision: 18348 http://gar.svn.sourceforge.net/gar/?rev=18348&view=rev Author: bdwalton Date: 2012-06-12 01:41:51 +0000 (Tue, 12 Jun 2012) Log Message: ----------- imap-c-client/trunk: set proper license file Modified Paths: -------------- csw/mgar/pkg/imap-c-client/trunk/Makefile Modified: csw/mgar/pkg/imap-c-client/trunk/Makefile =================================================================== --- csw/mgar/pkg/imap-c-client/trunk/Makefile 2012-06-12 01:30:27 UTC (rev 18347) +++ csw/mgar/pkg/imap-c-client/trunk/Makefile 2012-06-12 01:41:51 UTC (rev 18348) @@ -18,6 +18,8 @@ MASTER_SITES = ftp://ftp.cac.washington.edu/imap/ DISTFILES = $(DISTNAME).tar.Z +LICENSE = LICENSE.txt + PATCHDIR = $(WORKDIR) PATCHDIRLEVEL = 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 Tue Jun 12 03:49:07 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 12 Jun 2012 01:49:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[18349] csw/mgar/pkg/imap-c-client/trunk/Makefile Message-ID: Revision: 18349 http://gar.svn.sourceforge.net/gar/?rev=18349&view=rev Author: bdwalton Date: 2012-06-12 01:49:06 +0000 (Tue, 12 Jun 2012) Log Message: ----------- imap-c-client/trunk: override surplus dep of dev on lib which is caused by poor .so file naming Modified Paths: -------------- csw/mgar/pkg/imap-c-client/trunk/Makefile Modified: csw/mgar/pkg/imap-c-client/trunk/Makefile =================================================================== --- csw/mgar/pkg/imap-c-client/trunk/Makefile 2012-06-12 01:41:51 UTC (rev 18348) +++ csw/mgar/pkg/imap-c-client/trunk/Makefile 2012-06-12 01:49:06 UTC (rev 18349) @@ -40,6 +40,7 @@ PKGFILES_CSWlibc-client2007f-dev = $(PKGFILES_DEVEL_INCLUDEDIR) RUNTIME_DEP_PKGS_CSWlibc-client2007f-dev += CSWlibc-client2007f OBSOLETED_BY_CSWlibc-client2007f-dev = CSWimap-devel +CHECKPKG_OVERRIDES_CSWlibc-client2007f-dev += surplus-dependency|CSWlibc-client2007f CONFIGURE_SCRIPTS = BUILD_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 Tue Jun 12 03:53:44 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 12 Jun 2012 01:53:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[18350] csw/mgar/pkg/imap-c-client/trunk/Makefile Message-ID: Revision: 18350 http://gar.svn.sourceforge.net/gar/?rev=18350&view=rev Author: bdwalton Date: 2012-06-12 01:53:44 +0000 (Tue, 12 Jun 2012) Log Message: ----------- imap-c-client/trunk: add a few overrides for the library package; bad soname and an incosequential /usr/share reference Modified Paths: -------------- csw/mgar/pkg/imap-c-client/trunk/Makefile Modified: csw/mgar/pkg/imap-c-client/trunk/Makefile =================================================================== --- csw/mgar/pkg/imap-c-client/trunk/Makefile 2012-06-12 01:49:06 UTC (rev 18349) +++ csw/mgar/pkg/imap-c-client/trunk/Makefile 2012-06-12 01:53:44 UTC (rev 18350) @@ -34,6 +34,8 @@ PKGFILES_CSWlibc-client2007f += $(call pkgfiles_lib,libc-client.2007f.so) RUNTIME_DEP_PKGS_CSWlibc-client2007f += CSWlibssl1-0-0 OBSOLETED_BY_CSWlibc-client2007f = CSWimaprt +CHECKPKG_OVERRIDES_CSWlibc-client2007f += file-with-bad-content|/usr/share|root/opt/csw/lib/libc-client.2007f.so +CHECKPKG_OVERRIDES_CSWlibc-client2007f += soname-equals-filename|file=/opt/csw/lib/libc-client.2007f.so PACKAGES += CSWlibc-client2007f-dev SPKG_DESC_CSWlibc-client2007f-dev = Development files for $(NAME) $(DISTVERSION) 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 12 04:17:08 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 12 Jun 2012 02:17:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[18351] csw/mgar/pkg/imap-c-client/trunk Message-ID: Revision: 18351 http://gar.svn.sourceforge.net/gar/?rev=18351&view=rev Author: bdwalton Date: 2012-06-12 02:17:08 +0000 (Tue, 12 Jun 2012) Log Message: ----------- imap-c-client/trunk: import legacy libs and split out a package for them in case sites built against the old version; move rt obsoletion from 2007 to 2004 lib version Modified Paths: -------------- csw/mgar/pkg/imap-c-client/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/imap-c-client/trunk/files/libc-client.2004g.so.i386 csw/mgar/pkg/imap-c-client/trunk/files/libc-client.2004g.so.sparc Modified: csw/mgar/pkg/imap-c-client/trunk/Makefile =================================================================== --- csw/mgar/pkg/imap-c-client/trunk/Makefile 2012-06-12 01:53:44 UTC (rev 18350) +++ csw/mgar/pkg/imap-c-client/trunk/Makefile 2012-06-12 02:17:08 UTC (rev 18351) @@ -29,11 +29,20 @@ # Make more md5 functions static to reduce namespace pollution PATCHFILES += authmd5.diff +PACKAGES += CSWlibc-client2004g +SPKG_DESC_CSWlibc-client2004g += $(DESCRIPTION), libc-client.2004g.so +PKGFILES_CSWlibc-client2004g += $(call pkgfiles_lib,libc-client.2004g.so) +RUNTIME_DEP_PKGS_CSWlibc-client2004g += CSWlibssl0-9-8 +OBSOLETED_BY_CSWlibc-client2004g = CSWimaprt +CHECKPKG_OVERRIDES_CSWlibc-client2004g += file-with-bad-content|/usr/share|root/opt/csw/lib/libc-client.2004g.so +CHECKPKG_OVERRIDES_CSWlibc-client2004g += file-with-bad-content|/export/home|root/opt/csw/lib/libc-client.2004g.so +CHECKPKG_OVERRIDES_CSWlibc-client2004g += file-with-bad-content|/export/medusa|root/opt/csw/lib/libc-client.2004g.so +CHECKPKG_OVERRIDES_CSWlibc-client2004g += soname-equals-filename|file=/opt/csw/lib/libc-client.2004g.so + PACKAGES += CSWlibc-client2007f SPKG_DESC_CSWlibc-client2007f += $(DESCRIPTION), libc-client.2007f.so PKGFILES_CSWlibc-client2007f += $(call pkgfiles_lib,libc-client.2007f.so) RUNTIME_DEP_PKGS_CSWlibc-client2007f += CSWlibssl1-0-0 -OBSOLETED_BY_CSWlibc-client2007f = CSWimaprt CHECKPKG_OVERRIDES_CSWlibc-client2007f += file-with-bad-content|/usr/share|root/opt/csw/lib/libc-client.2007f.so CHECKPKG_OVERRIDES_CSWlibc-client2007f += soname-equals-filename|file=/opt/csw/lib/libc-client.2007f.so @@ -69,3 +78,5 @@ $(WORKSRC)/src/osdep/tops-20/shortsym.h $(DESTDIR)$(includedir)/imap @$(MAKECOOKIE) +post-merge: + ginstall -m755 $(FILEDIR)/libc-client.2004g.so.$(GARCH) $(PKGROOT)$(libdir)/libc-client.2004g.so Added: csw/mgar/pkg/imap-c-client/trunk/files/libc-client.2004g.so.i386 =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/imap-c-client/trunk/files/libc-client.2004g.so.i386 ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/x-sharedlib Added: csw/mgar/pkg/imap-c-client/trunk/files/libc-client.2004g.so.sparc =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/imap-c-client/trunk/files/libc-client.2004g.so.sparc ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/x-sharedlib 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 12 04:26:57 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 12 Jun 2012 02:26:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[18352] csw/mgar/pkg/imap-c-client/trunk/Makefile Message-ID: Revision: 18352 http://gar.svn.sourceforge.net/gar/?rev=18352&view=rev Author: bdwalton Date: 2012-06-12 02:26:57 +0000 (Tue, 12 Jun 2012) Log Message: ----------- imap-c-client/trunk: make the dev package version agnostic and add an unversioned .so symlink to it Modified Paths: -------------- csw/mgar/pkg/imap-c-client/trunk/Makefile Modified: csw/mgar/pkg/imap-c-client/trunk/Makefile =================================================================== --- csw/mgar/pkg/imap-c-client/trunk/Makefile 2012-06-12 02:17:08 UTC (rev 18351) +++ csw/mgar/pkg/imap-c-client/trunk/Makefile 2012-06-12 02:26:57 UTC (rev 18352) @@ -46,12 +46,13 @@ CHECKPKG_OVERRIDES_CSWlibc-client2007f += file-with-bad-content|/usr/share|root/opt/csw/lib/libc-client.2007f.so CHECKPKG_OVERRIDES_CSWlibc-client2007f += soname-equals-filename|file=/opt/csw/lib/libc-client.2007f.so -PACKAGES += CSWlibc-client2007f-dev -SPKG_DESC_CSWlibc-client2007f-dev = Development files for $(NAME) $(DISTVERSION) -PKGFILES_CSWlibc-client2007f-dev = $(PKGFILES_DEVEL_INCLUDEDIR) -RUNTIME_DEP_PKGS_CSWlibc-client2007f-dev += CSWlibc-client2007f -OBSOLETED_BY_CSWlibc-client2007f-dev = CSWimap-devel -CHECKPKG_OVERRIDES_CSWlibc-client2007f-dev += surplus-dependency|CSWlibc-client2007f +PACKAGES += CSWlibc-client-dev +SPKG_DESC_CSWlibc-client-dev = Development files for $(NAME) $(DISTVERSION) +PKGFILES_CSWlibc-client-dev = $(PKGFILES_DEVEL_INCLUDEDIR) +PKGFILES_CSWlibc-client-dev = $(libdir)/libc-client.so +RUNTIME_DEP_PKGS_CSWlibc-client-dev += CSWlibc-client2007f +OBSOLETED_BY_CSWlibc-client-dev = CSWimap-devel +CHECKPKG_OVERRIDES_CSWlibc-client-dev += surplus-dependency|CSWlibc-client2007f CONFIGURE_SCRIPTS = BUILD_SCRIPTS = custom @@ -76,6 +77,7 @@ ginstall -p -m644 $(WORKSRC)/c-client/linkage.c $(DESTDIR)$(includedir)/imap ginstall -p -m644 \ $(WORKSRC)/src/osdep/tops-20/shortsym.h $(DESTDIR)$(includedir)/imap + cd $(DESTDIR)$(libdir); ln -s libc-client.$(DISTVERSION).so libc-client.so @$(MAKECOOKIE) post-merge: 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 12 04:41:19 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 12 Jun 2012 02:41:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[18353] csw/mgar/pkg/imap-c-client/trunk/Makefile Message-ID: Revision: 18353 http://gar.svn.sourceforge.net/gar/?rev=18353&view=rev Author: bdwalton Date: 2012-06-12 02:41:19 +0000 (Tue, 12 Jun 2012) Log Message: ----------- imap-c-client/trunk: build for solaris 10 only Modified Paths: -------------- csw/mgar/pkg/imap-c-client/trunk/Makefile Modified: csw/mgar/pkg/imap-c-client/trunk/Makefile =================================================================== --- csw/mgar/pkg/imap-c-client/trunk/Makefile 2012-06-12 02:26:57 UTC (rev 18352) +++ csw/mgar/pkg/imap-c-client/trunk/Makefile 2012-06-12 02:41:19 UTC (rev 18353) @@ -6,6 +6,8 @@ GARTYPE = v2 CATEGORIES = lib +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + DESCRIPTION = UW IMAP C-Client define BLURB An API (application programming interface) used to build email clients and 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 12 05:00:37 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 12 Jun 2012 03:00:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[18354] csw/mgar/pkg/imap-c-client/trunk/Makefile Message-ID: Revision: 18354 http://gar.svn.sourceforge.net/gar/?rev=18354&view=rev Author: bdwalton Date: 2012-06-12 03:00:36 +0000 (Tue, 12 Jun 2012) Log Message: ----------- imap-c-client/trunk: streamline the versioning variables Modified Paths: -------------- csw/mgar/pkg/imap-c-client/trunk/Makefile Modified: csw/mgar/pkg/imap-c-client/trunk/Makefile =================================================================== --- csw/mgar/pkg/imap-c-client/trunk/Makefile 2012-06-12 02:41:19 UTC (rev 18353) +++ csw/mgar/pkg/imap-c-client/trunk/Makefile 2012-06-12 03:00:36 UTC (rev 18354) @@ -1,8 +1,5 @@ NAME = imap -VERSION = 2007 -DISTRELEASE = f -DISTVERSION = $(VERSION)$(DISTRELEASE) -DISTNAME = $(NAME)-$(VERSION)$(DISTRELEASE) +VERSION = 2007f GARTYPE = v2 CATEGORIES = lib @@ -49,7 +46,7 @@ CHECKPKG_OVERRIDES_CSWlibc-client2007f += soname-equals-filename|file=/opt/csw/lib/libc-client.2007f.so PACKAGES += CSWlibc-client-dev -SPKG_DESC_CSWlibc-client-dev = Development files for $(NAME) $(DISTVERSION) +SPKG_DESC_CSWlibc-client-dev = Development files for $(NAME) $(VERSION) PKGFILES_CSWlibc-client-dev = $(PKGFILES_DEVEL_INCLUDEDIR) PKGFILES_CSWlibc-client-dev = $(libdir)/libc-client.so RUNTIME_DEP_PKGS_CSWlibc-client-dev += CSWlibc-client2007f @@ -66,20 +63,20 @@ include gar/category.mk build-custom: - @( cd $(WORKSRC) ; $(BUILD_ENV) DISTVERSION=$(DISTVERSION) make soc ) + @( cd $(WORKSRC) ; $(BUILD_ENV) DISTVERSION=$(VERSION) make soc ) @$(MAKECOOKIE) install-custom: ginstall -d $(DESTDIR)$(libdir) ginstall -p -m644 $(WORKSRC)/c-client/c-client.a $(DESTDIR)$(libdir) ginstall -p -m755 \ - $(WORKSRC)/c-client/libc-client.$(DISTVERSION).so $(DESTDIR)$(libdir) + $(WORKSRC)/c-client/libc-client.$(VERSION).so $(DESTDIR)$(libdir) ginstall -d $(DESTDIR)$(includedir)/imap ginstall -p -m644 $(WORKSRC)/c-client/*.h $(DESTDIR)$(includedir)/imap ginstall -p -m644 $(WORKSRC)/c-client/linkage.c $(DESTDIR)$(includedir)/imap ginstall -p -m644 \ $(WORKSRC)/src/osdep/tops-20/shortsym.h $(DESTDIR)$(includedir)/imap - cd $(DESTDIR)$(libdir); ln -s libc-client.$(DISTVERSION).so libc-client.so + cd $(DESTDIR)$(libdir); ln -s libc-client.$(VERSION).so libc-client.so @$(MAKECOOKIE) post-merge: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Tue Jun 12 09:27:20 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Tue, 12 Jun 2012 07:27:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[18355] csw/mgar/pkg/389-ds-base/trunk/Makefile Message-ID: Revision: 18355 http://gar.svn.sourceforge.net/gar/?rev=18355&view=rev Author: cgrzemba Date: 2012-06-12 07:27:20 +0000 (Tue, 12 Jun 2012) Log Message: ----------- 389-ds-base/trunk: add BUILD_DEP_PKGS, mantis 0004957 Modified Paths: -------------- csw/mgar/pkg/389-ds-base/trunk/Makefile Modified: csw/mgar/pkg/389-ds-base/trunk/Makefile =================================================================== --- csw/mgar/pkg/389-ds-base/trunk/Makefile 2012-06-12 03:00:36 UTC (rev 18354) +++ csw/mgar/pkg/389-ds-base/trunk/Makefile 2012-06-12 07:27:20 UTC (rev 18355) @@ -32,6 +32,17 @@ PATCHFILES += 0007-fixup-Makefile.am.patch # PATCHFILES += 0007-fixup-plugin_syntax.c.patch +BUILD_DEP_PKGS += CSWbdb48devel +BUILD_DEP_PKGS += CSWnspr-dev +BUILD_DEP_PKGS += CSWlibnss-dev +BUILD_DEP_PKGS += CSWnetsnmp-dev +BUILD_DEP_PKGS += CSWmozldap-dev +BUILD_DEP_PKGS += CSWsasl-dev +BUILD_DEP_PKGS += CSWlibicu-dev +BUILD_DEP_PKGS += CSWlibsvrcore0-dev +BUILD_DEP_PKGS += CSWlibpcre-dev +BUILD_DEP_PKGS += CSWlibkrb5-dev + INITSMF = /etc/opt/csw/init.d/dirsrv RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibssldap60 RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibprldap60 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Tue Jun 12 09:43:41 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Tue, 12 Jun 2012 07:43:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[18356] csw/mgar/pkg/emacs_template/trunk/Makefile Message-ID: Revision: 18356 http://gar.svn.sourceforge.net/gar/?rev=18356&view=rev Author: pfelecan Date: 2012-06-12 07:43:40 +0000 (Tue, 12 Jun 2012) Log Message: ----------- kludge to install the README.CSW in the correct location (see DISTFILES) comment. Modified Paths: -------------- csw/mgar/pkg/emacs_template/trunk/Makefile Modified: csw/mgar/pkg/emacs_template/trunk/Makefile =================================================================== --- csw/mgar/pkg/emacs_template/trunk/Makefile 2012-06-12 07:27:20 UTC (rev 18355) +++ csw/mgar/pkg/emacs_template/trunk/Makefile 2012-06-12 07:43:40 UTC (rev 18356) @@ -13,7 +13,11 @@ DISTNAME = template MASTER_SITES = http://downloads.sourceforge.net/emacs-template/$(DISTNAME)/$(VERSION)/ DISTFILES = $(DISTNAME)-$(VERSION).tar.gz -DISTFILES += README.CSW +# if this is uncommented the file is found in the package and the +# obsolecency package in a sub directory of $(docdir)/emacs_template, +# which is incorrect and unconvenient; consequently, the file is +# installed in the install-custom target. +#DISTFILES += README.CSW VENDOR_URL = http://emacs-template.sourceforge.net/ BUILD_DEP_PKGS += CSWemacs @@ -61,6 +65,7 @@ ginstall --preserve-timestamps --mode=u=rwx,go=r $(WORKSRC)/lisp/template.elc $(DESTDIR)/$(lispdir) ginstall --directory --mode=u=rwx,go=rx $(DESTDIR)/$(docdir) ginstall --preserve-timestamps --mode=u=rwx,go=r $(WORKSRC)/lisp/ChangeLog $(DESTDIR)/$(docdir) + ginstall --preserve-timestamps --mode=u=rwx,go=r $(FILEDIR)/README.CSW $(DESTDIR)/$(docdir) ginstall --directory --mode=u=rwx,go=rx $(DESTDIR)/$(tpldir) ginstall --preserve-timestamps --mode=u=rwx,go=r $(WORKSRC)/templates/DEFAULT.tpl $(DESTDIR)/$(tpldir) ginstall --preserve-timestamps --mode=u=rwx,go=r $(WORKSRC)/templates/Makefile.tpl $(DESTDIR)/$(tpldir) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Tue Jun 12 09:58:32 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Tue, 12 Jun 2012 07:58:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[18357] csw/mgar/pkg/emacs_template/trunk Message-ID: Revision: 18357 http://gar.svn.sourceforge.net/gar/?rev=18357&view=rev Author: pfelecan Date: 2012-06-12 07:58:32 +0000 (Tue, 12 Jun 2012) Log Message: ----------- addition of the missing license (verified the sources for adequacy with GPL 3 which alright (explicit)). Modified Paths: -------------- csw/mgar/pkg/emacs_template/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/emacs_template/trunk/files/COPYING Modified: csw/mgar/pkg/emacs_template/trunk/Makefile =================================================================== --- csw/mgar/pkg/emacs_template/trunk/Makefile 2012-06-12 07:43:40 UTC (rev 18356) +++ csw/mgar/pkg/emacs_template/trunk/Makefile 2012-06-12 07:58:32 UTC (rev 18357) @@ -13,6 +13,7 @@ DISTNAME = template MASTER_SITES = http://downloads.sourceforge.net/emacs-template/$(DISTNAME)/$(VERSION)/ DISTFILES = $(DISTNAME)-$(VERSION).tar.gz +DISTFILES += COPYING # if this is uncommented the file is found in the package and the # obsolecency package in a sub directory of $(docdir)/emacs_template, # which is incorrect and unconvenient; consequently, the file is Added: csw/mgar/pkg/emacs_template/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/emacs_template/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/emacs_template/trunk/files/COPYING 2012-06-12 07:58:32 UTC (rev 18357) @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Tue Jun 12 10:56:42 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Tue, 12 Jun 2012 08:56:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[18358] csw/mgar/pkg/librecad/trunk Message-ID: Revision: 18358 http://gar.svn.sourceforge.net/gar/?rev=18358&view=rev Author: cgrzemba Date: 2012-06-12 08:56:42 +0000 (Tue, 12 Jun 2012) Log Message: ----------- librecad/trunk: add install scripts Modified Paths: -------------- csw/mgar/pkg/librecad/trunk/Makefile csw/mgar/pkg/librecad/trunk/files/0000-adjust-for-csw-environment.patch Modified: csw/mgar/pkg/librecad/trunk/Makefile =================================================================== --- csw/mgar/pkg/librecad/trunk/Makefile 2012-06-12 07:58:32 UTC (rev 18357) +++ csw/mgar/pkg/librecad/trunk/Makefile 2012-06-12 08:56:42 UTC (rev 18358) @@ -38,12 +38,34 @@ BUILD_DEP_PKGS += CSWboost-gcc-dev BUILD_DEP_PKGS += CSWlibfreetype-dev +PACKAGES += CSWlibreCAD +CATALOGNAME_CSWlibreCAD = libreCAD +PKGFILES_CSWlibreCAD += $(call baseisadirs,$(bindir),.*) +PKGFILES_CSWlibreCAD += $(prefix)/resources/* +RUNTIME_DEP_PKGS_CSWlibreCAD += CSWlibqthelp4-gxx +RUNTIME_DEP_PKGS_CSWlibreCAD += CSWlibqtcore4-gxx +RUNTIME_DEP_PKGS_CSWlibreCAD += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWlibreCAD += CSWlibqtgui4-gxx +RUNTIME_DEP_PKGS_CSWlibreCAD += CSWlibqtsvg4-gxx +RUNTIME_DEP_PKGS_CSWlibreCAD += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibreCAD += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWlibreCAD += CSWlibmuparser2-gxx +RUNTIME_DEP_PKGS_CSWlibreCAD += CSWlibqtsql4-gxx + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_SCRIPTS = custom +INSTALL_SCRIPTS = custom configure-custom: cd $(WORKSRC) && $(bindir)/qmake $(call tolower,$(NAME)).pro +install-custom: + ginstall -d 755 $(DESTDIR)$(bindir) + ginstall -m 755 $(WORKSRC)/unix/librecad $(DESTDIR)$(bindir) + ginstall -m 755 $(WORKSRC)/unix/ttf2lff $(DESTDIR)$(bindir) + ginstall -d 755 $(DESTDIR)$(datadir)/resources + gcp -rfp $(WORKSRC)/unix/resources $(DESTDIR)$(datadir) include gar/category.mk +PATH := /opt/csw/gnu:$(PATH) Modified: csw/mgar/pkg/librecad/trunk/files/0000-adjust-for-csw-environment.patch =================================================================== --- csw/mgar/pkg/librecad/trunk/files/0000-adjust-for-csw-environment.patch 2012-06-12 07:58:32 UTC (rev 18357) +++ csw/mgar/pkg/librecad/trunk/files/0000-adjust-for-csw-environment.patch 2012-06-12 08:56:42 UTC (rev 18358) @@ -21,19 +21,18 @@ DEFINES += QC_SCMREVISION=\"$$SCMREVISION\" macx { diff --git a/settings.pro b/settings.pro -index b120052..67346d3 100644 +index b120052..b5354ea 100644 --- a/settings.pro +++ b/settings.pro -@@ -4,7 +4,9 @@ win32 { - unix { +@@ -5,6 +5,6 @@ unix { macx { include(settings_macx.pro) -+ } solaris { -+ include(settings_csw.pro) } else { - include(settings_linux.pro) +- include(settings_linux.pro) ++ include(settings_csw.pro) } } + -- 1.7.10.2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Tue Jun 12 11:09:13 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Tue, 12 Jun 2012 09:09:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[18359] csw/mgar/pkg/librecad/trunk/Makefile Message-ID: Revision: 18359 http://gar.svn.sourceforge.net/gar/?rev=18359&view=rev Author: cgrzemba Date: 2012-06-12 09:09:13 +0000 (Tue, 12 Jun 2012) Log Message: ----------- librecad/trunk: correct install target Modified Paths: -------------- csw/mgar/pkg/librecad/trunk/Makefile Modified: csw/mgar/pkg/librecad/trunk/Makefile =================================================================== --- csw/mgar/pkg/librecad/trunk/Makefile 2012-06-12 08:56:42 UTC (rev 18358) +++ csw/mgar/pkg/librecad/trunk/Makefile 2012-06-12 09:09:13 UTC (rev 18359) @@ -59,13 +59,16 @@ configure-custom: cd $(WORKSRC) && $(bindir)/qmake $(call tolower,$(NAME)).pro + @$(MAKECOOKIE) install-custom: - ginstall -d 755 $(DESTDIR)$(bindir) + ginstall -d $(DESTDIR)$(bindir) ginstall -m 755 $(WORKSRC)/unix/librecad $(DESTDIR)$(bindir) ginstall -m 755 $(WORKSRC)/unix/ttf2lff $(DESTDIR)$(bindir) - ginstall -d 755 $(DESTDIR)$(datadir)/resources + ginstall -d $(DESTDIR)$(datadir)/resources gcp -rfp $(WORKSRC)/unix/resources $(DESTDIR)$(datadir) + @$(MAKECOOKIE) + 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 cgrzemba at users.sourceforge.net Tue Jun 12 12:06:55 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Tue, 12 Jun 2012 10:06:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[18360] csw/mgar/pkg/librecad/trunk Message-ID: Revision: 18360 http://gar.svn.sourceforge.net/gar/?rev=18360&view=rev Author: cgrzemba Date: 2012-06-12 10:06:55 +0000 (Tue, 12 Jun 2012) Log Message: ----------- librecad/trunk: add resource path patch Modified Paths: -------------- csw/mgar/pkg/librecad/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/librecad/trunk/files/0001-adjust-rs_system-forcsw.patch Modified: csw/mgar/pkg/librecad/trunk/Makefile =================================================================== --- csw/mgar/pkg/librecad/trunk/Makefile 2012-06-12 09:09:13 UTC (rev 18359) +++ csw/mgar/pkg/librecad/trunk/Makefile 2012-06-12 10:06:55 UTC (rev 18360) @@ -32,6 +32,7 @@ PATCHFILES += 0000-adjust-for-csw-environment.patch PATCHFILES += 0000-add-csw-settings.patch +PATCHFILES += 0001-adjust-rs_system-forcsw.patch BUILD_DEP_PKGS += CSWqt4-gxx-dev BUILD_DEP_PKGS += CSWmuparser-dev @@ -66,7 +67,7 @@ ginstall -m 755 $(WORKSRC)/unix/librecad $(DESTDIR)$(bindir) ginstall -m 755 $(WORKSRC)/unix/ttf2lff $(DESTDIR)$(bindir) ginstall -d $(DESTDIR)$(datadir)/resources - gcp -rfp $(WORKSRC)/unix/resources $(DESTDIR)$(datadir) + gcp -rfp $(WORKSRC)/unix/resources $(DESTDIR)$(datadir)/librecad @$(MAKECOOKIE) include gar/category.mk Added: csw/mgar/pkg/librecad/trunk/files/0001-adjust-rs_system-forcsw.patch =================================================================== --- csw/mgar/pkg/librecad/trunk/files/0001-adjust-rs_system-forcsw.patch (rev 0) +++ csw/mgar/pkg/librecad/trunk/files/0001-adjust-rs_system-forcsw.patch 2012-06-12 10:06:55 UTC (rev 18360) @@ -0,0 +1,18 @@ +--- a/librecad/src/lib/engine/rs_system.cpp ++++ b/librecad/src/lib/engine/rs_system.cpp +@@ -544,6 +544,7 @@ QStringList RS_System::getDirectoryList(const QString& _subDirectory) { + + // Others, RVT April 25, 2011 removed, doesn anybody use that still? + // dirList.append("/usr/X11R6/share/" + appDirName + "/" + subDirectory); ++ dirList.append("/opt/csw/share/" + appDirName + "/" + subDirectory); + + + #ifdef Q_OS_MAC +@@ -557,6 +558,7 @@ QStringList RS_System::getDirectoryList(const QString& _subDirectory) { + // Add support directory if librecad is run-in-place, + // not for Apple because it uses resources this is more for unix systems + dirList.append(appDir + "/resources/" + subDirectory); ++ dirList.append("/opt/csw/share/"+ appDirName + "/resources/" + subDirectory); + #endif + + // Individual directories: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Tue Jun 12 13:14:14 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Tue, 12 Jun 2012 11:14:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[18361] csw/mgar/pkg/389-ds-base/trunk/Makefile Message-ID: Revision: 18361 http://gar.svn.sourceforge.net/gar/?rev=18361&view=rev Author: cgrzemba Date: 2012-06-12 11:14:14 +0000 (Tue, 12 Jun 2012) Log Message: ----------- 389-ds-base/trunk: add build dependency Modified Paths: -------------- csw/mgar/pkg/389-ds-base/trunk/Makefile Modified: csw/mgar/pkg/389-ds-base/trunk/Makefile =================================================================== --- csw/mgar/pkg/389-ds-base/trunk/Makefile 2012-06-12 10:06:55 UTC (rev 18360) +++ csw/mgar/pkg/389-ds-base/trunk/Makefile 2012-06-12 11:14:14 UTC (rev 18361) @@ -37,6 +37,7 @@ BUILD_DEP_PKGS += CSWlibnss-dev BUILD_DEP_PKGS += CSWnetsnmp-dev BUILD_DEP_PKGS += CSWmozldap-dev +BUILD_DEP_PKGS += CSWmozldap-tools BUILD_DEP_PKGS += CSWsasl-dev BUILD_DEP_PKGS += CSWlibicu-dev BUILD_DEP_PKGS += CSWlibsvrcore0-dev This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Tue Jun 12 13:28:18 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Tue, 12 Jun 2012 11:28:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[18362] csw/mgar/pkg/389-ds-base/trunk/Makefile Message-ID: Revision: 18362 http://gar.svn.sourceforge.net/gar/?rev=18362&view=rev Author: cgrzemba Date: 2012-06-12 11:28:18 +0000 (Tue, 12 Jun 2012) Log Message: ----------- 389-ds-base/trunk: add build dependencies Modified Paths: -------------- csw/mgar/pkg/389-ds-base/trunk/Makefile Modified: csw/mgar/pkg/389-ds-base/trunk/Makefile =================================================================== --- csw/mgar/pkg/389-ds-base/trunk/Makefile 2012-06-12 11:14:14 UTC (rev 18361) +++ csw/mgar/pkg/389-ds-base/trunk/Makefile 2012-06-12 11:28:18 UTC (rev 18362) @@ -32,6 +32,8 @@ PATCHFILES += 0007-fixup-Makefile.am.patch # PATCHFILES += 0007-fixup-plugin_syntax.c.patch +BUILD_DEP_PKGS += CSWautoconf +BUILD_DEP_PKGS += CSWautomake BUILD_DEP_PKGS += CSWbdb48devel BUILD_DEP_PKGS += CSWnspr-dev BUILD_DEP_PKGS += CSWlibnss-dev This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Tue Jun 12 14:09:38 2012 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Tue, 12 Jun 2012 12:09:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[18363] csw/mgar/pkg/amavisd-new/trunk Message-ID: Revision: 18363 http://gar.svn.sourceforge.net/gar/?rev=18363&view=rev Author: idogan23 Date: 2012-06-12 12:09:38 +0000 (Tue, 12 Jun 2012) Log Message: ----------- amavisd-new: bump version to 2.7.1, major cleanup Modified Paths: -------------- csw/mgar/pkg/amavisd-new/trunk/Makefile csw/mgar/pkg/amavisd-new/trunk/checksums Added Paths: ----------- csw/mgar/pkg/amavisd-new/trunk/files/0001-amavisd-agent.patch csw/mgar/pkg/amavisd-new/trunk/files/0001-amavisd-nanny.patch csw/mgar/pkg/amavisd-new/trunk/files/0001-amavisd-release.patch csw/mgar/pkg/amavisd-new/trunk/files/0001-amavisd-signer.patch csw/mgar/pkg/amavisd-new/trunk/files/0001-amavisd-snmp-subagent.patch csw/mgar/pkg/amavisd-new/trunk/files/0001-amavisd-submit.patch csw/mgar/pkg/amavisd-new/trunk/files/0001-amavisd.conf.patch csw/mgar/pkg/amavisd-new/trunk/files/0001-amavisd.patch Removed Paths: ------------- csw/mgar/pkg/amavisd-new/trunk/files/CSWamavisdnew.postinstall csw/mgar/pkg/amavisd-new/trunk/files/CSWamavisdnew.preinstall csw/mgar/pkg/amavisd-new/trunk/files/CSWpackage.gspec csw/mgar/pkg/amavisd-new/trunk/files/amavisd-agent.diff csw/mgar/pkg/amavisd-new/trunk/files/amavisd-nanny.diff csw/mgar/pkg/amavisd-new/trunk/files/amavisd-release.diff csw/mgar/pkg/amavisd-new/trunk/files/amavisd.conf.diff csw/mgar/pkg/amavisd-new/trunk/files/amavisd.diff Modified: csw/mgar/pkg/amavisd-new/trunk/Makefile =================================================================== --- csw/mgar/pkg/amavisd-new/trunk/Makefile 2012-06-12 11:28:18 UTC (rev 18362) +++ csw/mgar/pkg/amavisd-new/trunk/Makefile 2012-06-12 12:09:38 UTC (rev 18363) @@ -1,5 +1,5 @@ NAME = amavisd-new -VERSION = 2.6.4 +VERSION = 2.7.1 CATEGORIES = server GARTYPE = v2 @@ -16,8 +16,6 @@ MASTER_SITES = http://www.ijs.si/software/amavisd/#download DISTFILES = $(NAME)-$(VERSION).tar.gz DISTFILES += CSWamavisdnew.cswusergroup -DISTFILES += CSWamavisdnew.postinstall -DISTFILES += CSWamavisdnew.preinstall # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz @@ -36,6 +34,17 @@ RUNTIME_DEP_PKGS += CSWpmconvertuulib RUNTIME_DEP_PKGS += CSWpmmaildkim RUNTIME_DEP_PKGS += CSWpmunixsyslog +RUNTIME_DEP_PKGS += CSWpmnetsnmp +RUNTIME_DEP_PKGS += CSWunrar +RUNTIME_DEP_PKGS += CSWtnef +RUNTIME_DEP_PKGS += CSWcabex +RUNTIME_DEP_PKGS += CSWunarj +RUNTIME_DEP_PKGS += CSWp7zip +RUNTIME_DEP_PKGS += CSWzip +RUNTIME_DEP_PKGS += CSWlzop +RUNTIME_DEP_PKGS += CSWxz +RUNTIME_DEP_PKGS += CSWgzip +RUNTIME_DEP_PKGS += CSWbzip2 CHECKPKG_OVERRIDES_CSWamavisdnew += surplus-dependency|CSWpmmaildkim CHECKPKG_OVERRIDES_CSWamavisdnew += surplus-dependency|CSWpmnetserver @@ -50,20 +59,57 @@ CHECKPKG_OVERRIDES_CSWamavisdnew += surplus-dependency|CSWspamassassin CHECKPKG_OVERRIDES_CSWamavisdnew += surplus-dependency|CSWpmmimetools CHECKPKG_OVERRIDES_CSWamavisdnew += surplus-dependency|CSWpmunixsyslog +CHECKPKG_OVERRIDES_CSWamavisdnew += surplus-dependency|CSWp7zip +CHECKPKG_OVERRIDES_CSWamavisdnew += surplus-dependency|CSWunarj +CHECKPKG_OVERRIDES_CSWamavisdnew += surplus-dependency|CSWgzip +CHECKPKG_OVERRIDES_CSWamavisdnew += surplus-dependency|CSWxz +CHECKPKG_OVERRIDES_CSWamavisdnew += surplus-dependency|CSWcabex +CHECKPKG_OVERRIDES_CSWamavisdnew += surplus-dependency|CSWlzop +CHECKPKG_OVERRIDES_CSWamavisdnew += surplus-dependency|CSWtnef +CHECKPKG_OVERRIDES_CSWamavisdnew += surplus-dependency|CSWbzip2 +CHECKPKG_OVERRIDES_CSWamavisdnew += surplus-dependency|CSWzip +CHECKPKG_OVERRIDES_CSWamavisdnew += surplus-dependency|CSWunrar +CHECKPKG_OVERRIDES_CSWamavisdnew += surplus-dependency|CSWpmnetsnmp -PATCHFILES += amavisd-agent.diff -PATCHFILES += amavisd-nanny.diff -PATCHFILES += amavisd-release.diff -PATCHFILES += amavisd.conf.diff -PATCHFILES += amavisd.diff +PATCHFILES += 0001-amavisd-agent.patch +PATCHFILES += 0001-amavisd-nanny.patch +PATCHFILES += 0001-amavisd-release.patch +PATCHFILES += 0001-amavisd.conf.patch +PATCHFILES += 0001-amavisd.patch PATCHFILES += p0f-analyzer.pl.diff +PATCHFILES += 0001-amavisd-signer.patch +PATCHFILES += 0001-amavisd-snmp-subagent.patch +PATCHFILES += 0001-amavisd-submit.patch -SPKG_CLASSES = none cswinitsmf -PROTOTYPE_FILTER = awk ' \ - $$$$3 ~ /\/init.d\/cswamavisdnew$$$$/ { $$$$2 = "cswinitsmf" } \ - $$$$3 ~ /\/csw\/amavisd-new.conf$$$$/ { $$$$2 = "cswcpsampleconf" } \ - { print }' +CHECKPKG_OVERRIDES_CSWamavisdnew += file-with-bad-content|/usr/local|root/opt/csw/sbin/amavisd-new +CHECKPKG_OVERRIDES_CSWamavisdnew += file-with-bad-content|/usr/local|root/opt/csw/share/doc/amavisd-new/RELEASE_NOTES +CHECKPKG_OVERRIDES_CSWamavisdnew += file-with-bad-content|/usr/local|root/opt/csw/share/doc/amavisd-new/README_FILES/README.milter +CHECKPKG_OVERRIDES_CSWamavisdnew += file-with-bad-content|/usr/local|root/opt/csw/share/doc/amavisd-new/README_FILES/README.sendmail +CHECKPKG_OVERRIDES_CSWamavisdnew += file-with-bad-content|/usr/local|root/opt/csw/share/doc/amavisd-new/README_FILES/README.old.scanners +CHECKPKG_OVERRIDES_CSWamavisdnew += file-with-bad-content|/usr/local|root/opt/csw/share/doc/amavisd-new/README_FILES/README.chroot +CHECKPKG_OVERRIDES_CSWamavisdnew += file-with-bad-content|/usr/share|root/opt/csw/share/doc/amavisd-new/README_FILES/README.sendmail-dual +CHECKPKG_OVERRIDES_CSWamavisdnew += file-with-bad-content|/usr/share|root/opt/csw/share/doc/amavisd-new/README_FILES/README.sendmail +CHECKPKG_OVERRIDES_CSWamavisdnew += file-with-bad-content|/usr/share|root/opt/csw/share/doc/amavisd-new/README_FILES/README.chroot +CHECKPKG_OVERRIDES_CSWamavisdnew += file-with-bad-content|/usr/share|root/opt/csw/share/doc/amavisd-new/README_FILES/README.sendmail-dual.old +CHECKPKG_OVERRIDES_CSWamavisdnew += file-with-bad-content|/usr/local|root/opt/csw/bin/amavisd-snmp-subagent +CHECKPKG_OVERRIDES_CSWamavisdnew += catalogname-does-not-match-pkgname|pkgname=CSWamavisdnew|catalogname=amavisd_new|expected-catalogname=amavisdnew + +INITSMF = /etc/opt/csw/init.d/cswamavisdnew +USERGROUP = /etc/opt/csw/pkg/CSWamavisdnew/cswusergroup +SAMPLECONF = /etc/opt/csw/amavisn/amavisd-new.conf + +PROTOTYPE_MODIFIERS = amavis_ugfiles +AMAVIS_UGFILES = /var/opt/csw/amavisn /var/opt/csw/amavisn/tmp /var/opt/csw/amavisn/var /var/opt/csw/amavisn/db /var/var/opt/csw/amavisn/virusmails +PROTOTYPE_FILES_amavis_ugfiles = $(AMAVIS_UGFILES) +PROTOTYPE_USER_amavis_ugfiles = amavisn +PROTOTYPE_GROUP_amavis_ugfiles = amavisn +PROTOTYPE_CLASS_amavis_ugfiles = ugfiles + +PROTOTYPE_MODIFIERS += amavis_chmod +PROTOTYPE_FILES_chmod = $(AMAVIS_UGFILES) +PROTOTYPE_PERMS_chmod = 0750 + CONFIGURE_SCRIPTS = BUILD_SCRIPTS = TEST_SCRIPTS = @@ -73,8 +119,8 @@ PVARDIR = $(DESTDIR)/var/opt/csw/$(NAME) AMAVISBIN = amavisd-agent amavisd-nanny amavisd-release p0f-analyzer.pl -AMAVISBIN += amavisd-nanny -AMAVISBIN += amavisd-release +AMAVISBIN += amavisd-nanny amavisd-signer amavisd-snmp-subagent +AMAVISBIN += amavisd-release amavisd-submit AMAVISBIN += p0f-analyzer.pl AMAVISSBIN = amavisd-new @@ -84,18 +130,17 @@ AMAVISDOC += RELEASE_NOTES AMAVISDOC += AAAREADME.first AMAVISDOC += amavisd.conf-default -AMAVISDOC += amavisd.conf-sample +AMAVISDOC += test-messages install-custom: echo " ==> Installing $(NAME)" - ginstall -d $(DESTDIR)$(prefix)/etc + ginstall -d $(DESTDIR)/etc/opt/csw/amavisn ginstall -d $(DESTDIR)$(prefix)/bin ginstall -d $(DESTDIR)$(prefix)/sbin ginstall -d $(DESTDIR)$(prefix)/share/doc/amavisd-new cd $(WORKSRC); \ mv amavisd amavisd-new; \ - mv amavisd.conf amavisd-new.conf.CSW; \ - cp amavisd-new.conf.CSW $(DESTDIR)$(prefix)/etc; \ + cp amavisd-new.conf $(DESTDIR)/etc/opt/csw/amavisn; \ cp $(AMAVISBIN) $(DESTDIR)$(prefix)/bin; \ cp $(AMAVISSBIN) $(DESTDIR)$(prefix)/sbin; \ cp -r $(AMAVISDOC) $(DESTDIR)$(prefix)/share/doc/amavisd-new Modified: csw/mgar/pkg/amavisd-new/trunk/checksums =================================================================== --- csw/mgar/pkg/amavisd-new/trunk/checksums 2012-06-12 11:28:18 UTC (rev 18362) +++ csw/mgar/pkg/amavisd-new/trunk/checksums 2012-06-12 12:09:38 UTC (rev 18363) @@ -1,10 +1 @@ -b1af7a961c5f3111efeb72d83b21a0fd CSWamavisdnew.cswusergroup -b12bd6b3223756e47e95347fc177bd7b CSWamavisdnew.postinstall -171767585ab6662c0cbedae26e9baa2c CSWamavisdnew.preinstall -b9cafe6715bc2703ac9411f24f248cd3 amavisd-agent.diff -3e81998c8b933129870e3cab68d40261 amavisd-nanny.diff -03d31657f14cd64c1cb38786214234b4 amavisd-new-2.6.4.tar.gz -f218d10e5280940268a3ffaa125a00ae amavisd-release.diff -9c3d4118cf3837e559a6026d6b89b377 amavisd.conf.diff -071af9fb79ee5e9d045905043fea2b96 amavisd.diff -befafc9594d5e1c1c8710b7d4d129d0b p0f-analyzer.pl.diff +87cd516d1c6349a4389947fb949ff1a2 amavisd-new-2.7.1.tar.gz Added: csw/mgar/pkg/amavisd-new/trunk/files/0001-amavisd-agent.patch =================================================================== --- csw/mgar/pkg/amavisd-new/trunk/files/0001-amavisd-agent.patch (rev 0) +++ csw/mgar/pkg/amavisd-new/trunk/files/0001-amavisd-agent.patch 2012-06-12 12:09:38 UTC (rev 18363) @@ -0,0 +1,31 @@ +From e59bca005dc82ea0c5ff07b2736ccda4eaadbc78 Mon Sep 17 00:00:00 2001 +From: Ihsan Dogan +Date: Mon, 11 Jun 2012 11:26:06 +0200 +Subject: [PATCH] amavisd-agent + +--- + amavisd-agent | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/amavisd-agent b/amavisd-agent +index 0e5565c..1dc1d3b 100755 +--- a/amavisd-agent ++++ b/amavisd-agent +@@ -1,4 +1,4 @@ +-#!/usr/bin/perl -T ++#!/opt/csw/bin/perl -T + + #------------------------------------------------------------------------------ + # This is amavisd-agent, a demo program to display +@@ -50,7 +50,7 @@ use BerkeleyDB; + + my($dbfile) = 'snmp.db'; + my($db_home) = # DB databases directory +- defined $ENV{'AMAVISD_DB_HOME'} ? $ENV{'AMAVISD_DB_HOME'} : '/var/amavis/db'; ++ defined $ENV{'AMAVISD_DB_HOME'} ? $ENV{'AMAVISD_DB_HOME'} : '/var/opt/csw/amavisn/db'; + + my($wakeuptime) = 10; # -w, sleep time in seconds, may be fractional + my($repeatcount); # -c, repeat count (when defined) +-- +1.7.10.3 + Added: csw/mgar/pkg/amavisd-new/trunk/files/0001-amavisd-nanny.patch =================================================================== --- csw/mgar/pkg/amavisd-new/trunk/files/0001-amavisd-nanny.patch (rev 0) +++ csw/mgar/pkg/amavisd-new/trunk/files/0001-amavisd-nanny.patch 2012-06-12 12:09:38 UTC (rev 18363) @@ -0,0 +1,31 @@ +From e044f36f4e7c77202278f1dc24a5f42ceffbfeb5 Mon Sep 17 00:00:00 2001 +From: Ihsan Dogan +Date: Mon, 11 Jun 2012 11:28:48 +0200 +Subject: [PATCH] amavisd-nanny + +--- + amavisd-nanny | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/amavisd-nanny b/amavisd-nanny +index ddb95de..392841f 100755 +--- a/amavisd-nanny ++++ b/amavisd-nanny +@@ -1,4 +1,4 @@ +-#!/usr/bin/perl -T ++#!/opt/csw/bin/perl -T + + #------------------------------------------------------------------------------ + # This is amavisd-nanny, a program to show the status +@@ -58,7 +58,7 @@ my($activettl) = 10*60; # stuck active children are sent a SIGTERM + + my($dbfile) = 'nanny.db'; + my($db_home) = # DB databases directory +- defined $ENV{'AMAVISD_DB_HOME'} ? $ENV{'AMAVISD_DB_HOME'} : '/var/amavis/db'; ++ defined $ENV{'AMAVISD_DB_HOME'} ? $ENV{'AMAVISD_DB_HOME'} : '/var/opt/csw/amavisn/db'; + my($wakeuptime) = 2; # -w, sleep time in seconds, may be fractional + my($repeatcount); # -c, repeat count (when defined) + +-- +1.7.10.3 + Added: csw/mgar/pkg/amavisd-new/trunk/files/0001-amavisd-release.patch =================================================================== --- csw/mgar/pkg/amavisd-new/trunk/files/0001-amavisd-release.patch (rev 0) +++ csw/mgar/pkg/amavisd-new/trunk/files/0001-amavisd-release.patch 2012-06-12 12:09:38 UTC (rev 18363) @@ -0,0 +1,31 @@ +From 931091cba08b5d93f299a9f6d67e088932779eb3 Mon Sep 17 00:00:00 2001 +From: Ihsan Dogan +Date: Mon, 11 Jun 2012 11:30:41 +0200 +Subject: [PATCH] amavisd-release + +--- + amavisd-release | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/amavisd-release b/amavisd-release +index 8bb7f7c..87d2ace 100755 +--- a/amavisd-release ++++ b/amavisd-release +@@ -1,4 +1,4 @@ +-#!/usr/bin/perl -T ++#!/opt/csw/bin/perl -T + + #------------------------------------------------------------------------------ + # This is amavisd-release, an EXAMPLE quarantine release utility program. +@@ -79,7 +79,7 @@ use vars qw($log_level $socketname); + + $log_level = 1; + # $socketname = '127.0.0.1:9998'; +- $socketname = '/var/amavis/amavisd.sock'; ++ $socketname = '/var/opt/csw/amavisn/amavisd.sock'; + + sub sanitize_str { + my($str, $keep_eol) = @_; +-- +1.7.10.3 + Added: csw/mgar/pkg/amavisd-new/trunk/files/0001-amavisd-signer.patch =================================================================== --- csw/mgar/pkg/amavisd-new/trunk/files/0001-amavisd-signer.patch (rev 0) +++ csw/mgar/pkg/amavisd-new/trunk/files/0001-amavisd-signer.patch 2012-06-12 12:09:38 UTC (rev 18363) @@ -0,0 +1,33 @@ +From ab042d4819b769df0a412ff9a8c2025bac6e0a82 Mon Sep 17 00:00:00 2001 +From: Ihsan Dogan +Date: Mon, 11 Jun 2012 10:50:53 +0200 +Subject: [PATCH] amavisd-signer + +--- + amavisd-signer | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/amavisd-signer b/amavisd-signer +index 1867f0a..111f199 100755 +--- a/amavisd-signer ++++ b/amavisd-signer +@@ -1,4 +1,4 @@ +-#!/usr/bin/perl -T ++#!/opt/csw/bin/perl -T + + #------------------------------------------------------------------------------ + # This is amavisd-signer, a DKIM signing service daemon for amavisd. +@@ -83,8 +83,8 @@ $VERSION = 1.000; # 20100730 + # Please adjust the following settings as necessary: + # + +-$daemon_user = 'vscan'; +-$daemon_group = 'vscan'; ++$daemon_user = 'amavisn'; ++$daemon_group = 'amavisn'; + # $daemon_chroot_dir = '/var/amavis'; # chroot directory or undef + + # $daemonize = 1; +-- +1.7.10.3 + Added: csw/mgar/pkg/amavisd-new/trunk/files/0001-amavisd-snmp-subagent.patch =================================================================== --- csw/mgar/pkg/amavisd-new/trunk/files/0001-amavisd-snmp-subagent.patch (rev 0) +++ csw/mgar/pkg/amavisd-new/trunk/files/0001-amavisd-snmp-subagent.patch 2012-06-12 12:09:38 UTC (rev 18363) @@ -0,0 +1,22 @@ +From ee4aacc46e0a89f996c5097a3023b31e05b4b47e Mon Sep 17 00:00:00 2001 +From: Ihsan Dogan +Date: Mon, 11 Jun 2012 11:01:27 +0200 +Subject: [PATCH] amavisd-snmp-subagent + +--- + amavisd-snmp-subagent | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/amavisd-snmp-subagent b/amavisd-snmp-subagent +index a7bd858..39a294e 100755 +--- a/amavisd-snmp-subagent ++++ b/amavisd-snmp-subagent +@@ -1,4 +1,4 @@ +-#!/usr/bin/perl -T ++#!/opt/csw/bin/perl -T + + #------------------------------------------------------------------------------ + # This program implements a SNMP AgentX (RFC 2741) subagent for amavisd-new. +-- +1.7.10.3 + Added: csw/mgar/pkg/amavisd-new/trunk/files/0001-amavisd-submit.patch =================================================================== --- csw/mgar/pkg/amavisd-new/trunk/files/0001-amavisd-submit.patch (rev 0) +++ csw/mgar/pkg/amavisd-new/trunk/files/0001-amavisd-submit.patch 2012-06-12 12:09:38 UTC (rev 18363) @@ -0,0 +1,33 @@ +From d28f12c2f49eb5612ddcdff185c3b460e373a25d Mon Sep 17 00:00:00 2001 +From: Ihsan Dogan +Date: Mon, 11 Jun 2012 11:08:44 +0200 +Subject: [PATCH] amavisd-submit + +--- + amavisd-submit | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/amavisd-submit b/amavisd-submit +index 3d86c68..029464c 100755 +--- a/amavisd-submit ++++ b/amavisd-submit +@@ -1,4 +1,4 @@ +-#!/usr/bin/perl -T ++#!/opt/csw/bin/perl -T + + #------------------------------------------------------------------------------ + # This is amavisd-submit, a simple demonstrational program, taking an email +@@ -66,8 +66,8 @@ use vars qw($VERSION); $VERSION = 2.000; + use vars qw($log_level $socketname $tempbase); + + $log_level = 0; +- $tempbase = '/var/amavis'; # where to create a temp directory with a msg +- $socketname = '/var/amavis/amavisd.sock'; ++ $tempbase = '/var/opt/csw/amavisn'; # where to create a temp directory with a msg ++ $socketname = '/var/opt/csw/amavisn/amavisd.sock'; + # $socketname = '127.0.0.1:9998'; + + sub sanitize_str { +-- +1.7.10.3 + Added: csw/mgar/pkg/amavisd-new/trunk/files/0001-amavisd.conf.patch =================================================================== --- csw/mgar/pkg/amavisd-new/trunk/files/0001-amavisd.conf.patch (rev 0) +++ csw/mgar/pkg/amavisd-new/trunk/files/0001-amavisd.conf.patch 2012-06-12 12:09:38 UTC (rev 18363) @@ -0,0 +1,45 @@ +From c47e866662f728bec223702d78c556a425f2b3b4 Mon Sep 17 00:00:00 2001 +From: Ihsan Dogan +Date: Mon, 11 Jun 2012 11:37:24 +0200 +Subject: [PATCH] amavisd.conf + +--- + amavisd.conf | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/amavisd.conf b/amavisd.conf +index 7edddde..02ed967 100644 +--- a/amavisd.conf ++++ b/amavisd.conf +@@ -14,15 +14,15 @@ use strict; + # $bypass_decode_parts = 1; # controls running of decoders&dearchivers + + $max_servers = 2; # num of pre-forked children (2..30 is common), -m +-$daemon_user = 'vscan'; # (no default; customary: vscan or amavis), -u +-$daemon_group = 'vscan'; # (no default; customary: vscan or amavis), -g ++$daemon_user = 'amavisn'; # (no default; customary: vscan or amavis), -u ++$daemon_group = 'amavisn'; # (no default; customary: vscan or amavis), -g + + $mydomain = 'example.com'; # a convenient default for other settings + +-# $MYHOME = '/var/amavis'; # a convenient default for other settings, -H ++$MYHOME = '/var/opt/csw/amavisn'; # a convenient default for other settings, -H + $TEMPBASE = "$MYHOME/tmp"; # working directory, needs to exist, -T + $ENV{TMPDIR} = $TEMPBASE; # environment variable TMPDIR, used by SA, etc. +-$QUARANTINEDIR = '/var/virusmails'; # -Q ++$QUARANTINEDIR = '/var/opt/csw/amavisn/virusmails'; # -Q + # $quarantine_subdir_levels = 1; # add level of subdirs to disperse quarantine + # $release_format = 'resend'; # 'attach', 'plain', 'resend' + # $report_format = 'arf'; # 'attach', 'plain', 'resend', 'arf' +@@ -126,7 +126,7 @@ $mailfrom_to_quarantine = ''; # null return path; uses original sender if undef + # $recipient_delimiter = '+'; # undef disables address extensions altogether + # when enabling addr extensions do also Postfix/main.cf: recipient_delimiter=+ + +-$path = '/usr/local/sbin:/usr/local/bin:/usr/sbin:/sbin:/usr/bin:/bin'; ++$path = '/opt/csw/bin:/opt/csw/sbin:/usr/sfw/bin:/usr/sfw/sbin:/sbin:/usr/bin:/bin' + # $dspam = 'dspam'; + + $MAXLEVELS = 14; +-- +1.7.10.3 + Added: csw/mgar/pkg/amavisd-new/trunk/files/0001-amavisd.patch =================================================================== --- csw/mgar/pkg/amavisd-new/trunk/files/0001-amavisd.patch (rev 0) +++ csw/mgar/pkg/amavisd-new/trunk/files/0001-amavisd.patch 2012-06-12 12:09:38 UTC (rev 18363) @@ -0,0 +1,31 @@ +From 845c0a27fce492baf75a10ce6b3b547e3df793aa Mon Sep 17 00:00:00 2001 +From: Ihsan Dogan +Date: Mon, 11 Jun 2012 11:41:07 +0200 +Subject: [PATCH] amavisd + +--- + amavisd | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/amavisd b/amavisd +index 1939023..095ee8b 100755 +--- a/amavisd ++++ b/amavisd +@@ -1,4 +1,4 @@ +-#!/usr/bin/perl -T ++#!/opt/csw/bin/perl -T + + #------------------------------------------------------------------------------ + # This is amavisd-new. +@@ -15657,7 +15657,7 @@ $Amavis::Conf::map_full_type_to_short_type_re = + Amavis::Lookup::RE->new(@$Amavis::Conf::map_full_type_to_short_type_re); + + # default location of the config file if none specified +-push(@config_files, '/etc/amavisd.conf') if !@config_files; ++push(@config_files, '/etc/opt/csw/amavisn/amavisd-new.conf') if !@config_files; + # Read and evaluate config files, which may override default settings + Amavis::Conf::include_config_files(@config_files); + Amavis::Conf::supply_after_defaults(); +-- +1.7.10.3 + Deleted: csw/mgar/pkg/amavisd-new/trunk/files/CSWamavisdnew.postinstall =================================================================== --- csw/mgar/pkg/amavisd-new/trunk/files/CSWamavisdnew.postinstall 2012-06-12 11:28:18 UTC (rev 18362) +++ csw/mgar/pkg/amavisd-new/trunk/files/CSWamavisdnew.postinstall 2012-06-12 12:09:38 UTC (rev 18363) @@ -1,41 +0,0 @@ -# Build log file name -installlog=${BASEDIR}/opt/csw/var/amavisn/install-`date '+%Y%m%d%H%M%S'` - -# copy new config file, if it's not existing -if [ ! -f $BASEDIR/opt/csw/etc/amavisd-new.conf ] ; then - cp -p $BASEDIR/opt/csw/etc/amavisd-new.conf.CSW $BASEDIR/opt/csw/etc/amavisd-new.conf -fi - - -# Upgrade and verify bdb database files for amavis. -DB_HOME=${BASEDIR}/opt/csw/var/amavisn/db - -if [ -f ${BASEDIR}$DB_HOME/*.db ] ; then - cd ${BASEDIR}$DB_HOME - - # Verify each file before upgrading - echo "Running db_verify (before upgrade) on $DB_HOME" >>$installlog - for each_db in `ls *.db` - do - ${BASEDIR}/opt/csw/bdb47/bin/db_verify -h $DB_HOME -o $each_db >>$installlog 2>&1 - done - - # Update the database environment to the new value - echo "Running db_recover on $DB_HOME" >>$installlog - ${BASEDIR}/opt/csw/bdb47/bin/db_recover -h $DB_HOME >>$installlog 2>&1 - - # Upgrade each file. This does nothing if no upgrade is needed. - echo "Running db_upgrade on $DB_HOME" >>$installlog - for each_db in `ls *.db` - do - ${BASEDIR}/opt/csw/bdb47/bin/db_upgrade -h $DB_HOME $each_db >>$installlog 2>&1 - done - - # Verify each file - echo "Running db_verify (after upgrade) on $DB_HOME" >>$installlog - for each_db in `ls *.db` - do - ${BASEDIR}/opt/csw/bdb47/bin/db_verify -h $DB_HOME -o $each_db >>$installlog 2>&1 - done -fi - Deleted: csw/mgar/pkg/amavisd-new/trunk/files/CSWamavisdnew.preinstall =================================================================== --- csw/mgar/pkg/amavisd-new/trunk/files/CSWamavisdnew.preinstall 2012-06-12 11:28:18 UTC (rev 18362) +++ csw/mgar/pkg/amavisd-new/trunk/files/CSWamavisdnew.preinstall 2012-06-12 12:09:38 UTC (rev 18363) @@ -1,46 +0,0 @@ -#!/bin/sh - -# check, if the amavisn group does exist -grep '^amavisn:' $PKG_ROOT_DIR/etc/group >/dev/null -if [ $? -ne 0 ] ; then - getent passwd amavisn >/dev/null - if [ $? -ne 0 ] ; then - NEEDGROUP=1 - fi -fi - -# check, if the amavisn user does exist -grep '^amavisn:' $PKG_ROOT_DIR/etc/passwd >/dev/null -if [ $? -ne 0 ] ; then - getent passwd amavisn >/dev/null - if [ $? -ne 0 ] ; then - NEEDUSER=1 - fi -fi - -# create hte amavisn group, if NEEDGROUP=1 -if [ "$NEEDGROUP" = 1 ] ; then - echo Adding required amavisn group - /usr/sbin/groupadd amavisn -fi - -# create the amavisn user, if NEEDUSER=1 -if [ "$NEEDUSER" = 1 ] ; then - echo Adding required amavisn user - - # create necessary directories - mkdir -p /opt/csw/var/amavisn/tmp /opt/csw/var/amavisn/var /opt/csw/var/amavisn/db - - # create the amavis user - /usr/sbin/useradd -d /opt/csw/var/amavisn -g amavisn -c 'amavisn pseud user' -s /bin/false amavisn - - # change ownership & permissions - chown -R amavisn:amavisn /opt/csw/var/amavisn - chmod -R 750 /opt/csw/var/amavisn - - # create a quarantine area for virus mails, set perm & owner - mkdir /opt/csw/var/amavisn-quarantine - chown amavisn:amavisn /opt/csw/var/amavisn-quarantine - chmod 750 /opt/csw/var/amavisn-quarantine -fi - Deleted: csw/mgar/pkg/amavisd-new/trunk/files/CSWpackage.gspec =================================================================== --- csw/mgar/pkg/amavisd-new/trunk/files/CSWpackage.gspec 2012-06-12 11:28:18 UTC (rev 18362) +++ csw/mgar/pkg/amavisd-new/trunk/files/CSWpackage.gspec 2012-06-12 12:09:38 UTC (rev 18363) @@ -1,4 +0,0 @@ -%var bitname amavisd_new -%var pkgname CSWamavisdnew -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/LICENSE Deleted: csw/mgar/pkg/amavisd-new/trunk/files/amavisd-agent.diff =================================================================== --- csw/mgar/pkg/amavisd-new/trunk/files/amavisd-agent.diff 2012-06-12 11:28:18 UTC (rev 18362) +++ csw/mgar/pkg/amavisd-new/trunk/files/amavisd-agent.diff 2012-06-12 12:09:38 UTC (rev 18363) @@ -1,18 +0,0 @@ -diff --speed-large-files --minimal -Nru amavisd-new-2.6.0.orig/amavisd-agent amavisd-new-2.6.0/amavisd-agent ---- amavisd-new-2.6.0.orig/amavisd-agent 2008-04-10 20:47:12.000000000 +0200 -+++ amavisd-new-2.6.0/amavisd-agent 2008-11-09 22:41:09.872612800 +0100 -@@ -1,4 +1,4 @@ --#!/usr/bin/perl -T -+#!opt/csw/bin/perl -T - - #------------------------------------------------------------------------------ - # This is amavisd-agent, a demo program to display -@@ -50,7 +50,7 @@ - - my($dbfile) = 'snmp.db'; - my($db_home) = # DB databases directory -- defined $ENV{'AMAVISD_DB_HOME'} ? $ENV{'AMAVISD_DB_HOME'} : '/var/amavis/db'; -+ defined $ENV{'AMAVISD_DB_HOME'} ? $ENV{'AMAVISD_DB_HOME'} : '/opt/csw/var/amavisn/db'; - - my($wakeuptime) = 10; # -w, sleep time in seconds, may be fractional - my($repeatcount); # -c, repeat count (when defined) Deleted: csw/mgar/pkg/amavisd-new/trunk/files/amavisd-nanny.diff =================================================================== --- csw/mgar/pkg/amavisd-new/trunk/files/amavisd-nanny.diff 2012-06-12 11:28:18 UTC (rev 18362) +++ csw/mgar/pkg/amavisd-new/trunk/files/amavisd-nanny.diff 2012-06-12 12:09:38 UTC (rev 18363) @@ -1,18 +0,0 @@ -diff --speed-large-files --minimal -Nru amavisd-new-2.6.0.orig/amavisd-nanny amavisd-new-2.6.0/amavisd-nanny ---- amavisd-new-2.6.0.orig/amavisd-nanny 2008-03-28 23:55:02.000000000 +0100 -+++ amavisd-new-2.6.0/amavisd-nanny 2008-11-09 22:42:52.323269000 +0100 -@@ -1,4 +1,4 @@ --#!/usr/bin/perl -T -+#!/opt/csw/bin/perl -T - - #------------------------------------------------------------------------------ - # This is amavisd-nanny, a program to show the status -@@ -58,7 +58,7 @@ - - my($dbfile) = 'nanny.db'; - my($db_home) = # DB databases directory -- defined $ENV{'AMAVISD_DB_HOME'} ? $ENV{'AMAVISD_DB_HOME'} : '/var/amavis/db'; -+ defined $ENV{'AMAVISD_DB_HOME'} ? $ENV{'AMAVISD_DB_HOME'} : '/opt/csw/var/amavisn/db'; - my($wakeuptime) = 2; # -w, sleep time in seconds, may be fractional - my($repeatcount); # -c, repeat count (when defined) - Deleted: csw/mgar/pkg/amavisd-new/trunk/files/amavisd-release.diff =================================================================== --- csw/mgar/pkg/amavisd-new/trunk/files/amavisd-release.diff 2012-06-12 11:28:18 UTC (rev 18362) +++ csw/mgar/pkg/amavisd-new/trunk/files/amavisd-release.diff 2012-06-12 12:09:38 UTC (rev 18363) @@ -1,18 +0,0 @@ -diff --speed-large-files --minimal -Nru amavisd-new-2.6.0.orig/amavisd-release amavisd-new-2.6.0/amavisd-release ---- amavisd-new-2.6.0.orig/amavisd-release 2008-03-17 15:43:33.000000000 +0100 -+++ amavisd-new-2.6.0/amavisd-release 2008-11-09 22:43:55.624383000 +0100 -@@ -1,4 +1,4 @@ --#!/usr/bin/perl -T -+#!/opt/csw/bin/perl -T - - #------------------------------------------------------------------------------ - # This is amavisd-release, an EXAMPLE quarantine release utility program. -@@ -79,7 +79,7 @@ - - $log_level = 1; - # $socketname = '127.0.0.1:9998'; -- $socketname = '/var/amavis/amavisd.sock'; -+ $socketname = '/opt/csw/var/amavisn/amavisd.sock'; - - sub sanitize_str { - my($str, $keep_eol) = @_; Deleted: csw/mgar/pkg/amavisd-new/trunk/files/amavisd.conf.diff =================================================================== --- csw/mgar/pkg/amavisd-new/trunk/files/amavisd.conf.diff 2012-06-12 11:28:18 UTC (rev 18362) +++ csw/mgar/pkg/amavisd-new/trunk/files/amavisd.conf.diff 2012-06-12 12:09:38 UTC (rev 18363) @@ -1,28 +0,0 @@ -diff --speed-large-files --minimal -Nru amavisd-new-2.6.2.orig/amavisd.conf amavisd-new-2.6.2/amavisd.conf ---- amavisd-new-2.6.2.orig/amavisd.conf 2008-12-15 01:50:03.000000000 +0100 -+++ amavisd-new-2.6.2/amavisd.conf 2009-04-17 22:51:46.060535660 +0200 -@@ -15,12 +15,12 @@ - # $bypass_decode_parts = 1; # controls running of decoders&dearchivers - - $max_servers = 2; # num of pre-forked children (2..30 is common), -m --$daemon_user = 'vscan'; # (no default; customary: vscan or amavis), -u --$daemon_group = 'vscan'; # (no default; customary: vscan or amavis), -g -+$daemon_user = 'amavisn'; # (no default; customary: vscan or amavis), -u -+$daemon_group = 'amavisn'; # (no default; customary: vscan or amavis), -g - - $mydomain = 'example.com'; # a convenient default for other settings - --# $MYHOME = '/var/amavis'; # a convenient default for other settings, -H -+$MYHOME = '/opt/csw/var/amavisn'; # a convenient default for other settings, -H - $TEMPBASE = "$MYHOME/tmp"; # working directory, needs to exist, -T - $ENV{TMPDIR} = $TEMPBASE; # environment variable TMPDIR, used by SA, etc. - $QUARANTINEDIR = '/var/virusmails'; # -Q -@@ -130,7 +130,7 @@ - # $recipient_delimiter = '+'; # undef disables address extensions altogether - # when enabling addr extensions do also Postfix/main.cf: recipient_delimiter=+ - --$path = '/usr/local/sbin:/usr/local/bin:/usr/sbin:/sbin:/usr/bin:/bin'; -+$path = '/opt/csw/bin:/opt/csw/sbin:/usr/sfw/bin:/usr/sfw/sbin:/sbin:/usr/bin:/bin'; - # $dspam = 'dspam'; - - $MAXLEVELS = 14; Deleted: csw/mgar/pkg/amavisd-new/trunk/files/amavisd.diff =================================================================== --- csw/mgar/pkg/amavisd-new/trunk/files/amavisd.diff 2012-06-12 11:28:18 UTC (rev 18362) +++ csw/mgar/pkg/amavisd-new/trunk/files/amavisd.diff 2012-06-12 12:09:38 UTC (rev 18363) @@ -1,18 +0,0 @@ -diff --speed-large-files --minimal -Nru amavisd-new-2.6.1.orig/amavisd amavisd-new-2.6.1/amavisd ---- amavisd-new-2.6.1.orig/amavisd 2008-06-29 02:37:58.000000000 +0200 -+++ amavisd-new-2.6.1/amavisd 2008-11-13 12:53:24.516468200 +0100 -@@ -1,4 +1,4 @@ --#!/usr/bin/perl -T -+#!/opt/csw/bin/perl -T - - #------------------------------------------------------------------------------ - # This is amavisd-new. -@@ -12554,7 +12554,7 @@ - Amavis::Lookup::RE->new(@$Amavis::Conf::map_full_type_to_short_type_re); - - # default location of the config file if none specified --push(@config_files, '/etc/amavisd.conf') if !@config_files; -+push(@config_files, '/opt/csw/etc/amavisd-new.conf') if !@config_files; - # Read and evaluate config files, which may override default settings - Amavis::Conf::include_config_files(@config_files); - Amavis::Conf::supply_after_defaults(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Tue Jun 12 14:10:41 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Tue, 12 Jun 2012 12:10:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[18364] csw/mgar/pkg/librecad/trunk/Makefile Message-ID: Revision: 18364 http://gar.svn.sourceforge.net/gar/?rev=18364&view=rev Author: cgrzemba Date: 2012-06-12 12:10:41 +0000 (Tue, 12 Jun 2012) Log Message: ----------- librecad/trunk: add path for qt bins Modified Paths: -------------- csw/mgar/pkg/librecad/trunk/Makefile Modified: csw/mgar/pkg/librecad/trunk/Makefile =================================================================== --- csw/mgar/pkg/librecad/trunk/Makefile 2012-06-12 12:09:38 UTC (rev 18363) +++ csw/mgar/pkg/librecad/trunk/Makefile 2012-06-12 12:10:41 UTC (rev 18364) @@ -72,4 +72,4 @@ include gar/category.mk -PATH := /opt/csw/gnu:$(PATH) +PATH := /opt/csw/gnu:$(PATH):/opt/csw/gxx/bin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Tue Jun 12 16:02:48 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Tue, 12 Jun 2012 14:02:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[18365] csw/mgar/pkg/librecad/trunk/files/ 0001-adjust-rs_system-forcsw.patch Message-ID: Revision: 18365 http://gar.svn.sourceforge.net/gar/?rev=18365&view=rev Author: cgrzemba Date: 2012-06-12 14:02:46 +0000 (Tue, 12 Jun 2012) Log Message: ----------- librecad/trunk: adjust appDir patch Modified Paths: -------------- csw/mgar/pkg/librecad/trunk/files/0001-adjust-rs_system-forcsw.patch Modified: csw/mgar/pkg/librecad/trunk/files/0001-adjust-rs_system-forcsw.patch =================================================================== --- csw/mgar/pkg/librecad/trunk/files/0001-adjust-rs_system-forcsw.patch 2012-06-12 12:10:41 UTC (rev 18364) +++ csw/mgar/pkg/librecad/trunk/files/0001-adjust-rs_system-forcsw.patch 2012-06-12 14:02:46 UTC (rev 18365) @@ -4,7 +4,7 @@ // Others, RVT April 25, 2011 removed, doesn anybody use that still? // dirList.append("/usr/X11R6/share/" + appDirName + "/" + subDirectory); -+ dirList.append("/opt/csw/share/" + appDirName + "/" + subDirectory); ++ dirList.append("/opt/csw/gxx/share/" + appDirName + "/" + subDirectory); #ifdef Q_OS_MAC @@ -12,7 +12,7 @@ // Add support directory if librecad is run-in-place, // not for Apple because it uses resources this is more for unix systems dirList.append(appDir + "/resources/" + subDirectory); -+ dirList.append("/opt/csw/share/"+ appDirName + "/resources/" + subDirectory); ++ dirList.append("/opt/csw/gxx/share/"+ appDirName + "/resources/" + subDirectory); #endif // Individual directories: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Tue Jun 12 16:26:32 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Tue, 12 Jun 2012 14:26:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[18366] csw/mgar/pkg Message-ID: Revision: 18366 http://gar.svn.sourceforge.net/gar/?rev=18366&view=rev Author: pfelecan Date: 2012-06-12 14:26:32 +0000 (Tue, 12 Jun 2012) Log Message: ----------- migration from a private recipe to a GAR based recipe started; however, the configuration, depending on pilot-link greater than the 12.3 that we have, doesn't finishes. Added Paths: ----------- csw/mgar/pkg/jpilot/ csw/mgar/pkg/jpilot/Makefile csw/mgar/pkg/jpilot/branches/ csw/mgar/pkg/jpilot/tags/ csw/mgar/pkg/jpilot/trunk/ csw/mgar/pkg/jpilot/trunk/Makefile csw/mgar/pkg/jpilot/trunk/checksums csw/mgar/pkg/jpilot/trunk/files/ Added: csw/mgar/pkg/jpilot/Makefile =================================================================== --- csw/mgar/pkg/jpilot/Makefile (rev 0) +++ csw/mgar/pkg/jpilot/Makefile 2012-06-12 14:26:32 UTC (rev 18366) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/jpilot/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/jpilot/trunk/Makefile =================================================================== --- csw/mgar/pkg/jpilot/trunk/Makefile (rev 0) +++ csw/mgar/pkg/jpilot/trunk/Makefile 2012-06-12 14:26:32 UTC (rev 18366) @@ -0,0 +1,37 @@ +# $Id$ + +NAME = jpilot +VERSION = 1.8.1 +GARTYPE = v2 +CATEGORIES = apps + +DESCRIPTION = GNOME Desktop Organizer Software for the Palm Pilot +define BLURB + J-Pilot is a desktop organizer application for PalmOS devices. + It is meant to be an alternative to the Palm Desktop for those + who run the most popular Operating Systems in the World, Linux and Unix. +endef + +MASTER_SITES = http://jpilot.org/ +DISTFILES = $(DISTNAME).tar.gz + +GARCOMPILER = GNU + +BUILD_DEP_PKGS += CSWpmxmlparser +BUILD_DEP_PKGS += CSWpilotlink + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-pilot-prefix=$(prefix) +CONFIGURE_ARGS += --with-libintl-prefix=$(prefix) +CONFIGURE_ARGS += --with-libiconv-prefix=$(prefix) + +PACKAGING_PLATFORMS = solaris10-sparc +PACKAGING_PLATFORMS += solaris10-i386 + +include gar/category.mk + +PATH := /opt/csw/gnu:$(PATH) + +# this is private and not available publicly +mydependencies: + $(HOME)/bin/ocswdeplist --package $(NAME) Property changes on: csw/mgar/pkg/jpilot/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/jpilot/trunk/checksums =================================================================== --- csw/mgar/pkg/jpilot/trunk/checksums (rev 0) +++ csw/mgar/pkg/jpilot/trunk/checksums 2012-06-12 14:26:32 UTC (rev 18366) @@ -0,0 +1 @@ +ac59a5708f37e30d39e85b1fcedd266f jpilot-1.8.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Tue Jun 12 17:07:37 2012 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Tue, 12 Jun 2012 15:07:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[18367] csw/mgar/pkg/postgresql/branches/postgresql-8.3 Message-ID: Revision: 18367 http://gar.svn.sourceforge.net/gar/?rev=18367&view=rev Author: guengel Date: 2012-06-12 15:07:36 +0000 (Tue, 12 Jun 2012) Log Message: ----------- postgresql/branches/postgresql-8.3: Dropped support for Solaris 9. Fixed inclusion of changelog.CSW in packages Modified Paths: -------------- csw/mgar/pkg/postgresql/branches/postgresql-8.3/Makefile csw/mgar/pkg/postgresql/branches/postgresql-8.3/files/changelog.CSW Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.3/Makefile =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.3/Makefile 2012-06-12 14:26:32 UTC (rev 18366) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.3/Makefile 2012-06-12 15:07:36 UTC (rev 18367) @@ -94,6 +94,8 @@ VERSION = $(BASE_VERSION).$(PATCHLEVEL) CATEGORIES = apps +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + # Useful when making a series of builds on the same day # GARFLAVOR ?= DBG @@ -269,11 +271,11 @@ PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += .*/alternatives/$(NAME)$(BASE_VERSION_NODOT)_server.* PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += .*/CSW$(NAME)$(BASE_VERSION_NODOT)-server.postmsg PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += .*$(docdir)/$(NAME)$(BASE_VERSION_NODOT)_server/README.CSW +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += .*$(docdir)/$(NAME)$(BASE_VERSION_NODOT)_server/changelog.CSW RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibreadline6 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibz1 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibpq5 -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibgnugetopt0 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibxslt1 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibgssapi-krb5-2 @@ -290,11 +292,11 @@ PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-client += .*/alternatives/$(NAME)$(BASE_VERSION_NODOT)_client.* PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-client += .*/CSW$(NAME)$(BASE_VERSION_NODOT)-client.postmsg PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-client += .*$(docdir)/$(NAME)$(BASE_VERSION_NODOT)_client/README.CSW +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-client += .*$(docdir)/$(NAME)$(BASE_VERSION_NODOT)_client/changelog.CSW RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibreadline6 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibz1 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibpq5 -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibgnugetopt0 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibxslt1 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibgssapi-krb5-2 @@ -309,10 +311,10 @@ PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += .*/alternatives/$(NAME)$(BASE_VERSION_NODOT)_contrib.* PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += .*/CSW$(NAME)$(BASE_VERSION_NODOT)-contrib.postmsg PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += .*$(docdir)/$(NAME)$(BASE_VERSION_NODOT)_contrib/README.CSW +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += .*$(docdir)/$(NAME)$(BASE_VERSION_NODOT)_contrib/changelog.CSW RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibz1 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibpq5 -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibgnugetopt0 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibxslt1 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibgssapi-krb5-2 @@ -329,6 +331,7 @@ PKGFILES_CSW$(NAME)-dev += $(foreach n,$(BIN_NAMES_DEVEL),.*/man1/$(n)\.1$$) PKGFILES_CSW$(NAME)-dev += .*/CSW$(NAME)-dev.postmsg PKGFILES_CSW$(NAME)-dev += .*$(docdir)/$(NAME)_dev/README.CSW +PKGFILES_CSW$(NAME)-dev += .*/postgresql_dev/changelog.CSW # See `post-merge-modulated:' PKGFILES_CSW$(NAME)-dev += .*/libpgport\.a$ RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibecpg-compat3 @@ -337,7 +340,6 @@ RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibpgtypes3 RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibz1 RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibgssapi-krb5-2 -RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibgnugetopt0 RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibxslt1 RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibreadline6 @@ -359,6 +361,7 @@ PACKAGES += CSWlibecpg-compat3 SPKG_DESC_CSWlibecpg-compat3 = PostgreSQL $(VERSION), libecpg_compat PKGFILES_CSWlibecpg-compat3 = $(call pkgfiles_lib,libecpg_compat.so.3) +PKGFILES_CSWlibecpg-compat3 += .*/libecpg_compat3/changelog.CSW RUNTIME_DEP_PKGS_CSWlibecpg-compat3 = CSWlibecpg6 RUNTIME_DEP_PKGS_CSWlibecpg-compat3 += CSWlibpgtypes3 RUNTIME_DEP_PKGS_CSWlibecpg-compat3 += CSWlibpq5 @@ -366,16 +369,19 @@ PACKAGES += CSWlibecpg6 SPKG_DESC_CSWlibecpg6 = PostgreSQL $(VERSION), libecpg PKGFILES_CSWlibecpg6 = $(call pkgfiles_lib,libecpg.so.6) +PKGFILES_CSWlibecpg6 += .*/libecpg6/changelog.CSW RUNTIME_DEP_PKGS_CSWlibecpg6 += CSWlibpgtypes3 RUNTIME_DEP_PKGS_CSWlibecpg6 += CSWlibpq5 PACKAGES += CSWlibpgtypes3 SPKG_DESC_CSWlibpgtypes3 = PostgreSQL $(VERSION), libpgtypes PKGFILES_CSWlibpgtypes3 = $(call pkgfiles_lib,libpgtypes.so.3) +PKGFILES_CSWlibpgtypes3 += .*/libpgtypes3/changelog.CSW PACKAGES += CSWlibpq5 SPKG_DESC_CSWlibpq5 = PostgreSQL $(VERSION), libpq PKGFILES_CSWlibpq5 = $(call pkgfiles_lib,libpq.so.5) +PKGFILES_CSWlibpq5 += .*/libpq5/changelog.CSW RUNTIME_DEP_PKGS_CSWlibpq5 = CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWlibpq5 += CSWlibgssapi-krb5-2 @@ -387,7 +393,6 @@ BUILD_DEP_PKGS += CSWlibreadline-dev BUILD_DEP_PKGS += CSWgsed # gsed is used in this recipe BUILD_DEP_PKGS += CSWlibz-dev -BUILD_DEP_PKGS += CSWlibgnugetopt-dev EXTRA_LD_OPTIONS = -R$(prefix)/lib/\$$ISALIST Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.3/files/changelog.CSW =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.3/files/changelog.CSW 2012-06-12 14:26:32 UTC (rev 18366) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.3/files/changelog.CSW 2012-06-12 15:07:36 UTC (rev 18367) @@ -1,3 +1,13 @@ +postgresql83 (8.3.19,REV=2012.06.12) + + * Dropped support for Solaris 9 + + * Include changelog.CSW in all packages, thus removing the clustering of + changelog.CSW files in CSWpostgresql + + -- Rafael Ostertag Tue, 12 June 2012 16:55:57+0200 + + postgresql83 (8.3.19,REV=2012.06.11) * New upstream release 8.3.19. 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 12 19:19:51 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 12 Jun 2012 17:19:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[18368] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 18368 http://gar.svn.sourceforge.net/gar/?rev=18368&view=rev Author: bdwalton Date: 2012-06-12 17:19:50 +0000 (Tue, 12 Jun 2012) Log Message: ----------- php5/trunk: update imap (libc-client) build dependency Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2012-06-12 15:07:36 UTC (rev 18367) +++ csw/mgar/pkg/php5/trunk/Makefile 2012-06-12 17:19:50 UTC (rev 18368) @@ -55,7 +55,7 @@ BUILD_DEP_PKGS += CSWlibxml2-dev CSWlibexpat1 CSWlibz-dev CSWlibcurl-dev CSWjpeg BUILD_DEP_PKGS += CSWlibpng-dev CSWt1lib CSWxpm CSWlibgdbm-dev CSWlibgmp10 BUILD_DEP_PKGS += CSWggettext-dev CSWlibssl-dev CSWlibgd2 CSWbdb42devel -BUILD_DEP_PKGS += CSWlibcares-dev CSWftype2 CSWlibiconv-dev CSWimap-devel +BUILD_DEP_PKGS += CSWlibcares-dev CSWftype2 CSWlibiconv-dev CSWlibc-client-dev BUILD_DEP_PKGS += CSWoldapdevel CSWlibkrb5-dev CSWsasl CSWlibltdl7 BUILD_DEP_PKGS += CSWlibmcrypt CSWfreetds CSWmysql-dev CSWunixodbc BUILD_DEP_PKGS += CSWlibreadline-dev CSWlibncurses-dev CSWnetsnmp-dev This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Tue Jun 12 21:56:33 2012 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Tue, 12 Jun 2012 19:56:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[18369] csw/mgar/pkg/postgresql/branches/postgresql-8.4 Message-ID: Revision: 18369 http://gar.svn.sourceforge.net/gar/?rev=18369&view=rev Author: guengel Date: 2012-06-12 19:56:32 +0000 (Tue, 12 Jun 2012) Log Message: ----------- postgresql/branches/postgresql-8.4: Dropped support for Solaris 9. Fixed inclusion of changelog.CSW in packages. Modified Paths: -------------- csw/mgar/pkg/postgresql/branches/postgresql-8.4/Makefile csw/mgar/pkg/postgresql/branches/postgresql-8.4/files/changelog.CSW Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.4/Makefile =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.4/Makefile 2012-06-12 17:19:50 UTC (rev 18368) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.4/Makefile 2012-06-12 19:56:32 UTC (rev 18369) @@ -94,6 +94,8 @@ VERSION = $(BASE_VERSION).$(PATCHLEVEL) CATEGORIES = apps +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + # Useful when making a series of builds on the same day # GARFLAVOR ?= DBG @@ -271,17 +273,17 @@ PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += .*/alternatives/$(NAME)$(BASE_VERSION_NODOT)_server.* PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += .*/CSW$(NAME)$(BASE_VERSION_NODOT)-server.postmsg PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += .*$(docdir)/$(NAME)$(BASE_VERSION_NODOT)_server/README.CSW +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += .*$(docdir)/$(NAME)$(BASE_VERSION_NODOT)_server/changelog.CSW RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibreadline6 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibz1 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibpq5 -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibgnugetopt0 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibxslt1 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibgssapi-krb5-2 -CHECKPKG_OVERRIDES_CSW$(NAME)$(BASE_VERSION_NODOT)-server = $(foreach n,$(SO_NAMES_SERVER), soname-not-part-of-filename|soname=lib$(n).0|filename=$(n) ) +#CHECKPKG_OVERRIDES_CSW$(NAME)$(BASE_VERSION_NODOT)-server = $(foreach n,$(SO_NAMES_SERVER), soname-not-part-of-filename|soname=lib$(n).0|filename=$(n) ) # This one isn't covered by the above. -CHECKPKG_OVERRIDES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += soname-not-part-of-filename|soname=libplpgsql.so.1|filename=plpgsql.so +#CHECKPKG_OVERRIDES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += soname-not-part-of-filename|soname=libplpgsql.so.1|filename=plpgsql.so #ALTERNATIVES_CSW$(NAME)$(BASE_VERSION_NODOT)-server = $(foreach i,$(NEEDED_ISAS), server_$(i)) PACKAGES += CSW$(NAME)$(BASE_VERSION_NODOT)-client @@ -292,11 +294,11 @@ PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-client += .*/alternatives/$(NAME)$(BASE_VERSION_NODOT)_client.* PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-client += .*/CSW$(NAME)$(BASE_VERSION_NODOT)-client.postmsg PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-client += .*$(docdir)/$(NAME)$(BASE_VERSION_NODOT)_client/README.CSW +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-client += .*$(docdir)/$(NAME)$(BASE_VERSION_NODOT)_client/changelog.CSW RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibreadline6 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibz1 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibpq5 -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibgnugetopt0 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibxslt1 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibgssapi-krb5-2 @@ -311,16 +313,16 @@ PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += .*/alternatives/$(NAME)$(BASE_VERSION_NODOT)_contrib.* PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += .*/CSW$(NAME)$(BASE_VERSION_NODOT)-contrib.postmsg PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += .*$(docdir)/$(NAME)$(BASE_VERSION_NODOT)_contrib/README.CSW +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += .*$(docdir)/$(NAME)$(BASE_VERSION_NODOT)_contrib/changelog.CSW RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibz1 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibpq5 -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibgnugetopt0 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibxslt1 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibgssapi-krb5-2 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibreadline6 # This will produce some 'unused overrides'. -CHECKPKG_OVERRIDES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib = $(foreach n,$(SO_NAMES_CONTRIB), soname-not-part-of-filename|soname=lib$(n).0|filename=$(n) ) +#CHECKPKG_OVERRIDES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib = $(foreach n,$(SO_NAMES_CONTRIB), soname-not-part-of-filename|soname=lib$(n).0|filename=$(n) ) #ALTERNATIVES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib = $(foreach i,$(NEEDED_ISAS), contrib_$(i)) PACKAGES += CSW$(NAME)-dev @@ -331,6 +333,7 @@ PKGFILES_CSW$(NAME)-dev += $(foreach n,$(BIN_NAMES_DEVEL),.*/man1/$(n)\.1$$) PKGFILES_CSW$(NAME)-dev += .*/CSW$(NAME)-dev.postmsg PKGFILES_CSW$(NAME)-dev += .*$(docdir)/$(NAME)_dev/README.CSW +PKGFILES_CSW$(NAME)-dev += .*/postgresql_dev/changelog.CSW # See `post-merge-modulated:' PKGFILES_CSW$(NAME)-dev += .*/libpgport\.a$ RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibecpg-compat3 @@ -339,7 +342,6 @@ RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibpgtypes3 RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibz1 RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibgssapi-krb5-2 -RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibgnugetopt0 RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibxslt1 RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibreadline6 @@ -361,6 +363,7 @@ PACKAGES += CSWlibecpg-compat3 SPKG_DESC_CSWlibecpg-compat3 = PostgreSQL $(VERSION), libecpg_compat PKGFILES_CSWlibecpg-compat3 = $(call pkgfiles_lib,libecpg_compat.so.3) +PKGFILES_CSWlibecpg-compat3 += .*/libecpg_compat3/changelog.CSW RUNTIME_DEP_PKGS_CSWlibecpg-compat3 = CSWlibecpg6 RUNTIME_DEP_PKGS_CSWlibecpg-compat3 += CSWlibpgtypes3 RUNTIME_DEP_PKGS_CSWlibecpg-compat3 += CSWlibpq5 @@ -368,16 +371,19 @@ PACKAGES += CSWlibecpg6 SPKG_DESC_CSWlibecpg6 = PostgreSQL $(VERSION), libecpg PKGFILES_CSWlibecpg6 = $(call pkgfiles_lib,libecpg.so.6) +PKGFILES_CSWlibecpg6 += .*/libecpg6/changelog.CSW RUNTIME_DEP_PKGS_CSWlibecpg6 += CSWlibpgtypes3 RUNTIME_DEP_PKGS_CSWlibecpg6 += CSWlibpq5 PACKAGES += CSWlibpgtypes3 SPKG_DESC_CSWlibpgtypes3 = PostgreSQL $(VERSION), libpgtypes PKGFILES_CSWlibpgtypes3 = $(call pkgfiles_lib,libpgtypes.so.3) +PKGFILES_CSWlibpgtypes3 += .*/libpgtypes3/changelog.CSW PACKAGES += CSWlibpq5 SPKG_DESC_CSWlibpq5 = PostgreSQL $(VERSION), libpq PKGFILES_CSWlibpq5 = $(call pkgfiles_lib,libpq.so.5) +PKGFILES_CSWlibpq5 += .*/libpq5/changelog.CSW RUNTIME_DEP_PKGS_CSWlibpq5 = CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWlibpq5 += CSWlibgssapi-krb5-2 Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.4/files/changelog.CSW =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.4/files/changelog.CSW 2012-06-12 17:19:50 UTC (rev 18368) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.4/files/changelog.CSW 2012-06-12 19:56:32 UTC (rev 18369) @@ -1,3 +1,13 @@ +postgresql84 (8.4.12,REV=2012.06.12) + + * Dropped support for Solaris 9 + + * Include changelog.CSW in all packages, thus removing the clustering of + changelog.CSW files in CSWpostgresql + + -- Rafael Ostertag Tue, 12 June 2012 19:30:57+0200 + + postgresql84 (8.4.12,REV=2012.06.11) * New upstream release 8.4.12. 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 13 02:39:15 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 13 Jun 2012 00:39:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[18370] csw/mgar/pkg/imap-c-client/trunk/Makefile Message-ID: Revision: 18370 http://gar.svn.sourceforge.net/gar/?rev=18370&view=rev Author: bdwalton Date: 2012-06-13 00:39:15 +0000 (Wed, 13 Jun 2012) Log Message: ----------- imap-c-client/trunk: correct the pkgfiles statements for the dev package to actually include the header files Modified Paths: -------------- csw/mgar/pkg/imap-c-client/trunk/Makefile Modified: csw/mgar/pkg/imap-c-client/trunk/Makefile =================================================================== --- csw/mgar/pkg/imap-c-client/trunk/Makefile 2012-06-12 19:56:32 UTC (rev 18369) +++ csw/mgar/pkg/imap-c-client/trunk/Makefile 2012-06-13 00:39:15 UTC (rev 18370) @@ -48,7 +48,7 @@ PACKAGES += CSWlibc-client-dev SPKG_DESC_CSWlibc-client-dev = Development files for $(NAME) $(VERSION) PKGFILES_CSWlibc-client-dev = $(PKGFILES_DEVEL_INCLUDEDIR) -PKGFILES_CSWlibc-client-dev = $(libdir)/libc-client.so +PKGFILES_CSWlibc-client-dev += $(libdir)/libc-client.so RUNTIME_DEP_PKGS_CSWlibc-client-dev += CSWlibc-client2007f OBSOLETED_BY_CSWlibc-client-dev = CSWimap-devel CHECKPKG_OVERRIDES_CSWlibc-client-dev += surplus-dependency|CSWlibc-client2007f 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 13 02:55:23 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 13 Jun 2012 00:55:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[18371] csw/mgar/pkg/imap-c-client/trunk/Makefile Message-ID: Revision: 18371 http://gar.svn.sourceforge.net/gar/?rev=18371&view=rev Author: bdwalton Date: 2012-06-13 00:55:23 +0000 (Wed, 13 Jun 2012) Log Message: ----------- imap-c-client/trunk: include the static library in the dev package Modified Paths: -------------- csw/mgar/pkg/imap-c-client/trunk/Makefile Modified: csw/mgar/pkg/imap-c-client/trunk/Makefile =================================================================== --- csw/mgar/pkg/imap-c-client/trunk/Makefile 2012-06-13 00:39:15 UTC (rev 18370) +++ csw/mgar/pkg/imap-c-client/trunk/Makefile 2012-06-13 00:55:23 UTC (rev 18371) @@ -22,6 +22,8 @@ PATCHDIR = $(WORKDIR) PATCHDIRLEVEL = 0 +MERGE_EXCLUDE_STATICLIBS = + # Build libc-client.so PATCHFILES += shared.diff @@ -49,9 +51,11 @@ SPKG_DESC_CSWlibc-client-dev = Development files for $(NAME) $(VERSION) PKGFILES_CSWlibc-client-dev = $(PKGFILES_DEVEL_INCLUDEDIR) PKGFILES_CSWlibc-client-dev += $(libdir)/libc-client.so +PKGFILES_CSWlibc-client-dev += $(libdir)/c-client.a RUNTIME_DEP_PKGS_CSWlibc-client-dev += CSWlibc-client2007f OBSOLETED_BY_CSWlibc-client-dev = CSWimap-devel CHECKPKG_OVERRIDES_CSWlibc-client-dev += surplus-dependency|CSWlibc-client2007f +CHECKPKG_OVERRIDES_CSWlibc-client-dev += file-with-bad-content|/usr/share|root/opt/csw/lib/c-client.a CONFIGURE_SCRIPTS = BUILD_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 Wed Jun 13 03:25:34 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 13 Jun 2012 01:25:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[18372] csw/mgar/pkg/nmap/trunk Message-ID: Revision: 18372 http://gar.svn.sourceforge.net/gar/?rev=18372&view=rev Author: bdwalton Date: 2012-06-13 01:25:34 +0000 (Wed, 13 Jun 2012) Log Message: ----------- nmap/trunk: version bump Modified Paths: -------------- csw/mgar/pkg/nmap/trunk/Makefile csw/mgar/pkg/nmap/trunk/checksums Modified: csw/mgar/pkg/nmap/trunk/Makefile =================================================================== --- csw/mgar/pkg/nmap/trunk/Makefile 2012-06-13 00:55:23 UTC (rev 18371) +++ csw/mgar/pkg/nmap/trunk/Makefile 2012-06-13 01:25:34 UTC (rev 18372) @@ -1,8 +1,10 @@ NAME = nmap -VERSION = 5.59BETA1 +VERSION = 6.00 CATEGORIES = net GARTYPE = v2 +PACKAGING_PLATFORMS = solaris10-i386 solaris10-sparc + DESCRIPTION = A network exploration tool and security/port scanner define BLURB Nmap is a utility for network exploration or security auditing. It supports Modified: csw/mgar/pkg/nmap/trunk/checksums =================================================================== --- csw/mgar/pkg/nmap/trunk/checksums 2012-06-13 00:55:23 UTC (rev 18371) +++ csw/mgar/pkg/nmap/trunk/checksums 2012-06-13 01:25:34 UTC (rev 18372) @@ -1 +1 @@ -3494499e6fd4716088017bbab8af1dbf nmap-5.59BETA1.tar.bz2 +e365cdada811c57e172b24b62746ab7d nmap-6.00.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 Wed Jun 13 03:35:19 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 13 Jun 2012 01:35:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[18373] csw/mgar/pkg Message-ID: Revision: 18373 http://gar.svn.sourceforge.net/gar/?rev=18373&view=rev Author: bdwalton Date: 2012-06-13 01:35:19 +0000 (Wed, 13 Jun 2012) Log Message: ----------- add stub for tn5250 Added Paths: ----------- csw/mgar/pkg/tn5250/ csw/mgar/pkg/tn5250/Makefile csw/mgar/pkg/tn5250/branches/ csw/mgar/pkg/tn5250/tags/ csw/mgar/pkg/tn5250/trunk/ csw/mgar/pkg/tn5250/trunk/Makefile csw/mgar/pkg/tn5250/trunk/checksums csw/mgar/pkg/tn5250/trunk/files/ Copied: csw/mgar/pkg/tn5250/Makefile (from rev 15145, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/tn5250/Makefile (rev 0) +++ csw/mgar/pkg/tn5250/Makefile 2012-06-13 01:35:19 UTC (rev 18373) @@ -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/tn5250/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/tn5250/trunk/Makefile =================================================================== --- csw/mgar/pkg/tn5250/trunk/Makefile (rev 0) +++ csw/mgar/pkg/tn5250/trunk/Makefile 2012-06-13 01:35:19 UTC (rev 18373) @@ -0,0 +1,29 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = tn5250 +VERSION = x.y +GARTYPE = v2 +CATEGORIES = category + +DESCRIPTION = Brief description +define BLURB + Long description +endef + +MASTER_SITES = +DISTFILES = $(DISTNAME).tar.gz + +# File name regex to get notifications about upstream software releases +# NOTE: Use this only if the automatic regex creation +# does not work for your package +# 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/tn5250/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/tn5250/trunk/checksums =================================================================== This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Wed Jun 13 03:42:04 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 13 Jun 2012 01:42:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[18374] csw/mgar/pkg/tn5250/trunk Message-ID: Revision: 18374 http://gar.svn.sourceforge.net/gar/?rev=18374&view=rev Author: bdwalton Date: 2012-06-13 01:42:04 +0000 (Wed, 13 Jun 2012) Log Message: ----------- tn5250/trunk: add basic definitions Modified Paths: -------------- csw/mgar/pkg/tn5250/trunk/Makefile csw/mgar/pkg/tn5250/trunk/checksums Modified: csw/mgar/pkg/tn5250/trunk/Makefile =================================================================== --- csw/mgar/pkg/tn5250/trunk/Makefile 2012-06-13 01:35:19 UTC (rev 18373) +++ csw/mgar/pkg/tn5250/trunk/Makefile 2012-06-13 01:42:04 UTC (rev 18374) @@ -2,27 +2,18 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = tn5250 -VERSION = x.y +VERSION = 0.17.4 GARTYPE = v2 -CATEGORIES = category +CATEGORIES = net -DESCRIPTION = Brief description +DESCRIPTION = A tn5250 emulator define BLURB - Long description +tn5250 is a telnet client for the IBM iSeries and AS/400 that emulates 5250 terminals and printers. This function is the same as that provided by the 5250 emulator in IBM iSeries Access. endef -MASTER_SITES = +MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(DISTNAME).tar.gz -# File name regex to get notifications about upstream software releases -# NOTE: Use this only if the automatic regex creation -# does not work for your package -# 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 Modified: csw/mgar/pkg/tn5250/trunk/checksums =================================================================== --- csw/mgar/pkg/tn5250/trunk/checksums 2012-06-13 01:35:19 UTC (rev 18373) +++ csw/mgar/pkg/tn5250/trunk/checksums 2012-06-13 01:42:04 UTC (rev 18374) @@ -0,0 +1 @@ +d1eb7c5a2e15cd2f43a1c115e2734153 tn5250-0.17.4.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Wed Jun 13 03:53:10 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 13 Jun 2012 01:53:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[18375] csw/mgar/pkg/tn5250/trunk/Makefile Message-ID: Revision: 18375 http://gar.svn.sourceforge.net/gar/?rev=18375&view=rev Author: bdwalton Date: 2012-06-13 01:53:09 +0000 (Wed, 13 Jun 2012) Log Message: ----------- tn5250/trunk: solaris 10 only Modified Paths: -------------- csw/mgar/pkg/tn5250/trunk/Makefile Modified: csw/mgar/pkg/tn5250/trunk/Makefile =================================================================== --- csw/mgar/pkg/tn5250/trunk/Makefile 2012-06-13 01:42:04 UTC (rev 18374) +++ csw/mgar/pkg/tn5250/trunk/Makefile 2012-06-13 01:53:09 UTC (rev 18375) @@ -6,6 +6,8 @@ GARTYPE = v2 CATEGORIES = net +PACKAGING_PLATFORMS = solaris10-i386 solaris10-sparc + DESCRIPTION = A tn5250 emulator define BLURB tn5250 is a telnet client for the IBM iSeries and AS/400 that emulates 5250 terminals and printers. This function is the same as that provided by the 5250 emulator in IBM iSeries Access. 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 13 04:15:26 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 13 Jun 2012 02:15:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[18376] csw/mgar/pkg/tn5250/trunk/Makefile Message-ID: Revision: 18376 http://gar.svn.sourceforge.net/gar/?rev=18376&view=rev Author: bdwalton Date: 2012-06-13 02:15:25 +0000 (Wed, 13 Jun 2012) Log Message: ----------- tn5250/trunk: build using gcc Modified Paths: -------------- csw/mgar/pkg/tn5250/trunk/Makefile Modified: csw/mgar/pkg/tn5250/trunk/Makefile =================================================================== --- csw/mgar/pkg/tn5250/trunk/Makefile 2012-06-13 01:53:09 UTC (rev 18375) +++ csw/mgar/pkg/tn5250/trunk/Makefile 2012-06-13 02:15:25 UTC (rev 18376) @@ -16,6 +16,8 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(DISTNAME).tar.gz +GARCOMPILER = GNU + CONFIGURE_ARGS = $(DIRPATHS) include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Wed Jun 13 04:27:29 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 13 Jun 2012 02:27:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[18377] csw/mgar/pkg/tn5250/trunk Message-ID: Revision: 18377 http://gar.svn.sourceforge.net/gar/?rev=18377&view=rev Author: bdwalton Date: 2012-06-13 02:27:29 +0000 (Wed, 13 Jun 2012) Log Message: ----------- tn5250/trunk: ensure we have FIONBIO defined by including sys/filio.h where required Modified Paths: -------------- csw/mgar/pkg/tn5250/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/tn5250/trunk/files/0001-Ensure-we-have-FIONBIO-defined.patch Modified: csw/mgar/pkg/tn5250/trunk/Makefile =================================================================== --- csw/mgar/pkg/tn5250/trunk/Makefile 2012-06-13 02:15:25 UTC (rev 18376) +++ csw/mgar/pkg/tn5250/trunk/Makefile 2012-06-13 02:27:29 UTC (rev 18377) @@ -15,6 +15,7 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(DISTNAME).tar.gz +PATCHFILES += 0001-Ensure-we-have-FIONBIO-defined.patch GARCOMPILER = GNU Added: csw/mgar/pkg/tn5250/trunk/files/0001-Ensure-we-have-FIONBIO-defined.patch =================================================================== --- csw/mgar/pkg/tn5250/trunk/files/0001-Ensure-we-have-FIONBIO-defined.patch (rev 0) +++ csw/mgar/pkg/tn5250/trunk/files/0001-Ensure-we-have-FIONBIO-defined.patch 2012-06-13 02:27:29 UTC (rev 18377) @@ -0,0 +1,62 @@ +From efd27be644cb0679377690e41469c57d31c4e670 Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Wed, 13 Jun 2012 04:12:40 +0200 +Subject: [PATCH] Ensure we have FIONBIO defined + +Include sys/filio.h in files that use the FIONBIO constant. + +Signed-off-by: Ben Walton +--- + lib5250/sslstream.c | 4 ++++ + lib5250/telnetstr.c | 4 ++++ + lib5250/utility.c | 4 ++++ + 3 files changed, 12 insertions(+) + +diff --git a/lib5250/sslstream.c b/lib5250/sslstream.c +index 7181566..d4d0342 100644 +--- a/lib5250/sslstream.c ++++ b/lib5250/sslstream.c +@@ -30,6 +30,10 @@ + #include + #include + ++#if defined (__SVR4) && defined (__sun) ++#include ++#endif ++ + static int ssl_stream_get_next(Tn5250Stream *This,unsigned char *buf,int size); + static void ssl_stream_do_verb(Tn5250Stream * This, unsigned char verb, unsigned char what); + static int ssl_stream_host_verb(Tn5250Stream * This, unsigned char verb, +diff --git a/lib5250/telnetstr.c b/lib5250/telnetstr.c +index 9ad2624..7fa2688 100644 +--- a/lib5250/telnetstr.c ++++ b/lib5250/telnetstr.c +@@ -21,6 +21,10 @@ + */ + #include "tn5250-private.h" + ++#if defined (__SVR4) && defined (__sun) ++#include ++#endif ++ + static int telnet_stream_get_next(Tn5250Stream * This, unsigned char *buf, int size); + static void telnet_stream_do_verb(Tn5250Stream * This, unsigned char verb, unsigned char what); + static int telnet_stream_host_verb(Tn5250Stream * This, unsigned char verb, +diff --git a/lib5250/utility.c b/lib5250/utility.c +index 9f55b36..c736697 100644 +--- a/lib5250/utility.c ++++ b/lib5250/utility.c +@@ -22,6 +22,10 @@ + #include "tn5250-private.h" + #include "transmaps.h" + ++#if defined (__SVR4) && defined (__sun) ++#include ++#endif ++ + static char mapfix[256]; + static char mapfix2[256]; + static char mapfix3[256]; +-- +1.7.10.3 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Wed Jun 13 04:43:26 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 13 Jun 2012 02:43:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[18378] csw/mgar/pkg/tn5250/trunk/Makefile Message-ID: Revision: 18378 http://gar.svn.sourceforge.net/gar/?rev=18378&view=rev Author: bdwalton Date: 2012-06-13 02:43:25 +0000 (Wed, 13 Jun 2012) Log Message: ----------- tn5250/trunk: make sure we include the ncurses headers Modified Paths: -------------- csw/mgar/pkg/tn5250/trunk/Makefile Modified: csw/mgar/pkg/tn5250/trunk/Makefile =================================================================== --- csw/mgar/pkg/tn5250/trunk/Makefile 2012-06-13 02:27:29 UTC (rev 18377) +++ csw/mgar/pkg/tn5250/trunk/Makefile 2012-06-13 02:43:25 UTC (rev 18378) @@ -19,6 +19,8 @@ GARCOMPILER = GNU +EXTRA_INC += $(includedir)/ncurses + CONFIGURE_ARGS = $(DIRPATHS) include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Wed Jun 13 04:45:32 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 13 Jun 2012 02:45:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[18379] csw/mgar/pkg/tn5250/trunk/Makefile Message-ID: Revision: 18379 http://gar.svn.sourceforge.net/gar/?rev=18379&view=rev Author: bdwalton Date: 2012-06-13 02:45:32 +0000 (Wed, 13 Jun 2012) Log Message: ----------- tn5250/trunk: add library deps Modified Paths: -------------- csw/mgar/pkg/tn5250/trunk/Makefile Modified: csw/mgar/pkg/tn5250/trunk/Makefile =================================================================== --- csw/mgar/pkg/tn5250/trunk/Makefile 2012-06-13 02:43:25 UTC (rev 18378) +++ csw/mgar/pkg/tn5250/trunk/Makefile 2012-06-13 02:45:32 UTC (rev 18379) @@ -19,6 +19,10 @@ GARCOMPILER = GNU +RUNTIME_DEP_PKGS_CSWtn5250 += CSWlibncurses5 +RUNTIME_DEP_PKGS_CSWtn5250 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWtn5250 += CSWlibssl1-0-0 + EXTRA_INC += $(includedir)/ncurses CONFIGURE_ARGS = $(DIRPATHS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Wed Jun 13 04:55:59 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 13 Jun 2012 02:55:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[18380] csw/mgar/pkg/tn5250/trunk/Makefile Message-ID: Revision: 18380 http://gar.svn.sourceforge.net/gar/?rev=18380&view=rev Author: bdwalton Date: 2012-06-13 02:55:59 +0000 (Wed, 13 Jun 2012) Log Message: ----------- tn5250/trunk: add package splits (the lib package is likely overkill but should not hurt) Modified Paths: -------------- csw/mgar/pkg/tn5250/trunk/Makefile Modified: csw/mgar/pkg/tn5250/trunk/Makefile =================================================================== --- csw/mgar/pkg/tn5250/trunk/Makefile 2012-06-13 02:45:32 UTC (rev 18379) +++ csw/mgar/pkg/tn5250/trunk/Makefile 2012-06-13 02:55:59 UTC (rev 18380) @@ -19,10 +19,24 @@ GARCOMPILER = GNU +PACKAGES += CSWtn5250 +SPKG_DESC_CSWtn5250 = $(DESCRIPTION) RUNTIME_DEP_PKGS_CSWtn5250 += CSWlibncurses5 -RUNTIME_DEP_PKGS_CSWtn5250 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWtn5250 += CSWlib5250-0 RUNTIME_DEP_PKGS_CSWtn5250 += CSWlibssl1-0-0 +PACKAGES += CSWlib5250-0 +SPKG_DESC_CSWlib5250-0 += $(DESCRIPTION), lib5250.so.0 +PKGFILES_CSWlib5250-0 += $(call baseisadirs,$(libdir),lib5250\.so\.0\.0\.0) +PKGFILES_CSWlib5250-0 += $(call baseisadirs,$(libdir),lib5250\.so\.0(\.\d+)*) +RUNTIME_DEP_PKGS_CSWlib5250-0 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlib5250-0 += CSWlibssl1-0-0 + +PACKAGES += CSWtn5250-dev +SPKG_DESC_CSWtn5250-dev += $(DESCRIPTION), development files +RUNTIME_DEP_PKGS_CSWtn5250-dev += CSWlib5250-0 +PKGFILES_CSWtn5250-dev += $(PKGFILES_DEVEL) + EXTRA_INC += $(includedir)/ncurses CONFIGURE_ARGS = $(DIRPATHS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Wed Jun 13 05:06:37 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 13 Jun 2012 03:06:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[18381] csw/mgar/pkg/tn5250/trunk/Makefile Message-ID: Revision: 18381 http://gar.svn.sourceforge.net/gar/?rev=18381&view=rev Author: bdwalton Date: 2012-06-13 03:06:37 +0000 (Wed, 13 Jun 2012) Log Message: ----------- tn5250/trunk: override bad content warning caused by a comment Modified Paths: -------------- csw/mgar/pkg/tn5250/trunk/Makefile Modified: csw/mgar/pkg/tn5250/trunk/Makefile =================================================================== --- csw/mgar/pkg/tn5250/trunk/Makefile 2012-06-13 02:55:59 UTC (rev 18380) +++ csw/mgar/pkg/tn5250/trunk/Makefile 2012-06-13 03:06:37 UTC (rev 18381) @@ -24,6 +24,8 @@ RUNTIME_DEP_PKGS_CSWtn5250 += CSWlibncurses5 RUNTIME_DEP_PKGS_CSWtn5250 += CSWlib5250-0 RUNTIME_DEP_PKGS_CSWtn5250 += CSWlibssl1-0-0 +# comment string +CHECKPKG_OVERRIDES_CSWtn5250 += file-with-bad-content|/usr/local|root/opt/csw/bin/5250keys PACKAGES += CSWlib5250-0 SPKG_DESC_CSWlib5250-0 += $(DESCRIPTION), lib5250.so.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 Wed Jun 13 05:08:01 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 13 Jun 2012 03:08:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[18382] csw/mgar/pkg/tn5250/trunk/Makefile Message-ID: Revision: 18382 http://gar.svn.sourceforge.net/gar/?rev=18382&view=rev Author: bdwalton Date: 2012-06-13 03:08:01 +0000 (Wed, 13 Jun 2012) Log Message: ----------- tn5250/trunk: override bad paths in README file Modified Paths: -------------- csw/mgar/pkg/tn5250/trunk/Makefile Modified: csw/mgar/pkg/tn5250/trunk/Makefile =================================================================== --- csw/mgar/pkg/tn5250/trunk/Makefile 2012-06-13 03:06:37 UTC (rev 18381) +++ csw/mgar/pkg/tn5250/trunk/Makefile 2012-06-13 03:08:01 UTC (rev 18382) @@ -26,6 +26,8 @@ RUNTIME_DEP_PKGS_CSWtn5250 += CSWlibssl1-0-0 # comment string CHECKPKG_OVERRIDES_CSWtn5250 += file-with-bad-content|/usr/local|root/opt/csw/bin/5250keys +CHECKPKG_OVERRIDES_CSWtn5250 += file-with-bad-content|/usr/local|root/opt/csw/share/tn5250/README +CHECKPKG_OVERRIDES_CSWtn5250 += file-with-bad-content|/usr/share|root/opt/csw/share/tn5250/README PACKAGES += CSWlib5250-0 SPKG_DESC_CSWlib5250-0 += $(DESCRIPTION), lib5250.so.0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Wed Jun 13 08:16:56 2012 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Wed, 13 Jun 2012 06:16:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[18383] csw/mgar/pkg/postgresql/branches/postgresql-9.0 Message-ID: Revision: 18383 http://gar.svn.sourceforge.net/gar/?rev=18383&view=rev Author: guengel Date: 2012-06-13 06:16:56 +0000 (Wed, 13 Jun 2012) Log Message: ----------- postgresql/branches/postgresql-9.0: Dropped support for Solaris 9. Fixed inclusion of changelog.CSW in packages. Modified Paths: -------------- csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/changelog.CSW Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile 2012-06-13 03:08:01 UTC (rev 18382) +++ csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile 2012-06-13 06:16:56 UTC (rev 18383) @@ -94,6 +94,8 @@ VERSION = $(BASE_VERSION).$(PATCHLEVEL) CATEGORIES = apps +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + # Useful when making a series of builds on the same day # GARFLAVOR ?= DBG @@ -273,11 +275,11 @@ PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += .*/alternatives/$(NAME)$(BASE_VERSION_NODOT)_server.* PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += .*/CSW$(NAME)$(BASE_VERSION_NODOT)-server.postmsg PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += .*$(docdir)/$(NAME)$(BASE_VERSION_NODOT)_server/README.CSW +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += .*$(docdir)/$(NAME)$(BASE_VERSION_NODOT)_server/changelog.CSW RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibreadline6 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibz1 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibpq5 -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibgnugetopt0 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibxslt1 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibgssapi-krb5-2 @@ -291,11 +293,11 @@ PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-client += .*/alternatives/$(NAME)$(BASE_VERSION_NODOT)_client.* PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-client += .*/CSW$(NAME)$(BASE_VERSION_NODOT)-client.postmsg PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-client += .*$(docdir)/$(NAME)$(BASE_VERSION_NODOT)_client/README.CSW +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-client += .*$(docdir)/$(NAME)$(BASE_VERSION_NODOT)_client/changelog.CSW RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibreadline6 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibz1 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibpq5 -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibgnugetopt0 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibxslt1 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibgssapi-krb5-2 @@ -310,10 +312,10 @@ PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += .*/alternatives/$(NAME)$(BASE_VERSION_NODOT)_contrib.* PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += .*/CSW$(NAME)$(BASE_VERSION_NODOT)-contrib.postmsg PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += .*$(docdir)/$(NAME)$(BASE_VERSION_NODOT)_contrib/README.CSW +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += .*$(docdir)/$(NAME)$(BASE_VERSION_NODOT)_contrib/changelog.CSW RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibz1 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibpq5 -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibgnugetopt0 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibxslt1 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibgssapi-krb5-2 @@ -328,6 +330,7 @@ PKGFILES_CSW$(NAME)-dev += $(foreach n,$(BIN_NAMES_DEVEL),.*/man1/$(n)\.1$$) PKGFILES_CSW$(NAME)-dev += .*/CSW$(NAME)-dev.postmsg PKGFILES_CSW$(NAME)-dev += .*$(docdir)/$(NAME)_dev/README.CSW +PKGFILES_CSW$(NAME)-dev += .*/postgresql_dev/changelog.CSW # See `post-merge-modulated:' PKGFILES_CSW$(NAME)-dev += .*/libpgport\.a$ RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibecpg-compat3 @@ -336,7 +339,6 @@ RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibpgtypes3 RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibz1 RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibgssapi-krb5-2 -RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibgnugetopt0 RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibxslt1 RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibreadline6 @@ -358,6 +360,7 @@ PACKAGES += CSWlibecpg-compat3 SPKG_DESC_CSWlibecpg-compat3 = PostgreSQL $(VERSION), libecpg_compat PKGFILES_CSWlibecpg-compat3 = $(call pkgfiles_lib,libecpg_compat.so.3) +PKGFILES_CSWlibecpg-compat3 += .*/libecpg_compat3/changelog.CSW RUNTIME_DEP_PKGS_CSWlibecpg-compat3 = CSWlibecpg6 RUNTIME_DEP_PKGS_CSWlibecpg-compat3 += CSWlibpgtypes3 RUNTIME_DEP_PKGS_CSWlibecpg-compat3 += CSWlibpq5 @@ -365,16 +368,19 @@ PACKAGES += CSWlibecpg6 SPKG_DESC_CSWlibecpg6 = PostgreSQL $(VERSION), libecpg PKGFILES_CSWlibecpg6 = $(call pkgfiles_lib,libecpg.so.6) +PKGFILES_CSWlibecpg6 += .*/libecpg6/changelog.CSW RUNTIME_DEP_PKGS_CSWlibecpg6 += CSWlibpgtypes3 RUNTIME_DEP_PKGS_CSWlibecpg6 += CSWlibpq5 PACKAGES += CSWlibpgtypes3 SPKG_DESC_CSWlibpgtypes3 = PostgreSQL $(VERSION), libpgtypes PKGFILES_CSWlibpgtypes3 = $(call pkgfiles_lib,libpgtypes.so.3) +PKGFILES_CSWlibpgtypes3 += .*/libpgtypes3/changelog.CSW PACKAGES += CSWlibpq5 SPKG_DESC_CSWlibpq5 = PostgreSQL $(VERSION), libpq PKGFILES_CSWlibpq5 = $(call pkgfiles_lib,libpq.so.5) +PKGFILES_CSWlibpq5 += .*/libpq5/changelog.CSW RUNTIME_DEP_PKGS_CSWlibpq5 = CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWlibpq5 += CSWlibgssapi-krb5-2 @@ -386,7 +392,6 @@ BUILD_DEP_PKGS += CSWlibreadline-dev BUILD_DEP_PKGS += CSWgsed # gsed is used in this recipe BUILD_DEP_PKGS += CSWlibz-dev -BUILD_DEP_PKGS += CSWlibgnugetopt-dev EXTRA_LD_OPTIONS = -R$(prefix)/lib/\$$ISALIST # Needed for thread safety check by configure Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/changelog.CSW =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/changelog.CSW 2012-06-13 03:08:01 UTC (rev 18382) +++ csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/changelog.CSW 2012-06-13 06:16:56 UTC (rev 18383) @@ -1,10 +1,15 @@ -postgresql90 (9.0.8,REV=2012.06.11) +postgresql90 (9.0.8,REV=2012.06.13) * New upstream release 9.0.8. - -- Rafael Ostertag Mon, 11 June 2012 15:42:57+0200 + * Dropped support for Solaris 9 + * Include changelog.CSW in all packages, thus removing the clustering of + changelog.CSW files in CSWpostgresql + -- Rafael Ostertag Mon, 13 June 2012 07:26:57+0200 + + postgresql90 (9.0.7,REV=2012.05.01) * New upstream release 9.0.7. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Wed Jun 13 11:53:06 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Wed, 13 Jun 2012 09:53:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[18384] csw/mgar/pkg/librecad/trunk/Makefile Message-ID: Revision: 18384 http://gar.svn.sourceforge.net/gar/?rev=18384&view=rev Author: cgrzemba Date: 2012-06-13 09:53:06 +0000 (Wed, 13 Jun 2012) Log Message: ----------- librecad/trunk: add extra license files Modified Paths: -------------- csw/mgar/pkg/librecad/trunk/Makefile Modified: csw/mgar/pkg/librecad/trunk/Makefile =================================================================== --- csw/mgar/pkg/librecad/trunk/Makefile 2012-06-13 06:16:56 UTC (rev 18383) +++ csw/mgar/pkg/librecad/trunk/Makefile 2012-06-13 09:53:06 UTC (rev 18384) @@ -7,22 +7,22 @@ GARTYPE = v2 CATEGORIES = gnome -DESCRIPTION = libreCAD - based on QCAD 2.0 +DESCRIPTION = LibreCAD - based on QCAD 2.0 define BLURB LibreCAD is a free Open Source CAD application for Windows, Apple and Linux. Support and documentation is free from our large, dedicated community of users, contributors and developers endef LICENSE += LICENSE -LICENSE += gpl-2.0.txt -LICENSE += gpl-2.0greater.txt -LICENSE += LICENSE_Apache2.txt -LICENSE += LICENSE_GPLv3.txt +EXTRA_LICENSE += gpl-2.0.txt +EXTRA_LICENSE += gpl-2.0greater.txt +EXTRA_LICENSE += LICENSE_Apache2.txt +EXTRA_LICENSE += LICENSE_GPLv3.txt # git clone https://github.com/LibreCAD/LibreCAD.git # https://github.com/LibreCAD/LibreCAD/tarball/master MASTER_SITES = # DISTFILES = $(DISTNAME).tar.gz -GIT_REPOS = http://github.com/LibreCAD/LibreCAD.git +GIT_REPOS = http://github.com/$(NAME)/$(NAME).git GIT_USE_PROXY = 1 # GIT_TREEISH_LibreCAD.git = $(GIT_VERSION) @@ -42,7 +42,7 @@ PACKAGES += CSWlibreCAD CATALOGNAME_CSWlibreCAD = libreCAD PKGFILES_CSWlibreCAD += $(call baseisadirs,$(bindir),.*) -PKGFILES_CSWlibreCAD += $(prefix)/resources/* +PKGFILES_CSWlibreCAD += $(datadir)/$(call tolower,$(NAME))/.* RUNTIME_DEP_PKGS_CSWlibreCAD += CSWlibqthelp4-gxx RUNTIME_DEP_PKGS_CSWlibreCAD += CSWlibqtcore4-gxx RUNTIME_DEP_PKGS_CSWlibreCAD += CSWlibstdc++6 @@ -66,8 +66,11 @@ ginstall -d $(DESTDIR)$(bindir) ginstall -m 755 $(WORKSRC)/unix/librecad $(DESTDIR)$(bindir) ginstall -m 755 $(WORKSRC)/unix/ttf2lff $(DESTDIR)$(bindir) - ginstall -d $(DESTDIR)$(datadir)/resources - gcp -rfp $(WORKSRC)/unix/resources $(DESTDIR)$(datadir)/librecad + ginstall -d $(DESTDIR)$(datadir)/$(call tolower, $(NAME))/resources + gcp -rfp $(WORKSRC)/unix/resources/* \ + $(DESTDIR)$(datadir)/$(call tolower, $(NAME))/resources + ginstall -d $(DESTDIR)$(subst gxx/,,$(docdir))/$(CATALOGNAME_CSWlibreCAD) + $(foreach L,$(EXTRA_LICENSE),gcp $(WORKSRC)/$L $(DESTDIR)$(subst gxx/,,$(docdir))/$(CATALOGNAME_CSWlibreCAD);) @$(MAKECOOKIE) include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Wed Jun 13 13:15:44 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Wed, 13 Jun 2012 11:15:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[18385] csw/mgar/pkg Message-ID: Revision: 18385 http://gar.svn.sourceforge.net/gar/?rev=18385&view=rev Author: pfelecan Date: 2012-06-13 11:15:43 +0000 (Wed, 13 Jun 2012) Log Message: ----------- migration from a private recipe to a GAR based recipe started; not for release as the package is monolithic. Added Paths: ----------- csw/mgar/pkg/libgnet/ csw/mgar/pkg/libgnet/Makefile csw/mgar/pkg/libgnet/branches/ csw/mgar/pkg/libgnet/tags/ csw/mgar/pkg/libgnet/trunk/ csw/mgar/pkg/libgnet/trunk/Makefile csw/mgar/pkg/libgnet/trunk/checksums csw/mgar/pkg/libgnet/trunk/files/ Added: csw/mgar/pkg/libgnet/Makefile =================================================================== --- csw/mgar/pkg/libgnet/Makefile (rev 0) +++ csw/mgar/pkg/libgnet/Makefile 2012-06-13 11:15:43 UTC (rev 18385) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/libgnet/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/libgnet/trunk/Makefile =================================================================== --- csw/mgar/pkg/libgnet/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libgnet/trunk/Makefile 2012-06-13 11:15:43 UTC (rev 18385) @@ -0,0 +1,35 @@ +# $Id$ + +NAME = libgnet +VERSION = 2.0.8 +GARTYPE = v2 +CATEGORIES = lib + +DESCRIPTION = Network library based on glib2 +define BLURB + GNet is a simple network library. It is written in C, object-oriented, + and built upon GLib. It is intended to be easy to use and port. +endef + +DISTNAME = gnet-$(VERSION) +MASTER_SITES = http://ftp.gnome.org/pub/GNOME/sources/gnet/2.0/ +DISTFILES = $(DISTNAME).tar.gz + +BUILD_DEP_PKGS += CSWlibglib2-dev +BUILD_DEP_PKGS += CSWlibiconv-dev + +RUNTIME_DEP_PKGS += CSWlibgcc-s1 +RUNTIME_DEP_PKGS += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS += CSWlibiconv2 +RUNTIME_DEP_PKGS += CSWlibintl8 + +CONFIGURE_ARGS = $(DIRPATHS) + +GARCOMPILER = GNU + +include gar/category.mk + +# this is private and not available publicly +mydependencies: + $(HOME)/bin/ocswdeplist --package $(NAME) Property changes on: csw/mgar/pkg/libgnet/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/libgnet/trunk/checksums =================================================================== --- csw/mgar/pkg/libgnet/trunk/checksums (rev 0) +++ csw/mgar/pkg/libgnet/trunk/checksums 2012-06-13 11:15:43 UTC (rev 18385) @@ -0,0 +1 @@ +f42215834646f656a5ecb2f5376f66ac gnet-2.0.8.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Jun 13 16:44:49 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 13 Jun 2012 14:44:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[18386] csw/mgar/pkg Message-ID: Revision: 18386 http://gar.svn.sourceforge.net/gar/?rev=18386&view=rev Author: wahwah Date: 2012-06-13 14:44:49 +0000 (Wed, 13 Jun 2012) Log Message: ----------- pypy/trunk: Initial commit. Let Dago figure out how to save the tarball with a sensible name. Added Paths: ----------- csw/mgar/pkg/pypy/ csw/mgar/pkg/pypy/Makefile csw/mgar/pkg/pypy/branches/ csw/mgar/pkg/pypy/tags/ csw/mgar/pkg/pypy/trunk/ csw/mgar/pkg/pypy/trunk/Makefile csw/mgar/pkg/pypy/trunk/checksums csw/mgar/pkg/pypy/trunk/files/ Added: csw/mgar/pkg/pypy/Makefile =================================================================== --- csw/mgar/pkg/pypy/Makefile (rev 0) +++ csw/mgar/pkg/pypy/Makefile 2012-06-13 14:44:49 UTC (rev 18386) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/pypy/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/pypy/trunk/Makefile =================================================================== --- csw/mgar/pkg/pypy/trunk/Makefile (rev 0) +++ csw/mgar/pkg/pypy/trunk/Makefile 2012-06-13 14:44:49 UTC (rev 18386) @@ -0,0 +1,20 @@ +# $Id$ +# +NAME = pypy +VERSION = 1.9 +GARTYPE = v2 +CATEGORIES = apps + +DESCRIPTION = Python in Python +define BLURB + Long description +endef + +MASTER_SITES = https://bitbucket.org/pypy/pypy/get/ +# The following is silly. +DISTFILES = release.tar.bz2 + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Property changes on: csw/mgar/pkg/pypy/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/pypy/trunk/checksums =================================================================== 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 13 17:17:14 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 13 Jun 2012 15:17:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[18387] csw/mgar/gar/v2/gar.conf.mk Message-ID: Revision: 18387 http://gar.svn.sourceforge.net/gar/?rev=18387&view=rev Author: dmichelsen Date: 2012-06-13 15:17:14 +0000 (Wed, 13 Jun 2012) Log Message: ----------- mGAR v2: Raise GCC4 level to 4.7 Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2012-06-13 14:44:49 UTC (rev 18386) +++ csw/mgar/gar/v2/gar.conf.mk 2012-06-13 15:17:14 UTC (rev 18387) @@ -539,7 +539,7 @@ SOS12U2_CC_HOME ?= /opt/solstudio12.2 SOS12U3_CC_HOME ?= /opt/solarisstudio12.3 - GCC4_VERSION ?= 4.6 + GCC4_VERSION ?= 4.7 GCC3_CC ?= $(GCC3_CC_HOME)/bin/gcc GCC4_CC ?= $(GCC4_CC_HOME)/bin/gcc-$(GCC4_VERSION) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Wed Jun 13 18:57:43 2012 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Wed, 13 Jun 2012 16:57:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[18388] csw/mgar/pkg/gtk2/trunk/Makefile Message-ID: Revision: 18388 http://gar.svn.sourceforge.net/gar/?rev=18388&view=rev Author: guengel Date: 2012-06-13 16:57:43 +0000 (Wed, 13 Jun 2012) Log Message: ----------- Updated dependencies Modified Paths: -------------- csw/mgar/pkg/gtk2/trunk/Makefile Modified: csw/mgar/pkg/gtk2/trunk/Makefile =================================================================== --- csw/mgar/pkg/gtk2/trunk/Makefile 2012-06-13 15:17:14 UTC (rev 18387) +++ csw/mgar/pkg/gtk2/trunk/Makefile 2012-06-13 16:57:43 UTC (rev 18388) @@ -49,8 +49,8 @@ # I pull the whole gdk pixbuf to make sure gdk-pixbuf-query-loaders will # called as well RUNTIME_DEP_PKGS_CSWgtk2 += CSWgdkpixbuf -RUNTIME_DEP_PKGS_CSWgtk2 += CSWfconfig -RUNTIME_DEP_PKGS_CSWgtk2 += CSWftype2 +RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibfontconfig1 +RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibfreetype6 RUNTIME_DEP_PKGS_CSWgtk2 += CSWgtk2-printbackends-file RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibatk1-0-0 RUNTIME_DEP_PKGS_CSWgtk2 += CSWlibcairo2 @@ -72,8 +72,8 @@ SPKG_DESC_CSWgtk2-printbackends-papi = $(DESCRIPTION), Print Backend PKGFILES_CSWgtk2-printbackends-papi = .*/printbackends/libprintbackend-papi.* RUNTIME_DEP_PKGS_CSWgtk2-printbackends-papi = CSWlibgdk-x11-2-0-0 -RUNTIME_DEP_PKGS_CSWgtk2-printbackends-papi += CSWfconfig -RUNTIME_DEP_PKGS_CSWgtk2-printbackends-papi += CSWftype2 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-papi += CSWlibfontconfig1 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-papi += CSWlibfreetype6 RUNTIME_DEP_PKGS_CSWgtk2-printbackends-papi += CSWlibatk1-0-0 RUNTIME_DEP_PKGS_CSWgtk2-printbackends-papi += CSWlibcairo2 RUNTIME_DEP_PKGS_CSWgtk2-printbackends-papi += CSWlibgdk-pixbuf2-0-0 @@ -91,8 +91,8 @@ SPKG_DESC_CSWgtk2-printbackends-file = $(DESCRIPTION), File Print Backend PKGFILES_CSWgtk2-printbackends-file = .*/printbackends/libprintbackend-file.* RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file = CSWgtk2-printbackends-papi -RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWfconfig -RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWftype2 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWlibfontconfig1 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWlibfreetype6 RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWlibatk1-0-0 RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWlibcairo2 RUNTIME_DEP_PKGS_CSWgtk2-printbackends-file += CSWlibgdk-pixbuf2-0-0 @@ -112,8 +112,8 @@ SPKG_DESC_CSWgtk2-printbackends-cups = $(DESCRIPTION), CUPS Print Backend PKGFILES_CSWgtk2-printbackends-cups = .*/printbackends/libprintbackend-cups.* RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups = CSWgtk2-printbackends-papi -RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWfconfig -RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWftype2 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibfontconfig1 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibfreetype6 RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibatk1-0-0 RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibcairo2 RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibcom-err3 @@ -129,20 +129,20 @@ RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibintl8 RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibk5crypto3 RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibkrb5-3 -RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibkrb5support0 RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibxrender RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibz1 -RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWosslrt RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWpango +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibgpg-error0 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibgcrypt11 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-cups += CSWlibgnutls26 CHECKPKG_OVERRIDES_CSWgtk2-printbackends-cups += surplus-dependency|CSWgtk2-printbackends-papi -CHECKPKG_OVERRIDES_CSWgtk2-printbackends-cups += bad-rpath-entry|/opt/csw/lib/|opt/csw/lib/gtk-2.0/2.10.0/printbackends/libprintbackend-cups.so PACKAGES += CSWgtk2-printbackends-lpr SPKG_DESC_CSWgtk2-printbackends-lpr = $(DESCRIPTION), LPR Print Backend PKGFILES_CSWgtk2-printbackends-lpr = .*/printbackends/libprintbackend-lpr.* RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr = CSWgtk2-printbackends-papi -RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWfconfig -RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWftype2 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWlibfontconfig1 +RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWlibfreetype6 RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWlibatk1-0-0 RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWlibcairo2 RUNTIME_DEP_PKGS_CSWgtk2-printbackends-lpr += CSWlibgdk-pixbuf2-0-0 @@ -161,8 +161,8 @@ PACKAGES += CSWlibgailutil18 SPKG_DESC_CSWlibgailutil18 = $(DESCRIPTION), libgailutil PKGFILES_CSWlibgailutil18 = $(call pkgfiles_lib,libgailutil.so.18) -RUNTIME_DEP_PKGS_CSWlibgailutil18 = CSWfconfig -RUNTIME_DEP_PKGS_CSWlibgailutil18 += CSWftype2 +RUNTIME_DEP_PKGS_CSWlibgailutil18 = CSWlibfontconfig1 +RUNTIME_DEP_PKGS_CSWlibgailutil18 += CSWlibfreetype6 RUNTIME_DEP_PKGS_CSWlibgailutil18 += CSWlibatk1-0-0 RUNTIME_DEP_PKGS_CSWlibgailutil18 += CSWlibcairo2 RUNTIME_DEP_PKGS_CSWlibgailutil18 += CSWlibgdk-pixbuf2-0-0 @@ -181,7 +181,7 @@ SPKG_DESC_CSWlibgdk-x11-2-0-0 = $(DESCRIPTION), libgdk-x11-2.0 PKGFILES_CSWlibgdk-x11-2-0-0 = $(call pkgfiles_lib,libgdk-x11-2.0.so.0) RUNTIME_DEP_PKGS_CSWlibgdk-x11-2-0-0 = CSWlibgdk-pixbuf2-0-0 -RUNTIME_DEP_PKGS_CSWlibgdk-x11-2-0-0 += CSWfconfig +RUNTIME_DEP_PKGS_CSWlibgdk-x11-2-0-0 += CSWlibfontconfig1 RUNTIME_DEP_PKGS_CSWlibgdk-x11-2-0-0 += CSWlibcairo2 RUNTIME_DEP_PKGS_CSWlibgdk-x11-2-0-0 += CSWlibgio2-0-0 RUNTIME_DEP_PKGS_CSWlibgdk-x11-2-0-0 += CSWlibglib2-0-0 @@ -197,8 +197,8 @@ SPKG_DESC_CSWlibgtk-x11-2-0-0 = $(DESCRIPTION), libgtk-x11-2.0 PKGFILES_CSWlibgtk-x11-2-0-0 = $(call pkgfiles_lib,libgtk-x11-2.0.so.0) RUNTIME_DEP_PKGS_CSWlibgtk-x11-2-0-0 = CSWlibgdk-x11-2-0-0 -RUNTIME_DEP_PKGS_CSWlibgtk-x11-2-0-0 += CSWfconfig -RUNTIME_DEP_PKGS_CSWlibgtk-x11-2-0-0 += CSWftype2 +RUNTIME_DEP_PKGS_CSWlibgtk-x11-2-0-0 += CSWlibfontconfig1 +RUNTIME_DEP_PKGS_CSWlibgtk-x11-2-0-0 += CSWlibfreetype6 RUNTIME_DEP_PKGS_CSWlibgtk-x11-2-0-0 += CSWlibatk1-0-0 RUNTIME_DEP_PKGS_CSWlibgtk-x11-2-0-0 += CSWlibcairo2 RUNTIME_DEP_PKGS_CSWlibgtk-x11-2-0-0 += CSWlibgdk-pixbuf2-0-0 @@ -223,9 +223,9 @@ RUNTIME_DEP_PKGS_CSWlibgtk2-dev = CSWlibgailutil18 # I pull the whole gdk pixbuf to make sure gdk-pixbuf-query-loaders # will be called as well -RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWfconfig -RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWftype2 -RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWgdkpixbuf +RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWlibfontconfig1 +RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWlibgdk-pixbuf2-0-0 RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWlibatk1-0-0 RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWlibcairo2 RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWlibgdk-pixbuf-dev @@ -241,10 +241,7 @@ RUNTIME_DEP_PKGS_CSWlibgtk2-dev += CSWpango OBSOLETED_BY_CSWlibgtk2-dev = CSWgtk2devel CATALOGNAME_CSWgtk2devel = gtk2_devel_stub -CHECKPKG_OVERRIDES_CSWlibgtk2-dev += surplus-dependency|CSWgdkpixbuf CHECKPKG_OVERRIDES_CSWlibgtk2-dev += surplus-dependency|CSWlibgdk-pixbuf-dev -# Covered by CSWgdkpixbuf -CHECKPKG_OVERRIDES_CSWlibgtk2-dev += missing-dependency|CSWlibgdk-pixbuf2-0-0 PACKAGES += CSWgtk2doc This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Wed Jun 13 19:37:27 2012 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Wed, 13 Jun 2012 17:37:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[18389] csw/mgar/pkg/postgresql/trunk Message-ID: Revision: 18389 http://gar.svn.sourceforge.net/gar/?rev=18389&view=rev Author: guengel Date: 2012-06-13 17:37:27 +0000 (Wed, 13 Jun 2012) Log Message: ----------- postgresql/trunk: Dropped support for Solaris 9. Fixed inclusion of changelog.CSW in packages. Modified Paths: -------------- csw/mgar/pkg/postgresql/trunk/Makefile csw/mgar/pkg/postgresql/trunk/files/changelog.CSW Modified: csw/mgar/pkg/postgresql/trunk/Makefile =================================================================== --- csw/mgar/pkg/postgresql/trunk/Makefile 2012-06-13 16:57:43 UTC (rev 18388) +++ csw/mgar/pkg/postgresql/trunk/Makefile 2012-06-13 17:37:27 UTC (rev 18389) @@ -95,6 +95,8 @@ CATEGORIES = apps GARTYPE = v2 +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + # Useful when making a series of builds on the same day # GARFLAVOR ?= DBG @@ -321,11 +323,11 @@ PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += .*/alternatives/$(NAME)$(BASE_VERSION_NODOT)_server.* PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += .*/CSW$(NAME)$(BASE_VERSION_NODOT)-server.postmsg PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += .*$(docdir)/$(NAME)$(BASE_VERSION_NODOT)_server/README.CSW +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-server += .*$(docdir)/$(NAME)$(BASE_VERSION_NODOT)_server/changelog.CSW RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibreadline6 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibz1 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibpq5 -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibgnugetopt0 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibxslt1 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibgssapi-krb5-2 @@ -339,11 +341,11 @@ PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-client += .*/alternatives/$(NAME)$(BASE_VERSION_NODOT)_client.* PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-client += .*/CSW$(NAME)$(BASE_VERSION_NODOT)-client.postmsg PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-client += .*$(docdir)/$(NAME)$(BASE_VERSION_NODOT)_client/README.CSW +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-client += .*$(docdir)/$(NAME)$(BASE_VERSION_NODOT)_client/changelog.CSW RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibreadline6 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibz1 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibpq5 -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibgnugetopt0 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibxslt1 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibgssapi-krb5-2 @@ -361,10 +363,10 @@ PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += .*/alternatives/$(NAME)$(BASE_VERSION_NODOT)_contrib.* PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += .*/CSW$(NAME)$(BASE_VERSION_NODOT)-contrib.postmsg PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += .*$(docdir)/$(NAME)$(BASE_VERSION_NODOT)_contrib/README.CSW +PKGFILES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += .*$(docdir)/$(NAME)$(BASE_VERSION_NODOT)_contrib/changelog.CSW RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibz1 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibpq5 -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibgnugetopt0 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibxslt1 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibgssapi-krb5-2 @@ -379,6 +381,7 @@ PKGFILES_CSW$(NAME)-dev += $(foreach n,$(BIN_NAMES_DEVEL),.*/man1/$(n)\.1$$) PKGFILES_CSW$(NAME)-dev += .*/CSW$(NAME)-dev.postmsg PKGFILES_CSW$(NAME)-dev += .*$(docdir)/$(NAME)_dev/README.CSW +PKGFILES_CSW$(NAME)-dev += .*/postgresql_dev/changelog.CSW # See `post-merge-modulated:' PKGFILES_CSW$(NAME)-dev += .*/libpgport\.a$ RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibecpg-compat3 @@ -387,7 +390,6 @@ RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibpgtypes3 RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibz1 RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibgssapi-krb5-2 -RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibgnugetopt0 RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibxslt1 RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSW$(NAME)-dev += CSWlibreadline6 @@ -409,6 +411,7 @@ PACKAGES += CSWlibecpg-compat3 SPKG_DESC_CSWlibecpg-compat3 = PostgreSQL $(VERSION), libecpg_compat PKGFILES_CSWlibecpg-compat3 = $(call pkgfiles_lib,libecpg_compat.so.3) +PKGFILES_CSWlibecpg-compat3 += .*/libecpg_compat3/changelog.CSW RUNTIME_DEP_PKGS_CSWlibecpg-compat3 = CSWlibecpg6 RUNTIME_DEP_PKGS_CSWlibecpg-compat3 += CSWlibpgtypes3 RUNTIME_DEP_PKGS_CSWlibecpg-compat3 += CSWlibpq5 @@ -416,16 +419,19 @@ PACKAGES += CSWlibecpg6 SPKG_DESC_CSWlibecpg6 = PostgreSQL $(VERSION), libecpg PKGFILES_CSWlibecpg6 = $(call pkgfiles_lib,libecpg.so.6) +PKGFILES_CSWlibecpg6 += .*/libecpg6/changelog.CSW RUNTIME_DEP_PKGS_CSWlibecpg6 += CSWlibpgtypes3 RUNTIME_DEP_PKGS_CSWlibecpg6 += CSWlibpq5 PACKAGES += CSWlibpgtypes3 SPKG_DESC_CSWlibpgtypes3 = PostgreSQL $(VERSION), libpgtypes PKGFILES_CSWlibpgtypes3 = $(call pkgfiles_lib,libpgtypes.so.3) +PKGFILES_CSWlibpgtypes3 += .*/libpgtypes3/changelog.CSW PACKAGES += CSWlibpq5 SPKG_DESC_CSWlibpq5 = PostgreSQL $(VERSION), libpq PKGFILES_CSWlibpq5 = $(call pkgfiles_lib,libpq.so.5) +PKGFILES_CSWlibpq5 += .*/libpq5/changelog.CSW RUNTIME_DEP_PKGS_CSWlibpq5 = CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWlibpq5 += CSWlibgssapi-krb5-2 @@ -437,7 +443,6 @@ BUILD_DEP_PKGS += CSWlibreadline-dev BUILD_DEP_PKGS += CSWgsed # gsed is used in this recipe BUILD_DEP_PKGS += CSWlibz-dev -BUILD_DEP_PKGS += CSWlibgnugetopt-dev # See comment on the test-custom target. TEST_SCRIPTS = custom Modified: csw/mgar/pkg/postgresql/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/postgresql/trunk/files/changelog.CSW 2012-06-13 16:57:43 UTC (rev 18388) +++ csw/mgar/pkg/postgresql/trunk/files/changelog.CSW 2012-06-13 17:37:27 UTC (rev 18389) @@ -1,10 +1,15 @@ -postgresql91 (9.1.4,REV=2012.06.11) +postgresql91 (9.1.4,REV=2012.06.13) * New upstream release 9.1.4. - -- Rafael Ostertag Mon, 11 June 2012 16:23:57+0200 + * Dropped support for Solaris 9 + * Include changelog.CSW in all packages, thus removing the clustering of + changelog.CSW files in CSWpostgresql + -- Rafael Ostertag Wed, 13 June 2012 15:46:57+0200 + + postgresql91 (9.1.3,REV=2012.05.01) * New upstream release 9.1.3. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Wed Jun 13 21:28:19 2012 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Wed, 13 Jun 2012 19:28:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[18390] csw/mgar/pkg/pgadmin3/trunk Message-ID: Revision: 18390 http://gar.svn.sourceforge.net/gar/?rev=18390&view=rev Author: guengel Date: 2012-06-13 19:28:19 +0000 (Wed, 13 Jun 2012) Log Message: ----------- pgadmin3/trunk: Update to 1.14.3. Modified Paths: -------------- csw/mgar/pkg/pgadmin3/trunk/Makefile csw/mgar/pkg/pgadmin3/trunk/checksums Modified: csw/mgar/pkg/pgadmin3/trunk/Makefile =================================================================== --- csw/mgar/pkg/pgadmin3/trunk/Makefile 2012-06-13 17:37:27 UTC (rev 18389) +++ csw/mgar/pkg/pgadmin3/trunk/Makefile 2012-06-13 19:28:19 UTC (rev 18390) @@ -3,26 +3,64 @@ # $Id$ NAME = pgadmin3 -VERSION = 1.10.0 +VERSION = 1.14.3 CATEGORIES = apps GARTYPE = v2 +GARCOMPILER = SOS12U1 +LICENSE = LICENSE + +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + DESCRIPTION = An administration and development platform for PostgreSQL define BLURB endef + SPKG_SOURCEURL = http://www.pgadmin.org/ -MASTER_SITES = http://wwwmaster.postgresql.org/redir/76/h/pgadmin3/release/v$(VERSION)/src/ +MASTER_SITES = http://ftp.postgresql.org/pub/pgadmin3/release/v$(VERSION)/src/ DISTFILES = $(NAME)-$(VERSION).tar.gz UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz -RUNTIME_DEP_PKGS += CSWpostgresql -RUNTIME_DEP_PKGS += CSWkrb5lib -RUNTIME_DEP_PKGS += CSWlibpq -RUNTIME_DEP_PKGS += CSWlibxml2 -RUNTIME_DEP_PKGS += CSWlibxslt -RUNTIME_DEP_PKGS += CSWosslrt -RUNTIME_DEP_PKGS += CSWwxwidgetscommon -RUNTIME_DEP_PKGS += CSWwxwidgetsgtk2 -RUNTIME_DEP_PKGS += CSWzlib -BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) CSWwxwidgetsdevel -TEST_SCRIPTS = + +# Ignore them for now +CHECKPKG_OVERRIDES_CSWpgadmin3 += file-with-bad-content|/usr/local|root/opt/csw/share/pgadmin3/docs/zh_TW/hints/instrumentation.html +CHECKPKG_OVERRIDES_CSWpgadmin3 += file-with-bad-content|/usr/local|root/opt/csw/share/pgadmin3/docs/cs_CZ/connect.html +CHECKPKG_OVERRIDES_CSWpgadmin3 += file-with-bad-content|/usr/local|root/opt/csw/share/pgadmin3/docs/cs_CZ/extend.html +CHECKPKG_OVERRIDES_CSWpgadmin3 += file-with-bad-content|/usr/local|root/opt/csw/share/pgadmin3/docs/cs_CZ/pgagent-install.html +CHECKPKG_OVERRIDES_CSWpgadmin3 += file-with-bad-content|/usr/local|root/opt/csw/share/pgadmin3/docs/cs_CZ/hints/instrumentation.html +CHECKPKG_OVERRIDES_CSWpgadmin3 += file-with-bad-content|/usr/local|root/opt/csw/share/pgadmin3/docs/zh_CN/hints/instrumentation.html +CHECKPKG_OVERRIDES_CSWpgadmin3 += file-with-bad-content|/usr/local|root/opt/csw/share/pgadmin3/docs/sl_SI/hints/instrumentation.html +CHECKPKG_OVERRIDES_CSWpgadmin3 += file-with-bad-content|/usr/local|root/opt/csw/share/pgadmin3/docs/es_ES/hints/instrumentation.html +CHECKPKG_OVERRIDES_CSWpgadmin3 += file-with-bad-content|/usr/local|root/opt/csw/share/pgadmin3/docs/fi_FI/hints/instrumentation.html +CHECKPKG_OVERRIDES_CSWpgadmin3 += file-with-bad-content|/usr/local|root/opt/csw/share/pgadmin3/docs/de_DE/hints/instrumentation.html +CHECKPKG_OVERRIDES_CSWpgadmin3 += file-with-bad-content|/usr/local|root/opt/csw/share/pgadmin3/docs/en_US/pgagent-install.html +CHECKPKG_OVERRIDES_CSWpgadmin3 += file-with-bad-content|/usr/local|root/opt/csw/share/pgadmin3/docs/en_US/extend.html +CHECKPKG_OVERRIDES_CSWpgadmin3 += file-with-bad-content|/usr/local|root/opt/csw/share/pgadmin3/docs/en_US/connect.html +CHECKPKG_OVERRIDES_CSWpgadmin3 += file-with-bad-content|/usr/local|root/opt/csw/share/pgadmin3/docs/en_US/hints/instrumentation.html +CHECKPKG_OVERRIDES_CSWpgadmin3 += file-with-bad-content|/usr/local|root/opt/csw/share/pgadmin3/docs/fr_FR/extend.html +CHECKPKG_OVERRIDES_CSWpgadmin3 += file-with-bad-content|/usr/local|root/opt/csw/share/pgadmin3/docs/fr_FR/connect.html +CHECKPKG_OVERRIDES_CSWpgadmin3 += file-with-bad-content|/usr/local|root/opt/csw/share/pgadmin3/docs/fr_FR/pgagent-install.html +CHECKPKG_OVERRIDES_CSWpgadmin3 += file-with-bad-content|/usr/local|root/opt/csw/share/pgadmin3/docs/fr_FR/hints/instrumentation.html +CHECKPKG_OVERRIDES_CSWpgadmin3 += file-with-bad-content|/usr/share|root/opt/csw/share/pgadmin3/docs/cs_CZ/pgagent-install.html +CHECKPKG_OVERRIDES_CSWpgadmin3 += file-with-bad-content|/usr/share|root/opt/csw/share/pgadmin3/docs/en_US/pgagent-install.html +CHECKPKG_OVERRIDES_CSWpgadmin3 += file-with-bad-content|/usr/share|root/opt/csw/share/pgadmin3/docs/fr_FR/pgagent-install.html + +RUNTIME_DEP_PKGS_CSWpgadmin3 += CSWwxwidgetscommon +RUNTIME_DEP_PKGS_CSWpgadmin3 += CSWwxwidgetsgtk2 +RUNTIME_DEP_PKGS_CSWpgadmin3 += CSWlibncursesw5 +RUNTIME_DEP_PKGS_CSWpgadmin3 += CSWlibssl1-0-0 +RUNTIME_DEP_PKGS_CSWpgadmin3 += CSWlibz1 +RUNTIME_DEP_PKGS_CSWpgadmin3 += CSWsunmath +RUNTIME_DEP_PKGS_CSWpgadmin3 += CSWlibxslt1 +RUNTIME_DEP_PKGS_CSWpgadmin3 += CSWlibkrb5-3 +RUNTIME_DEP_PKGS_CSWpgadmin3 += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSWpgadmin3 += CSWlibpq5 + +BUILD_DEP_PKGS = CSWlincursesw5-dev +BUILD_DEP_PKGS += CSWlibssl-dev +BUILD_DEP_PKGS += CSWlibxml2-dev +BUILD_DEP_PKGS += CSWlibxslt-dev +BUILD_DEP_PKGS += CSWwxwidgetsdevel + CONFIGURE_ARGS = $(DIRPATHS) + +EXTRA_CXXFLAGS += -norunpath include gar/category.mk Modified: csw/mgar/pkg/pgadmin3/trunk/checksums =================================================================== --- csw/mgar/pkg/pgadmin3/trunk/checksums 2012-06-13 17:37:27 UTC (rev 18389) +++ csw/mgar/pkg/pgadmin3/trunk/checksums 2012-06-13 19:28:19 UTC (rev 18390) @@ -1 +1 @@ -3f2032c78657e3db4e0719613751060c download/pgadmin3-1.10.0.tar.gz +0669074fda039f5128abb40f63948ff5 pgadmin3-1.14.3.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Wed Jun 13 21:32:10 2012 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Wed, 13 Jun 2012 19:32:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[18391] csw/mgar/pkg/pgadmin3/trunk/Makefile Message-ID: Revision: 18391 http://gar.svn.sourceforge.net/gar/?rev=18391&view=rev Author: guengel Date: 2012-06-13 19:32:10 +0000 (Wed, 13 Jun 2012) Log Message: ----------- pgadmin3/trunk: Fixed BUILD_DEPs. Modified Paths: -------------- csw/mgar/pkg/pgadmin3/trunk/Makefile Modified: csw/mgar/pkg/pgadmin3/trunk/Makefile =================================================================== --- csw/mgar/pkg/pgadmin3/trunk/Makefile 2012-06-13 19:28:19 UTC (rev 18390) +++ csw/mgar/pkg/pgadmin3/trunk/Makefile 2012-06-13 19:32:10 UTC (rev 18391) @@ -54,7 +54,7 @@ RUNTIME_DEP_PKGS_CSWpgadmin3 += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSWpgadmin3 += CSWlibpq5 -BUILD_DEP_PKGS = CSWlincursesw5-dev +BUILD_DEP_PKGS = CSWlibncurses-dev BUILD_DEP_PKGS += CSWlibssl-dev BUILD_DEP_PKGS += CSWlibxml2-dev BUILD_DEP_PKGS += CSWlibxslt-dev 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 14 02:21:14 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 14 Jun 2012 00:21:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[18392] csw/mgar/pkg/pureftpd/trunk Message-ID: Revision: 18392 http://gar.svn.sourceforge.net/gar/?rev=18392&view=rev Author: bdwalton Date: 2012-06-14 00:21:14 +0000 (Thu, 14 Jun 2012) Log Message: ----------- pureftpd/trunk: version bump, update ssl deps Modified Paths: -------------- csw/mgar/pkg/pureftpd/trunk/Makefile csw/mgar/pkg/pureftpd/trunk/checksums Modified: csw/mgar/pkg/pureftpd/trunk/Makefile =================================================================== --- csw/mgar/pkg/pureftpd/trunk/Makefile 2012-06-13 19:32:10 UTC (rev 18391) +++ csw/mgar/pkg/pureftpd/trunk/Makefile 2012-06-14 00:21:14 UTC (rev 18392) @@ -5,7 +5,7 @@ # - mysql # - pgsql NAME = pureftpd -VERSION = 1.0.27 +VERSION = 1.0.36 CATEGORIES = net GARTYPE = v2 SRCNAME = pure-ftpd @@ -23,12 +23,11 @@ DISTFILES = $(SRCNAME)-$(VERSION).tar.gz WORKSRC = $(WORKDIR)/$(SRCNAME)-$(VERSION) +BUILD_DEP_PKGS += CSWlibssl-dev + # we require openssl for tls -RUNTIME_DEP_PKGS = CSWosslrt +RUNTIME_DEP_PKGS = CSWlibssl1-0-0 -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz - # configure args CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-everything Modified: csw/mgar/pkg/pureftpd/trunk/checksums =================================================================== --- csw/mgar/pkg/pureftpd/trunk/checksums 2012-06-13 19:32:10 UTC (rev 18391) +++ csw/mgar/pkg/pureftpd/trunk/checksums 2012-06-14 00:21:14 UTC (rev 18392) @@ -1 +1 @@ -63bc52cfbcf99aae84f9b6472ed31ae1 pure-ftpd-1.0.27.tar.gz +bbcb48e8aa6ec1abff9775b89f84af91 pure-ftpd-1.0.36.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 Thu Jun 14 02:32:59 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 14 Jun 2012 00:32:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[18393] csw/mgar/pkg/pureftpd/trunk/Makefile Message-ID: Revision: 18393 http://gar.svn.sourceforge.net/gar/?rev=18393&view=rev Author: bdwalton Date: 2012-06-14 00:32:59 +0000 (Thu, 14 Jun 2012) Log Message: ----------- pureftpd/trunk: build for sol10 only Modified Paths: -------------- csw/mgar/pkg/pureftpd/trunk/Makefile Modified: csw/mgar/pkg/pureftpd/trunk/Makefile =================================================================== --- csw/mgar/pkg/pureftpd/trunk/Makefile 2012-06-14 00:21:14 UTC (rev 18392) +++ csw/mgar/pkg/pureftpd/trunk/Makefile 2012-06-14 00:32:59 UTC (rev 18393) @@ -10,6 +10,8 @@ GARTYPE = v2 SRCNAME = pure-ftpd +PACKAGING_PLATFORMS = solaris10-i386 solaris10-sparc + DESCRIPTION = A secure FTP daemon define BLURB Pure-FTPd is a free (BSD), secure, production-quality and 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 14 02:45:45 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 14 Jun 2012 00:45:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[18394] csw/mgar/pkg/pureftpd/trunk/Makefile Message-ID: Revision: 18394 http://gar.svn.sourceforge.net/gar/?rev=18394&view=rev Author: bdwalton Date: 2012-06-14 00:45:45 +0000 (Thu, 14 Jun 2012) Log Message: ----------- pureftpd/trunk: build with gcc and depend on libssp0 Modified Paths: -------------- csw/mgar/pkg/pureftpd/trunk/Makefile Modified: csw/mgar/pkg/pureftpd/trunk/Makefile =================================================================== --- csw/mgar/pkg/pureftpd/trunk/Makefile 2012-06-14 00:32:59 UTC (rev 18393) +++ csw/mgar/pkg/pureftpd/trunk/Makefile 2012-06-14 00:45:45 UTC (rev 18394) @@ -29,7 +29,10 @@ # we require openssl for tls RUNTIME_DEP_PKGS = CSWlibssl1-0-0 +RUNTIME_DEP_PKGS_CSWpureftpd += CSWlibssp0 +GARCOMPILER = GNU + # configure args CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-everything 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 14 02:47:44 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 14 Jun 2012 00:47:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[18395] csw/mgar/pkg/pureftpd/trunk/Makefile Message-ID: Revision: 18395 http://gar.svn.sourceforge.net/gar/?rev=18395&view=rev Author: bdwalton Date: 2012-06-14 00:47:43 +0000 (Thu, 14 Jun 2012) Log Message: ----------- pureftpd/trunk: we only build one package so do not use a suffix on runtime_dep_pkgs Modified Paths: -------------- csw/mgar/pkg/pureftpd/trunk/Makefile Modified: csw/mgar/pkg/pureftpd/trunk/Makefile =================================================================== --- csw/mgar/pkg/pureftpd/trunk/Makefile 2012-06-14 00:45:45 UTC (rev 18394) +++ csw/mgar/pkg/pureftpd/trunk/Makefile 2012-06-14 00:47:43 UTC (rev 18395) @@ -29,7 +29,7 @@ # we require openssl for tls RUNTIME_DEP_PKGS = CSWlibssl1-0-0 -RUNTIME_DEP_PKGS_CSWpureftpd += CSWlibssp0 +RUNTIME_DEP_PKGS += CSWlibssp0 GARCOMPILER = GNU This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Thu Jun 14 03:04:42 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 14 Jun 2012 01:04:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[18396] csw/mgar/pkg/pureftpd/trunk/Makefile Message-ID: Revision: 18396 http://gar.svn.sourceforge.net/gar/?rev=18396&view=rev Author: bdwalton Date: 2012-06-14 01:04:42 +0000 (Thu, 14 Jun 2012) Log Message: ----------- pureftpd/trunk: handle license installation with non-standard source package naming Modified Paths: -------------- csw/mgar/pkg/pureftpd/trunk/Makefile Modified: csw/mgar/pkg/pureftpd/trunk/Makefile =================================================================== --- csw/mgar/pkg/pureftpd/trunk/Makefile 2012-06-14 00:47:43 UTC (rev 18395) +++ csw/mgar/pkg/pureftpd/trunk/Makefile 2012-06-14 01:04:42 UTC (rev 18396) @@ -72,6 +72,7 @@ pre-install-modulated: ginstall -d $(DESTDIR)$(sysconfdir)/$(SRCNAME) ginstall -d $(DESTDIR)$(docdir)/$(SRCNAME) + ginstall -d $(DESTDIR)$(docdir)/$(NAME) ginstall -d $(DESTDIR)/var/opt/csw/run perl -pi -e 's@/var/run@/var/opt/csw/run@' ${WORKSRC}/src/ftpd.h perl -pi -e 's@/var/run@/var/opt/csw/run@' ${WORKSRC}/src/ftpwho-update.h @@ -86,4 +87,5 @@ ginstall -m 644 $$file $(DESTDIR)$(sysconfdir)/$(SRCNAME) ; \ done ) ginstall -m 644 $(WORKSRC)/pureftpd.schema $(DESTDIR)$(docdir)/$(SRCNAME) + ginstall -m 644 $(WORKSRC)/COPYING $(DESTDIR)$(docdir)/$(NAME)/license @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Thu Jun 14 03:13:04 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 14 Jun 2012 01:13:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[18397] csw/mgar/pkg/pureftpd/trunk/Makefile Message-ID: Revision: 18397 http://gar.svn.sourceforge.net/gar/?rev=18397&view=rev Author: bdwalton Date: 2012-06-14 01:13:04 +0000 (Thu, 14 Jun 2012) Log Message: ----------- pureftpd/trunk: override a usr/share reference in the man page Modified Paths: -------------- csw/mgar/pkg/pureftpd/trunk/Makefile Modified: csw/mgar/pkg/pureftpd/trunk/Makefile =================================================================== --- csw/mgar/pkg/pureftpd/trunk/Makefile 2012-06-14 01:04:42 UTC (rev 18396) +++ csw/mgar/pkg/pureftpd/trunk/Makefile 2012-06-14 01:13:04 UTC (rev 18397) @@ -54,6 +54,8 @@ sysconfdir = /etc/opt/csw SAMPLECONF = $(sysconfdir)/$(SRCNAME)/*.conf +CHECKPKG_OVERRIDES_CSWpureftpd += file-with-bad-content|/usr/share|root/opt/csw/share/man/man8/pure-ftpd.8 + include gar/category.mk # make sure, the linker uses libcrypt before libssl 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 14 03:29:47 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 14 Jun 2012 01:29:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[18398] csw/mgar/pkg/ruby18/trunk/Makefile Message-ID: Revision: 18398 http://gar.svn.sourceforge.net/gar/?rev=18398&view=rev Author: bdwalton Date: 2012-06-14 01:29:46 +0000 (Thu, 14 Jun 2012) Log Message: ----------- ruby18/trunk: build for solaris 10 only Modified Paths: -------------- csw/mgar/pkg/ruby18/trunk/Makefile Modified: csw/mgar/pkg/ruby18/trunk/Makefile =================================================================== --- csw/mgar/pkg/ruby18/trunk/Makefile 2012-06-14 01:13:04 UTC (rev 18397) +++ csw/mgar/pkg/ruby18/trunk/Makefile 2012-06-14 01:29:46 UTC (rev 18398) @@ -5,6 +5,8 @@ CATEGORIES = lang GARTYPE = v2 +PACKAGING_PLATFORMS = solaris10-i386 solaris10-sparc + TEST_SCRIPTS = TEST_ARGS = test-all @@ -29,10 +31,10 @@ ALTERNATIVES_CSWruby18 = ruby rbconfig18 ALTERNATIVE_ruby = $(bindir)/ruby ruby $(bindir)/ruby18 10 $(bindir)/irb irb $(bindir)/irb18 $(bindir)/erb erb $(bindir)/erb18 $(bindir)/rdoc rdoc $(bindir)/rdoc18 $(bindir)/ri ri $(bindir)/ri18 $(bindir)/testrb testrb $(bindir)/testrb18 $(mandir)/man1/ruby.1 ruby.1 $(mandir)/man1/ruby18.1 -ALTERNATIVE_rbconfig18 = $(libdir)/ruby/1.8/$(GARCH)-solaris2.9/rbconfig.rb rbconfig18 $(libdir)/ruby/1.8/$(GARCH)-solaris2.9/rbconfig.rb.sun 5 +ALTERNATIVE_rbconfig18 = $(libdir)/ruby/1.8/$(GARCH)-solaris2.10/rbconfig.rb rbconfig18 $(libdir)/ruby/1.8/$(GARCH)-solaris2.10/rbconfig.rb.sun 5 ALTERNATIVES_CSWruby18-gcc4 = rbconfig18_gcc -ALTERNATIVE_rbconfig18_gcc = $(libdir)/ruby/1.8/$(GARCH)-solaris2.9/rbconfig.rb rbconfig18 $(libdir)/ruby/1.8/$(GARCH)-solaris2.9/rbconfig.rb.gcc4 10 +ALTERNATIVE_rbconfig18_gcc = $(libdir)/ruby/1.8/$(GARCH)-solaris2.10/rbconfig.rb rbconfig18 $(libdir)/ruby/1.8/$(GARCH)-solaris2.10/rbconfig.rb.gcc4 10 ARCHALL_CSWruby18-doc = 1 ARCHALL_CSWruby18-mode = 1 @@ -85,7 +87,7 @@ PKGFILES_CSWruby18-doc = $(datadir)/ri/.* $(docdir)/$(NAME)/sample.* -PKGFILES_CSWruby18-gcc4 = $(libdir)/ruby/1.8/$(GARCH)-solaris2.9/.*gcc4 +PKGFILES_CSWruby18-gcc4 = $(libdir)/ruby/1.8/$(GARCH)-solaris2.10/.*gcc4 PKGFILES_CSWruby18-tk = $(libdir)/.*/tcl.* $(libdir)/.*/tk.* $(libdir)/.*-tk.rb @@ -158,7 +160,7 @@ SPKG_VERSION := $(SPKG_VERSION)$(PATCHLEVEL) -RBCDIR = $(libdir)/ruby/1.8/$(GARCH)-solaris2.9 +RBCDIR = $(libdir)/ruby/1.8/$(GARCH)-solaris2.10 RBCONFIG = $(RBCDIR)/rbconfig.rb merge-copy-custom: $(PKGROOT) $(INSTALLISADIR) @@ -171,7 +173,7 @@ post-install-modulated: @echo "Stripping DESTDIR from rbconfig.rb" @gsed -i -e s,$(DESTDIR),, \ - $(DESTDIR)$(libdir)/ruby/1.8/$(GARCH)-solaris2.9/rbconfig.rb + $(DESTDIR)$(libdir)/ruby/1.8/$(GARCH)-solaris2.10/rbconfig.rb @$(MAKECOOKIE) @echo "Setting up the CSW rbconfig stuff so we can switch between compilers" @mv $(DESTDIR)$(RBCONFIG) $(DESTDIR)$(RBCONFIG).$(COMPILER) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Thu Jun 14 08:42:31 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Thu, 14 Jun 2012 06:42:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[18399] csw/mgar/pkg/libgnet/trunk/Makefile Message-ID: Revision: 18399 http://gar.svn.sourceforge.net/gar/?rev=18399&view=rev Author: pfelecan Date: 2012-06-14 06:42:30 +0000 (Thu, 14 Jun 2012) Log Message: ----------- limiting the scope to Solaris 10 until glib development package installation on Solaris 9 Modified Paths: -------------- csw/mgar/pkg/libgnet/trunk/Makefile Modified: csw/mgar/pkg/libgnet/trunk/Makefile =================================================================== --- csw/mgar/pkg/libgnet/trunk/Makefile 2012-06-14 01:29:46 UTC (rev 18398) +++ csw/mgar/pkg/libgnet/trunk/Makefile 2012-06-14 06:42:30 UTC (rev 18399) @@ -15,6 +15,11 @@ MASTER_SITES = http://ftp.gnome.org/pub/GNOME/sources/gnet/2.0/ DISTFILES = $(DISTNAME).tar.gz +# until the glib development package is installed on Solaris 9 we +# limit the scope: +PACKAGING_PLATFORMS = solaris10-sparc +PACKAGING_PLATFORMS += solaris10-i386 + BUILD_DEP_PKGS += CSWlibglib2-dev BUILD_DEP_PKGS += CSWlibiconv-dev This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Thu Jun 14 10:06:12 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Thu, 14 Jun 2012 08:06:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[18400] csw/mgar/pkg/cups/trunk Message-ID: Revision: 18400 http://gar.svn.sourceforge.net/gar/?rev=18400&view=rev Author: cgrzemba Date: 2012-06-14 08:06:12 +0000 (Thu, 14 Jun 2012) Log Message: ----------- cups/trunk: version bump Modified Paths: -------------- csw/mgar/pkg/cups/trunk/Makefile csw/mgar/pkg/cups/trunk/checksums Modified: csw/mgar/pkg/cups/trunk/Makefile =================================================================== --- csw/mgar/pkg/cups/trunk/Makefile 2012-06-14 06:42:30 UTC (rev 18399) +++ csw/mgar/pkg/cups/trunk/Makefile 2012-06-14 08:06:12 UTC (rev 18400) @@ -3,7 +3,7 @@ # $Id$ NAME = cups -VERSION = 1.5.2 +VERSION = 1.5.3 CATEGORIES = net GARTYPE = v2 @@ -65,7 +65,8 @@ LICENSE = LICENSE.txt -GARCOMPILER ?= SOS12 # SOS12U3 +GARCOMPILER ?= SOS12U3 # SOS12U3 +PACKAGING_PLATFORMS = solaris10-i368 solaris10-sparc BUILD_DEP_PKGS = CSWggettext-dev BUILD_DEP_PKGS += CSWlibjpeg-dev @@ -208,9 +209,6 @@ RUNTIME_DEP_PKGS_CSWcups-dev += CSWlibcupsmime1 RUNTIME_DEP_PKGS_CSWcups-dev += CSWlibcupsimage2 RUNTIME_DEP_PKGS_CSWcups-dev += CSWlibcupscgi1 -OBSOLETED_BY_CSWcups-dev += CSWcups-devel -OBSOLETED_BY_CSWcups-dev += CSWcupsdev -OBSOLETED_BY_CSWcups-dev += CSWcupsdoc # The problematic cupslinks package # PACKAGES += CSWcupslinks Modified: csw/mgar/pkg/cups/trunk/checksums =================================================================== --- csw/mgar/pkg/cups/trunk/checksums 2012-06-14 06:42:30 UTC (rev 18399) +++ csw/mgar/pkg/cups/trunk/checksums 2012-06-14 08:06:12 UTC (rev 18400) @@ -1 +1 @@ -9471d2a7c920cfbb17133c32d2e6866f cups-1.5.2-source.tar.bz2 +e1ad15257aa6f162414ea3beae0c5df8 cups-1.5.3-source.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Jun 14 12:21:53 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 14 Jun 2012 10:21:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[18402] csw/mgar/pkg/zlib/trunk/files/ 0003-Add-h-to-the-linker-invocation.patch Message-ID: Revision: 18402 http://gar.svn.sourceforge.net/gar/?rev=18402&view=rev Author: wahwah Date: 2012-06-14 10:21:52 +0000 (Thu, 14 Jun 2012) Log Message: ----------- zlib/trunk: a whitespace bugfix Modified Paths: -------------- csw/mgar/pkg/zlib/trunk/files/0003-Add-h-to-the-linker-invocation.patch Modified: csw/mgar/pkg/zlib/trunk/files/0003-Add-h-to-the-linker-invocation.patch =================================================================== --- csw/mgar/pkg/zlib/trunk/files/0003-Add-h-to-the-linker-invocation.patch 2012-06-14 10:16:40 UTC (rev 18401) +++ csw/mgar/pkg/zlib/trunk/files/0003-Add-h-to-the-linker-invocation.patch 2012-06-14 10:21:52 UTC (rev 18402) @@ -16,7 +16,7 @@ placebo $(SHAREDLIBV): $(PIC_OBJS) libz.a - $(LDSHARED) $(SFLAGS) -o $@ $(PIC_OBJS) $(LDSHAREDLIBC) $(LDFLAGS) -+ $(LDSHARED) $(SFLAGS) -h $(SHAREDLIBM) -o $@ $(PIC_OBJS) $(LDSHAREDLIBC) $(LDFLAGS) ++ $(LDSHARED) $(SFLAGS) -h $(SHAREDLIBM) -o $@ $(PIC_OBJS) $(LDSHAREDLIBC) $(LDFLAGS) rm -f $(SHAREDLIB) $(SHAREDLIBM) ln -s $@ $(SHAREDLIB) ln -s $@ $(SHAREDLIBM) 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 14 12:16:41 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 14 Jun 2012 10:16:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[18401] csw/mgar/pkg/zlib/trunk Message-ID: Revision: 18401 http://gar.svn.sourceforge.net/gar/?rev=18401&view=rev Author: wahwah Date: 2012-06-14 10:16:40 +0000 (Thu, 14 Jun 2012) Log Message: ----------- zlib/trunk: updated one patch which didn't apply any more Modified Paths: -------------- csw/mgar/pkg/zlib/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/zlib/trunk/files/0003-Add-h-to-the-linker-invocation.patch Removed Paths: ------------- csw/mgar/pkg/zlib/trunk/files/Makefile.in.diff Modified: csw/mgar/pkg/zlib/trunk/Makefile =================================================================== --- csw/mgar/pkg/zlib/trunk/Makefile 2012-06-14 08:06:12 UTC (rev 18400) +++ csw/mgar/pkg/zlib/trunk/Makefile 2012-06-14 10:16:40 UTC (rev 18401) @@ -1,4 +1,4 @@ -# $Id$ +#: $Id$ NAME = zlib VERSION = 1.2.7 @@ -24,7 +24,7 @@ DISTFILES = $(DISTNAME).tar.bz2 DISTFILES += COPYING -PATCHFILES += Makefile.in.diff +PATCHFILES += 0003-Add-h-to-the-linker-invocation.patch PATCHFILES += configure.diff PACKAGES += CSWlibz1 Added: csw/mgar/pkg/zlib/trunk/files/0003-Add-h-to-the-linker-invocation.patch =================================================================== --- csw/mgar/pkg/zlib/trunk/files/0003-Add-h-to-the-linker-invocation.patch (rev 0) +++ csw/mgar/pkg/zlib/trunk/files/0003-Add-h-to-the-linker-invocation.patch 2012-06-14 10:16:40 UTC (rev 18401) @@ -0,0 +1,25 @@ +From 028ff36f20ffd5d5edf79af662e34908ce031a36 Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Thu, 14 Jun 2012 12:12:06 +0200 +Subject: [PATCH] Add -h to the linker invocation + +--- + Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.in b/Makefile.in +index 241deed..13bb227 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -160,7 +160,7 @@ minigzip64.o: test/minigzip.c zlib.h zconf.h + - at mv objs/$*.o $@ + + placebo $(SHAREDLIBV): $(PIC_OBJS) libz.a +- $(LDSHARED) $(SFLAGS) -o $@ $(PIC_OBJS) $(LDSHAREDLIBC) $(LDFLAGS) ++ $(LDSHARED) $(SFLAGS) -h $(SHAREDLIBM) -o $@ $(PIC_OBJS) $(LDSHAREDLIBC) $(LDFLAGS) + rm -f $(SHAREDLIB) $(SHAREDLIBM) + ln -s $@ $(SHAREDLIB) + ln -s $@ $(SHAREDLIBM) +-- +1.7.10.3 + Deleted: csw/mgar/pkg/zlib/trunk/files/Makefile.in.diff =================================================================== --- csw/mgar/pkg/zlib/trunk/files/Makefile.in.diff 2012-06-14 08:06:12 UTC (rev 18400) +++ csw/mgar/pkg/zlib/trunk/files/Makefile.in.diff 2012-06-14 10:16:40 UTC (rev 18401) @@ -1,11 +0,0 @@ ---- zlib-1.2.5/Makefile.in.orig 2010-05-26 12:54:35.283218000 +0200 -+++ zlib-1.2.5/Makefile.in 2010-05-26 13:13:37.622441685 +0200 -@@ -137,7 +137,7 @@ - - at mv objs/$*.o $@ - - $(SHAREDLIBV): $(PIC_OBJS) -- $(LDSHARED) $(SFLAGS) -o $@ $(PIC_OBJS) $(LDSHAREDLIBC) $(LDFLAGS) -+ $(LDSHARED) $(SFLAGS) -h $(SHAREDLIBM) -o $@ $(PIC_OBJS) $(LDSHAREDLIBC) $(LDFLAGS) - rm -f $(SHAREDLIB) $(SHAREDLIBM) - ln -s $@ $(SHAREDLIB) - ln -s $@ $(SHAREDLIBM) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Thu Jun 14 14:04:13 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Thu, 14 Jun 2012 12:04:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[18403] csw/mgar/pkg/cups/trunk Message-ID: Revision: 18403 http://gar.svn.sourceforge.net/gar/?rev=18403&view=rev Author: cgrzemba Date: 2012-06-14 12:04:13 +0000 (Thu, 14 Jun 2012) Log Message: ----------- cups/trunk: add patch for use Posix SH Modified Paths: -------------- csw/mgar/pkg/cups/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/cups/trunk/files/0002-use-posix-shell-in-install.sh.patch Modified: csw/mgar/pkg/cups/trunk/Makefile =================================================================== --- csw/mgar/pkg/cups/trunk/Makefile 2012-06-14 10:21:52 UTC (rev 18402) +++ csw/mgar/pkg/cups/trunk/Makefile 2012-06-14 12:04:13 UTC (rev 18403) @@ -51,6 +51,7 @@ DISTFILES += CSWcupsclient.README PATCHFILES += 0001-cswcups-for-the-service-name.patch +PATCHFILES += 0002-use-posix-shell-in-install.sh.patch # PATCHFILES = 0001-cswcups-for-service-name.patch # PATCHFILES += 0002-Adding-the-refcount-member-to-mime_type_t.patch # PATCHFILES += 0003-Reference-counting-for-printers-only.patch @@ -66,7 +67,7 @@ LICENSE = LICENSE.txt GARCOMPILER ?= SOS12U3 # SOS12U3 -PACKAGING_PLATFORMS = solaris10-i368 solaris10-sparc +PACKAGING_PLATFORMS = solaris10-i386 solaris10-sparc BUILD_DEP_PKGS = CSWggettext-dev BUILD_DEP_PKGS += CSWlibjpeg-dev @@ -231,7 +232,6 @@ RUNTIME_DEP_PKGS_CSWlibcups2 += CSWlibk5crypto3 RUNTIME_DEP_PKGS_CSWlibcups2 += CSWlibkrb5-3 RUNTIME_DEP_PKGS_CSWlibcups2 += CSWlibz1 -OBSOLETED_BY_CSWlibcups2 += CSWlibcups PACKAGES += CSWlibcupscgi1 SPKG_DESC_CSWlibcupscgi1 = CUPS libraries, libcupscgi.so.1 @@ -244,7 +244,6 @@ RUNTIME_DEP_PKGS_CSWlibcupscgi1 += CSWlibk5crypto3 RUNTIME_DEP_PKGS_CSWlibcupscgi1 += CSWlibkrb5-3 RUNTIME_DEP_PKGS_CSWlibcupscgi1 += CSWlibz1 -OBSOLETED_BY_CSWlibcupscgi1 += CSWlibcups PACKAGES += CSWlibcupsdriver1 SPKG_DESC_CSWlibcupsdriver1 = CUPS libraries, libcupsdriver.so.1 @@ -257,7 +256,6 @@ RUNTIME_DEP_PKGS_CSWlibcupsdriver1 += CSWlibkrb5-3 RUNTIME_DEP_PKGS_CSWlibcupsdriver1 += CSWlibgnutls26 RUNTIME_DEP_PKGS_CSWlibcupsdriver1 += CSWlibk5crypto3 -OBSOLETED_BY_CSWlibcupsdriver1 += CSWlibcups PACKAGES += CSWlibcupsimage2 SPKG_DESC_CSWlibcupsimage2 = CUPS libraries, libcupsimage.so.2 @@ -273,7 +271,6 @@ RUNTIME_DEP_PKGS_CSWlibcupsimage2 += CSWlibpng12-0 RUNTIME_DEP_PKGS_CSWlibcupsimage2 += CSWlibz1 RUNTIME_DEP_PKGS_CSWlibcupsimage2 += CSWlibtiff3 -OBSOLETED_BY_CSWlibcupsimage2 += CSWlibcups PACKAGES += CSWlibcupsmime1 SPKG_DESC_CSWlibcupsmime1 = CUPS libraries, libcupsmime.so.1 @@ -286,7 +283,6 @@ RUNTIME_DEP_PKGS_CSWlibcupsmime1 += CSWlibk5crypto3 RUNTIME_DEP_PKGS_CSWlibcupsmime1 += CSWlibkrb5-3 RUNTIME_DEP_PKGS_CSWlibcupsmime1 += CSWlibz1 -OBSOLETED_BY_CSWlibcupsmime1 += CSWlibcups PACKAGES += CSWlibcupsppdc1 SPKG_DESC_CSWlibcupsppdc1 = CUPS libraries, libcupsppdc.so.1 @@ -299,7 +295,6 @@ RUNTIME_DEP_PKGS_CSWlibcupsppdc1 += CSWlibkrb5-3 RUNTIME_DEP_PKGS_CSWlibcupsppdc1 += CSWlibgnutls26 RUNTIME_DEP_PKGS_CSWlibcupsppdc1 += CSWlibk5crypto3 -OBSOLETED_BY_CSWlibcupsppdc1 += CSWlibcups # For some reason -norunpath is not used here, investigate later CHECKPKG_OVERRIDES_CSWlibcupsppdc1 += bad-rpath-entry Added: csw/mgar/pkg/cups/trunk/files/0002-use-posix-shell-in-install.sh.patch =================================================================== --- csw/mgar/pkg/cups/trunk/files/0002-use-posix-shell-in-install.sh.patch (rev 0) +++ csw/mgar/pkg/cups/trunk/files/0002-use-posix-shell-in-install.sh.patch 2012-06-14 12:04:13 UTC (rev 18403) @@ -0,0 +1,22 @@ +From c41d2095c743121b31801bfe675a8fe415714022 Mon Sep 17 00:00:00 2001 +From: Carsten Grzemba +Date: Thu, 14 Jun 2012 11:46:25 +0200 +Subject: [PATCH] use posix shell in install.sh + +--- + install-sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/install-sh b/install-sh +index baa6e08..5bf1d50 100755 +--- a/install-sh ++++ b/install-sh +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/usr/xpg4/bin/sh + # + # "$Id: install-sh 10317 2012-03-01 00:05:55Z mike $" + # +-- +1.7.10.3 + 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 14 15:12:27 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 14 Jun 2012 13:12:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[18404] csw/mgar/pkg/gcc4/trunk Message-ID: Revision: 18404 http://gar.svn.sourceforge.net/gar/?rev=18404&view=rev Author: wahwah Date: 2012-06-14 13:12:26 +0000 (Thu, 14 Jun 2012) Log Message: ----------- gcc4/trunk: version bump to 4.7.1 Modified Paths: -------------- csw/mgar/pkg/gcc4/trunk/Makefile csw/mgar/pkg/gcc4/trunk/checksums Modified: csw/mgar/pkg/gcc4/trunk/Makefile =================================================================== --- csw/mgar/pkg/gcc4/trunk/Makefile 2012-06-14 12:04:13 UTC (rev 18403) +++ csw/mgar/pkg/gcc4/trunk/Makefile 2012-06-14 13:12:26 UTC (rev 18404) @@ -1,7 +1,7 @@ # $Id$ NAME = gcc -VERSION = 4.7.0 +VERSION = 4.7.1 CATEGORIES = lang GARTYPE = v2 BASE_VERSION = $(shell echo $(VERSION) | gsed -e 's/^\([0-9]\+\.[0-9]\+\)\(.*\)/\1/') Modified: csw/mgar/pkg/gcc4/trunk/checksums =================================================================== --- csw/mgar/pkg/gcc4/trunk/checksums 2012-06-14 12:04:13 UTC (rev 18403) +++ csw/mgar/pkg/gcc4/trunk/checksums 2012-06-14 13:12:26 UTC (rev 18404) @@ -1 +1 @@ -2a0f1d99fda235c29d40b561f81d9a77 gcc-4.7.0.tar.bz2 +933e6f15f51c031060af64a9e14149ff gcc-4.7.1.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Jun 14 16:41:53 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 14 Jun 2012 14:41:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[18405] csw/mgar/pkg/zlib/trunk/Makefile Message-ID: Revision: 18405 http://gar.svn.sourceforge.net/gar/?rev=18405&view=rev Author: wahwah Date: 2012-06-14 14:41:52 +0000 (Thu, 14 Jun 2012) Log Message: ----------- zlib/trunk: switching to GCC as a temporary fix for the linking problem on amd64 Modified Paths: -------------- csw/mgar/pkg/zlib/trunk/Makefile Modified: csw/mgar/pkg/zlib/trunk/Makefile =================================================================== --- csw/mgar/pkg/zlib/trunk/Makefile 2012-06-14 13:12:26 UTC (rev 18404) +++ csw/mgar/pkg/zlib/trunk/Makefile 2012-06-14 14:41:52 UTC (rev 18405) @@ -41,9 +41,16 @@ EXTRA_BUILD_ISAS = sparcv8plus sparcv8plus+vis pentium_pro+mmx pentium -# https://blogs.oracle.com/d/entry/building_shared_libraries_for_sparcv9 -EXTRA_CFLAGS = -xcode=pic32 +# Temporary switch to GCC, because the previous build resulted in a broken +# library on amd64 as reported by Rafael. +GARCOMPILER = GNU +LD_ALTEXEC = /opt/csw/bin/gld +EXTRA_EXPORTS = LD_ALTEXEC +# # https://blogs.oracle.com/d/entry/building_shared_libraries_for_sparcv9 +# EXTRA_CFLAGS_sparc = -xcode=pic32 +# EXTRA_CFLAGS += $(EXTRA_CFLAGS_$(GARCH)) + CONFIGURE_ARGS += --prefix=$(prefix) CONFIGURE_ARGS += --eprefix=$(exec_prefix) CONFIGURE_ARGS += --libdir=$(libdir) 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 14 16:50:28 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 14 Jun 2012 14:50:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[18406] csw/mgar/pkg/zlib/trunk/Makefile Message-ID: Revision: 18406 http://gar.svn.sourceforge.net/gar/?rev=18406&view=rev Author: wahwah Date: 2012-06-14 14:50:28 +0000 (Thu, 14 Jun 2012) Log Message: ----------- zlib/trunk: Add the libgcc_s dep Modified Paths: -------------- csw/mgar/pkg/zlib/trunk/Makefile Modified: csw/mgar/pkg/zlib/trunk/Makefile =================================================================== --- csw/mgar/pkg/zlib/trunk/Makefile 2012-06-14 14:41:52 UTC (rev 18405) +++ csw/mgar/pkg/zlib/trunk/Makefile 2012-06-14 14:50:28 UTC (rev 18406) @@ -30,6 +30,7 @@ PACKAGES += CSWlibz1 SPKG_DESC_CSWlibz1 = Zlib data compression library, libz.so.1 PKGFILES_CSWlibz1 = $(call pkgfiles_lib,libz.so.1) +RUNTIME_DEP_PKGS_CSWlibz1 += CSWlibgcc-s1 OBSOLETED_BY_CSWlibz1 = CSWzlib PACKAGES += CSWlibz-dev This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Thu Jun 14 22:14:16 2012 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Thu, 14 Jun 2012 20:14:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[18407] csw/mgar/pkg/zlib/branches Message-ID: Revision: 18407 http://gar.svn.sourceforge.net/gar/?rev=18407&view=rev Author: guengel Date: 2012-06-14 20:14:16 +0000 (Thu, 14 Jun 2012) Log Message: ----------- zlib/branches/amd64-pic: Branched in order to add CFLAGS for PIC code on x86. Modified Paths: -------------- csw/mgar/pkg/zlib/branches/amd64-pic/Makefile Added Paths: ----------- csw/mgar/pkg/zlib/branches/amd64-pic/ Modified: csw/mgar/pkg/zlib/branches/amd64-pic/Makefile =================================================================== --- csw/mgar/pkg/zlib/trunk/Makefile 2012-06-14 14:50:28 UTC (rev 18406) +++ csw/mgar/pkg/zlib/branches/amd64-pic/Makefile 2012-06-14 20:14:16 UTC (rev 18407) @@ -42,15 +42,10 @@ EXTRA_BUILD_ISAS = sparcv8plus sparcv8plus+vis pentium_pro+mmx pentium -# Temporary switch to GCC, because the previous build resulted in a broken -# library on amd64 as reported by Rafael. -GARCOMPILER = GNU -LD_ALTEXEC = /opt/csw/bin/gld -EXTRA_EXPORTS = LD_ALTEXEC - # # https://blogs.oracle.com/d/entry/building_shared_libraries_for_sparcv9 -# EXTRA_CFLAGS_sparc = -xcode=pic32 -# EXTRA_CFLAGS += $(EXTRA_CFLAGS_$(GARCH)) +EXTRA_CFLAGS_sparc = -xcode=pic32 +EXTRA_CFLAGS_i386 = -Kpic +EXTRA_CFLAGS += $(EXTRA_CFLAGS_$(GARCH)) CONFIGURE_ARGS += --prefix=$(prefix) CONFIGURE_ARGS += --eprefix=$(exec_prefix) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Thu Jun 14 22:47:00 2012 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Thu, 14 Jun 2012 20:47:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[18408] csw/mgar/pkg/tokyocabinet/trunk Message-ID: Revision: 18408 http://gar.svn.sourceforge.net/gar/?rev=18408&view=rev Author: guengel Date: 2012-06-14 20:47:00 +0000 (Thu, 14 Jun 2012) Log Message: ----------- tokyocabinet/trunk: Revived package Modified Paths: -------------- csw/mgar/pkg/tokyocabinet/trunk/Makefile csw/mgar/pkg/tokyocabinet/trunk/checksums Added Paths: ----------- csw/mgar/pkg/tokyocabinet/trunk/files/0001-Adjust-Makefile.in.patch csw/mgar/pkg/tokyocabinet/trunk/files/0001-updated-paths-for-csw.patch csw/mgar/pkg/tokyocabinet/trunk/files/0002-Use-make-variable.patch csw/mgar/pkg/tokyocabinet/trunk/files/0003-adjust-man-page-for-csw.patch Removed Paths: ------------- csw/mgar/pkg/tokyocabinet/trunk/files/0001-updated-paths-for-csw.patch Modified: csw/mgar/pkg/tokyocabinet/trunk/Makefile =================================================================== --- csw/mgar/pkg/tokyocabinet/trunk/Makefile 2012-06-14 20:14:16 UTC (rev 18407) +++ csw/mgar/pkg/tokyocabinet/trunk/Makefile 2012-06-14 20:47:00 UTC (rev 18408) @@ -1,26 +1,37 @@ -# $Id -: Makefile 13420 2011-02-20 21:04:03Z bdwalton $ +# $Id$ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = tokyocabinet VERSION = 1.4.47 GARTYPE = v2 -CATEGORIES = utils +CATEGORIES = lib +GARCOMPILER = SOS12U1 -DESCRIPTION = Tokyo Cabinet is a library of routines for managing a database. +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 +DESCRIPTION = Brief description define BLURB - Tokyo Cabinet is a library of routines for managing a database. The database is a - simple data file containing records, each is a pair of a key and a value. - Every key and value is serial bytes with variable length. Both binary data and - character string can be used as a key and a value. There is neither concept of - data tables nor data types. Records are organized in hash table, B+ tree, - or fixed-length array. + Tokyo Cabinet is a library of routines for managing a database. The + database is a simple data file containing records, each is a pair + of a key and a value. Every key and value is serial bytes with variable + length. Both binary data and character string can be used as a key and + a value. There is neither concept of data tables nor data types. Records + are organized in hash table, B+ tree, or fixed-length array. endef -MASTER_SITES = http://fallabs.com/tokyocabinet/ +MASTER_SITES = http://fallabs.com/tokyocabinet DISTFILES = $(DISTNAME).tar.gz +# Disables installation of CGI component and fixes +# installation of libraries. +PATCHFILES += 0001-Adjust-Makefile.in.patch + +# Use $(MAKE) in Makefile +PATCHFILES += 0002-Use-make-variable.patch + +# Adjust man page +PATCHFILES += 0003-adjust-man-page-for-csw.patch + # File name regex to get notifications about upstream software releases # NOTE: Use this only if the automatic regex creation # does not work for your package @@ -30,41 +41,57 @@ # uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES # UPSTREAM_MASTER_SITES = -PATCHFILES += 0001-updated-paths-for-csw.patch -CONFIGURE_ARGS = $(DIRPATHS) -GARCOMPILER = GCC4 -BUILD64 = 1 +PACKAGES = CSWlibtokyocabinet9 +SPKG_DESC_CSWlibtokyocabinet9 = Tokyocabinet - library +PKGFILES_CSWlibtokyocabinet9 = $(call pkgfiles_lib,libtokyocabinet.so.9) +RUNTIME_DEP_PKGS_CSWlibtokyocabinet9 += CSWlibbz2-1-0 +RUNTIME_DEP_PKGS_CSWlibtokyocabinet9 += CSWlibz1 +# I have no freaking idea where this is comming from +CHECKPKG_OVERRIDES_CSWlibtokyocabinet9 += file-with-bad-content|/usr/local|root/opt/csw/lib/libtokyocabinet.so.9.10.0 +CHECKPKG_OVERRIDES_CSWlibtokyocabinet9 += file-with-bad-content|/usr/local|root/opt/csw/lib/sparcv9/libtokyocabinet.so.9.10.0 -PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 -SKIP_MODULATIONS = isa-sparcv8 +PACKAGES += CSWlibtokyocabinet-dev +SPKG_DESC_CSWlibtokyocabinet-dev = Tokyocabinet - development files +PKGFILES_CSWlibtokyocabinet-dev = $(PKGFILES_DEVEL) +PKGFILES_CSWlibtokyocabinet-dev += .*/doc/libtokyocabinet_dev/tokyocabinet.idl +RUNTIME_DEP_PKGS_CSWlibtokyocabinet-dev = CSWlibtokyocabinet9 +PACKAGES += CSWtokyocabinet-bin +SPKG_DESC_CSWtokyocabinet-bin = Tokyocabinet - utilities +PKGFILES_CSWtokyocabinet-bin = .*/bin/.* +PKGFILES_CSWtokyocabinet-bin += .*/man/man/.* +RUNTIME_DEP_PKGS_CSWtokyocabinet-bin = CSWlibbz2-1-0 +RUNTIME_DEP_PKGS_CSWtokyocabinet-bin += CSWlibz1 +RUNTIME_DEP_PKGS_CSWtokyocabinet-bin += CSWlibtokyocabinet9 -EXTRA_CPPFLAGS += -DLOG_PERROR=0x00 -EXTRA_CPPFLAGS += -D__EXTENSIONS__ +PACKAGES += CSWtokyocabinet-doc +ARCHALL_CSWtokyocabinet-doc = 1 +SPKG_DESC_CSWtokyocabinet-doc = Tokyocabinet - documentation +PKGFILES_CSWtokyocabinet-doc = .*/doc/tokyocabinet_doc/.* +# That's ok, it's in the howto build section +CHECKPKG_OVERRIDES_CSWtokyocabinet-doc += file-with-bad-content|/usr/local|root/opt/csw/share/doc/tokyocabinet_doc/doc/spex-en.html +CHECKPKG_OVERRIDES_CSWtokyocabinet-doc += file-with-bad-content|/usr/local|root/opt/csw/share/doc/tokyocabinet_doc/doc/spex-ja.html -PACKAGES += CSWlibtokyocabinet9 -PACKAGES += CSWtokyocabinet-dev +BUILD64 = 1 -CATALOGNAME_CSWlibtokyocabinet9 = libtokyocabinet9 -CATALOGNAME_CSWtokyocabinet-dev = tokyocabinet_dev +EXTRA_CFLAGS = -xc99=all -Kpic +EXTRA_CPPFLAGS = -DPIC -RUNTIME_DEP_PKGS_CSWlibtokyocabinet9 += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWlibtokyocabinet9 += CSWlibbz2-1-0 -RUNTIME_DEP_PKGS_CSWlibtokyocabinet9 += CSWlibz1 -RUNTIME_DEP_PKGS_CSWtokyocabinet-dev += CSWlibtokyocabinet9 -RUNTIME_DEP_PKGS_CSWtokyocabinet += CSWlibtokyocabinet9 +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-zlib=$(prefix) +CONFIGURE_ARGS += --with-bzip=$(prefix) +CONFIGURE_ARGS += --disable-static +CONFIGURE_ARGS += --enable-shared -PKGFILES_CSWlibtokyocabinet9 += $(call pkgfiles_lib,libtokyocabinet.so.9) -PKGFILES_CSWtokyocabinet-dev += $(PKGFILES_DEVEL) - -SPKG_DESC_CSWlibtokyocabinet9 += $(DESCRIPTION), libtokyocabinet.so.9 -SPKG_DESC_CSWtokyocabinet-dev += $(DESCRIPTION), development files - -####################### -# Tests are disk intensive. uncomment to skip tests if need be. -####################### -#TEST_SCRIPTS = - include gar/category.mk -PATH:=/opt/csw/gnu:$(PATH) +post-merge: + install -d $(PKGROOT)$(docdir)/libtokyocabinet_dev + install -d $(PKGROOT)$(docdir)/tokyocabinet_doc + mv $(PKGROOT)$(sharedstatedir)/tokyocabinet/tokyocabinet.idl $(PKGROOT)$(docdir)/libtokyocabinet_dev/ + mv $(PKGROOT)$(sharedstatedir)/tokyocabinet/COPYING \ + $(PKGROOT)$(sharedstatedir)/tokyocabinet/ChangeLog \ + $(PKGROOT)$(docdir)/libtokyocabinet_dev/ + mv $(PKGROOT)$(sharedstatedir)/tokyocabinet/doc $(PKGROOT)$(docdir)/tokyocabinet_doc/ + rm -rf $(PKGROOT)$(sharedstatedir)/tokyocabinet + @$(MAKECOOKIE) Modified: csw/mgar/pkg/tokyocabinet/trunk/checksums =================================================================== --- csw/mgar/pkg/tokyocabinet/trunk/checksums 2012-06-14 20:14:16 UTC (rev 18407) +++ csw/mgar/pkg/tokyocabinet/trunk/checksums 2012-06-14 20:47:00 UTC (rev 18408) @@ -1 +1 @@ -3922632835 1002443 tokyocabinet-1.4.47.tar.gz +3d94fe2aebf5d9ff0478ed895bc46fc9 tokyocabinet-1.4.47.tar.gz Added: csw/mgar/pkg/tokyocabinet/trunk/files/0001-Adjust-Makefile.in.patch =================================================================== --- csw/mgar/pkg/tokyocabinet/trunk/files/0001-Adjust-Makefile.in.patch (rev 0) +++ csw/mgar/pkg/tokyocabinet/trunk/files/0001-Adjust-Makefile.in.patch 2012-06-14 20:47:00 UTC (rev 18408) @@ -0,0 +1,32 @@ +From fe5caa8e5e281e1feea1770a07da292bc71e36b2 Mon Sep 17 00:00:00 2001 +From: Rafael Ostertag +Date: Tue, 12 Jun 2012 22:09:07 +0200 +Subject: [PATCH] Adjust Makefile.in + +--- + Makefile.in | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index 8846c38..5282ec2 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -112,11 +112,12 @@ install : + mkdir -p $(DESTDIR)$(INCLUDEDIR) + cp -Rf $(HEADERFILES) $(DESTDIR)$(INCLUDEDIR) + mkdir -p $(DESTDIR)$(LIBDIR) +- cp -Rf $(LIBRARYFILES) $(DESTDIR)$(LIBDIR) ++ cp -RPf $(LIBRARYFILES) $(DESTDIR)$(LIBDIR) + mkdir -p $(DESTDIR)$(BINDIR) + cp -Rf $(COMMANDFILES) $(DESTDIR)$(BINDIR) +- mkdir -p $(DESTDIR)$(LIBEXECDIR) +- cp -Rf $(CGIFILES) $(DESTDIR)$(LIBEXECDIR) ++# We don't want this ++# mkdir -p $(DESTDIR)$(LIBEXECDIR) ++# cp -Rf $(CGIFILES) $(DESTDIR)$(LIBEXECDIR) + mkdir -p $(DESTDIR)$(DATADIR) + cp -Rf $(DOCUMENTFILES) $(DESTDIR)$(DATADIR) + mkdir -p $(DESTDIR)$(MAN1DIR) +-- +1.7.10.3 + Deleted: csw/mgar/pkg/tokyocabinet/trunk/files/0001-updated-paths-for-csw.patch =================================================================== --- csw/mgar/pkg/tokyocabinet/trunk/files/0001-updated-paths-for-csw.patch 2012-06-14 20:14:16 UTC (rev 18407) +++ csw/mgar/pkg/tokyocabinet/trunk/files/0001-updated-paths-for-csw.patch 2012-06-14 20:47:00 UTC (rev 18408) @@ -1,220 +0,0 @@ -From c032fb31ec09d251f675bdd4d064cc868b771d99 Mon Sep 17 00:00:00 2001 -From: Shawn McDermott -Date: Tue, 20 Sep 2011 14:43:37 +0200 -Subject: [PATCH] updated paths for csw - ---- - doc/spex-en.html | 72 ++++++++++++++++++++++++++-------------------------- - doc/spex-ja.html | 72 ++++++++++++++++++++++++++-------------------------- - man/tokyocabinet.3 | 4 +- - 3 files changed, 74 insertions(+), 74 deletions(-) - -diff --git a/doc/spex-en.html b/doc/spex-en.html -index 26c40ee..60ff06c 100644 ---- a/doc/spex-en.html -+++ b/doc/spex-en.html -@@ -192,39 +192,39 @@ - -

When a series of work finishes, the following files will be installed.

- --
/usr/local/include/tcutil.h
--/usr/local/include/tchdb.h
--/usr/local/include/tcbdb.h
--/usr/local/include/tcfdb.h
--/usr/local/include/tctdb.h
--/usr/local/include/tcadb.h
--/usr/local/lib/libtokyocabinet.a
--/usr/local/lib/libtokyocabinet.so.x.y.z
--/usr/local/lib/libtokyocabinet.so.x
--/usr/local/lib/libtokyocabinet.so
--/usr/local/lib/pkgconfig/tokyocabinet.pc
--/usr/local/bin/tcutest
--/usr/local/bin/tcumttest
--/usr/local/bin/tcucodec
--/usr/local/bin/tchtest
--/usr/local/bin/tchmttest
--/usr/local/bin/tchmgr
--/usr/local/bin/tcbmgr
--/usr/local/bin/tcbtest
--/usr/local/bin/tcbmttest
--/usr/local/bin/tcftest
--/usr/local/bin/tcfmttest
--/usr/local/bin/tcfmgr
--/usr/local/bin/tcttest
--/usr/local/bin/tctmttest
--/usr/local/bin/tctmgr
--/usr/local/bin/tcatest
--/usr/local/bin/tcamttest
--/usr/local/bin/tcamgr
--/usr/local/libexec/tcawmgr.cgi
--/usr/local/share/tokyocabinet/...
--/usr/local/man/man1/...
--/usr/local/man/man3/...
-+
/opt/csw/include/tcutil.h
-+/opt/csw/include/tchdb.h
-+/opt/csw/include/tcbdb.h
-+/opt/csw/include/tcfdb.h
-+/opt/csw/include/tctdb.h
-+/opt/csw/include/tcadb.h
-+/opt/csw/lib/libtokyocabinet.a
-+/opt/csw/lib/libtokyocabinet.so.x.y.z
-+/opt/csw/lib/libtokyocabinet.so.x
-+/opt/csw/lib/libtokyocabinet.so
-+/opt/csw/lib/pkgconfig/tokyocabinet.pc
-+/opt/csw/bin/tcutest
-+/opt/csw/bin/tcumttest
-+/opt/csw/bin/tcucodec
-+/opt/csw/bin/tchtest
-+/opt/csw/bin/tchmttest
-+/opt/csw/bin/tchmgr
-+/opt/csw/bin/tcbmgr
-+/opt/csw/bin/tcbtest
-+/opt/csw/bin/tcbmttest
-+/opt/csw/bin/tcftest
-+/opt/csw/bin/tcfmttest
-+/opt/csw/bin/tcfmgr
-+/opt/csw/bin/tcttest
-+/opt/csw/bin/tctmttest
-+/opt/csw/bin/tctmgr
-+/opt/csw/bin/tcatest
-+/opt/csw/bin/tcamttest
-+/opt/csw/bin/tcamgr
-+/opt/csw/libexec/tcawmgr.cgi
-+/opt/csw/share/tokyocabinet/...
-+/opt/csw/man/man1/...
-+/opt/csw/man/man3/...
- 
- -

Options of Configure

-@@ -246,14 +246,14 @@ -
  • --disable-shared : avoid to build shared libraries.
  • - - --

    `--prefix' and other options are also available as with usual UNIX software packages. If you want to install Tokyo Cabinet under `/usr' not `/usr/local', specify `--prefix=/usr'. As well, the library search path does not include `/usr/local/lib', it is necessary to set the environment variable `LD_LIBRARY_PATH' to include `/usr/local/lib' before running applications of Tokyo Cabinet.

    -+

    `--prefix' and other options are also available as with usual UNIX software packages. If you want to install Tokyo Cabinet under `/usr' not `/opt/csw', specify `--prefix=/usr'. As well, the library search path does not include `/opt/csw/lib', it is necessary to set the environment variable `LD_LIBRARY_PATH' to include `/opt/csw/lib' before running applications of Tokyo Cabinet.

    - -

    How to Use the Library

    - -

    Tokyo Cabinet provides API of the C language and it is available by programs conforming to the C89 (ANSI C) standard or the C99 standard. As the header files of Tokyo Cabinet are provided as `tcutil.h', `tchdb.h', `tcbdb.h', and `tcadb.h', applications should include one or more of them accordingly to use the API. As the library is provided as `libtokyocabinet.a' and `libtokyocabinet.so' and they depend on `libz.so', `libbz2.so', `librt.so', `libpthread.so', `libm.so', and `libc.so', linker options corresponding to them are required by the build command. The typical build command is the following.

    - --
    gcc -I/usr/local/include tc_example.c -o tc_example \
    --  -L/usr/local/lib -ltokyocabinet -lz -lbz2 -lrt -lpthread -lm -lc
    -+
    gcc -I/opt/csw/include tc_example.c -o tc_example \
    -+  -L/opt/csw/lib -ltokyocabinet -lz -lbz2 -lrt -lpthread -lm -lc
    - 
    - -

    You can also use Tokyo Cabinet in programs written in C++. Because each header is wrapped in C linkage (`extern "C"' block), you can simply include them into your C++ programs.

    -diff --git a/doc/spex-ja.html b/doc/spex-ja.html -index 7ab9cd4..1fd4a9d 100644 ---- a/doc/spex-ja.html -+++ b/doc/spex-ja.html -@@ -194,39 +194,39 @@ - -

    ?????????????????????????????

    - --
    /usr/local/include/tcutil.h
    --/usr/local/include/tchdb.h
    --/usr/local/include/tcbdb.h
    --/usr/local/include/tcfdb.h
    --/usr/local/include/tctdb.h
    --/usr/local/include/tcadb.h
    --/usr/local/lib/libtokyocabinet.a
    --/usr/local/lib/libtokyocabinet.so.x.y.z
    --/usr/local/lib/libtokyocabinet.so.x
    --/usr/local/lib/libtokyocabinet.so
    --/usr/local/lib/pkgconfig/tokyocabinet.pc
    --/usr/local/bin/tcutest
    --/usr/local/bin/tcumttest
    --/usr/local/bin/tcucodec
    --/usr/local/bin/tchtest
    --/usr/local/bin/tchmttest
    --/usr/local/bin/tchmgr
    --/usr/local/bin/tcbmgr
    --/usr/local/bin/tcbtest
    --/usr/local/bin/tcbmttest
    --/usr/local/bin/tcftest
    --/usr/local/bin/tcfmttest
    --/usr/local/bin/tcfmgr
    --/usr/local/bin/tcttest
    --/usr/local/bin/tctmttest
    --/usr/local/bin/tctmgr
    --/usr/local/bin/tcatest
    --/usr/local/bin/tcamttest
    --/usr/local/bin/tcamgr
    --/usr/local/libexec/tcawmgr.cgi
    --/usr/local/share/tokyocabinet/...
    --/usr/local/man/man1/...
    --/usr/local/man/man3/...
    -+
    /opt/csw/include/tcutil.h
    -+/opt/csw/include/tchdb.h
    -+/opt/csw/include/tcbdb.h
    -+/opt/csw/include/tcfdb.h
    -+/opt/csw/include/tctdb.h
    -+/opt/csw/include/tcadb.h
    -+/opt/csw/lib/libtokyocabinet.a
    -+/opt/csw/lib/libtokyocabinet.so.x.y.z
    -+/opt/csw/lib/libtokyocabinet.so.x
    -+/opt/csw/lib/libtokyocabinet.so
    -+/opt/csw/lib/pkgconfig/tokyocabinet.pc
    -+/opt/csw/bin/tcutest
    -+/opt/csw/bin/tcumttest
    -+/opt/csw/bin/tcucodec
    -+/opt/csw/bin/tchtest
    -+/opt/csw/bin/tchmttest
    -+/opt/csw/bin/tchmgr
    -+/opt/csw/bin/tcbmgr
    -+/opt/csw/bin/tcbtest
    -+/opt/csw/bin/tcbmttest
    -+/opt/csw/bin/tcftest
    -+/opt/csw/bin/tcfmttest
    -+/opt/csw/bin/tcfmgr
    -+/opt/csw/bin/tcttest
    -+/opt/csw/bin/tctmttest
    -+/opt/csw/bin/tctmgr
    -+/opt/csw/bin/tcatest
    -+/opt/csw/bin/tcamttest
    -+/opt/csw/bin/tcamgr
    -+/opt/csw/libexec/tcawmgr.cgi
    -+/opt/csw/share/tokyocabinet/...
    -+/opt/csw/man/man1/...
    -+/opt/csw/man/man3/...
    - 
    - -

    configure??????

    -@@ -248,14 +248,14 @@ -
  • --disable-shared : ?????????????????
  • - - --

    `--prefix' ?????????????UNIX???????????????????????`/usr/local' ?????? '/usr' ??????????????? `--prefix=/usr' ??????????????????????? `/usr/local/lib' ????????????Tokyo Cabinet???????????????????? `LD_LIBRARY_PATH' ??? `/usr/local/lib' ????????????????

    -+

    `--prefix' ?????????????UNIX???????????????????????`/opt/csw' ?????? '/usr' ??????????????? `--prefix=/usr' ??????????????????????? `/opt/csw/lib' ????????????Tokyo Cabinet???????????????????? `LD_LIBRARY_PATH' ??? `/opt/csw/lib' ????????????????

    - -

    ?????????

    - -

    Tokyo Cabinet?C???API????????C89???ANSI C????C99??????????????????????????Tokyo Cabinet???? `tcutil.h'?`tchdb.h'?`tcbdb.h'?`tcadb.h' ??????????????????????????????????????????????API????????????????????? `libtokyocabinet.a' ??? `libtokyocabinet.so' ???????????? `libz.so'?`libbz2.so', `librt.so', `libpthread.so'?`libm.so'?`libc.so' ?????????????????????????????????????????????????????????????????????????? ?????

    - --
    gcc -I/usr/local/include tc_example.c -o tc_example \
    --  -L/usr/local/lib -ltokyocabinet -lz -lbz2 -lrt -lpthread -lm -lc
    -+
    gcc -I/opt/csw/include tc_example.c -o tc_example \
    -+  -L/opt/csw/lib -ltokyocabinet -lz -lbz2 -lrt -lpthread -lm -lc
    - 
    - -

    Tokyo Cabinet?C++????????????????????????????????C???????extern "C"?????????????????????????????????????????

    -diff --git a/man/tokyocabinet.3 b/man/tokyocabinet.3 -index d050da5..ce275ce 100644 ---- a/man/tokyocabinet.3 -+++ b/man/tokyocabinet.3 -@@ -101,9 +101,9 @@ In cases that multiple processes access a database at the same time or some proc - Tokyo Cabinet provides API of the C language and it is available by programs conforming to the C89 (ANSI C) standard or the C99 standard. As the header files of Tokyo Cabinet are provided as `\fBtcutil.h\fR', `\fBtchdb.h\fR', and `\fBtcbdb.h\fR', applications should include one or more of them accordingly to use the API. As the library is provided as `\fBlibtokyocabinet.a\fR' and `\fBlibtokyocabinet.so\fR' and they depends `\fBlibz.so\fR', `\fBlibrt.so\fR', `\fBlibpthread.so\fR', `\fBlibm.so\fR', and `\fBlibc.so\fR', linker options `\fB\-ltokyocabinet\fR', `\fB\-lz\fR', `\fB\-lbz2\fR', `\fB\-lrt\fR', `\fB\-lpthread\fR', `\fB\-lm\fR', and `\fB\-lc\fR' are required for build command. A typical build command is the following. - .PP - .RS --gcc \-I/usr/local/include tc_example.c \-o tc_example \\ -+gcc \-I/opt/csw/include tc_example.c \-o tc_example \\ - .br -- \-L/usr/local/lib \-ltokyocabinet \-lz \-lbz2 \-lrt \-lpthread \-lm \-lc -+ \-L/opt/csw/lib \-ltokyocabinet \-lz \-lbz2 \-lrt \-lpthread \-lm \-lc - .RE - .PP - You can also use Tokyo Cabinet in programs written in C++. Because each header is wrapped in C linkage (`\fBextern "C"\fR' block), you can simply include them into your C++ programs. --- -1.7.6.1 - Added: csw/mgar/pkg/tokyocabinet/trunk/files/0001-updated-paths-for-csw.patch =================================================================== --- csw/mgar/pkg/tokyocabinet/trunk/files/0001-updated-paths-for-csw.patch (rev 0) +++ csw/mgar/pkg/tokyocabinet/trunk/files/0001-updated-paths-for-csw.patch 2012-06-14 20:47:00 UTC (rev 18408) @@ -0,0 +1,220 @@ +From c032fb31ec09d251f675bdd4d064cc868b771d99 Mon Sep 17 00:00:00 2001 +From: Shawn McDermott +Date: Tue, 20 Sep 2011 14:43:37 +0200 +Subject: [PATCH] updated paths for csw + +--- + doc/spex-en.html | 72 ++++++++++++++++++++++++++-------------------------- + doc/spex-ja.html | 72 ++++++++++++++++++++++++++-------------------------- + man/tokyocabinet.3 | 4 +- + 3 files changed, 74 insertions(+), 74 deletions(-) + +diff --git a/doc/spex-en.html b/doc/spex-en.html +index 26c40ee..60ff06c 100644 +--- a/doc/spex-en.html ++++ b/doc/spex-en.html +@@ -192,39 +192,39 @@ + +

    When a series of work finishes, the following files will be installed.

    + +-
    /usr/local/include/tcutil.h
    +-/usr/local/include/tchdb.h
    +-/usr/local/include/tcbdb.h
    +-/usr/local/include/tcfdb.h
    +-/usr/local/include/tctdb.h
    +-/usr/local/include/tcadb.h
    +-/usr/local/lib/libtokyocabinet.a
    +-/usr/local/lib/libtokyocabinet.so.x.y.z
    +-/usr/local/lib/libtokyocabinet.so.x
    +-/usr/local/lib/libtokyocabinet.so
    +-/usr/local/lib/pkgconfig/tokyocabinet.pc
    +-/usr/local/bin/tcutest
    +-/usr/local/bin/tcumttest
    +-/usr/local/bin/tcucodec
    +-/usr/local/bin/tchtest
    +-/usr/local/bin/tchmttest
    +-/usr/local/bin/tchmgr
    +-/usr/local/bin/tcbmgr
    +-/usr/local/bin/tcbtest
    +-/usr/local/bin/tcbmttest
    +-/usr/local/bin/tcftest
    +-/usr/local/bin/tcfmttest
    +-/usr/local/bin/tcfmgr
    +-/usr/local/bin/tcttest
    +-/usr/local/bin/tctmttest
    +-/usr/local/bin/tctmgr
    +-/usr/local/bin/tcatest
    +-/usr/local/bin/tcamttest
    +-/usr/local/bin/tcamgr
    +-/usr/local/libexec/tcawmgr.cgi
    +-/usr/local/share/tokyocabinet/...
    +-/usr/local/man/man1/...
    +-/usr/local/man/man3/...
    ++
    /opt/csw/include/tcutil.h
    ++/opt/csw/include/tchdb.h
    ++/opt/csw/include/tcbdb.h
    ++/opt/csw/include/tcfdb.h
    ++/opt/csw/include/tctdb.h
    ++/opt/csw/include/tcadb.h
    ++/opt/csw/lib/libtokyocabinet.a
    ++/opt/csw/lib/libtokyocabinet.so.x.y.z
    ++/opt/csw/lib/libtokyocabinet.so.x
    ++/opt/csw/lib/libtokyocabinet.so
    ++/opt/csw/lib/pkgconfig/tokyocabinet.pc
    ++/opt/csw/bin/tcutest
    ++/opt/csw/bin/tcumttest
    ++/opt/csw/bin/tcucodec
    ++/opt/csw/bin/tchtest
    ++/opt/csw/bin/tchmttest
    ++/opt/csw/bin/tchmgr
    ++/opt/csw/bin/tcbmgr
    ++/opt/csw/bin/tcbtest
    ++/opt/csw/bin/tcbmttest
    ++/opt/csw/bin/tcftest
    ++/opt/csw/bin/tcfmttest
    ++/opt/csw/bin/tcfmgr
    ++/opt/csw/bin/tcttest
    ++/opt/csw/bin/tctmttest
    ++/opt/csw/bin/tctmgr
    ++/opt/csw/bin/tcatest
    ++/opt/csw/bin/tcamttest
    ++/opt/csw/bin/tcamgr
    ++/opt/csw/libexec/tcawmgr.cgi
    ++/opt/csw/share/tokyocabinet/...
    ++/opt/csw/man/man1/...
    ++/opt/csw/man/man3/...
    + 
    + +

    Options of Configure

    +@@ -246,14 +246,14 @@ +
  • --disable-shared : avoid to build shared libraries.
  • + + +-

    `--prefix' and other options are also available as with usual UNIX software packages. If you want to install Tokyo Cabinet under `/usr' not `/usr/local', specify `--prefix=/usr'. As well, the library search path does not include `/usr/local/lib', it is necessary to set the environment variable `LD_LIBRARY_PATH' to include `/usr/local/lib' before running applications of Tokyo Cabinet.

    ++

    `--prefix' and other options are also available as with usual UNIX software packages. If you want to install Tokyo Cabinet under `/usr' not `/opt/csw', specify `--prefix=/usr'. As well, the library search path does not include `/opt/csw/lib', it is necessary to set the environment variable `LD_LIBRARY_PATH' to include `/opt/csw/lib' before running applications of Tokyo Cabinet.

    + +

    How to Use the Library

    + +

    Tokyo Cabinet provides API of the C language and it is available by programs conforming to the C89 (ANSI C) standard or the C99 standard. As the header files of Tokyo Cabinet are provided as `tcutil.h', `tchdb.h', `tcbdb.h', and `tcadb.h', applications should include one or more of them accordingly to use the API. As the library is provided as `libtokyocabinet.a' and `libtokyocabinet.so' and they depend on `libz.so', `libbz2.so', `librt.so', `libpthread.so', `libm.so', and `libc.so', linker options corresponding to them are required by the build command. The typical build command is the following.

    + +-
    gcc -I/usr/local/include tc_example.c -o tc_example \
    +-  -L/usr/local/lib -ltokyocabinet -lz -lbz2 -lrt -lpthread -lm -lc
    ++
    gcc -I/opt/csw/include tc_example.c -o tc_example \
    ++  -L/opt/csw/lib -ltokyocabinet -lz -lbz2 -lrt -lpthread -lm -lc
    + 
    + +

    You can also use Tokyo Cabinet in programs written in C++. Because each header is wrapped in C linkage (`extern "C"' block), you can simply include them into your C++ programs.

    +diff --git a/doc/spex-ja.html b/doc/spex-ja.html +index 7ab9cd4..1fd4a9d 100644 +--- a/doc/spex-ja.html ++++ b/doc/spex-ja.html +@@ -194,39 +194,39 @@ + +

    ?????????????????????????????

    + +-
    /usr/local/include/tcutil.h
    +-/usr/local/include/tchdb.h
    +-/usr/local/include/tcbdb.h
    +-/usr/local/include/tcfdb.h
    +-/usr/local/include/tctdb.h
    +-/usr/local/include/tcadb.h
    +-/usr/local/lib/libtokyocabinet.a
    +-/usr/local/lib/libtokyocabinet.so.x.y.z
    +-/usr/local/lib/libtokyocabinet.so.x
    +-/usr/local/lib/libtokyocabinet.so
    +-/usr/local/lib/pkgconfig/tokyocabinet.pc
    +-/usr/local/bin/tcutest
    +-/usr/local/bin/tcumttest
    +-/usr/local/bin/tcucodec
    +-/usr/local/bin/tchtest
    +-/usr/local/bin/tchmttest
    +-/usr/local/bin/tchmgr
    +-/usr/local/bin/tcbmgr
    +-/usr/local/bin/tcbtest
    +-/usr/local/bin/tcbmttest
    +-/usr/local/bin/tcftest
    +-/usr/local/bin/tcfmttest
    +-/usr/local/bin/tcfmgr
    +-/usr/local/bin/tcttest
    +-/usr/local/bin/tctmttest
    +-/usr/local/bin/tctmgr
    +-/usr/local/bin/tcatest
    +-/usr/local/bin/tcamttest
    +-/usr/local/bin/tcamgr
    +-/usr/local/libexec/tcawmgr.cgi
    +-/usr/local/share/tokyocabinet/...
    +-/usr/local/man/man1/...
    +-/usr/local/man/man3/...
    ++
    /opt/csw/include/tcutil.h
    ++/opt/csw/include/tchdb.h
    ++/opt/csw/include/tcbdb.h
    ++/opt/csw/include/tcfdb.h
    ++/opt/csw/include/tctdb.h
    ++/opt/csw/include/tcadb.h
    ++/opt/csw/lib/libtokyocabinet.a
    ++/opt/csw/lib/libtokyocabinet.so.x.y.z
    ++/opt/csw/lib/libtokyocabinet.so.x
    ++/opt/csw/lib/libtokyocabinet.so
    ++/opt/csw/lib/pkgconfig/tokyocabinet.pc
    ++/opt/csw/bin/tcutest
    ++/opt/csw/bin/tcumttest
    ++/opt/csw/bin/tcucodec
    ++/opt/csw/bin/tchtest
    ++/opt/csw/bin/tchmttest
    ++/opt/csw/bin/tchmgr
    ++/opt/csw/bin/tcbmgr
    ++/opt/csw/bin/tcbtest
    ++/opt/csw/bin/tcbmttest
    ++/opt/csw/bin/tcftest
    ++/opt/csw/bin/tcfmttest
    ++/opt/csw/bin/tcfmgr
    ++/opt/csw/bin/tcttest
    ++/opt/csw/bin/tctmttest
    ++/opt/csw/bin/tctmgr
    ++/opt/csw/bin/tcatest
    ++/opt/csw/bin/tcamttest
    ++/opt/csw/bin/tcamgr
    ++/opt/csw/libexec/tcawmgr.cgi
    ++/opt/csw/share/tokyocabinet/...
    ++/opt/csw/man/man1/...
    ++/opt/csw/man/man3/...
    + 
    + +

    configure??????

    +@@ -248,14 +248,14 @@ +
  • --disable-shared : ?????????????????
  • + + +-

    `--prefix' ?????????????UNIX???????????????????????`/usr/local' ?????? '/usr' ??????????????? `--prefix=/usr' ??????????????????????? `/usr/local/lib' ????????????Tokyo Cabinet???????????????????? `LD_LIBRARY_PATH' ??? `/usr/local/lib' ????????????????

    ++

    `--prefix' ?????????????UNIX???????????????????????`/opt/csw' ?????? '/usr' ??????????????? `--prefix=/usr' ??????????????????????? `/opt/csw/lib' ????????????Tokyo Cabinet???????????????????? `LD_LIBRARY_PATH' ??? `/opt/csw/lib' ????????????????

    + +

    ?????????

    + +

    Tokyo Cabinet?C???API????????C89???ANSI C????C99??????????????????????????Tokyo Cabinet???? `tcutil.h'?`tchdb.h'?`tcbdb.h'?`tcadb.h' ??????????????????????????????????????????????API????????????????????? `libtokyocabinet.a' ??? `libtokyocabinet.so' ???????????? `libz.so'?`libbz2.so', `librt.so', `libpthread.so'?`libm.so'?`libc.so' ?????????????????????????????????????????????????????????????????????????? ?????

    + +-
    gcc -I/usr/local/include tc_example.c -o tc_example \
    +-  -L/usr/local/lib -ltokyocabinet -lz -lbz2 -lrt -lpthread -lm -lc
    ++
    gcc -I/opt/csw/include tc_example.c -o tc_example \
    ++  -L/opt/csw/lib -ltokyocabinet -lz -lbz2 -lrt -lpthread -lm -lc
    + 
    + +

    Tokyo Cabinet?C++????????????????????????????????C???????extern "C"?????????????????????????????????????????

    +diff --git a/man/tokyocabinet.3 b/man/tokyocabinet.3 +index d050da5..ce275ce 100644 +--- a/man/tokyocabinet.3 ++++ b/man/tokyocabinet.3 +@@ -101,9 +101,9 @@ In cases that multiple processes access a database at the same time or some proc + Tokyo Cabinet provides API of the C language and it is available by programs conforming to the C89 (ANSI C) standard or the C99 standard. As the header files of Tokyo Cabinet are provided as `\fBtcutil.h\fR', `\fBtchdb.h\fR', and `\fBtcbdb.h\fR', applications should include one or more of them accordingly to use the API. As the library is provided as `\fBlibtokyocabinet.a\fR' and `\fBlibtokyocabinet.so\fR' and they depends `\fBlibz.so\fR', `\fBlibrt.so\fR', `\fBlibpthread.so\fR', `\fBlibm.so\fR', and `\fBlibc.so\fR', linker options `\fB\-ltokyocabinet\fR', `\fB\-lz\fR', `\fB\-lbz2\fR', `\fB\-lrt\fR', `\fB\-lpthread\fR', `\fB\-lm\fR', and `\fB\-lc\fR' are required for build command. A typical build command is the following. + .PP + .RS +-gcc \-I/usr/local/include tc_example.c \-o tc_example \\ ++gcc \-I/opt/csw/include tc_example.c \-o tc_example \\ + .br +- \-L/usr/local/lib \-ltokyocabinet \-lz \-lbz2 \-lrt \-lpthread \-lm \-lc ++ \-L/opt/csw/lib \-ltokyocabinet \-lz \-lbz2 \-lrt \-lpthread \-lm \-lc + .RE + .PP + You can also use Tokyo Cabinet in programs written in C++. Because each header is wrapped in C linkage (`\fBextern "C"\fR' block), you can simply include them into your C++ programs. +-- +1.7.6.1 + Added: csw/mgar/pkg/tokyocabinet/trunk/files/0002-Use-make-variable.patch =================================================================== --- csw/mgar/pkg/tokyocabinet/trunk/files/0002-Use-make-variable.patch (rev 0) +++ csw/mgar/pkg/tokyocabinet/trunk/files/0002-Use-make-variable.patch 2012-06-14 20:47:00 UTC (rev 18408) @@ -0,0 +1,93 @@ +From eee3e782fa7694aa0f03a4995b41419ee51878e0 Mon Sep 17 00:00:00 2001 +From: Rafael Ostertag +Date: Tue, 12 Jun 2012 22:30:30 +0200 +Subject: [PATCH] Use make variable + +--- + Makefile.in | 40 ++++++++++++++++++++-------------------- + 1 file changed, 20 insertions(+), 20 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index 5282ec2..a6e4f01 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -134,7 +134,7 @@ install : + + + install-strip : +- make DESTDIR=$(DESTDIR) install ++ $(MAKE) DESTDIR=$(DESTDIR) install + cd $(DESTDIR)$(BINDIR) && strip $(COMMANDFILES) + + +@@ -151,26 +151,26 @@ uninstall : + + + dist : +- make version +- make untabify +- make distclean ++ $(MAKE) version ++ $(MAKE) untabify ++ $(MAKE) distclean + cd .. && tar cvf - $(PACKAGEDIR) | gzip -c > $(PACKAGETGZ) + sync ; sync + + + distclean : clean +- cd example && make clean +- cd bros && make clean ++ cd example && $(MAKE) clean ++ cd bros && $(MAKE) clean + rm -rf Makefile tokyocabinet.pc config.cache config.log config.status autom4te.cache + + + check : +- make check-util +- make check-hdb +- make check-bdb +- make check-fdb +- make check-tdb +- make check-adb ++ $(MAKE) check-util ++ $(MAKE) check-hdb ++ $(MAKE) check-bdb ++ $(MAKE) check-fdb ++ $(MAKE) check-tdb ++ $(MAKE) check-adb + rm -rf casket* + @printf '\n' + @printf '#================================================================\n' +@@ -586,7 +586,7 @@ check-adb : + + + check-valgrind : +- make RUNCMD="valgrind --tool=memcheck --log-file=%p.vlog" check ++ $(MAKE) RUNCMD="valgrind --tool=memcheck --log-file=%p.vlog" check + grep ERROR *.vlog | grep -v ' 0 errors' ; true + grep 'at exit' *.vlog | grep -v ' 0 bytes' ; true + +@@ -630,13 +630,13 @@ check-race : + check-forever : + while true ; \ + do \ +- make check || break ; \ +- make check || break ; \ +- make check-thread || break ; \ +- make check-race || break ; \ +- make check-race || break ; \ +- make check-compare || break ; \ +- make check-compare || break ; \ ++ $(MAKE) check || break ; \ ++ $(MAKE) check || break ; \ ++ $(MAKE) check-thread || break ; \ ++ $(MAKE) check-race || break ; \ ++ $(MAKE) check-race || break ; \ ++ $(MAKE) check-compare || break ; \ ++ $(MAKE) check-compare || break ; \ + done + + +-- +1.7.10.3 + Added: csw/mgar/pkg/tokyocabinet/trunk/files/0003-adjust-man-page-for-csw.patch =================================================================== --- csw/mgar/pkg/tokyocabinet/trunk/files/0003-adjust-man-page-for-csw.patch (rev 0) +++ csw/mgar/pkg/tokyocabinet/trunk/files/0003-adjust-man-page-for-csw.patch 2012-06-14 20:47:00 UTC (rev 18408) @@ -0,0 +1,30 @@ +From 4a5ab50424e83a4148a961b48b25587f7325d675 Mon Sep 17 00:00:00 2001 +From: Rafael Ostertag +Date: Tue, 12 Jun 2012 23:08:08 +0200 +Subject: [PATCH] adjust man page for csw + +--- + man/tokyocabinet.3 | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/man/tokyocabinet.3 b/man/tokyocabinet.3 +index d050da5..fa67266 100644 +--- a/man/tokyocabinet.3 ++++ b/man/tokyocabinet.3 +@@ -101,9 +101,11 @@ In cases that multiple processes access a database at the same time or some proc + Tokyo Cabinet provides API of the C language and it is available by programs conforming to the C89 (ANSI C) standard or the C99 standard. As the header files of Tokyo Cabinet are provided as `\fBtcutil.h\fR', `\fBtchdb.h\fR', and `\fBtcbdb.h\fR', applications should include one or more of them accordingly to use the API. As the library is provided as `\fBlibtokyocabinet.a\fR' and `\fBlibtokyocabinet.so\fR' and they depends `\fBlibz.so\fR', `\fBlibrt.so\fR', `\fBlibpthread.so\fR', `\fBlibm.so\fR', and `\fBlibc.so\fR', linker options `\fB\-ltokyocabinet\fR', `\fB\-lz\fR', `\fB\-lbz2\fR', `\fB\-lrt\fR', `\fB\-lpthread\fR', `\fB\-lm\fR', and `\fB\-lc\fR' are required for build command. A typical build command is the following. + .PP + .RS +-gcc \-I/usr/local/include tc_example.c \-o tc_example \\ ++cc \-I/opt/csw/include tc_example.c \-o tc_example \\ + .br +- \-L/usr/local/lib \-ltokyocabinet \-lz \-lbz2 \-lrt \-lpthread \-lm \-lc ++ \-L/opt/csw/lib \-R/opt/csw/lib \-ltokyocabinet \\ ++.br ++ \-lz \-lbz2 \-lrt \-lpthread \-lm \-lc + .RE + .PP + You can also use Tokyo Cabinet in programs written in C++. Because each header is wrapped in C linkage (`\fBextern "C"\fR' block), you can simply include them into your C++ programs. +-- +1.7.10.3 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Thu Jun 14 22:48:22 2012 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Thu, 14 Jun 2012 20:48:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[18409] csw/mgar/pkg/tokyocabinet/trunk/files/ 0001-updated-paths-for-csw.patch Message-ID: Revision: 18409 http://gar.svn.sourceforge.net/gar/?rev=18409&view=rev Author: guengel Date: 2012-06-14 20:48:22 +0000 (Thu, 14 Jun 2012) Log Message: ----------- tokyocabinet/trunk: Obsolete Removed Paths: ------------- csw/mgar/pkg/tokyocabinet/trunk/files/0001-updated-paths-for-csw.patch Deleted: csw/mgar/pkg/tokyocabinet/trunk/files/0001-updated-paths-for-csw.patch =================================================================== --- csw/mgar/pkg/tokyocabinet/trunk/files/0001-updated-paths-for-csw.patch 2012-06-14 20:47:00 UTC (rev 18408) +++ csw/mgar/pkg/tokyocabinet/trunk/files/0001-updated-paths-for-csw.patch 2012-06-14 20:48:22 UTC (rev 18409) @@ -1,220 +0,0 @@ -From c032fb31ec09d251f675bdd4d064cc868b771d99 Mon Sep 17 00:00:00 2001 -From: Shawn McDermott -Date: Tue, 20 Sep 2011 14:43:37 +0200 -Subject: [PATCH] updated paths for csw - ---- - doc/spex-en.html | 72 ++++++++++++++++++++++++++-------------------------- - doc/spex-ja.html | 72 ++++++++++++++++++++++++++-------------------------- - man/tokyocabinet.3 | 4 +- - 3 files changed, 74 insertions(+), 74 deletions(-) - -diff --git a/doc/spex-en.html b/doc/spex-en.html -index 26c40ee..60ff06c 100644 ---- a/doc/spex-en.html -+++ b/doc/spex-en.html -@@ -192,39 +192,39 @@ - -

    When a series of work finishes, the following files will be installed.

    - --
    /usr/local/include/tcutil.h
    --/usr/local/include/tchdb.h
    --/usr/local/include/tcbdb.h
    --/usr/local/include/tcfdb.h
    --/usr/local/include/tctdb.h
    --/usr/local/include/tcadb.h
    --/usr/local/lib/libtokyocabinet.a
    --/usr/local/lib/libtokyocabinet.so.x.y.z
    --/usr/local/lib/libtokyocabinet.so.x
    --/usr/local/lib/libtokyocabinet.so
    --/usr/local/lib/pkgconfig/tokyocabinet.pc
    --/usr/local/bin/tcutest
    --/usr/local/bin/tcumttest
    --/usr/local/bin/tcucodec
    --/usr/local/bin/tchtest
    --/usr/local/bin/tchmttest
    --/usr/local/bin/tchmgr
    --/usr/local/bin/tcbmgr
    --/usr/local/bin/tcbtest
    --/usr/local/bin/tcbmttest
    --/usr/local/bin/tcftest
    --/usr/local/bin/tcfmttest
    --/usr/local/bin/tcfmgr
    --/usr/local/bin/tcttest
    --/usr/local/bin/tctmttest
    --/usr/local/bin/tctmgr
    --/usr/local/bin/tcatest
    --/usr/local/bin/tcamttest
    --/usr/local/bin/tcamgr
    --/usr/local/libexec/tcawmgr.cgi
    --/usr/local/share/tokyocabinet/...
    --/usr/local/man/man1/...
    --/usr/local/man/man3/...
    -+
    /opt/csw/include/tcutil.h
    -+/opt/csw/include/tchdb.h
    -+/opt/csw/include/tcbdb.h
    -+/opt/csw/include/tcfdb.h
    -+/opt/csw/include/tctdb.h
    -+/opt/csw/include/tcadb.h
    -+/opt/csw/lib/libtokyocabinet.a
    -+/opt/csw/lib/libtokyocabinet.so.x.y.z
    -+/opt/csw/lib/libtokyocabinet.so.x
    -+/opt/csw/lib/libtokyocabinet.so
    -+/opt/csw/lib/pkgconfig/tokyocabinet.pc
    -+/opt/csw/bin/tcutest
    -+/opt/csw/bin/tcumttest
    -+/opt/csw/bin/tcucodec
    -+/opt/csw/bin/tchtest
    -+/opt/csw/bin/tchmttest
    -+/opt/csw/bin/tchmgr
    -+/opt/csw/bin/tcbmgr
    -+/opt/csw/bin/tcbtest
    -+/opt/csw/bin/tcbmttest
    -+/opt/csw/bin/tcftest
    -+/opt/csw/bin/tcfmttest
    -+/opt/csw/bin/tcfmgr
    -+/opt/csw/bin/tcttest
    -+/opt/csw/bin/tctmttest
    -+/opt/csw/bin/tctmgr
    -+/opt/csw/bin/tcatest
    -+/opt/csw/bin/tcamttest
    -+/opt/csw/bin/tcamgr
    -+/opt/csw/libexec/tcawmgr.cgi
    -+/opt/csw/share/tokyocabinet/...
    -+/opt/csw/man/man1/...
    -+/opt/csw/man/man3/...
    - 
    - -

    Options of Configure

    -@@ -246,14 +246,14 @@ -
  • --disable-shared : avoid to build shared libraries.
  • - - --

    `--prefix' and other options are also available as with usual UNIX software packages. If you want to install Tokyo Cabinet under `/usr' not `/usr/local', specify `--prefix=/usr'. As well, the library search path does not include `/usr/local/lib', it is necessary to set the environment variable `LD_LIBRARY_PATH' to include `/usr/local/lib' before running applications of Tokyo Cabinet.

    -+

    `--prefix' and other options are also available as with usual UNIX software packages. If you want to install Tokyo Cabinet under `/usr' not `/opt/csw', specify `--prefix=/usr'. As well, the library search path does not include `/opt/csw/lib', it is necessary to set the environment variable `LD_LIBRARY_PATH' to include `/opt/csw/lib' before running applications of Tokyo Cabinet.

    - -

    How to Use the Library

    - -

    Tokyo Cabinet provides API of the C language and it is available by programs conforming to the C89 (ANSI C) standard or the C99 standard. As the header files of Tokyo Cabinet are provided as `tcutil.h', `tchdb.h', `tcbdb.h', and `tcadb.h', applications should include one or more of them accordingly to use the API. As the library is provided as `libtokyocabinet.a' and `libtokyocabinet.so' and they depend on `libz.so', `libbz2.so', `librt.so', `libpthread.so', `libm.so', and `libc.so', linker options corresponding to them are required by the build command. The typical build command is the following.

    - --
    gcc -I/usr/local/include tc_example.c -o tc_example \
    --  -L/usr/local/lib -ltokyocabinet -lz -lbz2 -lrt -lpthread -lm -lc
    -+
    gcc -I/opt/csw/include tc_example.c -o tc_example \
    -+  -L/opt/csw/lib -ltokyocabinet -lz -lbz2 -lrt -lpthread -lm -lc
    - 
    - -

    You can also use Tokyo Cabinet in programs written in C++. Because each header is wrapped in C linkage (`extern "C"' block), you can simply include them into your C++ programs.

    -diff --git a/doc/spex-ja.html b/doc/spex-ja.html -index 7ab9cd4..1fd4a9d 100644 ---- a/doc/spex-ja.html -+++ b/doc/spex-ja.html -@@ -194,39 +194,39 @@ - -

    ?????????????????????????????

    - --
    /usr/local/include/tcutil.h
    --/usr/local/include/tchdb.h
    --/usr/local/include/tcbdb.h
    --/usr/local/include/tcfdb.h
    --/usr/local/include/tctdb.h
    --/usr/local/include/tcadb.h
    --/usr/local/lib/libtokyocabinet.a
    --/usr/local/lib/libtokyocabinet.so.x.y.z
    --/usr/local/lib/libtokyocabinet.so.x
    --/usr/local/lib/libtokyocabinet.so
    --/usr/local/lib/pkgconfig/tokyocabinet.pc
    --/usr/local/bin/tcutest
    --/usr/local/bin/tcumttest
    --/usr/local/bin/tcucodec
    --/usr/local/bin/tchtest
    --/usr/local/bin/tchmttest
    --/usr/local/bin/tchmgr
    --/usr/local/bin/tcbmgr
    --/usr/local/bin/tcbtest
    --/usr/local/bin/tcbmttest
    --/usr/local/bin/tcftest
    --/usr/local/bin/tcfmttest
    --/usr/local/bin/tcfmgr
    --/usr/local/bin/tcttest
    --/usr/local/bin/tctmttest
    --/usr/local/bin/tctmgr
    --/usr/local/bin/tcatest
    --/usr/local/bin/tcamttest
    --/usr/local/bin/tcamgr
    --/usr/local/libexec/tcawmgr.cgi
    --/usr/local/share/tokyocabinet/...
    --/usr/local/man/man1/...
    --/usr/local/man/man3/...
    -+
    /opt/csw/include/tcutil.h
    -+/opt/csw/include/tchdb.h
    -+/opt/csw/include/tcbdb.h
    -+/opt/csw/include/tcfdb.h
    -+/opt/csw/include/tctdb.h
    -+/opt/csw/include/tcadb.h
    -+/opt/csw/lib/libtokyocabinet.a
    -+/opt/csw/lib/libtokyocabinet.so.x.y.z
    -+/opt/csw/lib/libtokyocabinet.so.x
    -+/opt/csw/lib/libtokyocabinet.so
    -+/opt/csw/lib/pkgconfig/tokyocabinet.pc
    -+/opt/csw/bin/tcutest
    -+/opt/csw/bin/tcumttest
    -+/opt/csw/bin/tcucodec
    -+/opt/csw/bin/tchtest
    -+/opt/csw/bin/tchmttest
    -+/opt/csw/bin/tchmgr
    -+/opt/csw/bin/tcbmgr
    -+/opt/csw/bin/tcbtest
    -+/opt/csw/bin/tcbmttest
    -+/opt/csw/bin/tcftest
    -+/opt/csw/bin/tcfmttest
    -+/opt/csw/bin/tcfmgr
    -+/opt/csw/bin/tcttest
    -+/opt/csw/bin/tctmttest
    -+/opt/csw/bin/tctmgr
    -+/opt/csw/bin/tcatest
    -+/opt/csw/bin/tcamttest
    -+/opt/csw/bin/tcamgr
    -+/opt/csw/libexec/tcawmgr.cgi
    -+/opt/csw/share/tokyocabinet/...
    -+/opt/csw/man/man1/...
    -+/opt/csw/man/man3/...
    - 
    - -

    configure??????

    -@@ -248,14 +248,14 @@ -
  • --disable-shared : ?????????????????
  • - - --

    `--prefix' ?????????????UNIX???????????????????????`/usr/local' ?????? '/usr' ??????????????? `--prefix=/usr' ??????????????????????? `/usr/local/lib' ????????????Tokyo Cabinet???????????????????? `LD_LIBRARY_PATH' ??? `/usr/local/lib' ????????????????

    -+

    `--prefix' ?????????????UNIX???????????????????????`/opt/csw' ?????? '/usr' ??????????????? `--prefix=/usr' ??????????????????????? `/opt/csw/lib' ????????????Tokyo Cabinet???????????????????? `LD_LIBRARY_PATH' ??? `/opt/csw/lib' ????????????????

    - -

    ?????????

    - -

    Tokyo Cabinet?C???API????????C89???ANSI C????C99??????????????????????????Tokyo Cabinet???? `tcutil.h'?`tchdb.h'?`tcbdb.h'?`tcadb.h' ??????????????????????????????????????????????API????????????????????? `libtokyocabinet.a' ??? `libtokyocabinet.so' ???????????? `libz.so'?`libbz2.so', `librt.so', `libpthread.so'?`libm.so'?`libc.so' ?????????????????????????????????????????????????????????????????????????? ?????

    - --
    gcc -I/usr/local/include tc_example.c -o tc_example \
    --  -L/usr/local/lib -ltokyocabinet -lz -lbz2 -lrt -lpthread -lm -lc
    -+
    gcc -I/opt/csw/include tc_example.c -o tc_example \
    -+  -L/opt/csw/lib -ltokyocabinet -lz -lbz2 -lrt -lpthread -lm -lc
    - 
    - -

    Tokyo Cabinet?C++????????????????????????????????C???????extern "C"?????????????????????????????????????????

    -diff --git a/man/tokyocabinet.3 b/man/tokyocabinet.3 -index d050da5..ce275ce 100644 ---- a/man/tokyocabinet.3 -+++ b/man/tokyocabinet.3 -@@ -101,9 +101,9 @@ In cases that multiple processes access a database at the same time or some proc - Tokyo Cabinet provides API of the C language and it is available by programs conforming to the C89 (ANSI C) standard or the C99 standard. As the header files of Tokyo Cabinet are provided as `\fBtcutil.h\fR', `\fBtchdb.h\fR', and `\fBtcbdb.h\fR', applications should include one or more of them accordingly to use the API. As the library is provided as `\fBlibtokyocabinet.a\fR' and `\fBlibtokyocabinet.so\fR' and they depends `\fBlibz.so\fR', `\fBlibrt.so\fR', `\fBlibpthread.so\fR', `\fBlibm.so\fR', and `\fBlibc.so\fR', linker options `\fB\-ltokyocabinet\fR', `\fB\-lz\fR', `\fB\-lbz2\fR', `\fB\-lrt\fR', `\fB\-lpthread\fR', `\fB\-lm\fR', and `\fB\-lc\fR' are required for build command. A typical build command is the following. - .PP - .RS --gcc \-I/usr/local/include tc_example.c \-o tc_example \\ -+gcc \-I/opt/csw/include tc_example.c \-o tc_example \\ - .br -- \-L/usr/local/lib \-ltokyocabinet \-lz \-lbz2 \-lrt \-lpthread \-lm \-lc -+ \-L/opt/csw/lib \-ltokyocabinet \-lz \-lbz2 \-lrt \-lpthread \-lm \-lc - .RE - .PP - You can also use Tokyo Cabinet in programs written in C++. Because each header is wrapped in C linkage (`\fBextern "C"\fR' block), you can simply include them into your C++ programs. --- -1.7.6.1 - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Thu Jun 14 23:02:35 2012 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Thu, 14 Jun 2012 21:02:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[18410] csw/mgar/pkg/zlib/branches/amd64-pic/Makefile Message-ID: Revision: 18410 http://gar.svn.sourceforge.net/gar/?rev=18410&view=rev Author: guengel Date: 2012-06-14 21:02:35 +0000 (Thu, 14 Jun 2012) Log Message: ----------- zlib/branches/amd64-pic: PIC code generation for SPARC according to http://sourceforge.net/apps/trac/gar/browser/csw/mgar/pkg/jbigkit/trunk/Makefile. Modified Paths: -------------- csw/mgar/pkg/zlib/branches/amd64-pic/Makefile Modified: csw/mgar/pkg/zlib/branches/amd64-pic/Makefile =================================================================== --- csw/mgar/pkg/zlib/branches/amd64-pic/Makefile 2012-06-14 20:48:22 UTC (rev 18409) +++ csw/mgar/pkg/zlib/branches/amd64-pic/Makefile 2012-06-14 21:02:35 UTC (rev 18410) @@ -43,7 +43,7 @@ EXTRA_BUILD_ISAS = sparcv8plus sparcv8plus+vis pentium_pro+mmx pentium # # https://blogs.oracle.com/d/entry/building_shared_libraries_for_sparcv9 -EXTRA_CFLAGS_sparc = -xcode=pic32 +EXTRA_CFLAGS_sparc = -xcode=pic13 EXTRA_CFLAGS_i386 = -Kpic EXTRA_CFLAGS += $(EXTRA_CFLAGS_$(GARCH)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Thu Jun 14 23:08:17 2012 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Thu, 14 Jun 2012 21:08:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[18411] csw/mgar/pkg/zlib/branches/amd64-pic/Makefile Message-ID: Revision: 18411 http://gar.svn.sourceforge.net/gar/?rev=18411&view=rev Author: guengel Date: 2012-06-14 21:08:17 +0000 (Thu, 14 Jun 2012) Log Message: ----------- zlib/branches/amd64-pic: Removed dependency on CSWlibgcc-s1 Modified Paths: -------------- csw/mgar/pkg/zlib/branches/amd64-pic/Makefile Modified: csw/mgar/pkg/zlib/branches/amd64-pic/Makefile =================================================================== --- csw/mgar/pkg/zlib/branches/amd64-pic/Makefile 2012-06-14 21:02:35 UTC (rev 18410) +++ csw/mgar/pkg/zlib/branches/amd64-pic/Makefile 2012-06-14 21:08:17 UTC (rev 18411) @@ -30,7 +30,6 @@ PACKAGES += CSWlibz1 SPKG_DESC_CSWlibz1 = Zlib data compression library, libz.so.1 PKGFILES_CSWlibz1 = $(call pkgfiles_lib,libz.so.1) -RUNTIME_DEP_PKGS_CSWlibz1 += CSWlibgcc-s1 OBSOLETED_BY_CSWlibz1 = CSWzlib PACKAGES += CSWlibz-dev This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Thu Jun 14 23:40:06 2012 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Thu, 14 Jun 2012 21:40:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[18412] csw/mgar/pkg/zlib/trunk Message-ID: Revision: 18412 http://gar.svn.sourceforge.net/gar/?rev=18412&view=rev Author: guengel Date: 2012-06-14 21:40:06 +0000 (Thu, 14 Jun 2012) Log Message: ----------- zlib/trunk: Merge amd64-pic branch into trunk (resolves zlib dynamic linking issue on amd64) Modified Paths: -------------- csw/mgar/pkg/zlib/trunk/Makefile Property Changed: ---------------- csw/mgar/pkg/zlib/trunk/ Property changes on: csw/mgar/pkg/zlib/trunk ___________________________________________________________________ Added: svn:mergeinfo + /csw/mgar/pkg/zlib/branches/amd64-pic:18407-18411 Modified: csw/mgar/pkg/zlib/trunk/Makefile =================================================================== --- csw/mgar/pkg/zlib/trunk/Makefile 2012-06-14 21:08:17 UTC (rev 18411) +++ csw/mgar/pkg/zlib/trunk/Makefile 2012-06-14 21:40:06 UTC (rev 18412) @@ -30,7 +30,6 @@ PACKAGES += CSWlibz1 SPKG_DESC_CSWlibz1 = Zlib data compression library, libz.so.1 PKGFILES_CSWlibz1 = $(call pkgfiles_lib,libz.so.1) -RUNTIME_DEP_PKGS_CSWlibz1 += CSWlibgcc-s1 OBSOLETED_BY_CSWlibz1 = CSWzlib PACKAGES += CSWlibz-dev @@ -42,15 +41,10 @@ EXTRA_BUILD_ISAS = sparcv8plus sparcv8plus+vis pentium_pro+mmx pentium -# Temporary switch to GCC, because the previous build resulted in a broken -# library on amd64 as reported by Rafael. -GARCOMPILER = GNU -LD_ALTEXEC = /opt/csw/bin/gld -EXTRA_EXPORTS = LD_ALTEXEC - # # https://blogs.oracle.com/d/entry/building_shared_libraries_for_sparcv9 -# EXTRA_CFLAGS_sparc = -xcode=pic32 -# EXTRA_CFLAGS += $(EXTRA_CFLAGS_$(GARCH)) +EXTRA_CFLAGS_sparc = -xcode=pic13 +EXTRA_CFLAGS_i386 = -Kpic +EXTRA_CFLAGS += $(EXTRA_CFLAGS_$(GARCH)) CONFIGURE_ARGS += --prefix=$(prefix) CONFIGURE_ARGS += --eprefix=$(exec_prefix) 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 14 23:45:46 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 14 Jun 2012 21:45:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[18413] csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Message-ID: Revision: 18413 http://gar.svn.sourceforge.net/gar/?rev=18413&view=rev Author: wahwah Date: 2012-06-14 21:45:46 +0000 (Thu, 14 Jun 2012) Log Message: ----------- mysql5/branches/mysql-5.0.x: fix the openssl binding setting Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2012-06-14 21:40:06 UTC (rev 18412) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2012-06-14 21:45:46 UTC (rev 18413) @@ -146,7 +146,7 @@ CONFIGURE_ARGS += --with-pthread CONFIGURE_ARGS += --with-readline CONFIGURE_ARGS += --with-zlib-dir=$(BUILD_PREFIX) -CONFIGURE_ARGS += --with-ssl=$(BUILD_PREFIX) +CONFIGURE_ARGS += --with-openssl=$(BUILD_PREFIX) CONFIGURE_ARGS += --with-plugins=max-no-ndb CONFIGURE_ARGS += --with-comment="(OpenCSW)" CONFIGURE_ARGS += --with-mysqld-user=mysql 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 14 23:49:20 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 14 Jun 2012 21:49:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[18414] csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/ Makefile Message-ID: Revision: 18414 http://gar.svn.sourceforge.net/gar/?rev=18414&view=rev Author: wahwah Date: 2012-06-14 21:49:19 +0000 (Thu, 14 Jun 2012) Log Message: ----------- mysql5/branches/mysql-5.1.x-optcsw: back to openssl-0.9.8 Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/Makefile Modified: csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/Makefile 2012-06-14 21:45:46 UTC (rev 18413) +++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/Makefile 2012-06-14 21:49:19 UTC (rev 18414) @@ -59,14 +59,14 @@ PKGFILES_CSWlibmysqlclient$(MYSQL_LIB_VER) += $(call baseisadirs,$(libdir),libmysqlclient\.so\.$(MYSQL_LIB_VER)(\.\d+)*) SPKG_DESC_CSWlibmysqlclient$(MYSQL_LIB_VER) += MySQL $(BASE_VERSION) client library, libmysqlclient.so.$(MYSQL_LIB_VER) RUNTIME_DEP_PKGS_CSWlibmysqlclient$(MYSQL_LIB_VER) += CSWlibz1 -RUNTIME_DEP_PKGS_CSWlibmysqlclient$(MYSQL_LIB_VER) += CSWlibssl1-0-0 +RUNTIME_DEP_PKGS_CSWlibmysqlclient$(MYSQL_LIB_VER) += CSWlibssl0-9-8 OBSOLETED_BY_CSWlibmysqlclient$(MYSQL_LIB_VER) += CSW$(NAME)rt PACKAGES += CSWlibmysqlclient-r$(MYSQL_LIB_VER) PKGFILES_CSWlibmysqlclient-r$(MYSQL_LIB_VER) += $(call baseisadirs,$(libdir),libmysqlclient_r\.so\.$(MYSQL_LIB_VER)(\.\d+)*) SPKG_DESC_CSWlibmysqlclient-r$(MYSQL_LIB_VER) += MySQL $(BASE_VERSION) client library, libmysqlclient_r.so.$(MYSQL_LIB_VER) RUNTIME_DEP_PKGS_CSWlibmysqlclient-r$(MYSQL_LIB_VER) += CSWlibz1 -RUNTIME_DEP_PKGS_CSWlibmysqlclient-r$(MYSQL_LIB_VER) += CSWlibssl1-0-0 +RUNTIME_DEP_PKGS_CSWlibmysqlclient-r$(MYSQL_LIB_VER) += CSWlibssl0-9-8 OBSOLETED_BY_CSWlibmysqlclient-r$(MYSQL_LIB_VER) += CSW$(NAME)rt # Defining the client programs, which are going to pick up the 32- and 64-bit @@ -99,7 +99,7 @@ RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibmysqlclient-r$(MYSQL_LIB_VER) RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibncursesw5 RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibz1 -RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibssl1-0-0 +RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibssl0-9-8 CHECKPKG_OVERRIDES_CSW$(NAME)client += bad-rpath-entry PACKAGES += CSW$(NAME) @@ -109,7 +109,7 @@ RUNTIME_DEP_PKGS_CSW$(NAME) += CSW$(NAME)client RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibwrap1 RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibz1 -RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibssl1-0-0 +RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibssl0-9-8 CHECKPKG_OVERRIDES_CSW$(NAME) += bad-rpath-entry CHECKPKG_OVERRIDES_CSW$(NAME) += file-with-bad-content 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 15 00:02:58 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 14 Jun 2012 22:02:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[18415] csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Message-ID: Revision: 18415 http://gar.svn.sourceforge.net/gar/?rev=18415&view=rev Author: wahwah Date: 2012-06-14 22:02:58 +0000 (Thu, 14 Jun 2012) Log Message: ----------- add the openssl dependency Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2012-06-14 21:49:19 UTC (rev 18414) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2012-06-14 22:02:58 UTC (rev 18415) @@ -55,11 +55,13 @@ PKGFILES_CSWlibmysqlclient$(MYSQL_LIB_VER) += $(call baseisadirs,$(libdir),libmysqlclient\.so\.$(MYSQL_LIB_VER)(\.\d+)*) SPKG_DESC_CSWlibmysqlclient$(MYSQL_LIB_VER) += MySQL $(BASE_VERSION) client library, libmysqlclient.so.$(MYSQL_LIB_VER) RUNTIME_DEP_PKGS_CSWlibmysqlclient$(MYSQL_LIB_VER) += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibmysqlclient$(MYSQL_LIB_VER) += CSWlibssl0-9-8 OBSOLETED_BY_CSWlibmysqlclient$(MYSQL_LIB_VER) += CSW$(NAME)rt PACKAGES += CSWlibmysqlclient-r$(MYSQL_LIB_VER) PKGFILES_CSWlibmysqlclient-r$(MYSQL_LIB_VER) += $(call baseisadirs,$(libdir),libmysqlclient_r\.so\.$(MYSQL_LIB_VER)(\.\d+)*) SPKG_DESC_CSWlibmysqlclient-r$(MYSQL_LIB_VER) += MySQL $(BASE_VERSION) client library, libmysqlclient_r.so.$(MYSQL_LIB_VER) +RUNTIME_DEP_PKGS_CSWlibmysqlclient-r$(MYSQL_LIB_VER) += CSWlibssl0-9-8 RUNTIME_DEP_PKGS_CSWlibmysqlclient-r$(MYSQL_LIB_VER) += CSWlibz1 OBSOLETED_BY_CSWlibmysqlclient-r$(MYSQL_LIB_VER) += CSW$(NAME)rt @@ -91,6 +93,7 @@ PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(client_programs),/opt/csw/sbin/$(bin_name)) RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibmysqlclient$(MYSQL_LIB_VER) RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibncursesw5 +RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibssl0-9-8 RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibz1 CHECKPKG_OVERRIDES_CSW$(NAME)client += bad-rpath-entry @@ -99,6 +102,7 @@ RUNTIME_DEP_PKGS_CSW$(NAME) += CSW$(NAME)client RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibmysqlclient$(MYSQL_LIB_VER) RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibmysqlclient-r$(MYSQL_LIB_VER) +RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibssl0-9-8 RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibwrap1 RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibz1 # RUNTIME_DEP_PKGS_CSW$(NAME) += CSWcoreutils This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From romeotheriault at users.sourceforge.net Fri Jun 15 00:10:51 2012 From: romeotheriault at users.sourceforge.net (romeotheriault at users.sourceforge.net) Date: Thu, 14 Jun 2012 22:10:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[18416] csw/mgar/pkg Message-ID: Revision: 18416 http://gar.svn.sourceforge.net/gar/?rev=18416&view=rev Author: romeotheriault Date: 2012-06-14 22:10:51 +0000 (Thu, 14 Jun 2012) Log Message: ----------- zeromq/trunk: Initial commit of zeromq build recipe Added Paths: ----------- csw/mgar/pkg/zeromq/ csw/mgar/pkg/zeromq/Makefile csw/mgar/pkg/zeromq/branches/ csw/mgar/pkg/zeromq/tags/ csw/mgar/pkg/zeromq/trunk/ csw/mgar/pkg/zeromq/trunk/Makefile csw/mgar/pkg/zeromq/trunk/checksums csw/mgar/pkg/zeromq/trunk/files/ Added: csw/mgar/pkg/zeromq/Makefile =================================================================== --- csw/mgar/pkg/zeromq/Makefile (rev 0) +++ csw/mgar/pkg/zeromq/Makefile 2012-06-14 22:10:51 UTC (rev 18416) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/zeromq/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/zeromq/trunk/Makefile =================================================================== --- csw/mgar/pkg/zeromq/trunk/Makefile (rev 0) +++ csw/mgar/pkg/zeromq/trunk/Makefile 2012-06-14 22:10:51 UTC (rev 18416) @@ -0,0 +1,34 @@ +NAME = zeromq +VERSION = 2.2.0 +GARTYPE = v2 +CATEGORIES = lib + +DESCRIPTION = Software library for fast, message-based applications +define BLURB + The 0MQ lightweight messaging kernel is a library which extends the + standard socket interfaces with features traditionally provided by + specialized messaging middle-ware products. 0MQ sockets provide an + abstraction of asynchronous message queues, multiple messaging + patterns, message filtering (subscriptions), seamless access to + multiple transport protocols and more. + + This package contains the ZeroMQ shared library. +endef + +MASTER_SITES = http://download.zeromq.org/ +DISTFILES = $(DISTNAME).tar.gz + +PACKAGES += CSWlibzmq1 +SPKG_DESC_CSWlibzmq1 = Software library for fast, message-based applications +PKGFILES_CSWlibzmq1 += $(call pkgfiles_lib,libzmq.so.1.0.1) +PKGFILES_CSWlibzmq1 += $(call pkgfiles_lib,libzmq.so.1) + +PACKAGES += CSWlibzmq1-dev +SPKG_DESC_CSWlibzmq1-dev += ZeroMQ development files +PKGFILES_CSWlibzmq1-dev += $(PKGFILES_DEVEL) +PKGFILES_CSWlibzmq1-dev += .*\.7 +RUNTIME_DEP_PKGS_CSWlibzmq1-dev += CSWlibzmq1 + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk Property changes on: csw/mgar/pkg/zeromq/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/zeromq/trunk/checksums =================================================================== --- csw/mgar/pkg/zeromq/trunk/checksums (rev 0) +++ csw/mgar/pkg/zeromq/trunk/checksums 2012-06-14 22:10:51 UTC (rev 18416) @@ -0,0 +1 @@ +1b11aae09b19d18276d0717b2ea288f6 zeromq-2.2.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From romeotheriault at users.sourceforge.net Fri Jun 15 03:54:08 2012 From: romeotheriault at users.sourceforge.net (romeotheriault at users.sourceforge.net) Date: Fri, 15 Jun 2012 01:54:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[18417] csw/mgar/pkg/zeromq/trunk/Makefile Message-ID: Revision: 18417 http://gar.svn.sourceforge.net/gar/?rev=18417&view=rev Author: romeotheriault Date: 2012-06-15 01:54:07 +0000 (Fri, 15 Jun 2012) Log Message: ----------- zeromq/trunk: add a post-install-modulated target to install upstream docs Modified Paths: -------------- csw/mgar/pkg/zeromq/trunk/Makefile Modified: csw/mgar/pkg/zeromq/trunk/Makefile =================================================================== --- csw/mgar/pkg/zeromq/trunk/Makefile 2012-06-14 22:10:51 UTC (rev 18416) +++ csw/mgar/pkg/zeromq/trunk/Makefile 2012-06-15 01:54:07 UTC (rev 18417) @@ -22,7 +22,13 @@ SPKG_DESC_CSWlibzmq1 = Software library for fast, message-based applications PKGFILES_CSWlibzmq1 += $(call pkgfiles_lib,libzmq.so.1.0.1) PKGFILES_CSWlibzmq1 += $(call pkgfiles_lib,libzmq.so.1) +PKGFILES_CSWlibzmq1 += $(docdir)/.* +CHECKPKG_OVERRIDES_CSWlibzmq1 += bad-rpath-entry|/lib|opt/csw/lib/libzmq.so.1.0.1 +CHECKPKG_OVERRIDES_CSWlibzmq1 += bad-rpath-entry|/opt/SUNWspro/lib|opt/csw/lib/libzmq.so.1.0.1 +CHECKPKG_OVERRIDES_CSWlibzmq1 += bad-rpath-entry|/opt/SUNWspro/lib/rw7|opt/csw/lib/libzmq.so.1.0.1 +CHECKPKG_OVERRIDES_CSWlibzmq1 += bad-rpath-entry|/opt/SUNWspro/lib/v8|opt/csw/lib/libzmq.so.1.0.1 + PACKAGES += CSWlibzmq1-dev SPKG_DESC_CSWlibzmq1-dev += ZeroMQ development files PKGFILES_CSWlibzmq1-dev += $(PKGFILES_DEVEL) @@ -32,3 +38,13 @@ CONFIGURE_ARGS = $(DIRPATHS) include gar/category.mk + +post-install-modulated: DOCDEST = $(DESTDIR)$(docdir)/libzmq1 +post-install-modulated: DOCS = AUTHORS ChangeLog COPYING.LESSER MAINTAINERS README +post-install-modulated: + + # Copy documentation (upstream) + ginstall -d $(DOCDEST) + cp $(addprefix $(WORKSRC)/,$(DOCS)) $(DOCDEST) + + @$(MAKECOOKIE) 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 15 03:57:16 2012 From: bwalton at opencsw.org (Ben Walton) Date: Thu, 14 Jun 2012 21:57:16 -0400 Subject: [csw-devel] SF.net SVN: gar:[18417] csw/mgar/pkg/zeromq/trunk/Makefile In-Reply-To: References: Message-ID: <1339725364-sup-75@pinkfloyd.chass.utoronto.ca> Excerpts from romeotheriault's message of Thu Jun 14 21:54:08 -0400 2012: Hi Romeo, > +CHECKPKG_OVERRIDES_CSWlibzmq1 += bad-rpath-entry|/lib|opt/csw/lib/libzmq.so.1.0.1 > +CHECKPKG_OVERRIDES_CSWlibzmq1 += bad-rpath-entry|/opt/SUNWspro/lib|opt/csw/lib/libzmq.so.1.0.1 > +CHECKPKG_OVERRIDES_CSWlibzmq1 += bad-rpath-entry|/opt/SUNWspro/lib/rw7|opt/csw/lib/libzmq.so.1.0.1 > +CHECKPKG_OVERRIDES_CSWlibzmq1 += > bad-rpath-entry|/opt/SUNWspro/lib/v8|opt/csw/lib/libzmq.so.1.0.1 You may want to see if you can correct these rather than overriding them. They're usually leaked in via improper options determined by the configure script. Thanks -Ben -- Ben Walton Systems Programmer - CHASS University of Toronto C:416.407.5610 | W:416.978.4302 From romeotheriault at opencsw.org Fri Jun 15 05:04:31 2012 From: romeotheriault at opencsw.org (Romeo Theriault) Date: Thu, 14 Jun 2012 17:04:31 -1000 Subject: [csw-devel] SF.net SVN: gar:[18417] csw/mgar/pkg/zeromq/trunk/Makefile In-Reply-To: <1339725364-sup-75@pinkfloyd.chass.utoronto.ca> References: <1339725364-sup-75@pinkfloyd.chass.utoronto.ca> Message-ID: On Thu, Jun 14, 2012 at 3:57 PM, Ben Walton wrote: > Excerpts from romeotheriault's message of Thu Jun 14 21:54:08 -0400 2012: > > Hi Romeo, > >> +CHECKPKG_OVERRIDES_CSWlibzmq1 += bad-rpath-entry|/lib|opt/csw/lib/libzmq.so.1.0.1 >> +CHECKPKG_OVERRIDES_CSWlibzmq1 += bad-rpath-entry|/opt/SUNWspro/lib|opt/csw/lib/libzmq.so.1.0.1 >> +CHECKPKG_OVERRIDES_CSWlibzmq1 += bad-rpath-entry|/opt/SUNWspro/lib/rw7|opt/csw/lib/libzmq.so.1.0.1 >> +CHECKPKG_OVERRIDES_CSWlibzmq1 += >> bad-rpath-entry|/opt/SUNWspro/lib/v8|opt/csw/lib/libzmq.so.1.0.1 > > You may want to see if you can correct these rather than overriding > them. Thanks Ben, was going to ask about them at some point but didn't want to overload the list with my questions :) I found this page: http://wiki.opencsw.org/checkpkg-error-tags#toc8 which talks about the bad-rpath-enty checkpkg error. I tried adding the EXTRA_LINKER_FLAGS = -norunpath setting to the makefile and recompiling but I still receive the errors. > They're usually leaked in via improper options determined by > the configure script. I apologize, but I'm kinda lost in terms of where I'd start looking to determine which options are being "improperly leaked in". If you could point me in a direction I can start digging that'd be great. Should I be manually setting the LDFLAGS on configure? Also, I don't really understand what the error is saying: > bad-rpath-entry|/lib|opt/csw/lib/libzmq.so.1.0.1 Is this saying that "/lib" is a run path in libzmq.so.1.0.1 that is invalid? Why is it bad? Thanks for any help, Romeo From romeotheriault at opencsw.org Fri Jun 15 05:22:43 2012 From: romeotheriault at opencsw.org (Romeo Theriault) Date: Thu, 14 Jun 2012 17:22:43 -1000 Subject: [csw-devel] SF.net SVN: gar:[18417] csw/mgar/pkg/zeromq/trunk/Makefile In-Reply-To: References: <1339725364-sup-75@pinkfloyd.chass.utoronto.ca> Message-ID: On Thu, Jun 14, 2012 at 5:04 PM, Romeo Theriault wrote: > On Thu, Jun 14, 2012 at 3:57 PM, Ben Walton wrote: >> Excerpts from romeotheriault's message of Thu Jun 14 21:54:08 -0400 2012: >> >> Hi Romeo, >> >>> +CHECKPKG_OVERRIDES_CSWlibzmq1 += bad-rpath-entry|/lib|opt/csw/lib/libzmq.so.1.0.1 >>> +CHECKPKG_OVERRIDES_CSWlibzmq1 += bad-rpath-entry|/opt/SUNWspro/lib|opt/csw/lib/libzmq.so.1.0.1 >>> +CHECKPKG_OVERRIDES_CSWlibzmq1 += bad-rpath-entry|/opt/SUNWspro/lib/rw7|opt/csw/lib/libzmq.so.1.0.1 >>> +CHECKPKG_OVERRIDES_CSWlibzmq1 += >>> bad-rpath-entry|/opt/SUNWspro/lib/v8|opt/csw/lib/libzmq.so.1.0.1 >> >> You may want to see if you can correct these rather than overriding >> them. > > Thanks Ben, was going to ask about them at some point but didn't want > to overload the list with my questions :) > > I found this page: http://wiki.opencsw.org/checkpkg-error-tags#toc8 > which talks about the bad-rpath-enty checkpkg error. I tried adding > the > > EXTRA_LINKER_FLAGS = -norunpath > > setting to the makefile and recompiling but I still receive the errors. > > >> They're usually leaked in via improper options determined by >> the configure script. > > I apologize, but I'm kinda lost in terms of where I'd start looking to > determine which options are being "improperly leaked in". If you could > point me in a direction I can start digging that'd be great. Gonna try patching ltmain.sh like you do in 'gettext' to see if that helps.... Romeo From romeotheriault at opencsw.org Fri Jun 15 05:46:29 2012 From: romeotheriault at opencsw.org (Romeo Theriault) Date: Thu, 14 Jun 2012 17:46:29 -1000 Subject: [csw-devel] SF.net SVN: gar:[18417] csw/mgar/pkg/zeromq/trunk/Makefile In-Reply-To: References: <1339725364-sup-75@pinkfloyd.chass.utoronto.ca> Message-ID: On Thu, Jun 14, 2012 at 5:22 PM, Romeo Theriault wrote: > Gonna try patching ltmain.sh like you do in 'gettext' to see if that helps.... Yay, patching ltmain.sh and adding the EXTRA_LINKER_FLAGS = -norunpath to the Makefile fixes the checkpkg warnings on the bad-rpaths! Ok, I'm happy. Time to call it a day. Thanks for the docs on how to fix the problem. Now if I only understood it all :) (Wax on, Wax off....) Romeo From romeotheriault at users.sourceforge.net Fri Jun 15 05:48:58 2012 From: romeotheriault at users.sourceforge.net (romeotheriault at users.sourceforge.net) Date: Fri, 15 Jun 2012 03:48:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[18418] csw/mgar/pkg/zeromq/trunk Message-ID: Revision: 18418 http://gar.svn.sourceforge.net/gar/?rev=18418&view=rev Author: romeotheriault Date: 2012-06-15 03:48:57 +0000 (Fri, 15 Jun 2012) Log Message: ----------- zeromq/trunk: patched ltmain.sh to fix stripping of run paths and added EXTRA_LINKER_FLAGS to Makefile Modified Paths: -------------- csw/mgar/pkg/zeromq/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/zeromq/trunk/files/0001-Patching-ltmain.sh-to-prevent-libtool-from-stripping.patch Modified: csw/mgar/pkg/zeromq/trunk/Makefile =================================================================== --- csw/mgar/pkg/zeromq/trunk/Makefile 2012-06-15 01:54:07 UTC (rev 18417) +++ csw/mgar/pkg/zeromq/trunk/Makefile 2012-06-15 03:48:57 UTC (rev 18418) @@ -18,15 +18,13 @@ MASTER_SITES = http://download.zeromq.org/ DISTFILES = $(DISTNAME).tar.gz +PATCHFILES += 0001-Patching-ltmain.sh-to-prevent-libtool-from-stripping.patch + PACKAGES += CSWlibzmq1 SPKG_DESC_CSWlibzmq1 = Software library for fast, message-based applications PKGFILES_CSWlibzmq1 += $(call pkgfiles_lib,libzmq.so.1.0.1) PKGFILES_CSWlibzmq1 += $(call pkgfiles_lib,libzmq.so.1) PKGFILES_CSWlibzmq1 += $(docdir)/.* -CHECKPKG_OVERRIDES_CSWlibzmq1 += bad-rpath-entry|/lib|opt/csw/lib/libzmq.so.1.0.1 -CHECKPKG_OVERRIDES_CSWlibzmq1 += bad-rpath-entry|/opt/SUNWspro/lib|opt/csw/lib/libzmq.so.1.0.1 -CHECKPKG_OVERRIDES_CSWlibzmq1 += bad-rpath-entry|/opt/SUNWspro/lib/rw7|opt/csw/lib/libzmq.so.1.0.1 -CHECKPKG_OVERRIDES_CSWlibzmq1 += bad-rpath-entry|/opt/SUNWspro/lib/v8|opt/csw/lib/libzmq.so.1.0.1 PACKAGES += CSWlibzmq1-dev @@ -37,6 +35,8 @@ CONFIGURE_ARGS = $(DIRPATHS) +EXTRA_LINKER_FLAGS = -norunpath + include gar/category.mk post-install-modulated: DOCDEST = $(DESTDIR)$(docdir)/libzmq1 Added: csw/mgar/pkg/zeromq/trunk/files/0001-Patching-ltmain.sh-to-prevent-libtool-from-stripping.patch =================================================================== --- csw/mgar/pkg/zeromq/trunk/files/0001-Patching-ltmain.sh-to-prevent-libtool-from-stripping.patch (rev 0) +++ csw/mgar/pkg/zeromq/trunk/files/0001-Patching-ltmain.sh-to-prevent-libtool-from-stripping.patch 2012-06-15 03:48:57 UTC (rev 18418) @@ -0,0 +1,25 @@ +From e91eb6ff070cb057fd63eb9444203611bda18378 Mon Sep 17 00:00:00 2001 +From: Romeo Theriault +Date: Fri, 15 Jun 2012 05:30:02 +0200 +Subject: [PATCH] Patching ltmain.sh to prevent libtool from stripping runpath + +--- + config/ltmain.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/config/ltmain.sh b/config/ltmain.sh +index b4a3231..dfc39b1 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|-xnorunpath|-norunpath) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" +-- +1.7.10.3 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Fri Jun 15 07:32:59 2012 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Fri, 15 Jun 2012 05:32:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[18419] csw/mgar/pkg/tokyocabinet/trunk/Makefile Message-ID: Revision: 18419 http://gar.svn.sourceforge.net/gar/?rev=18419&view=rev Author: guengel Date: 2012-06-15 05:32:59 +0000 (Fri, 15 Jun 2012) Log Message: ----------- tokyocabinet/trunk: Added distinct flags for generating PIC code on sparc/x86 Modified Paths: -------------- csw/mgar/pkg/tokyocabinet/trunk/Makefile Modified: csw/mgar/pkg/tokyocabinet/trunk/Makefile =================================================================== --- csw/mgar/pkg/tokyocabinet/trunk/Makefile 2012-06-15 03:48:57 UTC (rev 18418) +++ csw/mgar/pkg/tokyocabinet/trunk/Makefile 2012-06-15 05:32:59 UTC (rev 18419) @@ -74,7 +74,10 @@ BUILD64 = 1 -EXTRA_CFLAGS = -xc99=all -Kpic +EXTRA_CFLAGS-sparc = -xcode=pic13 +EXTRA_CFLAGS-i386 = -Kpic + +EXTRA_CFLAGS = -xc99=all $(EXTRA_CFLAGS-$(GARCH)) EXTRA_CPPFLAGS = -DPIC CONFIGURE_ARGS = $(DIRPATHS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Jun 15 10:16:09 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 15 Jun 2012 08:16:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[18420] csw/mgar/pkg/libneon27/branches Message-ID: Revision: 18420 http://gar.svn.sourceforge.net/gar/?rev=18420&view=rev Author: dmichelsen Date: 2012-06-15 08:16:08 +0000 (Fri, 15 Jun 2012) Log Message: ----------- libneon27/branches/libneon27-openssl-0.9.8-solaris-9: Make branch for old libssl 0.9.8 on Solaris 9 Added Paths: ----------- csw/mgar/pkg/libneon27/branches/libneon27-openssl-0.9.8-solaris-9/ csw/mgar/pkg/libneon27/branches/libneon27-openssl-0.9.8-solaris-9/Makefile Removed Paths: ------------- csw/mgar/pkg/libneon27/branches/libneon27-openssl-0.9.8-solaris-9/Makefile Deleted: csw/mgar/pkg/libneon27/branches/libneon27-openssl-0.9.8-solaris-9/Makefile =================================================================== --- csw/mgar/pkg/libneon27/trunk/Makefile 2012-04-04 21:59:21 UTC (rev 17611) +++ csw/mgar/pkg/libneon27/branches/libneon27-openssl-0.9.8-solaris-9/Makefile 2012-06-15 08:16:08 UTC (rev 18420) @@ -1,131 +0,0 @@ -NAME = neon -VERSION = 0.29.6 -CATEGORIES = lib -GARTYPE = v2 - -EXTRA_MODULATORS = FEATURES -MODULATIONS_FEATURES = minimal full - -DESCRIPTION = Neon HTTP and WebDAV client library -define BLURB - neon is an HTTP and WebDAV client library for Unix systems, with a C language - API. It provides high-level interfaces to HTTP/1.1 and WebDAV methods, and a - low-level interface to HTTP request/response handling, allowing new methods to - be easily implemented. -endef - -MASTER_SITES = http://www.webdav.org/$(NAME)/ -DISTFILES = $(DISTNAME).tar.gz -DISTFILES += COPYING - -FOREIGN_PACKAGES += CSWlibneon26 -OBSOLETED_BY_CSWlibneon26 = CSWneon - -FOREIGN_PACKAGES += CSWlibneon26-feature -OBSOLETED_BY_CSWlibneon26-feature = CSWneonfull - -CATALOGNAME_CSWneonfull = neon_full_stub - -PACKAGES += CSWlibneon27 -CATALOGNAME_CSWlibneon27 = libneon27 -SPKG_DESC_CSWlibneon27 = Neon HTTP and WebDAV client library, libneon.so.27 -PKGFILES_CSWlibneon27 += $(call pkgfiles_lib,libneon.so.27) -PKGFILES_CSWlibneon27 += $(sharedstatedir)/locale/.* -RUNTIME_DEP_PKGS_CSWlibneon27 += CSWlibexpat1 -RUNTIME_DEP_PKGS_CSWlibneon27 += CSWosslrt -RUNTIME_DEP_PKGS_CSWlibneon27 += CSWlibz1 -RUNTIME_DEP_PKGS_CSWlibneon27 += CSWlibintl8 -OBSOLETED_BY_CSWlibneon27 = CSWneon - -PACKAGES += CSWlibneon27-feature -CATALOGNAME_CSWlibneon27_feature = libneon27_feature -SPKG_DESC_CSWlibneon27-feature = Neon HTTP and WebDAV client library with all features enabled, supersedes libneon.so.27 -PKGFILES_CSWlibneon27-feature += $(call pkgfiles_lib,libneon-feature.so.27) -RUNTIME_DEP_PKGS_CSWlibneon27-feature += CSWlibneon27 -CHECKPKG_OVERRIDES_CSWlibneon27-feature += surplus-dependency|CSWlibneon27 -RUNTIME_DEP_PKGS_CSWlibneon27-feature += CSWosslrt -RUNTIME_DEP_PKGS_CSWlibneon27-feature += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibneon27-feature += CSWlibproxy -RUNTIME_DEP_PKGS_CSWlibneon27-feature += CSWlibz1 -RUNTIME_DEP_PKGS_CSWlibneon27-feature += CSWlibcom-err3 -RUNTIME_DEP_PKGS_CSWlibneon27-feature += CSWlibexpat1 -RUNTIME_DEP_PKGS_CSWlibneon27-feature += CSWlibkrb5-3 -RUNTIME_DEP_PKGS_CSWlibneon27-feature += CSWlibgssapi-krb5-2 -RUNTIME_DEP_PKGS_CSWlibneon27-feature += CSWlibk5crypto3 -RUNTIME_DEP_PKGS_CSWlibneon27-feature += CSWlibpakchois0 -OBSOLETED_BY_CSWlibneon27-feature = CSWneonfull - -PACKAGES += CSWlibneon-dev -CATALOGNAME_CSWlibneon-dev = libneon_dev -SPKG_DESC_CSWlibneon-dev = Development files for libneon.so.27 -# PKGFILES is catchall -RUNTIME_DEP_PKGS_CSWlibneon-dev += CSWlibneon27 -OBSOLETED_BY_CSWlibneon-dev = CSWneon-devel - -# This describes the defaults during configure -CHECKPKG_OVERRIDES_CSWlibneon-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/neon/html/using.html - -# These are artifacts of the feature lib being a regular one. -# As it is never linked against the soname doesn't matter here and the package name -# is obviously different from the soname in this case. -CHECKPKG_OVERRIDES_CSWlibneon27-feature += soname-not-part-of-filename|soname=libneon.so.27|filename=libneon-feature.so.27.2.6 -CHECKPKG_OVERRIDES_CSWlibneon27-feature += soname-not-part-of-filename|soname=libneon.so.27|filename=libneon-feature.so.27.2.6 -CHECKPKG_OVERRIDES_CSWlibneon27-feature += shared-lib-pkgname-mismatch - -BUILD_DEP_PKGS = CSWossldevel - -CONFIGURE_ARGS_features-minimal = --without-libproxy --without-pakchois --without-gssapi -CONFIGURE_ARGS_features-full = --with-libproxy --with-packchois - -CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --enable-shared --enable-static -CONFIGURE_ARGS += --with-ssl=openssl -CONFIGURE_ARGS += --with-expat -CONFIGURE_ARGS += $(CONFIGURE_ARGS_features-$(FEATURES)) - -BUILD64 = 1 - -# Tests fail, investigate later -SKIPTEST ?= 1 - -# Make sure to use a defined timezone or tests may fail -# TEST_OVERRIDE_VARS = TZ -# TEST_OVERRIDE_VAR_TZ = GMT - -# Omit version number suffix on docdir -INSTALL_OVERRIDE_VARS = docdir -INSTALL_OVERRIDE_VAR_docdir = $(datadir)/doc/neon - -# We select pkgconfig for minimal library bindings. As libneon is self-contained (links -# to all necessary libs directly) the full version can simly be linked in. -EXTRA_PAX_ARGS_features-full = -s ",.*/pkgconfig.*,," -EXTRA_PAX_ARGS += $(EXTRA_PAX_ARGS_features-$(FEATURES)) - -EXTRA_PAX_ARGS_isa-default-features-full += -s ",.*/libneon\.so(\.\d+)?$$,," -s ",\(\.$(libdir)/libneon\)\(\.so\.\d+\..*\),\1-feature\2,p" -EXTRA_PAX_ARGS_isa-extra-features-full += -s ",.*/libneon\.so(\.\d+)?$$,," -s ",\.$(libdir)/libneon\(\.so\.\d+\..*\),.$(libdir_install)/$(ISA)/libneon-feature\1,p" - -MERGE_SCRIPTS_isa-default-features-minimal = copy-all -MERGE_SCRIPTS_isa-default64-features-minimal = copy-relocated-only -MERGE_DIRS_isa-default64-features-minimal = $(bindir) $(sbindir) $(libexecdir) $(libdir) -MERGE_SCRIPTS_isa-default-features-full = copy-only -MERGE_DIRS_isa-default-features-full = $(libdir) -MERGE_SCRIPTS_isa-default64-features-full = copy-relocated-only -MERGE_DIRS_isa-default64-features-full = $(libdir) - -EXTRA_LINKER_FLAGS = -lintl - -include gar/category.mk - -post-build-isa-$(ISA_DEFAULT)-features-minimal post-build-isa-$(ISA_DEFAULT64)-features-minimal: EXTRA_LD_OPTIONS = -f libneon-feature.so.27 -post-build-isa-$(ISA_DEFAULT)-features-minimal post-build-isa-$(ISA_DEFAULT64)-features-minimal: - rm -f $(WORKSRC)/src/libneon.la - $(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_VARS),$(TTT)="$(BUILD_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $(WORKSRC) $(BUILD_ARGS) - @$(MAKECOOKIE) - -post-merge: - @# This is needed because the substitutions from pax args do not change the - @# contents of the symlink - rm -f $(PKGROOT)$(libdir)/libneon-feature.so.27 - ln -s libneon-feature.so.27.2.6 $(PKGROOT)$(libdir)/libneon-feature.so.27 - rm -f $(PKGROOT)$(libdir)/$(ISA_DEFAULT64)/libneon-feature.so.27 - ln -s libneon-feature.so.27.2.6 $(PKGROOT)$(libdir)/$(ISA_DEFAULT64)/libneon-feature.so.27 Copied: csw/mgar/pkg/libneon27/branches/libneon27-openssl-0.9.8-solaris-9/Makefile (from rev 18150, csw/mgar/pkg/libneon27/trunk/Makefile) =================================================================== --- csw/mgar/pkg/libneon27/branches/libneon27-openssl-0.9.8-solaris-9/Makefile (rev 0) +++ csw/mgar/pkg/libneon27/branches/libneon27-openssl-0.9.8-solaris-9/Makefile 2012-06-15 08:16:08 UTC (rev 18420) @@ -0,0 +1,131 @@ +NAME = neon +VERSION = 0.29.6 +CATEGORIES = lib +GARTYPE = v2 + +EXTRA_MODULATORS = FEATURES +MODULATIONS_FEATURES = minimal full + +DESCRIPTION = Neon HTTP and WebDAV client library +define BLURB + neon is an HTTP and WebDAV client library for Unix systems, with a C language + API. It provides high-level interfaces to HTTP/1.1 and WebDAV methods, and a + low-level interface to HTTP request/response handling, allowing new methods to + be easily implemented. +endef + +MASTER_SITES = http://www.webdav.org/$(NAME)/ +DISTFILES = $(DISTNAME).tar.gz +DISTFILES += COPYING + +FOREIGN_PACKAGES += CSWlibneon26 +OBSOLETED_BY_CSWlibneon26 = CSWneon + +FOREIGN_PACKAGES += CSWlibneon26-feature +OBSOLETED_BY_CSWlibneon26-feature = CSWneonfull + +CATALOGNAME_CSWneonfull = neon_full_stub + +PACKAGES += CSWlibneon27 +CATALOGNAME_CSWlibneon27 = libneon27 +SPKG_DESC_CSWlibneon27 = Neon HTTP and WebDAV client library, libneon.so.27 +PKGFILES_CSWlibneon27 += $(call pkgfiles_lib,libneon.so.27) +PKGFILES_CSWlibneon27 += $(sharedstatedir)/locale/.* +RUNTIME_DEP_PKGS_CSWlibneon27 += CSWlibexpat1 +RUNTIME_DEP_PKGS_CSWlibneon27 += CSWlibssl0-9-8 +RUNTIME_DEP_PKGS_CSWlibneon27 += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibneon27 += CSWlibintl8 +OBSOLETED_BY_CSWlibneon27 = CSWneon + +PACKAGES += CSWlibneon27-feature +CATALOGNAME_CSWlibneon27_feature = libneon27_feature +SPKG_DESC_CSWlibneon27-feature = Neon HTTP and WebDAV client library with all features enabled, supersedes libneon.so.27 +PKGFILES_CSWlibneon27-feature += $(call pkgfiles_lib,libneon-feature.so.27) +RUNTIME_DEP_PKGS_CSWlibneon27-feature += CSWlibneon27 +CHECKPKG_OVERRIDES_CSWlibneon27-feature += surplus-dependency|CSWlibneon27 +RUNTIME_DEP_PKGS_CSWlibneon27-feature += CSWlibssl0-9-8 +RUNTIME_DEP_PKGS_CSWlibneon27-feature += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibneon27-feature += CSWlibproxy +RUNTIME_DEP_PKGS_CSWlibneon27-feature += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibneon27-feature += CSWlibcom-err3 +RUNTIME_DEP_PKGS_CSWlibneon27-feature += CSWlibexpat1 +RUNTIME_DEP_PKGS_CSWlibneon27-feature += CSWlibkrb5-3 +RUNTIME_DEP_PKGS_CSWlibneon27-feature += CSWlibgssapi-krb5-2 +RUNTIME_DEP_PKGS_CSWlibneon27-feature += CSWlibk5crypto3 +RUNTIME_DEP_PKGS_CSWlibneon27-feature += CSWlibpakchois0 +OBSOLETED_BY_CSWlibneon27-feature = CSWneonfull + +PACKAGES += CSWlibneon-dev +CATALOGNAME_CSWlibneon-dev = libneon_dev +SPKG_DESC_CSWlibneon-dev = Development files for libneon.so.27 +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWlibneon-dev += CSWlibneon27 +OBSOLETED_BY_CSWlibneon-dev = CSWneon-devel + +# This describes the defaults during configure +CHECKPKG_OVERRIDES_CSWlibneon-dev += file-with-bad-content|/usr/local|root/opt/csw/share/doc/neon/html/using.html + +# These are artifacts of the feature lib being a regular one. +# As it is never linked against the soname doesn't matter here and the package name +# is obviously different from the soname in this case. +CHECKPKG_OVERRIDES_CSWlibneon27-feature += soname-not-part-of-filename|soname=libneon.so.27|filename=libneon-feature.so.27.2.6 +CHECKPKG_OVERRIDES_CSWlibneon27-feature += soname-not-part-of-filename|soname=libneon.so.27|filename=libneon-feature.so.27.2.6 +CHECKPKG_OVERRIDES_CSWlibneon27-feature += shared-lib-pkgname-mismatch + +BUILD_DEP_PKGS = CSWlibssl-dev + +CONFIGURE_ARGS_features-minimal = --without-libproxy --without-pakchois --without-gssapi +CONFIGURE_ARGS_features-full = --with-libproxy --with-packchois + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-shared --enable-static +CONFIGURE_ARGS += --with-ssl=openssl +CONFIGURE_ARGS += --with-expat +CONFIGURE_ARGS += $(CONFIGURE_ARGS_features-$(FEATURES)) + +BUILD64 = 1 + +# Tests fail, investigate later +SKIPTEST ?= 1 + +# Make sure to use a defined timezone or tests may fail +# TEST_OVERRIDE_VARS = TZ +# TEST_OVERRIDE_VAR_TZ = GMT + +# Omit version number suffix on docdir +INSTALL_OVERRIDE_VARS = docdir +INSTALL_OVERRIDE_VAR_docdir = $(datadir)/doc/neon + +# We select pkgconfig for minimal library bindings. As libneon is self-contained (links +# to all necessary libs directly) the full version can simly be linked in. +EXTRA_PAX_ARGS_features-full = -s ",.*/pkgconfig.*,," +EXTRA_PAX_ARGS += $(EXTRA_PAX_ARGS_features-$(FEATURES)) + +EXTRA_PAX_ARGS_isa-default-features-full += -s ",.*/libneon\.so(\.\d+)?$$,," -s ",\(\.$(libdir)/libneon\)\(\.so\.\d+\..*\),\1-feature\2,p" +EXTRA_PAX_ARGS_isa-extra-features-full += -s ",.*/libneon\.so(\.\d+)?$$,," -s ",\.$(libdir)/libneon\(\.so\.\d+\..*\),.$(libdir_install)/$(ISA)/libneon-feature\1,p" + +MERGE_SCRIPTS_isa-default-features-minimal = copy-all +MERGE_SCRIPTS_isa-default64-features-minimal = copy-relocated-only +MERGE_DIRS_isa-default64-features-minimal = $(bindir) $(sbindir) $(libexecdir) $(libdir) +MERGE_SCRIPTS_isa-default-features-full = copy-only +MERGE_DIRS_isa-default-features-full = $(libdir) +MERGE_SCRIPTS_isa-default64-features-full = copy-relocated-only +MERGE_DIRS_isa-default64-features-full = $(libdir) + +EXTRA_LINKER_FLAGS = -lintl + +include gar/category.mk + +post-build-isa-$(ISA_DEFAULT)-features-minimal post-build-isa-$(ISA_DEFAULT64)-features-minimal: EXTRA_LD_OPTIONS = -f libneon-feature.so.27 +post-build-isa-$(ISA_DEFAULT)-features-minimal post-build-isa-$(ISA_DEFAULT64)-features-minimal: + rm -f $(WORKSRC)/src/libneon.la + $(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach TTT,$(BUILD_OVERRIDE_VARS),$(TTT)="$(BUILD_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") -C $(WORKSRC) $(BUILD_ARGS) + @$(MAKECOOKIE) + +post-merge: + @# This is needed because the substitutions from pax args do not change the + @# contents of the symlink + rm -f $(PKGROOT)$(libdir)/libneon-feature.so.27 + ln -s libneon-feature.so.27.2.6 $(PKGROOT)$(libdir)/libneon-feature.so.27 + rm -f $(PKGROOT)$(libdir)/$(ISA_DEFAULT64)/libneon-feature.so.27 + ln -s libneon-feature.so.27.2.6 $(PKGROOT)$(libdir)/$(ISA_DEFAULT64)/libneon-feature.so.27 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 15 10:21:26 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 15 Jun 2012 08:21:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[18421] csw/mgar/pkg/gcc4/trunk/Makefile Message-ID: Revision: 18421 http://gar.svn.sourceforge.net/gar/?rev=18421&view=rev Author: wahwah Date: 2012-06-15 08:21:26 +0000 (Fri, 15 Jun 2012) Log Message: ----------- dependencies alphabetically Modified Paths: -------------- csw/mgar/pkg/gcc4/trunk/Makefile Modified: csw/mgar/pkg/gcc4/trunk/Makefile =================================================================== --- csw/mgar/pkg/gcc4/trunk/Makefile 2012-06-15 08:16:08 UTC (rev 18420) +++ csw/mgar/pkg/gcc4/trunk/Makefile 2012-06-15 08:21:26 UTC (rev 18421) @@ -132,8 +132,10 @@ RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibgij$(JAVA_LIB_VERSION) RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibgmp10 RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibgmpxx4 +RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibgo0 RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibgomp1 RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibisl7 +RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibitm1 RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibmpc2 RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibmpfr4 RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibppl-c4 @@ -141,14 +143,12 @@ RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibpwl5 RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibssp0 RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibz1 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibitm1 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibgo0 # checkpkg-undetectable dependencies RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWbinutils -RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWgsed RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWcoreutils RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWggrep +RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWgsed ALTERNATIVES_$(PKG_BASENAME)core += $(PKG_VERSION_TOKEN)core ALTERNATIVE_$(PKG_VERSION_TOKEN)core += $(bindir)/cpp gcc_core $(bindir)/cpp$(PROGRAM_SUFFIX) $(ALTERNATIVES_PRIO) @@ -466,8 +466,8 @@ RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += CSWlibisl7 RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += CSWlibmpc2 RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += CSWlibmpfr4 +RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += CSWlibobjc$(LIBOBJC) RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += CSWlibobjc-gc$(LIBOBJC) -RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += CSWlibobjc$(LIBOBJC) RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += CSWlibppl-c4 RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += CSWlibppl9 RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += CSWlibpwl5 @@ -497,18 +497,18 @@ CHECKPKG_OVERRIDES_$(PKG_BASENAME)ada += surplus-dependency|$(PKG_BASENAME)core CHECKPKG_OVERRIDES_$(PKG_BASENAME)ada += file-with-bad-content +RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibcloog-isl2 +RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibgmp10 +RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibgmpxx4 RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibiconv2 +RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibisl7 +RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibmpc2 +RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibmpfr4 RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibppl-c4 +RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibppl9 +RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibpwl5 RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibz1 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibmpfr4 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibpwl5 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibmpc2 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibgmpxx4 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibisl7 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibgmp10 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibcloog-isl2 -RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibppl9 # This is an obsolete package. Nothing depends on it, so we can remove it. INCOMPATIBLE_PKGS_$(PKG_BASENAME)ada = $(PKG_BASENAME)adart This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at opencsw.org Fri Jun 15 10:42:12 2012 From: wilbury at opencsw.org (Juraj Lutter) Date: Fri, 15 Jun 2012 10:42:12 +0200 Subject: [csw-devel] SF.net SVN: gar:[18416] csw/mgar/pkg In-Reply-To: References: Message-ID: <4FDAF564.8050802@opencsw.org> On 06/15/2012 12:10 AM, romeotheriault at users.sourceforge.net wrote: > Revision: 18416 > http://gar.svn.sourceforge.net/gar/?rev=18416&view=rev > Author: romeotheriault > Date: 2012-06-14 22:10:51 +0000 (Thu, 14 Jun 2012) > Log Message: > ----------- > zeromq/trunk: Initial commit of zeromq build recipe I know 0mq authors in person, I can probably report any issues to them. -- Juraj Lutter From dmichelsen at users.sourceforge.net Fri Jun 15 11:06:31 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 15 Jun 2012 09:06:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[18422] csw/mgar/pkg/libneon27/branches/libneon27-openssl-0 .9.8-solaris-9/Makefile Message-ID: Revision: 18422 http://gar.svn.sourceforge.net/gar/?rev=18422&view=rev Author: dmichelsen Date: 2012-06-15 09:06:31 +0000 (Fri, 15 Jun 2012) Log Message: ----------- libneon27/branches/libneon27-openssl-0.9.8-solaris-9: Disable 64 bit for Solaris 9 on i386 Modified Paths: -------------- csw/mgar/pkg/libneon27/branches/libneon27-openssl-0.9.8-solaris-9/Makefile Modified: csw/mgar/pkg/libneon27/branches/libneon27-openssl-0.9.8-solaris-9/Makefile =================================================================== --- csw/mgar/pkg/libneon27/branches/libneon27-openssl-0.9.8-solaris-9/Makefile 2012-06-15 08:21:26 UTC (rev 18421) +++ csw/mgar/pkg/libneon27/branches/libneon27-openssl-0.9.8-solaris-9/Makefile 2012-06-15 09:06:31 UTC (rev 18422) @@ -83,8 +83,15 @@ CONFIGURE_ARGS += --with-expat CONFIGURE_ARGS += $(CONFIGURE_ARGS_features-$(FEATURES)) -BUILD64 = 1 +# Enabling 64 bit for i386 means amd64 which means building on Solaris 10 and +# merging on Solaris 9. As Solaris 10 has openssl 1.0.0 this results in mixed +# bindings and as there is a different libneon27 for Solaris 10 anyway we disable +# the unused 64 bit for i368 here. +BUILD64-i386 = +BUILD64-sparc = 1 +BUILD64 = $(BUILD64-$(GARCH)) + # Tests fail, investigate later SKIPTEST ?= 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Jun 15 11:40:55 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 15 Jun 2012 09:40:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[18423] csw/mgar/pkg/libneon27/branches/libneon27-openssl-0 .9.8-solaris-9/Makefile Message-ID: Revision: 18423 http://gar.svn.sourceforge.net/gar/?rev=18423&view=rev Author: dmichelsen Date: 2012-06-15 09:40:54 +0000 (Fri, 15 Jun 2012) Log Message: ----------- libneon27/branches/libneon27-openssl-0.9.8-solaris-9: Honour 32 bit only merge Modified Paths: -------------- csw/mgar/pkg/libneon27/branches/libneon27-openssl-0.9.8-solaris-9/Makefile Modified: csw/mgar/pkg/libneon27/branches/libneon27-openssl-0.9.8-solaris-9/Makefile =================================================================== --- csw/mgar/pkg/libneon27/branches/libneon27-openssl-0.9.8-solaris-9/Makefile 2012-06-15 09:06:31 UTC (rev 18422) +++ csw/mgar/pkg/libneon27/branches/libneon27-openssl-0.9.8-solaris-9/Makefile 2012-06-15 09:40:54 UTC (rev 18423) @@ -134,5 +134,5 @@ @# contents of the symlink rm -f $(PKGROOT)$(libdir)/libneon-feature.so.27 ln -s libneon-feature.so.27.2.6 $(PKGROOT)$(libdir)/libneon-feature.so.27 - rm -f $(PKGROOT)$(libdir)/$(ISA_DEFAULT64)/libneon-feature.so.27 - ln -s libneon-feature.so.27.2.6 $(PKGROOT)$(libdir)/$(ISA_DEFAULT64)/libneon-feature.so.27 + $(if $(BUILD64),rm -f $(PKGROOT)$(libdir)/$(ISA_DEFAULT64)/libneon-feature.so.27) + $(if $(BUILD64),ln -s libneon-feature.so.27.2.6 $(PKGROOT)$(libdir)/$(ISA_DEFAULT64)/libneon-feature.so.27) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Fri Jun 15 13:27:28 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Fri, 15 Jun 2012 11:27:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[18424] csw/mgar/pkg/libgnet/trunk/Makefile Message-ID: Revision: 18424 http://gar.svn.sourceforge.net/gar/?rev=18424&view=rev Author: pfelecan Date: 2012-06-15 11:27:28 +0000 (Fri, 15 Jun 2012) Log Message: ----------- packages split; not ready for release. Modified Paths: -------------- csw/mgar/pkg/libgnet/trunk/Makefile Modified: csw/mgar/pkg/libgnet/trunk/Makefile =================================================================== --- csw/mgar/pkg/libgnet/trunk/Makefile 2012-06-15 09:40:54 UTC (rev 18423) +++ csw/mgar/pkg/libgnet/trunk/Makefile 2012-06-15 11:27:28 UTC (rev 18424) @@ -33,6 +33,28 @@ GARCOMPILER = GNU +PACKAGES += CSWlibgnet2-doc +SPKG_DESC_CSWlibgnet2-doc = $(DESCRIPTION), documentation +OBSOLETED_BY_CSWlibgnet2-doc= CSWlibgnet2doc +CATALOGNAME_CSWlibgnet2doc = libgnet2_doc_stub +ARCHALL_CSWlibgnet2-doc = 1 + +PACKAGES += CSWlibgnet2-0-0 +CATALOGNAME_CSWlibgnet2-0-0 = libgnet2_0_0 +PKGFILES_CSWlibgnet2-0-0 += $(call baseisadirs,$(libdir),libgnet-2\.0\.so\.0\.8\.0) +PKGFILES_CSWlibgnet2-0-0 += $(call baseisadirs,$(libdir),libgnet-2\.0\.so\.0(\.\d+)*) +SPKG_DESC_CSWlibgnet2-0-0 = $(DESCRIPTION), libgnet-2.0.so.0 +OBSOLETED_BY_CSWlibgnet2-0-0= CSWlibgnet2rt +CATALOGNAME_CSWlibgnet2rt = libgnet2_rt_stub + +PACKAGES += CSWlibgnet2-dev +SPKG_DESC_CSWlibgnet2-dev = $(DESCRIPTION), development files +PKGFILES_CSWlibgnet2-dev += /opt/csw/lib/libgnet-2.0.so +PKGFILES_CSWlibgnet2-dev += $(PKGFILES_DEVEL) +OBSOLETED_BY_CSWlibgnet2-dev= CSWlibgnet2 +CATALOGNAME_CSWlibgnet2 = libgnet2_stub +ARCHALL_CSWlibgnet2-dev = 1 + include gar/category.mk # this is private and not available publicly 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 15 15:00:46 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 15 Jun 2012 13:00:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[18425] csw/mgar/pkg/squid/branches Message-ID: Revision: 18425 http://gar.svn.sourceforge.net/gar/?rev=18425&view=rev Author: dmichelsen Date: 2012-06-15 13:00:46 +0000 (Fri, 15 Jun 2012) Log Message: ----------- squid3-dam: Make private branch, update to 3.1.20 Modified Paths: -------------- csw/mgar/pkg/squid/branches/squid3-dam/Makefile csw/mgar/pkg/squid/branches/squid3-dam/checksums Added Paths: ----------- csw/mgar/pkg/squid/branches/squid3-dam/ Modified: csw/mgar/pkg/squid/branches/squid3-dam/Makefile =================================================================== --- csw/mgar/pkg/squid/branches/squid3/Makefile 2012-06-14 14:50:28 UTC (rev 18406) +++ csw/mgar/pkg/squid/branches/squid3-dam/Makefile 2012-06-15 13:00:46 UTC (rev 18425) @@ -4,7 +4,7 @@ NAME = squid VERSION = 3.1 CATEGORIES = server -RELEASE = 19 +RELEASE = 20 DISTVERSION = $(VERSION).$(RELEASE) DISTNAME = squid-$(DISTVERSION) RELVER = $(shell echo $(VERSION) |gsed 's/\(^[0-9]\).*\.[0-9]*/\1/') @@ -44,13 +44,16 @@ MASTER_SITES = http://www.squid-cache.org/Versions/v$(RELVER)/$(VERSION)/ DISTFILES = squid-$(DISTVERSION).tar.bz2 -PATCHFILES = 0000-Use-opt-csw-bin-bash-for-bootstrap.sh.patch -PATCHFILES += 0002-Link-against-OpenSSL-from-OpenCSW.patch -PATCHFILES += 0003-Check-for-ber_pvt_opt_on-instead-of-main-in-libber.patch +#PATCHFILES = 0000-Use-opt-csw-bin-bash-for-bootstrap.sh.patch +#PATCHFILES += 0002-Link-against-OpenSSL-from-OpenCSW.patch +#PATCHFILES += 0003-Check-for-ber_pvt_opt_on-instead-of-main-in-libber.patch PATCHFILES += 0006-Replace-usr-local-squid-libexec-with-opt-csw-libexec.patch -PATCHFILES += 0006-Use-default-cache_dir.patch -PATCHFILES += 0006-Use-usr-xpg4-bin-egrep.patch +#PATCHFILES += 0006-Use-default-cache_dir.patch +#PATCHFILES += 0006-Use-usr-xpg4-bin-egrep.patch PATCHFILES += 0007-Use-OpenCSW-specific-paths-for-various-helper-tests.patch + +# Use patch until this is fixed: +# http://bugs.squid-cache.org/show_bug.cgi?id=3572 PATCHFILES += 0008-Rename-IpAddress-to-SquidIpAddress-to-make-mib2.h-ha.patch sysconfdir = /etc/$(prefix)/$(NAME) @@ -85,11 +88,29 @@ CONFIGURE_ARGS += --with-openssl=$(prefix) CONFIGURE_ARGS += --with-default-user=$(NAME) +# Allowed values (see configure --help): +# POSIX_V6_ILP32_OFF32 32 bits +# POSIX_V6_ILP32_OFFBIG 32 bits with large file support +# POSIX_V6_LP64_OFF64 64 bits +# POSIX_V6_LPBIG_OFFBIG large pointers and files +# XBS5_ILP32_OFF32 32 bits (legacy) +# XBS5_ILP32_OFFBIG 32 bits with large file support (legacy) +# XBS5_LP64_OFF64 64 bits (legacy) +# XBS5_LPBIG_OFFBIG large pointers and files (legacy) +# default The default for your OS + +BUILD_ENVIRONMENT-32 = POSIX_V6_ILP32_OFFBIG +BUILD_ENVIRONMENT-64 = POSIX_V6_LPBIG_OFFBIG + +CONFIGURE_ARGS += --with-build-environment=$(BUILD_ENVIRONMENT-$(MEMORYMODEL)) + GARCOMPILER = GNU -EXTRA_LDFLAGS += -L$(prefix)/bdb48/lib -R$(prefix)/bdb48/lib + +EXTRA_LIB += $(prefix)/bdb48/lib EXTRA_INC += $(prefix)/bdb48/include -TEST_TARGET = +# The testsuite requires cppunit +TEST_SCRIPTS = SAMPLECONF = squid.conf SAMPLECONF += cachemgr.conf @@ -110,10 +131,14 @@ SPKG_REVSTAMP := $(SPKG_REVSTAMP)_$(RELEASE) -pre-configure-modulated: - cd $(WORKSRC) && $(BUILD_ENV) ./bootstrap.sh - @$(MAKECOOKIE) +post-extract-modulated: + -echo "#!/bin/sh\nexit 0" > $(WORKSRC)/helpers/negotiate_auth/squid_kerb_auth/config.test + -chmod 755 $(WORKSRC)/helpers/negotiate_auth/squid_kerb_auth/config.test +#pre-configure-modulated: +# cd $(WORKSRC) && $(BUILD_ENV) ./bootstrap.sh +# @$(MAKECOOKIE) + post-install-modulated: ginstall -d $(DESTDIR)/etc/opt/csw/init.d ginstall -d $(DESTDIR)/var/opt/csw/$(NAME)/logs Modified: csw/mgar/pkg/squid/branches/squid3-dam/checksums =================================================================== --- csw/mgar/pkg/squid/branches/squid3/checksums 2012-06-14 14:50:28 UTC (rev 18406) +++ csw/mgar/pkg/squid/branches/squid3-dam/checksums 2012-06-15 13:00:46 UTC (rev 18425) @@ -1 +1 @@ -9b6ffaf96bee8f05f0085bc6361d7c94 squid-3.1.19.tar.bz2 +c4d733a383c0508fd0746d64a2d7278a squid-3.1.20.tar.bz2 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 15 15:30:57 2012 From: bwalton at opencsw.org (Ben Walton) Date: Fri, 15 Jun 2012 09:30:57 -0400 Subject: [csw-devel] SF.net SVN: gar:[18417] csw/mgar/pkg/zeromq/trunk/Makefile In-Reply-To: References: <1339725364-sup-75@pinkfloyd.chass.utoronto.ca> Message-ID: <1339766994-sup-7292@pinkfloyd.chass.utoronto.ca> Excerpts from Romeo Theriault's message of Thu Jun 14 23:46:29 -0400 2012: > Yay, patching ltmain.sh and adding the EXTRA_LINKER_FLAGS = > -norunpath to the Makefile fixes the checkpkg warnings on the > bad-rpaths! Ok, I'm happy. Time to call it a day. Great! Glad you found a solution. There are all sorts of hoops to jump through for things like this. There is lots of collected experience too though, so if you find something weird, chances are someone has hit it before. :) Thanks -Ben -- Ben Walton Systems Programmer - CHASS University of Toronto C:416.407.5610 | W:416.978.4302 From guengel at users.sourceforge.net Fri Jun 15 17:45:03 2012 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Fri, 15 Jun 2012 15:45:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[18426] csw/mgar/pkg/pgadmin3/trunk/Makefile Message-ID: Revision: 18426 http://gar.svn.sourceforge.net/gar/?rev=18426&view=rev Author: guengel Date: 2012-06-15 15:45:03 +0000 (Fri, 15 Jun 2012) Log Message: ----------- pgadmin3/trunk: Explicitely tell configure where to find libxml, libxslt and postgres-dev. Modified Paths: -------------- csw/mgar/pkg/pgadmin3/trunk/Makefile Modified: csw/mgar/pkg/pgadmin3/trunk/Makefile =================================================================== --- csw/mgar/pkg/pgadmin3/trunk/Makefile 2012-06-15 13:00:46 UTC (rev 18425) +++ csw/mgar/pkg/pgadmin3/trunk/Makefile 2012-06-15 15:45:03 UTC (rev 18426) @@ -58,9 +58,13 @@ BUILD_DEP_PKGS += CSWlibssl-dev BUILD_DEP_PKGS += CSWlibxml2-dev BUILD_DEP_PKGS += CSWlibxslt-dev +BUILD_DEP_PKGS += CSWpostgresql-dev BUILD_DEP_PKGS += CSWwxwidgetsdevel -CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-pgsql=$(prefix) +CONFIGURE_ARGS += --with-libxml2=$(prefix) +CONFIGURE_ARGS += --with-libxslt=$(prefix) EXTRA_CXXFLAGS += -norunpath include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Fri Jun 15 18:00:40 2012 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Fri, 15 Jun 2012 16:00:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[18427] csw/mgar/pkg/pgadmin3/trunk/Makefile Message-ID: Revision: 18427 http://gar.svn.sourceforge.net/gar/?rev=18427&view=rev Author: guengel Date: 2012-06-15 16:00:40 +0000 (Fri, 15 Jun 2012) Log Message: ----------- pgadmin3/trunk: Added CSWlibiconv2 to RUNTIME_DEP_PKGS Modified Paths: -------------- csw/mgar/pkg/pgadmin3/trunk/Makefile Modified: csw/mgar/pkg/pgadmin3/trunk/Makefile =================================================================== --- csw/mgar/pkg/pgadmin3/trunk/Makefile 2012-06-15 15:45:03 UTC (rev 18426) +++ csw/mgar/pkg/pgadmin3/trunk/Makefile 2012-06-15 16:00:40 UTC (rev 18427) @@ -53,6 +53,7 @@ RUNTIME_DEP_PKGS_CSWpgadmin3 += CSWlibkrb5-3 RUNTIME_DEP_PKGS_CSWpgadmin3 += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSWpgadmin3 += CSWlibpq5 +RUNTIME_DEP_PKGS_CSWpgadmin3 += CSWlibiconv2 BUILD_DEP_PKGS = CSWlibncurses-dev BUILD_DEP_PKGS += CSWlibssl-dev This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dam at opencsw.org Fri Jun 15 21:18:47 2012 From: dam at opencsw.org (Dagobert Michelsen) Date: Fri, 15 Jun 2012 21:18:47 +0200 Subject: [csw-devel] SF.net SVN: gar:[18417] csw/mgar/pkg/zeromq/trunk/Makefile In-Reply-To: References: <1339725364-sup-75@pinkfloyd.chass.utoronto.ca> Message-ID: <110F0D8C-6CD6-4844-B70B-499E467089A3@opencsw.org> Hi Romeo, Am 15.06.2012 um 05:46 schrieb Romeo Theriault: > On Thu, Jun 14, 2012 at 5:22 PM, Romeo Theriault > wrote: >> Gonna try patching ltmain.sh like you do in 'gettext' to see if that helps.... > > Yay, patching ltmain.sh and adding the EXTRA_LINKER_FLAGS = -norunpath > to the Makefile fixes the checkpkg warnings on the bad-rpaths! Ok, I'm > happy. Time to call it a day. > > Thanks for the docs on how to fix the problem. > > Now if I only understood it all :) (Wax on, Wax off....) I just read that libtool keeps -Wl, if you have some spare cycles it would be cool if you could test adding -Wl,-norunpath without the libtool patch and see if the option makes it to the linker. Best regards -- Dago From romeotheriault at opencsw.org Fri Jun 15 22:08:35 2012 From: romeotheriault at opencsw.org (Romeo Theriault) Date: Fri, 15 Jun 2012 10:08:35 -1000 Subject: [csw-devel] SF.net SVN: gar:[18417] csw/mgar/pkg/zeromq/trunk/Makefile In-Reply-To: <110F0D8C-6CD6-4844-B70B-499E467089A3@opencsw.org> References: <1339725364-sup-75@pinkfloyd.chass.utoronto.ca> <110F0D8C-6CD6-4844-B70B-499E467089A3@opencsw.org> Message-ID: On Fri, Jun 15, 2012 at 9:18 AM, Dagobert Michelsen wrote: > I just read that libtool keeps -Wl, if you have some spare cycles it would be cool > if you could test adding > ?-Wl,-norunpath > without the libtool patch and see if the option makes it to the linker. Sure, I'll give it a shot later today and report back. Romeo From romeotheriault at opencsw.org Fri Jun 15 22:09:41 2012 From: romeotheriault at opencsw.org (Romeo Theriault) Date: Fri, 15 Jun 2012 10:09:41 -1000 Subject: [csw-devel] SF.net SVN: gar:[18416] csw/mgar/pkg In-Reply-To: <4FDAF564.8050802@opencsw.org> References: <4FDAF564.8050802@opencsw.org> Message-ID: On Thu, Jun 14, 2012 at 10:42 PM, Juraj Lutter wrote: > I know 0mq authors in person, I can probably report any issues to them. Good to know, now if my bug reports aren't getting any attention I know who to call ;) Thanks, Romeo From guengel at users.sourceforge.net Fri Jun 15 23:00:43 2012 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Fri, 15 Jun 2012 21:00:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[18428] csw/mgar/pkg/tokyocabinet/trunk Message-ID: Revision: 18428 http://gar.svn.sourceforge.net/gar/?rev=18428&view=rev Author: guengel Date: 2012-06-15 21:00:42 +0000 (Fri, 15 Jun 2012) Log Message: ----------- tokyocabinet/trunk: Tests will be done on local disk, i.e. /var/tmp in order to avoid issues with NFS. Modified Paths: -------------- csw/mgar/pkg/tokyocabinet/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/tokyocabinet/trunk/files/0002-Huge-Makefile.in-patch.patch Removed Paths: ------------- csw/mgar/pkg/tokyocabinet/trunk/files/0001-Adjust-Makefile.in.patch csw/mgar/pkg/tokyocabinet/trunk/files/0002-Use-make-variable.patch Modified: csw/mgar/pkg/tokyocabinet/trunk/Makefile =================================================================== --- csw/mgar/pkg/tokyocabinet/trunk/Makefile 2012-06-15 16:00:40 UTC (rev 18427) +++ csw/mgar/pkg/tokyocabinet/trunk/Makefile 2012-06-15 21:00:42 UTC (rev 18428) @@ -22,16 +22,12 @@ MASTER_SITES = http://fallabs.com/tokyocabinet DISTFILES = $(DISTNAME).tar.gz -# Disables installation of CGI component and fixes -# installation of libraries. -PATCHFILES += 0001-Adjust-Makefile.in.patch - -# Use $(MAKE) in Makefile -PATCHFILES += 0002-Use-make-variable.patch - # Adjust man page PATCHFILES += 0003-adjust-man-page-for-csw.patch +# This patch also goes hand in hand with TEST_ARGS further below. +PATCHFILES += 0002-Huge-Makefile.in-patch.patch + # File name regex to get notifications about upstream software releases # NOTE: Use this only if the automatic regex creation # does not work for your package @@ -46,7 +42,6 @@ PKGFILES_CSWlibtokyocabinet9 = $(call pkgfiles_lib,libtokyocabinet.so.9) RUNTIME_DEP_PKGS_CSWlibtokyocabinet9 += CSWlibbz2-1-0 RUNTIME_DEP_PKGS_CSWlibtokyocabinet9 += CSWlibz1 -# I have no freaking idea where this is comming from CHECKPKG_OVERRIDES_CSWlibtokyocabinet9 += file-with-bad-content|/usr/local|root/opt/csw/lib/libtokyocabinet.so.9.10.0 CHECKPKG_OVERRIDES_CSWlibtokyocabinet9 += file-with-bad-content|/usr/local|root/opt/csw/lib/sparcv9/libtokyocabinet.so.9.10.0 @@ -59,7 +54,7 @@ PACKAGES += CSWtokyocabinet-bin SPKG_DESC_CSWtokyocabinet-bin = Tokyocabinet - utilities PKGFILES_CSWtokyocabinet-bin = .*/bin/.* -PKGFILES_CSWtokyocabinet-bin += .*/man/man/.* +PKGFILES_CSWtokyocabinet-bin += .*/man/man1/.* RUNTIME_DEP_PKGS_CSWtokyocabinet-bin = CSWlibbz2-1-0 RUNTIME_DEP_PKGS_CSWtokyocabinet-bin += CSWlibz1 RUNTIME_DEP_PKGS_CSWtokyocabinet-bin += CSWlibtokyocabinet9 @@ -86,6 +81,8 @@ CONFIGURE_ARGS += --disable-static CONFIGURE_ARGS += --enable-shared +TEST_ARGS += WORKDIR=$(abspath $(WORKDIR)/$(NAME)-$(VERSION)) + include gar/category.mk post-merge: Deleted: csw/mgar/pkg/tokyocabinet/trunk/files/0001-Adjust-Makefile.in.patch =================================================================== --- csw/mgar/pkg/tokyocabinet/trunk/files/0001-Adjust-Makefile.in.patch 2012-06-15 16:00:40 UTC (rev 18427) +++ csw/mgar/pkg/tokyocabinet/trunk/files/0001-Adjust-Makefile.in.patch 2012-06-15 21:00:42 UTC (rev 18428) @@ -1,32 +0,0 @@ -From fe5caa8e5e281e1feea1770a07da292bc71e36b2 Mon Sep 17 00:00:00 2001 -From: Rafael Ostertag -Date: Tue, 12 Jun 2012 22:09:07 +0200 -Subject: [PATCH] Adjust Makefile.in - ---- - Makefile.in | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index 8846c38..5282ec2 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -112,11 +112,12 @@ install : - mkdir -p $(DESTDIR)$(INCLUDEDIR) - cp -Rf $(HEADERFILES) $(DESTDIR)$(INCLUDEDIR) - mkdir -p $(DESTDIR)$(LIBDIR) -- cp -Rf $(LIBRARYFILES) $(DESTDIR)$(LIBDIR) -+ cp -RPf $(LIBRARYFILES) $(DESTDIR)$(LIBDIR) - mkdir -p $(DESTDIR)$(BINDIR) - cp -Rf $(COMMANDFILES) $(DESTDIR)$(BINDIR) -- mkdir -p $(DESTDIR)$(LIBEXECDIR) -- cp -Rf $(CGIFILES) $(DESTDIR)$(LIBEXECDIR) -+# We don't want this -+# mkdir -p $(DESTDIR)$(LIBEXECDIR) -+# cp -Rf $(CGIFILES) $(DESTDIR)$(LIBEXECDIR) - mkdir -p $(DESTDIR)$(DATADIR) - cp -Rf $(DOCUMENTFILES) $(DESTDIR)$(DATADIR) - mkdir -p $(DESTDIR)$(MAN1DIR) --- -1.7.10.3 - Added: csw/mgar/pkg/tokyocabinet/trunk/files/0002-Huge-Makefile.in-patch.patch =================================================================== --- csw/mgar/pkg/tokyocabinet/trunk/files/0002-Huge-Makefile.in-patch.patch (rev 0) +++ csw/mgar/pkg/tokyocabinet/trunk/files/0002-Huge-Makefile.in-patch.patch 2012-06-15 21:00:42 UTC (rev 18428) @@ -0,0 +1,1019 @@ +From 86ca8332047e917abb94a4a67080d85454656d38 Mon Sep 17 00:00:00 2001 +From: Rafael Ostertag +Date: Fri, 15 Jun 2012 20:27:25 +0200 +Subject: [PATCH] Huge Makefile.in patch + +This patch does several things: It + + * makes the Makefile aware of $(MAKE) + * fixes LD_RUN_PATH + * makes tests to be performed locally in /var/tmp +--- + Makefile.in | 895 ++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 448 insertions(+), 447 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index 8846c38..9bee6f2 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -54,8 +54,8 @@ CFLAGS = @MYCFLAGS@ + LDFLAGS = @MYLDFLAGS@ + CMDLDFLAGS = @MYCMDLDFLAGS@ + LIBS = @LIBS@ +-LDENV = LD_RUN_PATH=/lib:/usr/lib:$(LIBDIR):$(HOME)/lib:/usr/local/lib:@MYRUNPATH@:. +-RUNENV = @MYLDLIBPATHENV@=.:/lib:/usr/lib:$(LIBDIR):$(HOME)/lib:/usr/local/lib:@MYRUNPATH@ ++LDENV = LD_RUN_PATH=/lib:/usr/lib:$(LIBDIR):@MYRUNPATH@:. ++RUNENV = @MYLDLIBPATHENV@=$(WORKDIR):.:/lib:/usr/lib:$(LIBDIR):@MYRUNPATH@ + POSTCMD = @MYPOSTCMD@ + + +@@ -112,11 +112,12 @@ install : + mkdir -p $(DESTDIR)$(INCLUDEDIR) + cp -Rf $(HEADERFILES) $(DESTDIR)$(INCLUDEDIR) + mkdir -p $(DESTDIR)$(LIBDIR) +- cp -Rf $(LIBRARYFILES) $(DESTDIR)$(LIBDIR) ++ cp -RPf $(LIBRARYFILES) $(DESTDIR)$(LIBDIR) + mkdir -p $(DESTDIR)$(BINDIR) + cp -Rf $(COMMANDFILES) $(DESTDIR)$(BINDIR) +- mkdir -p $(DESTDIR)$(LIBEXECDIR) +- cp -Rf $(CGIFILES) $(DESTDIR)$(LIBEXECDIR) ++# We don't want this ++# mkdir -p $(DESTDIR)$(LIBEXECDIR) ++# cp -Rf $(CGIFILES) $(DESTDIR)$(LIBEXECDIR) + mkdir -p $(DESTDIR)$(DATADIR) + cp -Rf $(DOCUMENTFILES) $(DESTDIR)$(DATADIR) + mkdir -p $(DESTDIR)$(MAN1DIR) +@@ -133,7 +134,7 @@ install : + + + install-strip : +- make DESTDIR=$(DESTDIR) install ++ $(MAKE) DESTDIR=$(DESTDIR) install + cd $(DESTDIR)$(BINDIR) && strip $(COMMANDFILES) + + +@@ -150,27 +151,27 @@ uninstall : + + + dist : +- make version +- make untabify +- make distclean ++ $(MAKE) version ++ $(MAKE) untabify ++ $(MAKE) distclean + cd .. && tar cvf - $(PACKAGEDIR) | gzip -c > $(PACKAGETGZ) + sync ; sync + + + distclean : clean +- cd example && make clean +- cd bros && make clean ++ cd example && $(MAKE) clean ++ cd bros && $(MAKE) clean + rm -rf Makefile tokyocabinet.pc config.cache config.log config.status autom4te.cache + + + check : +- make check-util +- make check-hdb +- make check-bdb +- make check-fdb +- make check-tdb +- make check-adb +- rm -rf casket* ++ $(MAKE) check-util ++ $(MAKE) check-hdb ++ $(MAKE) check-bdb ++ $(MAKE) check-fdb ++ $(MAKE) check-tdb ++ $(MAKE) check-adb ++ cd /var/tmp ; rm -rf casket* + @printf '\n' + @printf '#================================================================\n' + @printf '# Checking completed.\n' +@@ -178,492 +179,492 @@ check : + + + check-util : +- rm -rf casket* +- $(RUNENV) $(RUNCMD) ./tcamgr version +- $(RUNENV) $(RUNCMD) ./tcutest xstr 50000 +- $(RUNENV) $(RUNCMD) ./tcutest list -rd 50000 +- $(RUNENV) $(RUNCMD) ./tcutest map -rd -tr 50000 +- $(RUNENV) $(RUNCMD) ./tcutest map -rd -tr -rnd -dc 50000 +- $(RUNENV) $(RUNCMD) ./tcutest tree -rd -tr 50000 +- $(RUNENV) $(RUNCMD) ./tcutest tree -rd -tr -rnd -dc 50000 +- $(RUNENV) $(RUNCMD) ./tcutest mdb -rd -tr 50000 +- $(RUNENV) $(RUNCMD) ./tcutest mdb -rd -tr -rnd -dc 50000 +- $(RUNENV) $(RUNCMD) ./tcutest mdb -rd -tr -rnd -dpr 50000 +- $(RUNENV) $(RUNCMD) ./tcutest ndb -rd -tr 50000 +- $(RUNENV) $(RUNCMD) ./tcutest ndb -rd -tr -rnd -dc 50000 +- $(RUNENV) $(RUNCMD) ./tcutest ndb -rd -tr -rnd -dpr 50000 +- $(RUNENV) $(RUNCMD) ./tcutest misc 500 +- $(RUNENV) $(RUNCMD) ./tcutest wicked 50000 +- $(RUNENV) $(RUNCMD) ./tcumttest combo 5 50000 500 +- $(RUNENV) $(RUNCMD) ./tcumttest combo -rnd 5 50000 500 +- $(RUNENV) $(RUNCMD) ./tcumttest typical 5 50000 5000 +- $(RUNENV) $(RUNCMD) ./tcumttest typical -rr 1000 5 50000 5000 +- $(RUNENV) $(RUNCMD) ./tcumttest typical -nc 5 50000 5000 +- $(RUNENV) $(RUNCMD) ./tcumttest combo -tr 5 50000 500 +- $(RUNENV) $(RUNCMD) ./tcumttest combo -tr -rnd 5 50000 500 +- $(RUNENV) $(RUNCMD) ./tcumttest typical -tr 5 50000 5000 +- $(RUNENV) $(RUNCMD) ./tcumttest typical -tr -rr 1000 5 50000 5000 +- $(RUNENV) $(RUNCMD) ./tcumttest typical -tr -nc 5 50000 5000 +- $(RUNENV) $(RUNCMD) ./tcucodec url Makefile > check.in +- $(RUNENV) $(RUNCMD) ./tcucodec url -d check.in > check.out +- $(RUNENV) $(RUNCMD) ./tcucodec base Makefile > check.in +- $(RUNENV) $(RUNCMD) ./tcucodec base -d check.in > check.out +- $(RUNENV) $(RUNCMD) ./tcucodec quote Makefile > check.in +- $(RUNENV) $(RUNCMD) ./tcucodec quote -d check.in > check.out +- $(RUNENV) $(RUNCMD) ./tcucodec mime Makefile > check.in +- $(RUNENV) $(RUNCMD) ./tcucodec mime -d check.in > check.out +- $(RUNENV) $(RUNCMD) ./tcucodec pack -bwt Makefile > check.in +- $(RUNENV) $(RUNCMD) ./tcucodec pack -d -bwt check.in > check.out +- $(RUNENV) $(RUNCMD) ./tcucodec tcbs Makefile > check.in +- $(RUNENV) $(RUNCMD) ./tcucodec tcbs -d check.in > check.out +- $(RUNENV) $(RUNCMD) ./tcucodec zlib Makefile > check.in +- $(RUNENV) $(RUNCMD) ./tcucodec zlib -d check.in > check.out +- $(RUNENV) $(RUNCMD) ./tcucodec xml Makefile > check.in +- $(RUNENV) $(RUNCMD) ./tcucodec xml -d check.in > check.out +- $(RUNENV) $(RUNCMD) ./tcucodec cstr Makefile > check.in +- $(RUNENV) $(RUNCMD) ./tcucodec cstr -d check.in > check.out +- $(RUNENV) $(RUNCMD) ./tcucodec ucs Makefile > check.in +- $(RUNENV) $(RUNCMD) ./tcucodec ucs -d check.in > check.out +- $(RUNENV) $(RUNCMD) ./tcucodec date -ds '1978-02-11T18:05:30+09:00' -rf > check.out +- $(RUNENV) $(RUNCMD) ./tcucodec cipher -key "mikio" Makefile > check.in +- $(RUNENV) $(RUNCMD) ./tcucodec cipher -key "mikio" check.in > check.out +- $(RUNENV) $(RUNCMD) ./tcucodec tmpl -var name mikio -var nick micky \ ++ cd /var/tmp ; rm -rf casket* ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcamgr version ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcutest xstr 50000 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcutest list -rd 50000 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcutest map -rd -tr 50000 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcutest map -rd -tr -rnd -dc 50000 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcutest tree -rd -tr 50000 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcutest tree -rd -tr -rnd -dc 50000 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcutest mdb -rd -tr 50000 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcutest mdb -rd -tr -rnd -dc 50000 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcutest mdb -rd -tr -rnd -dpr 50000 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcutest ndb -rd -tr 50000 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcutest ndb -rd -tr -rnd -dc 50000 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcutest ndb -rd -tr -rnd -dpr 50000 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcutest misc 500 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcutest wicked 50000 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcumttest combo 5 50000 500 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcumttest combo -rnd 5 50000 500 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcumttest typical 5 50000 5000 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcumttest typical -rr 1000 5 50000 5000 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcumttest typical -nc 5 50000 5000 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcumttest combo -tr 5 50000 500 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcumttest combo -tr -rnd 5 50000 500 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcumttest typical -tr 5 50000 5000 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcumttest typical -tr -rr 1000 5 50000 5000 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcumttest typical -tr -nc 5 50000 5000 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcucodec url $(WORKDIR)/Makefile > check.in ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcucodec url -d check.in > check.out ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcucodec base $(WORKDIR)/Makefile > check.in ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcucodec base -d check.in > check.out ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcucodec quote $(WORKDIR)/Makefile > check.in ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcucodec quote -d check.in > check.out ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcucodec mime $(WORKDIR)/Makefile > check.in ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcucodec mime -d check.in > check.out ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcucodec pack -bwt $(WORKDIR)/Makefile > check.in ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcucodec pack -d -bwt check.in > check.out ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcucodec tcbs $(WORKDIR)/Makefile > check.in ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcucodec tcbs -d check.in > check.out ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcucodec zlib $(WORKDIR)/Makefile > check.in ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcucodec zlib -d check.in > check.out ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcucodec xml $(WORKDIR)/Makefile > check.in ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcucodec xml -d check.in > check.out ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcucodec cstr $(WORKDIR)/Makefile > check.in ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcucodec cstr -d check.in > check.out ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcucodec ucs $(WORKDIR)/Makefile > check.in ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcucodec ucs -d check.in > check.out ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcucodec date -ds '1978-02-11T18:05:30+09:00' -rf > check.out ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcucodec cipher -key "mikio" $(WORKDIR)/Makefile > check.in ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcucodec cipher -key "mikio" check.in > check.out ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcucodec tmpl -var name mikio -var nick micky \ + '@name=[%name%][%IF nick%] nick=[%nick%][%END%][%IF hoge%][%ELSE%].[%END%]' > check.out +- $(RUNENV) $(RUNCMD) ./tcucodec conf > check.out +- rm -rf casket* ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcucodec conf > check.out ++ cd /var/tmp ; rm -rf casket* + + + check-hdb : +- rm -rf casket* +- $(RUNENV) $(RUNCMD) ./tchtest write casket 50000 5000 5 5 +- $(RUNENV) $(RUNCMD) ./tchtest read casket +- $(RUNENV) $(RUNCMD) ./tchtest remove casket +- $(RUNENV) $(RUNCMD) ./tchtest write -mt -tl -td -rc 50 -xm 500000 casket 50000 5000 5 5 +- $(RUNENV) $(RUNCMD) ./tchtest read -mt -nb -rc 50 -xm 500000 casket +- $(RUNENV) $(RUNCMD) ./tchtest remove -mt -rc 50 -xm 500000 casket +- $(RUNENV) $(RUNCMD) ./tchtest write -as -tb -rc 50 -xm 500000 casket 50000 50000 5 5 +- $(RUNENV) $(RUNCMD) ./tchtest read -nl -rc 50 -xm 500000 casket +- $(RUNENV) $(RUNCMD) ./tchtest remove -rc 50 -xm 500000 -df 5 casket +- $(RUNENV) $(RUNCMD) ./tchtest rcat -pn 500 -xm 50000 -df 5 casket 50000 5000 5 5 +- $(RUNENV) $(RUNCMD) ./tchtest rcat -tl -td -pn 5000 casket 50000 500 5 15 +- $(RUNENV) $(RUNCMD) ./tchtest rcat -nl -pn 500 -rl casket 5000 500 5 5 +- $(RUNENV) $(RUNCMD) ./tchtest rcat -tb -pn 500 casket 5000 500 5 5 +- $(RUNENV) $(RUNCMD) ./tchtest rcat -ru -pn 500 casket 5000 500 1 1 +- $(RUNENV) $(RUNCMD) ./tchtest rcat -tl -td -ru -pn 500 casket 5000 500 1 1 +- $(RUNENV) $(RUNCMD) ./tchmgr list -pv casket > check.out +- $(RUNENV) $(RUNCMD) ./tchmgr list -pv -fm 1 -px casket > check.out +- $(RUNENV) $(RUNCMD) ./tchtest misc casket 5000 +- $(RUNENV) $(RUNCMD) ./tchtest misc -tl -td casket 5000 +- $(RUNENV) $(RUNCMD) ./tchtest misc -mt -tb casket 500 +- $(RUNENV) $(RUNCMD) ./tchtest wicked casket 50000 +- $(RUNENV) $(RUNCMD) ./tchtest wicked -tl -td casket 50000 +- $(RUNENV) $(RUNCMD) ./tchtest wicked -mt -tb casket 5000 +- $(RUNENV) $(RUNCMD) ./tchtest wicked -tt casket 5000 +- $(RUNENV) $(RUNCMD) ./tchtest wicked -tx casket 5000 +- $(RUNENV) $(RUNCMD) ./tchmttest write -xm 500000 -df 5 -tl casket 5 5000 500 5 +- $(RUNENV) $(RUNCMD) ./tchmttest read -xm 500000 -df 5 casket 5 +- $(RUNENV) $(RUNCMD) ./tchmttest read -xm 500000 -rnd casket 5 +- $(RUNENV) $(RUNCMD) ./tchmttest remove -xm 500000 casket 5 +- $(RUNENV) $(RUNCMD) ./tchmttest wicked -nc casket 5 5000 +- $(RUNENV) $(RUNCMD) ./tchmttest wicked -tl -td casket 5 5000 +- $(RUNENV) $(RUNCMD) ./tchmttest wicked -tb casket 5 5000 +- $(RUNENV) $(RUNCMD) ./tchmttest typical -df 5 casket 5 50000 5000 +- $(RUNENV) $(RUNCMD) ./tchmttest typical -rr 1000 casket 5 50000 5000 +- $(RUNENV) $(RUNCMD) ./tchmttest typical -tl -rc 50000 -nc casket 5 50000 5000 +- $(RUNENV) $(RUNCMD) ./tchmttest race -df 5 casket 5 10000 +- $(RUNENV) $(RUNCMD) ./tchmgr create casket 3 1 1 +- $(RUNENV) $(RUNCMD) ./tchmgr inform casket +- $(RUNENV) $(RUNCMD) ./tchmgr put casket one first +- $(RUNENV) $(RUNCMD) ./tchmgr put casket two second +- $(RUNENV) $(RUNCMD) ./tchmgr put -dk casket three third +- $(RUNENV) $(RUNCMD) ./tchmgr put -dc casket three third +- $(RUNENV) $(RUNCMD) ./tchmgr put -dc casket three third +- $(RUNENV) $(RUNCMD) ./tchmgr put -dc casket three third +- $(RUNENV) $(RUNCMD) ./tchmgr put casket four fourth +- $(RUNENV) $(RUNCMD) ./tchmgr put -dk casket five fifth +- $(RUNENV) $(RUNCMD) ./tchmgr out casket one +- $(RUNENV) $(RUNCMD) ./tchmgr out casket two +- $(RUNENV) $(RUNCMD) ./tchmgr get casket three > check.out +- $(RUNENV) $(RUNCMD) ./tchmgr get casket four > check.out +- $(RUNENV) $(RUNCMD) ./tchmgr get casket five > check.out +- $(RUNENV) $(RUNCMD) ./tchmgr list -pv casket > check.out +- $(RUNENV) $(RUNCMD) ./tchmgr optimize casket +- $(RUNENV) $(RUNCMD) ./tchmgr put -dc casket three third +- $(RUNENV) $(RUNCMD) ./tchmgr get casket three > check.out +- $(RUNENV) $(RUNCMD) ./tchmgr get casket four > check.out +- $(RUNENV) $(RUNCMD) ./tchmgr get casket five > check.out +- $(RUNENV) $(RUNCMD) ./tchmgr list -pv casket > check.out +- rm -rf casket* ++ cd /var/tmp ; rm -rf casket* ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tchtest write casket 50000 5000 5 5 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tchtest read casket ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tchtest remove casket ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tchtest write -mt -tl -td -rc 50 -xm 500000 casket 50000 5000 5 5 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tchtest read -mt -nb -rc 50 -xm 500000 casket ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tchtest remove -mt -rc 50 -xm 500000 casket ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tchtest write -as -tb -rc 50 -xm 500000 casket 50000 50000 5 5 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tchtest read -nl -rc 50 -xm 500000 casket ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tchtest remove -rc 50 -xm 500000 -df 5 casket ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tchtest rcat -pn 500 -xm 50000 -df 5 casket 50000 5000 5 5 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tchtest rcat -tl -td -pn 5000 casket 50000 500 5 15 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tchtest rcat -nl -pn 500 -rl casket 5000 500 5 5 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tchtest rcat -tb -pn 500 casket 5000 500 5 5 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tchtest rcat -ru -pn 500 casket 5000 500 1 1 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tchtest rcat -tl -td -ru -pn 500 casket 5000 500 1 1 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tchmgr list -pv casket > check.out ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tchmgr list -pv -fm 1 -px casket > check.out ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tchtest misc casket 5000 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tchtest misc -tl -td casket 5000 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tchtest misc -mt -tb casket 500 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tchtest wicked casket 50000 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tchtest wicked -tl -td casket 50000 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tchtest wicked -mt -tb casket 5000 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tchtest wicked -tt casket 5000 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tchtest wicked -tx casket 5000 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tchmttest write -xm 500000 -df 5 -tl casket 5 5000 500 5 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tchmttest read -xm 500000 -df 5 casket 5 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tchmttest read -xm 500000 -rnd casket 5 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tchmttest remove -xm 500000 casket 5 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tchmttest wicked -nc casket 5 5000 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tchmttest wicked -tl -td casket 5 5000 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tchmttest wicked -tb casket 5 5000 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tchmttest typical -df 5 casket 5 50000 5000 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tchmttest typical -rr 1000 casket 5 50000 5000 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tchmttest typical -tl -rc 50000 -nc casket 5 50000 5000 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tchmttest race -df 5 casket 5 10000 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tchmgr create casket 3 1 1 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tchmgr inform casket ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tchmgr put casket one first ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tchmgr put casket two second ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tchmgr put -dk casket three third ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tchmgr put -dc casket three third ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tchmgr put -dc casket three third ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tchmgr put -dc casket three third ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tchmgr put casket four fourth ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tchmgr put -dk casket five fifth ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tchmgr out casket one ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tchmgr out casket two ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tchmgr get casket three > check.out ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tchmgr get casket four > check.out ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tchmgr get casket five > check.out ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tchmgr list -pv casket > check.out ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tchmgr optimize casket ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tchmgr put -dc casket three third ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tchmgr get casket three > check.out ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tchmgr get casket four > check.out ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tchmgr get casket five > check.out ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tchmgr list -pv casket > check.out ++ cd /var/tmp ; rm -rf casket* + + + check-bdb : +- rm -rf casket* +- $(RUNENV) $(RUNCMD) ./tcbtest write casket 50000 5 5 5000 5 5 +- $(RUNENV) $(RUNCMD) ./tcbtest read casket +- $(RUNENV) $(RUNCMD) ./tcbtest remove casket +- $(RUNENV) $(RUNCMD) ./tcbmgr list -rb 00001000 00002000 casket > check.out +- $(RUNENV) $(RUNCMD) ./tcbmgr list -fm 000001 casket > check.out +- $(RUNENV) $(RUNCMD) ./tcbtest write -mt -tl -td -ls 1024 casket 50000 5000 5000 5000 5 5 +- $(RUNENV) $(RUNCMD) ./tcbtest read -mt -nb casket +- $(RUNENV) $(RUNCMD) ./tcbtest remove -mt casket +- $(RUNENV) $(RUNCMD) ./tcbtest write -tb -xm 50000 casket 50000 5 5 50000 5 5 +- $(RUNENV) $(RUNCMD) ./tcbtest read -nl casket +- $(RUNENV) $(RUNCMD) ./tcbtest remove -df 5 casket +- $(RUNENV) $(RUNCMD) ./tcbtest rcat -lc 5 -nc 5 -df 5 -pn 500 casket 50000 5 5 5000 5 5 +- $(RUNENV) $(RUNCMD) ./tcbtest rcat -tl -td -pn 5000 casket 50000 5 5 500 5 15 +- $(RUNENV) $(RUNCMD) ./tcbtest rcat -nl -pn 5000 -rl casket 15000 5 5 500 5 5 +- $(RUNENV) $(RUNCMD) ./tcbtest rcat -ca 1000 -tb -pn 5000 casket 15000 5 5 500 5 5 +- $(RUNENV) $(RUNCMD) ./tcbtest rcat -ru -pn 500 casket 5000 5 5 500 1 1 +- $(RUNENV) $(RUNCMD) ./tcbtest rcat -cd -tl -td -ru -pn 500 casket 5000 5 5 500 1 1 +- $(RUNENV) $(RUNCMD) ./tcbmgr list -pv casket > check.out +- $(RUNENV) $(RUNCMD) ./tcbtest queue casket 15000 5 5 +- $(RUNENV) $(RUNCMD) ./tcbtest misc casket 5000 +- $(RUNENV) $(RUNCMD) ./tcbtest misc -tl -td casket 5000 +- $(RUNENV) $(RUNCMD) ./tcbtest misc -mt -tb casket 500 +- $(RUNENV) $(RUNCMD) ./tcbtest wicked casket 50000 +- $(RUNENV) $(RUNCMD) ./tcbtest wicked -tl -td casket 50000 +- $(RUNENV) $(RUNCMD) ./tcbtest wicked -mt -tb casket 5000 +- $(RUNENV) $(RUNCMD) ./tcbtest wicked -tt casket 5000 +- $(RUNENV) $(RUNCMD) ./tcbtest wicked -tx casket 5000 +- $(RUNENV) $(RUNCMD) ./tcbtest write -cd -lc 5 -nc 5 casket 5000 5 5 5 5 5 +- $(RUNENV) $(RUNCMD) ./tcbtest read -cd -lc 5 -nc 5 casket +- $(RUNENV) $(RUNCMD) ./tcbtest remove -cd -lc 5 -nc 5 casket +- $(RUNENV) $(RUNCMD) ./tcbmgr list -pv casket > check.out +- $(RUNENV) $(RUNCMD) ./tcbtest write -ci -td -lc 5 -nc 5 casket 5000 5 5 5 5 5 +- $(RUNENV) $(RUNCMD) ./tcbtest read -ci -lc 5 -nc 5 casket +- $(RUNENV) $(RUNCMD) ./tcbtest remove -ci -lc 5 -nc 5 casket +- $(RUNENV) $(RUNCMD) ./tcbmgr list -pv casket > check.out +- $(RUNENV) $(RUNCMD) ./tcbtest write -cj -tb -lc 5 -nc 5 casket 5000 5 5 5 5 5 +- $(RUNENV) $(RUNCMD) ./tcbtest read -cj -lc 5 -nc 5 casket +- $(RUNENV) $(RUNCMD) ./tcbtest remove -cj -lc 5 -nc 5 casket +- $(RUNENV) $(RUNCMD) ./tcbmgr list -pv casket > check.out +- $(RUNENV) $(RUNCMD) ./tcbmttest write -df 5 -tl casket 5 5000 5 5 500 5 +- $(RUNENV) $(RUNCMD) ./tcbmttest read -df 5 casket 5 +- $(RUNENV) $(RUNCMD) ./tcbmttest read -rnd casket 5 +- $(RUNENV) $(RUNCMD) ./tcbmttest remove casket 5 +- $(RUNENV) $(RUNCMD) ./tcbmttest wicked -nc casket 5 5000 +- $(RUNENV) $(RUNCMD) ./tcbmttest wicked -tl -td casket 5 5000 +- $(RUNENV) $(RUNCMD) ./tchmttest wicked -tb casket 5 5000 +- $(RUNENV) $(RUNCMD) ./tcbmttest typical -df 5 casket 5 50000 5 5 +- $(RUNENV) $(RUNCMD) ./tcbmttest typical -rr 1000 casket 5 50000 5 5 +- $(RUNENV) $(RUNCMD) ./tcbmttest typical -tl -nc casket 5 50000 5 5 +- $(RUNENV) $(RUNCMD) ./tcbmttest race -df 5 casket 5 10000 +- $(RUNENV) $(RUNCMD) ./tcbmgr create casket 4 4 3 1 1 +- $(RUNENV) $(RUNCMD) ./tcbmgr inform casket +- $(RUNENV) $(RUNCMD) ./tcbmgr put casket one first +- $(RUNENV) $(RUNCMD) ./tcbmgr put casket two second +- $(RUNENV) $(RUNCMD) ./tcbmgr put -dk casket three third +- $(RUNENV) $(RUNCMD) ./tcbmgr put -dc casket three third +- $(RUNENV) $(RUNCMD) ./tcbmgr put -dc casket three third +- $(RUNENV) $(RUNCMD) ./tcbmgr put -dd casket three third +- $(RUNENV) $(RUNCMD) ./tcbmgr put -dd casket three third +- $(RUNENV) $(RUNCMD) ./tcbmgr put casket four fourth +- $(RUNENV) $(RUNCMD) ./tcbmgr put -dk casket five fifth +- $(RUNENV) $(RUNCMD) ./tcbmgr out casket one +- $(RUNENV) $(RUNCMD) ./tcbmgr out casket two +- $(RUNENV) $(RUNCMD) ./tcbmgr get casket three > check.out +- $(RUNENV) $(RUNCMD) ./tcbmgr get casket four > check.out +- $(RUNENV) $(RUNCMD) ./tcbmgr get casket five > check.out +- $(RUNENV) $(RUNCMD) ./tcbmgr list -pv casket > check.out +- $(RUNENV) $(RUNCMD) ./tcbmgr list -j three -pv casket > check.out +- $(RUNENV) $(RUNCMD) ./tcbmgr optimize casket +- $(RUNENV) $(RUNCMD) ./tcbmgr put -dc casket three third +- $(RUNENV) $(RUNCMD) ./tcbmgr get casket three > check.out +- $(RUNENV) $(RUNCMD) ./tcbmgr get casket four > check.out +- $(RUNENV) $(RUNCMD) ./tcbmgr get casket five > check.out +- $(RUNENV) $(RUNCMD) ./tcbmgr list -pv casket > check.out ++ cd /var/tmp ; rm -rf casket* ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcbtest write casket 50000 5 5 5000 5 5 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcbtest read casket ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcbtest remove casket ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcbmgr list -rb 00001000 00002000 casket > check.out ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcbmgr list -fm 000001 casket > check.out ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcbtest write -mt -tl -td -ls 1024 casket 50000 5000 5000 5000 5 5 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcbtest read -mt -nb casket ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcbtest remove -mt casket ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcbtest write -tb -xm 50000 casket 50000 5 5 50000 5 5 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcbtest read -nl casket ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcbtest remove -df 5 casket ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcbtest rcat -lc 5 -nc 5 -df 5 -pn 500 casket 50000 5 5 5000 5 5 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcbtest rcat -tl -td -pn 5000 casket 50000 5 5 500 5 15 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcbtest rcat -nl -pn 5000 -rl casket 15000 5 5 500 5 5 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcbtest rcat -ca 1000 -tb -pn 5000 casket 15000 5 5 500 5 5 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcbtest rcat -ru -pn 500 casket 5000 5 5 500 1 1 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcbtest rcat -cd -tl -td -ru -pn 500 casket 5000 5 5 500 1 1 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcbmgr list -pv casket > check.out ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcbtest queue casket 15000 5 5 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcbtest misc casket 5000 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcbtest misc -tl -td casket 5000 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcbtest misc -mt -tb casket 500 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcbtest wicked casket 50000 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcbtest wicked -tl -td casket 50000 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcbtest wicked -mt -tb casket 5000 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcbtest wicked -tt casket 5000 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcbtest wicked -tx casket 5000 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcbtest write -cd -lc 5 -nc 5 casket 5000 5 5 5 5 5 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcbtest read -cd -lc 5 -nc 5 casket ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcbtest remove -cd -lc 5 -nc 5 casket ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcbmgr list -pv casket > check.out ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcbtest write -ci -td -lc 5 -nc 5 casket 5000 5 5 5 5 5 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcbtest read -ci -lc 5 -nc 5 casket ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcbtest remove -ci -lc 5 -nc 5 casket ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcbmgr list -pv casket > check.out ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcbtest write -cj -tb -lc 5 -nc 5 casket 5000 5 5 5 5 5 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcbtest read -cj -lc 5 -nc 5 casket ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcbtest remove -cj -lc 5 -nc 5 casket ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcbmgr list -pv casket > check.out ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcbmttest write -df 5 -tl casket 5 5000 5 5 500 5 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcbmttest read -df 5 casket 5 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcbmttest read -rnd casket 5 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcbmttest remove casket 5 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcbmttest wicked -nc casket 5 5000 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcbmttest wicked -tl -td casket 5 5000 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tchmttest wicked -tb casket 5 5000 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcbmttest typical -df 5 casket 5 50000 5 5 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcbmttest typical -rr 1000 casket 5 50000 5 5 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcbmttest typical -tl -nc casket 5 50000 5 5 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcbmttest race -df 5 casket 5 10000 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcbmgr create casket 4 4 3 1 1 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcbmgr inform casket ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcbmgr put casket one first ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcbmgr put casket two second ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcbmgr put -dk casket three third ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcbmgr put -dc casket three third ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcbmgr put -dc casket three third ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcbmgr put -dd casket three third ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcbmgr put -dd casket three third ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcbmgr put casket four fourth ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcbmgr put -dk casket five fifth ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcbmgr out casket one ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcbmgr out casket two ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcbmgr get casket three > check.out ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcbmgr get casket four > check.out ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcbmgr get casket five > check.out ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcbmgr list -pv casket > check.out ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcbmgr list -j three -pv casket > check.out ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcbmgr optimize casket ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcbmgr put -dc casket three third ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcbmgr get casket three > check.out ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcbmgr get casket four > check.out ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcbmgr get casket five > check.out ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcbmgr list -pv casket > check.out + + + check-fdb : +- rm -rf casket* +- $(RUNENV) $(RUNCMD) ./tcftest write casket 50000 50 +- $(RUNENV) $(RUNCMD) ./tcftest read casket +- $(RUNENV) $(RUNCMD) ./tcftest remove casket +- $(RUNENV) $(RUNCMD) ./tcftest write casket 50000 50 +- $(RUNENV) $(RUNCMD) ./tcftest read -mt -nb casket +- $(RUNENV) $(RUNCMD) ./tcftest remove -mt casket +- $(RUNENV) $(RUNCMD) ./tcftest rcat -pn 500 casket 50000 50 +- $(RUNENV) $(RUNCMD) ./tcftest rcat -nl -pn 500 -rl casket 5000 500 +- $(RUNENV) $(RUNCMD) ./tcftest rcat -pn 500 -ru casket 5000 500 +- $(RUNENV) $(RUNCMD) ./tcfmgr list -pv casket > check.out +- $(RUNENV) $(RUNCMD) ./tcfmgr list -pv -ri "[100,200)" -px casket > check.out +- $(RUNENV) $(RUNCMD) ./tcftest misc casket 5000 +- $(RUNENV) $(RUNCMD) ./tcftest misc -mt -nl casket 500 +- $(RUNENV) $(RUNCMD) ./tcftest wicked casket 50000 +- $(RUNENV) $(RUNCMD) ./tcftest wicked -mt -nb casket 50000 +- $(RUNENV) $(RUNCMD) ./tcfmttest write casket 5 5000 50 +- $(RUNENV) $(RUNCMD) ./tcfmttest read casket 5 +- $(RUNENV) $(RUNCMD) ./tcfmttest read -rnd casket 5 +- $(RUNENV) $(RUNCMD) ./tcfmttest remove casket 5 +- $(RUNENV) $(RUNCMD) ./tcfmttest wicked -nc casket 5 5000 +- $(RUNENV) $(RUNCMD) ./tcfmttest wicked casket 5 5000 +- $(RUNENV) $(RUNCMD) ./tcfmttest typical casket 5 50000 50 +- $(RUNENV) $(RUNCMD) ./tcfmttest typical -rr 1000 casket 5 50000 50 +- $(RUNENV) $(RUNCMD) ./tcfmttest typical -nc casket 5 50000 50 +- $(RUNENV) $(RUNCMD) ./tcfmgr create casket 50 +- $(RUNENV) $(RUNCMD) ./tcfmgr inform casket +- $(RUNENV) $(RUNCMD) ./tcfmgr put casket 1 first +- $(RUNENV) $(RUNCMD) ./tcfmgr put casket 2 second +- $(RUNENV) $(RUNCMD) ./tcfmgr put -dk casket 3 third +- $(RUNENV) $(RUNCMD) ./tcfmgr put -dc casket 3 third +- $(RUNENV) $(RUNCMD) ./tcfmgr put -dc casket 3 third +- $(RUNENV) $(RUNCMD) ./tcfmgr put -dc casket 3 third +- $(RUNENV) $(RUNCMD) ./tcfmgr put casket 4 fourth +- $(RUNENV) $(RUNCMD) ./tcfmgr put -dk casket 5 fifth +- $(RUNENV) $(RUNCMD) ./tcfmgr out casket 1 +- $(RUNENV) $(RUNCMD) ./tcfmgr out casket 2 +- $(RUNENV) $(RUNCMD) ./tcfmgr get casket 3 > check.out +- $(RUNENV) $(RUNCMD) ./tcfmgr get casket 4 > check.out +- $(RUNENV) $(RUNCMD) ./tcfmgr get casket 5 > check.out +- $(RUNENV) $(RUNCMD) ./tcfmgr list -pv casket > check.out +- $(RUNENV) $(RUNCMD) ./tcfmgr optimize casket 5 +- $(RUNENV) $(RUNCMD) ./tcfmgr put -dc casket 3 third +- $(RUNENV) $(RUNCMD) ./tcfmgr get casket 3 > check.out +- $(RUNENV) $(RUNCMD) ./tcfmgr get casket 4 > check.out +- $(RUNENV) $(RUNCMD) ./tcfmgr get casket 5 > check.out +- $(RUNENV) $(RUNCMD) ./tcfmgr list -pv casket > check.out ++ cd /var/tmp ; rm -rf casket* ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcftest write casket 50000 50 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcftest read casket ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcftest remove casket ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcftest write casket 50000 50 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcftest read -mt -nb casket ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcftest remove -mt casket ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcftest rcat -pn 500 casket 50000 50 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcftest rcat -nl -pn 500 -rl casket 5000 500 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcftest rcat -pn 500 -ru casket 5000 500 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcfmgr list -pv casket > check.out ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcfmgr list -pv -ri "[100,200)" -px casket > check.out ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcftest misc casket 5000 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcftest misc -mt -nl casket 500 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcftest wicked casket 50000 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcftest wicked -mt -nb casket 50000 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcfmttest write casket 5 5000 50 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcfmttest read casket 5 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcfmttest read -rnd casket 5 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcfmttest remove casket 5 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcfmttest wicked -nc casket 5 5000 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcfmttest wicked casket 5 5000 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcfmttest typical casket 5 50000 50 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcfmttest typical -rr 1000 casket 5 50000 50 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcfmttest typical -nc casket 5 50000 50 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcfmgr create casket 50 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcfmgr inform casket ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcfmgr put casket 1 first ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcfmgr put casket 2 second ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcfmgr put -dk casket 3 third ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcfmgr put -dc casket 3 third ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcfmgr put -dc casket 3 third ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcfmgr put -dc casket 3 third ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcfmgr put casket 4 fourth ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcfmgr put -dk casket 5 fifth ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcfmgr out casket 1 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcfmgr out casket 2 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcfmgr get casket 3 > check.out ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcfmgr get casket 4 > check.out ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcfmgr get casket 5 > check.out ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcfmgr list -pv casket > check.out ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcfmgr optimize casket 5 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcfmgr put -dc casket 3 third ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcfmgr get casket 3 > check.out ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcfmgr get casket 4 > check.out ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcfmgr get casket 5 > check.out ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcfmgr list -pv casket > check.out + + + check-tdb : +- rm -rf casket* +- $(RUNENV) $(RUNCMD) ./tcttest write casket 50000 5000 5 5 +- $(RUNENV) $(RUNCMD) ./tcttest read casket +- $(RUNENV) $(RUNCMD) ./tcttest remove casket +- $(RUNENV) $(RUNCMD) ./tcttest write -mt -tl -td -rc 50 -lc 5 -nc 5 -xm 500000 \ ++ cd /var/tmp ; rm -rf casket* ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcttest write casket 50000 5000 5 5 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcttest read casket ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcttest remove casket ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcttest write -mt -tl -td -rc 50 -lc 5 -nc 5 -xm 500000 \ + -is -in -it -if -ix casket 5000 5000 5 5 +- $(RUNENV) $(RUNCMD) ./tcttest read -mt -nb -rc 50 -lc 5 -nc 5 -xm 500000 casket +- $(RUNENV) $(RUNCMD) ./tcttest remove -mt -rc 50 -lc 5 -nc 5 -xm 500000 -df 5 casket +- $(RUNENV) $(RUNCMD) ./tcttest rcat -pn 500 -xm 50000 -df 5 -is casket 5000 5000 5 5 +- $(RUNENV) $(RUNCMD) ./tcttest rcat -tl -td -pn 5000 -is -in casket 5000 500 5 15 +- $(RUNENV) $(RUNCMD) ./tcttest rcat -nl -pn 500 -rl -is -in casket 5000 500 5 5 +- $(RUNENV) $(RUNCMD) ./tcttest rcat -tb -pn 500 -is -in casket 5000 500 5 5 +- $(RUNENV) $(RUNCMD) ./tcttest rcat -ru -pn 500 -is -in casket 5000 500 1 1 +- $(RUNENV) $(RUNCMD) ./tcttest rcat -tl -td -ru -pn 500 -is -in casket 5000 500 1 1 +- $(RUNENV) $(RUNCMD) ./tctmgr list -pv casket > check.out +- $(RUNENV) $(RUNCMD) ./tctmgr list -pv -px casket > check.out +- $(RUNENV) $(RUNCMD) ./tcttest misc casket 500 +- $(RUNENV) $(RUNCMD) ./tcttest misc -tl -td casket 500 +- $(RUNENV) $(RUNCMD) ./tcttest misc -mt -tb casket 500 +- $(RUNENV) $(RUNCMD) ./tcttest wicked casket 5000 +- $(RUNENV) $(RUNCMD) ./tcttest wicked -tl -td casket 5000 +- $(RUNENV) $(RUNCMD) ./tcttest wicked -mt -tb casket 5000 +- $(RUNENV) $(RUNCMD) ./tcttest wicked -tt casket 5000 +- $(RUNENV) $(RUNCMD) ./tcttest wicked -tx casket 5000 +- $(RUNENV) $(RUNCMD) ./tctmttest write -xm 500000 -df 5 -tl -is -in casket 5 5000 500 5 +- $(RUNENV) $(RUNCMD) ./tctmttest read -xm 500000 -df 5 casket 5 +- $(RUNENV) $(RUNCMD) ./tctmttest read -xm 500000 -rnd casket 5 +- $(RUNENV) $(RUNCMD) ./tctmttest remove -xm 500000 casket 5 +- $(RUNENV) $(RUNCMD) ./tctmttest wicked casket 5 5000 +- $(RUNENV) $(RUNCMD) ./tctmttest wicked -tl -td casket 5 5000 +- $(RUNENV) $(RUNCMD) ./tctmttest typical -df 5 casket 5 5000 500 +- $(RUNENV) $(RUNCMD) ./tctmttest typical -rr 1000 casket 5 5000 500 +- $(RUNENV) $(RUNCMD) ./tctmttest typical -tl -rc 50000 -lc 5 -nc 5 casket 5 5000 500 +- $(RUNENV) $(RUNCMD) ./tctmgr create casket 3 1 1 +- $(RUNENV) $(RUNCMD) ./tctmgr setindex casket name +- $(RUNENV) $(RUNCMD) ./tctmgr inform casket +- $(RUNENV) $(RUNCMD) ./tctmgr put casket "" name mikio birth 19780211 lang ja,en,c +- $(RUNENV) $(RUNCMD) ./tctmgr put casket "" name fal birth 19771007 lang ja +- $(RUNENV) $(RUNCMD) ./tctmgr put casket "" name banana price 100 +- $(RUNENV) $(RUNCMD) ./tctmgr put -dc casket 3 color yellow +- $(RUNENV) $(RUNCMD) ./tctmgr put -dk casket "" name melon price 1200 color green +- $(RUNENV) $(RUNCMD) ./tctmgr put casket "" name void birth 20010101 lang en +- $(RUNENV) $(RUNCMD) ./tctmgr out casket 5 +- $(RUNENV) $(RUNCMD) ./tctmgr get casket 1 > check.out +- $(RUNENV) $(RUNCMD) ./tctmgr get casket 2 > check.out +- $(RUNENV) $(RUNCMD) ./tctmgr get casket 3 > check.out +- $(RUNENV) $(RUNCMD) ./tctmgr search casket > check.out +- $(RUNENV) $(RUNCMD) ./tctmgr search -m 10 -sk 1 -pv -ph casket > check.out +- $(RUNENV) $(RUNCMD) ./tctmgr search -m 10 -ord name STRDESC -pv -ph casket > check.out +- $(RUNENV) $(RUNCMD) ./tctmgr search -m 10 -ord name STRDESC -pv -ph casket \ ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcttest read -mt -nb -rc 50 -lc 5 -nc 5 -xm 500000 casket ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcttest remove -mt -rc 50 -lc 5 -nc 5 -xm 500000 -df 5 casket ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcttest rcat -pn 500 -xm 50000 -df 5 -is casket 5000 5000 5 5 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcttest rcat -tl -td -pn 5000 -is -in casket 5000 500 5 15 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcttest rcat -nl -pn 500 -rl -is -in casket 5000 500 5 5 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcttest rcat -tb -pn 500 -is -in casket 5000 500 5 5 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcttest rcat -ru -pn 500 -is -in casket 5000 500 1 1 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcttest rcat -tl -td -ru -pn 500 -is -in casket 5000 500 1 1 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tctmgr list -pv casket > check.out ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tctmgr list -pv -px casket > check.out ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcttest misc casket 500 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcttest misc -tl -td casket 500 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcttest misc -mt -tb casket 500 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcttest wicked casket 5000 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcttest wicked -tl -td casket 5000 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcttest wicked -mt -tb casket 5000 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcttest wicked -tt casket 5000 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcttest wicked -tx casket 5000 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tctmttest write -xm 500000 -df 5 -tl -is -in casket 5 5000 500 5 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tctmttest read -xm 500000 -df 5 casket 5 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tctmttest read -xm 500000 -rnd casket 5 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tctmttest remove -xm 500000 casket 5 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tctmttest wicked casket 5 5000 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tctmttest wicked -tl -td casket 5 5000 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tctmttest typical -df 5 casket 5 5000 500 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tctmttest typical -rr 1000 casket 5 5000 500 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tctmttest typical -tl -rc 50000 -lc 5 -nc 5 casket 5 5000 500 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tctmgr create casket 3 1 1 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tctmgr setindex casket name ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tctmgr inform casket ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tctmgr put casket "" name mikio birth 19780211 lang ja,en,c ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tctmgr put casket "" name fal birth 19771007 lang ja ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tctmgr put casket "" name banana price 100 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tctmgr put -dc casket 3 color yellow ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tctmgr put -dk casket "" name melon price 1200 color green ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tctmgr put casket "" name void birth 20010101 lang en ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tctmgr out casket 5 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tctmgr get casket 1 > check.out ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tctmgr get casket 2 > check.out ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tctmgr get casket 3 > check.out ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tctmgr search casket > check.out ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tctmgr search -m 10 -sk 1 -pv -ph casket > check.out ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tctmgr search -m 10 -ord name STRDESC -pv -ph casket > check.out ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tctmgr search -m 10 -ord name STRDESC -pv -ph casket \ + name STRBW mi birth NUMBT 19700101,19791231 lang STRAND ja,en > check.out +- $(RUNENV) $(RUNCMD) ./tctmgr search -ord birth NUMDESC -pv -ms UNION casket \ ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tctmgr search -ord birth NUMDESC -pv -ms UNION casket \ + name STREQ mikio name STRINC fal name FTSEX "ba na na" +- $(RUNENV) $(RUNCMD) ./tctmgr setindex casket name +- $(RUNENV) $(RUNCMD) ./tctmgr setindex -it dec casket birth +- $(RUNENV) $(RUNCMD) ./tctmgr setindex casket lang +- $(RUNENV) $(RUNCMD) ./tctmgr list -pv casket > check.out +- $(RUNENV) $(RUNCMD) ./tctmgr optimize casket +- $(RUNENV) $(RUNCMD) ./tctmgr put casket "" name tokyo country japan lang ja +- $(RUNENV) $(RUNCMD) ./tctmgr search -m 10 -sk 1 -pv -ph casket > check.out +- $(RUNENV) $(RUNCMD) ./tctmgr search -m 10 -ord name STRDESC -pv -ph casket > check.out +- $(RUNENV) $(RUNCMD) ./tctmgr search -m 10 -ord name STRDESC -pv -ph casket \ ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tctmgr setindex casket name ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tctmgr setindex -it dec casket birth ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tctmgr setindex casket lang ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tctmgr list -pv casket > check.out ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tctmgr optimize casket ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tctmgr put casket "" name tokyo country japan lang ja ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tctmgr search -m 10 -sk 1 -pv -ph casket > check.out ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tctmgr search -m 10 -ord name STRDESC -pv -ph casket > check.out ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tctmgr search -m 10 -ord name STRDESC -pv -ph casket \ + name STRBW mi birth NUMBT 19700101,19791231 lang STRAND ja,en > check.out +- $(RUNENV) $(RUNCMD) ./tctmgr search -ord price NUMDESC -ph -rm casket name STRINC a +- $(RUNENV) $(RUNCMD) ./tctmgr list -pv casket > check.out ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tctmgr search -ord price NUMDESC -ph -rm casket name STRINC a ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tctmgr list -pv casket > check.out + + + check-adb : +- rm -rf casket* +- $(RUNENV) $(RUNCMD) ./tcatest write 'casket.tch#mode=wct#bnum=5000' 50000 +- $(RUNENV) $(RUNCMD) ./tcatest read 'casket.tch#mode=r' +- $(RUNENV) $(RUNCMD) ./tcatest remove 'casket.tch#mode=w' +- $(RUNENV) $(RUNCMD) ./tcatest misc 'casket.tch#mode=wct#bnum=500#opts=ld' 5000 +- $(RUNENV) $(RUNCMD) ./tcatest wicked 'casket.tch#mode=wct' 5000 +- $(RUNENV) $(RUNCMD) ./tcatest write '@casket.tcb#mode=wct#lmemb=5#nmemb=5' 50000 +- $(RUNENV) $(RUNCMD) ./tcatest read '@casket.tcb#mode=r' +- $(RUNENV) $(RUNCMD) ./tcatest remove '@casket.tcb#mode=w' +- $(RUNENV) $(RUNCMD) ./tcatest misc '@casket.tcb#mode=wct#lmemb=5#nmemb=5#opts=ld' 5000 +- $(RUNENV) $(RUNCMD) ./tcatest wicked '@casket.tcb#mode=wct' 5000 +- $(RUNENV) $(RUNCMD) ./tcatest write 'casket.tcf#mode=wct#width=10' 50000 +- $(RUNENV) $(RUNCMD) ./tcatest read 'casket.tcf#mode=r' +- $(RUNENV) $(RUNCMD) ./tcatest remove 'casket.tcf#mode=w' +- $(RUNENV) $(RUNCMD) ./tcatest write '*#bnum=5000#cap=100' 50000 +- $(RUNENV) $(RUNCMD) ./tcatest misc '*' 5000 +- $(RUNENV) $(RUNCMD) ./tcatest wicked '*' 5000 +- $(RUNENV) $(RUNCMD) ./tcatest write '%casket-mul.tch#mode=wct#bnum=500' 50000 +- $(RUNENV) $(RUNCMD) ./tcatest read '%casket-mul.tch#mode=r' +- $(RUNENV) $(RUNCMD) ./tcatest remove '%casket-mul.tch#mode=w' +- $(RUNENV) $(RUNCMD) ./tcatest misc '%casket-mul.tch#mode=wct#bnum=500#opts=ld' 5000 +- $(RUNENV) $(RUNCMD) ./tcatest wicked '%casket-mul.tch#mode=wct' 5000 +- $(RUNENV) $(RUNCMD) ./tcatest compare casket 50 500 +- $(RUNENV) $(RUNCMD) ./tcatest compare casket 5 5000 +- $(RUNENV) $(RUNCMD) ./tcamttest write 'casket.tch#mode=wct#bnum=5000' 5 5000 +- $(RUNENV) $(RUNCMD) ./tcamttest read 'casket.tch#mode=r' 5 +- $(RUNENV) $(RUNCMD) ./tcamttest remove 'casket.tch#mode=w' 5 +- $(RUNENV) $(RUNCMD) ./tcamttest write '%casket-mul.tcb#mode=wct#bnum=5000' 5 5000 +- $(RUNENV) $(RUNCMD) ./tcamttest read '%casket-mul.tcb#mode=r' 5 +- $(RUNENV) $(RUNCMD) ./tcamttest remove '%casket-mul.tcb#mode=w' 5 +- $(RUNENV) $(RUNCMD) ./tcamgr create 'casket.tch#mode=wct#bnum=3' +- $(RUNENV) $(RUNCMD) ./tcamgr inform 'casket.tch' +- $(RUNENV) $(RUNCMD) ./tcamgr put casket.tch one first +- $(RUNENV) $(RUNCMD) ./tcamgr put casket.tch two second +- $(RUNENV) $(RUNCMD) ./tcamgr put -dk casket.tch three third +- $(RUNENV) $(RUNCMD) ./tcamgr put -dc casket.tch three third +- $(RUNENV) $(RUNCMD) ./tcamgr put -dc casket.tch three third +- $(RUNENV) $(RUNCMD) ./tcamgr put -dc casket.tch three third +- $(RUNENV) $(RUNCMD) ./tcamgr put casket.tch four fourth +- $(RUNENV) $(RUNCMD) ./tcamgr put -dk casket.tch five fifth +- $(RUNENV) $(RUNCMD) ./tcamgr out casket.tch one +- $(RUNENV) $(RUNCMD) ./tcamgr out casket.tch two +- $(RUNENV) $(RUNCMD) ./tcamgr get casket.tch three > check.out +- $(RUNENV) $(RUNCMD) ./tcamgr get casket.tch four > check.out +- $(RUNENV) $(RUNCMD) ./tcamgr get casket.tch five > check.out +- $(RUNENV) $(RUNCMD) ./tcamgr list -pv -fm f casket.tch > check.out +- $(RUNENV) $(RUNCMD) ./tcamgr optimize casket.tch +- $(RUNENV) $(RUNCMD) ./tcamgr put -dc casket.tch three third +- $(RUNENV) $(RUNCMD) ./tcamgr get casket.tch three > check.out +- $(RUNENV) $(RUNCMD) ./tcamgr get casket.tch four > check.out +- $(RUNENV) $(RUNCMD) ./tcamgr get casket.tch five > check.out +- $(RUNENV) $(RUNCMD) ./tcamgr misc casket.tch putlist six sixth seven seventh +- $(RUNENV) $(RUNCMD) ./tcamgr misc casket.tch outlist six +- $(RUNENV) $(RUNCMD) ./tcamgr misc casket.tch getlist three four five six > check.out +- $(RUNENV) $(RUNCMD) ./tcamgr list -pv casket.tch > check.out +- $(RUNENV) $(RUNCMD) ./tcamgr create 'casket.tct#mode=wct#idx=name:lex#idx=age:dec' +- $(RUNENV) $(RUNCMD) ./tcamgr put -sep '|' casket.tct 1 "name|mikio|age|30" +- $(RUNENV) $(RUNCMD) ./tcamgr put -sep '|' casket.tct 2 "name|fal|age|31" +- $(RUNENV) $(RUNCMD) ./tcamgr put -sep '|' casket.tct 3 "name|lupin|age|29" +- $(RUNENV) $(RUNCMD) ./tcamgr get -sep '\t' casket.tct 1 > check.out +- $(RUNENV) $(RUNCMD) ./tcamgr list -sep '\t' -pv casket.tct > check.out +- $(RUNENV) $(RUNCMD) ./tcamgr misc -sep '|' casket.tct search \ ++ cd /var/tmp ; rm -rf casket* ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcatest write 'casket.tch#mode=wct#bnum=5000' 50000 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcatest read 'casket.tch#mode=r' ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcatest remove 'casket.tch#mode=w' ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcatest misc 'casket.tch#mode=wct#bnum=500#opts=ld' 5000 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcatest wicked 'casket.tch#mode=wct' 5000 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcatest write '@casket.tcb#mode=wct#lmemb=5#nmemb=5' 50000 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcatest read '@casket.tcb#mode=r' ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcatest remove '@casket.tcb#mode=w' ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcatest misc '@casket.tcb#mode=wct#lmemb=5#nmemb=5#opts=ld' 5000 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcatest wicked '@casket.tcb#mode=wct' 5000 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcatest write 'casket.tcf#mode=wct#width=10' 50000 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcatest read 'casket.tcf#mode=r' ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcatest remove 'casket.tcf#mode=w' ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcatest write '*#bnum=5000#cap=100' 50000 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcatest misc '*' 5000 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcatest wicked '*' 5000 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcatest write '%casket-mul.tch#mode=wct#bnum=500' 50000 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcatest read '%casket-mul.tch#mode=r' ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcatest remove '%casket-mul.tch#mode=w' ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcatest misc '%casket-mul.tch#mode=wct#bnum=500#opts=ld' 5000 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcatest wicked '%casket-mul.tch#mode=wct' 5000 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcatest compare casket 50 500 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcatest compare casket 5 5000 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcamttest write 'casket.tch#mode=wct#bnum=5000' 5 5000 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcamttest read 'casket.tch#mode=r' 5 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcamttest remove 'casket.tch#mode=w' 5 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcamttest write '%casket-mul.tcb#mode=wct#bnum=5000' 5 5000 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcamttest read '%casket-mul.tcb#mode=r' 5 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcamttest remove '%casket-mul.tcb#mode=w' 5 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcamgr create 'casket.tch#mode=wct#bnum=3' ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcamgr inform 'casket.tch' ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcamgr put casket.tch one first ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcamgr put casket.tch two second ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcamgr put -dk casket.tch three third ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcamgr put -dc casket.tch three third ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcamgr put -dc casket.tch three third ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcamgr put -dc casket.tch three third ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcamgr put casket.tch four fourth ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcamgr put -dk casket.tch five fifth ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcamgr out casket.tch one ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcamgr out casket.tch two ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcamgr get casket.tch three > check.out ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcamgr get casket.tch four > check.out ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcamgr get casket.tch five > check.out ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcamgr list -pv -fm f casket.tch > check.out ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcamgr optimize casket.tch ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcamgr put -dc casket.tch three third ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcamgr get casket.tch three > check.out ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcamgr get casket.tch four > check.out ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcamgr get casket.tch five > check.out ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcamgr misc casket.tch putlist six sixth seven seventh ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcamgr misc casket.tch outlist six ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcamgr misc casket.tch getlist three four five six > check.out ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcamgr list -pv casket.tch > check.out ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcamgr create 'casket.tct#mode=wct#idx=name:lex#idx=age:dec' ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcamgr put -sep '|' casket.tct 1 "name|mikio|age|30" ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcamgr put -sep '|' casket.tct 2 "name|fal|age|31" ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcamgr put -sep '|' casket.tct 3 "name|lupin|age|29" ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcamgr get -sep '\t' casket.tct 1 > check.out ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcamgr list -sep '\t' -pv casket.tct > check.out ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcamgr misc -sep '|' casket.tct search \ + "addcond|name|STRINC|i" "setorder|age|NUMASC" "setmax|1" "get" > check.out +- $(RUNENV) $(RUNCMD) ./tcamgr misc -sep '|' casket.tct search "get" "out" > check.out +- $(RUNENV) $(RUNCMD) ./tcamgr create '%casket-mul.tcb#mode=wct' +- $(RUNENV) $(RUNCMD) ./tcamgr put '%casket-mul.tcb' one first +- $(RUNENV) $(RUNCMD) ./tcamgr put '%casket-mul.tcb' two second +- $(RUNENV) $(RUNCMD) ./tcamgr put -dk '%casket-mul.tcb' three third +- $(RUNENV) $(RUNCMD) ./tcamgr put -dc '%casket-mul.tcb' three third +- $(RUNENV) $(RUNCMD) ./tcamgr put -dc '%casket-mul.tcb' three third +- $(RUNENV) $(RUNCMD) ./tcamgr put -dc '%casket-mul.tcb' three third +- $(RUNENV) $(RUNCMD) ./tcamgr put '%casket-mul.tcb' four fourth +- $(RUNENV) $(RUNCMD) ./tcamgr put -dk '%casket-mul.tcb' five fifth +- $(RUNENV) $(RUNCMD) ./tcamgr out '%casket-mul.tcb' one +- $(RUNENV) $(RUNCMD) ./tcamgr out '%casket-mul.tcb' two +- $(RUNENV) $(RUNCMD) ./tcamgr get '%casket-mul.tcb' three > check.out +- $(RUNENV) $(RUNCMD) ./tcamgr get '%casket-mul.tcb' four > check.out +- $(RUNENV) $(RUNCMD) ./tcamgr get '%casket-mul.tcb' five > check.out +- $(RUNENV) $(RUNCMD) ./tcamgr list -pv -fm f '%casket-mul.tcb' > check.out +- $(RUNENV) $(RUNCMD) ./tcamgr optimize '%casket-mul.tcb' +- $(RUNENV) $(RUNCMD) ./tcamgr put -dc '%casket-mul.tcb' three third +- $(RUNENV) $(RUNCMD) ./tcamgr get '%casket-mul.tcb' three > check.out +- $(RUNENV) $(RUNCMD) ./tcamgr get '%casket-mul.tcb' four > check.out +- $(RUNENV) $(RUNCMD) ./tcamgr get '%casket-mul.tcb' five > check.out +- $(RUNENV) $(RUNCMD) ./tcamgr misc '%casket-mul.tcb' '%putlist' six sixth seven seventh +- $(RUNENV) $(RUNCMD) ./tcamgr misc '%casket-mul.tcb' '@outlist' six +- $(RUNENV) $(RUNCMD) ./tcamgr misc '%casket-mul.tcb' '@getlist' \ ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcamgr misc -sep '|' casket.tct search "get" "out" > check.out ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcamgr create '%casket-mul.tcb#mode=wct' ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcamgr put '%casket-mul.tcb' one first ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcamgr put '%casket-mul.tcb' two second ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcamgr put -dk '%casket-mul.tcb' three third ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcamgr put -dc '%casket-mul.tcb' three third ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcamgr put -dc '%casket-mul.tcb' three third ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcamgr put -dc '%casket-mul.tcb' three third ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcamgr put '%casket-mul.tcb' four fourth ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcamgr put -dk '%casket-mul.tcb' five fifth ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcamgr out '%casket-mul.tcb' one ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcamgr out '%casket-mul.tcb' two ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcamgr get '%casket-mul.tcb' three > check.out ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcamgr get '%casket-mul.tcb' four > check.out ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcamgr get '%casket-mul.tcb' five > check.out ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcamgr list -pv -fm f '%casket-mul.tcb' > check.out ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcamgr optimize '%casket-mul.tcb' ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcamgr put -dc '%casket-mul.tcb' three third ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcamgr get '%casket-mul.tcb' three > check.out ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcamgr get '%casket-mul.tcb' four > check.out ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcamgr get '%casket-mul.tcb' five > check.out ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcamgr misc '%casket-mul.tcb' '%putlist' six sixth seven seventh ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcamgr misc '%casket-mul.tcb' '@outlist' six ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcamgr misc '%casket-mul.tcb' '@getlist' \ + three four five six > check.out +- $(RUNENV) $(RUNCMD) ./tcamgr list -pv '%casket-mul.tcb' > check.out ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcamgr list -pv '%casket-mul.tcb' > check.out + + + check-valgrind : +- make RUNCMD="valgrind --tool=memcheck --log-file=%p.vlog" check ++ $(MAKE) RUNCMD="valgrind --tool=memcheck --log-file=%p.vlog" check + grep ERROR *.vlog | grep -v ' 0 errors' ; true + grep 'at exit' *.vlog | grep -v ' 0 bytes' ; true + + + check-large : +- rm -rf casket* +- $(RUNENV) $(RUNCMD) ./tchmttest typical casket 3 1000000 5000000 13 8 +- $(RUNENV) $(RUNCMD) ./tchmttest typical -nc casket 3 1000000 5000000 13 8 +- $(RUNENV) $(RUNCMD) ./tcbmttest typical casket 3 500000 8 8 500000 16 8 +- $(RUNENV) $(RUNCMD) ./tcbmttest typical -nc casket 3 500000 8 8 500000 16 8 +- $(RUNENV) $(RUNCMD) ./tcfmttest typical casket 3 500000 2048 4g +- $(RUNENV) $(RUNCMD) ./tcfmttest typical -nc casket 3 500000 2048 4g +- rm -rf casket* ++ cd /var/tmp ; rm -rf casket* ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tchmttest typical casket 3 1000000 5000000 13 8 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tchmttest typical -nc casket 3 1000000 5000000 13 8 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcbmttest typical casket 3 500000 8 8 500000 16 8 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcbmttest typical -nc casket 3 500000 8 8 500000 16 8 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcfmttest typical casket 3 500000 2048 4g ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcfmttest typical -nc casket 3 500000 2048 4g ++ cd /var/tmp ; rm -rf casket* + + + check-compare : +- $(RUNENV) $(RUNCMD) ./tcatest compare casket 5 10000 +- $(RUNENV) $(RUNCMD) ./tcatest compare casket 10 5000 +- $(RUNENV) $(RUNCMD) ./tcatest compare casket 50 1000 +- $(RUNENV) $(RUNCMD) ./tcatest compare casket 100 500 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcatest compare casket 5 10000 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcatest compare casket 10 5000 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcatest compare casket 50 1000 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcatest compare casket 100 500 + + + check-thread : +- rm -rf casket* +- $(RUNENV) $(RUNCMD) ./tcumttest typical 5 500000 500000 +- $(RUNENV) $(RUNCMD) ./tcumttest typical -nc -rr 1000 5 500000 500000 +- $(RUNENV) $(RUNCMD) ./tchmttest typical casket 5 500000 500000 +- $(RUNENV) $(RUNCMD) ./tchmttest typical -rc 500000 -nc -rr 1000 casket 5 500000 500000 +- $(RUNENV) $(RUNCMD) ./tcbmttest typical casket 5 100000 5 5 +- $(RUNENV) $(RUNCMD) ./tcbmttest typical -nc -rr 1000 casket 5 100000 5 5 +- $(RUNENV) $(RUNCMD) ./tcfmttest typical casket 5 500000 10 +- $(RUNENV) $(RUNCMD) ./tcfmttest typical -nc -rr 1000 casket 5 500000 10 +- rm -rf casket* ++ cd /var/tmp ; rm -rf casket* ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcumttest typical 5 500000 500000 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcumttest typical -nc -rr 1000 5 500000 500000 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tchmttest typical casket 5 500000 500000 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tchmttest typical -rc 500000 -nc -rr 1000 casket 5 500000 500000 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcbmttest typical casket 5 100000 5 5 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcbmttest typical -nc -rr 1000 casket 5 100000 5 5 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcfmttest typical casket 5 500000 10 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcfmttest typical -nc -rr 1000 casket 5 500000 10 ++ cd /var/tmp ; rm -rf casket* + + + check-race : +- $(RUNENV) $(RUNCMD) ./tchmttest race casket 5 10000 +- $(RUNENV) $(RUNCMD) ./tcbmttest race casket 5 10000 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tchmttest race casket 5 10000 ++ cd /var/tmp ; $(RUNENV) $(RUNCMD) $(WORKDIR)/tcbmttest race casket 5 10000 + + + check-forever : + while true ; \ + do \ +- make check || break ; \ +- make check || break ; \ +- make check-thread || break ; \ +- make check-race || break ; \ +- make check-race || break ; \ +- make check-compare || break ; \ +- make check-compare || break ; \ ++ $(MAKE) check || break ; \ ++ $(MAKE) check || break ; \ ++ $(MAKE) check-thread || break ; \ ++ $(MAKE) check-race || break ; \ ++ $(MAKE) check-race || break ; \ ++ $(MAKE) check-compare || break ; \ ++ $(MAKE) check-compare || break ; \ + done + + + words : +- rm -f casket-* words.tsv +- cat /usr/share/dict/words | \ ++ cd /var/tmp ; rm -f casket-* words.tsv ++ cd /var/tmp ; cat /usr/share/dict/words | \ + tr '\t\r' ' ' | grep -v '^ *$$' | cat -n | sort | \ + LC_ALL=C sed -e 's/^ *//' -e 's/\(^[0-9]*\)\t\(.*\)/\2\t\1/' > words.tsv +- ./tchmgr create casket-hash -1 0 ; ./tchmgr importtsv casket-hash words.tsv +- ./tcbmgr create casket-btree 8192 ; ./tcbmgr importtsv casket-btree words.tsv +- ./tcbmgr create -td casket-btree-td 8192 ; ./tcbmgr importtsv casket-btree-td words.tsv +- ./tcbmgr create -tb casket-btree-tb 8192 ; ./tcbmgr importtsv casket-btree-tb words.tsv +- ./tcbmgr create -tt casket-btree-tt 8192 ; ./tcbmgr importtsv casket-btree-tt words.tsv +- ./tcbmgr create -tx casket-btree-tx 8192 ; ./tcbmgr importtsv casket-btree-tx words.tsv +- wc -c words.tsv casket-hash casket-btree \ ++ $(WORKDIR)/tchmgr create casket-hash -1 0 ; $(WORKDIR)/tchmgr importtsv casket-hash words.tsv ++ $(WORKDIR)/tcbmgr create casket-btree 8192 ; $(WORKDIR)/tcbmgr importtsv casket-btree words.tsv ++ $(WORKDIR)/tcbmgr create -td casket-btree-td 8192 ; $(WORKDIR)/tcbmgr importtsv casket-btree-td words.tsv ++ $(WORKDIR)/tcbmgr create -tb casket-btree-tb 8192 ; $(WORKDIR)/tcbmgr importtsv casket-btree-tb words.tsv ++ $(WORKDIR)/tcbmgr create -tt casket-btree-tt 8192 ; $(WORKDIR)/tcbmgr importtsv casket-btree-tt words.tsv ++ $(WORKDIR)/tcbmgr create -tx casket-btree-tx 8192 ; $(WORKDIR)/tcbmgr importtsv casket-btree-tx words.tsv ++ cd /var/tmp ; wc -c words.tsv casket-hash casket-btree \ + casket-btree-td casket-btree-tb casket-btree-tt casket-btree-tx + + + wordtable : +- rm -rf casket* words.tsv +- cat /usr/share/dict/words | \ ++ cd /var/tmp ; rm -rf casket* words.tsv ++ cd /var/tmp ; cat /usr/share/dict/words | \ + tr '\t\r' ' ' | grep -v '^ *$$' | cat -n | sort | \ + LC_ALL=C sed -e 's/^ *//' -e 's/\(^[0-9]*\)\t\(.*\)/\1\tword\t\2\tnum\t\1/' \ + -e 's/$$/\txxx\tabc\tyyy\t123/' > words.tsv +- ./tctmgr create casket +- ./tctmgr setindex casket word +- ./tctmgr setindex -it dec casket num +- ./tctmgr importtsv casket words.tsv ++ $(WORKDIR)/tctmgr create casket ++ $(WORKDIR)/tctmgr setindex casket word ++ $(WORKDIR)/tctmgr setindex -it dec casket num ++ $(WORKDIR)/tctmgr importtsv casket words.tsv + + + .PHONY : all clean install check +-- +1.7.10.3 + Deleted: csw/mgar/pkg/tokyocabinet/trunk/files/0002-Use-make-variable.patch =================================================================== --- csw/mgar/pkg/tokyocabinet/trunk/files/0002-Use-make-variable.patch 2012-06-15 16:00:40 UTC (rev 18427) +++ csw/mgar/pkg/tokyocabinet/trunk/files/0002-Use-make-variable.patch 2012-06-15 21:00:42 UTC (rev 18428) @@ -1,93 +0,0 @@ -From eee3e782fa7694aa0f03a4995b41419ee51878e0 Mon Sep 17 00:00:00 2001 -From: Rafael Ostertag -Date: Tue, 12 Jun 2012 22:30:30 +0200 -Subject: [PATCH] Use make variable - ---- - Makefile.in | 40 ++++++++++++++++++++-------------------- - 1 file changed, 20 insertions(+), 20 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index 5282ec2..a6e4f01 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -134,7 +134,7 @@ install : - - - install-strip : -- make DESTDIR=$(DESTDIR) install -+ $(MAKE) DESTDIR=$(DESTDIR) install - cd $(DESTDIR)$(BINDIR) && strip $(COMMANDFILES) - - -@@ -151,26 +151,26 @@ uninstall : - - - dist : -- make version -- make untabify -- make distclean -+ $(MAKE) version -+ $(MAKE) untabify -+ $(MAKE) distclean - cd .. && tar cvf - $(PACKAGEDIR) | gzip -c > $(PACKAGETGZ) - sync ; sync - - - distclean : clean -- cd example && make clean -- cd bros && make clean -+ cd example && $(MAKE) clean -+ cd bros && $(MAKE) clean - rm -rf Makefile tokyocabinet.pc config.cache config.log config.status autom4te.cache - - - check : -- make check-util -- make check-hdb -- make check-bdb -- make check-fdb -- make check-tdb -- make check-adb -+ $(MAKE) check-util -+ $(MAKE) check-hdb -+ $(MAKE) check-bdb -+ $(MAKE) check-fdb -+ $(MAKE) check-tdb -+ $(MAKE) check-adb - rm -rf casket* - @printf '\n' - @printf '#================================================================\n' -@@ -586,7 +586,7 @@ check-adb : - - - check-valgrind : -- make RUNCMD="valgrind --tool=memcheck --log-file=%p.vlog" check -+ $(MAKE) RUNCMD="valgrind --tool=memcheck --log-file=%p.vlog" check - grep ERROR *.vlog | grep -v ' 0 errors' ; true - grep 'at exit' *.vlog | grep -v ' 0 bytes' ; true - -@@ -630,13 +630,13 @@ check-race : - check-forever : - while true ; \ - do \ -- make check || break ; \ -- make check || break ; \ -- make check-thread || break ; \ -- make check-race || break ; \ -- make check-race || break ; \ -- make check-compare || break ; \ -- make check-compare || break ; \ -+ $(MAKE) check || break ; \ -+ $(MAKE) check || break ; \ -+ $(MAKE) check-thread || break ; \ -+ $(MAKE) check-race || break ; \ -+ $(MAKE) check-race || break ; \ -+ $(MAKE) check-compare || break ; \ -+ $(MAKE) check-compare || break ; \ - done - - --- -1.7.10.3 - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sat Jun 16 04:20:22 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 16 Jun 2012 02:20:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[18429] csw/mgar/pkg/monit/trunk Message-ID: Revision: 18429 http://gar.svn.sourceforge.net/gar/?rev=18429&view=rev Author: bdwalton Date: 2012-06-16 02:20:22 +0000 (Sat, 16 Jun 2012) Log Message: ----------- monit/trunk: add patch to remove hard coded compiler options; build for sol10 only with gcc Modified Paths: -------------- csw/mgar/pkg/monit/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/monit/trunk/files/0001-Drop-some-build-flags-that-get-hard-coded-by-configu.patch Modified: csw/mgar/pkg/monit/trunk/Makefile =================================================================== --- csw/mgar/pkg/monit/trunk/Makefile 2012-06-15 21:00:42 UTC (rev 18428) +++ csw/mgar/pkg/monit/trunk/Makefile 2012-06-16 02:20:22 UTC (rev 18429) @@ -1,13 +1,6 @@ # $Id$ # TODO (release-critical prefixed with !, non release-critical with *) -# ! Early stage recipe, doesn't build yet # -#gmake[3]: Entering directory `/home/skayser/mgar/pkg/monit/trunk/work/solaris9-sparc/build-isa-sparcv8/monit-5.3.1/libmonit' -#/bin/bash ./libtool --tag=CC --mode=compile /opt/SUNWspro/bin/cc -DHAVE_CONFIG_H -I. -I./src -I./src -I./src/exceptions -I./src/io -I./src/net -I./src/util -I./src/thread -I/opt/csw/include -I/opt/csw/include -xO3 -m32 -xarch=v8 -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -D__EXTENSIONS__ -m64 -mtune=v9 -c -o src/Bootstrap.lo src/Bootstrap.c -#libtool: compile: /opt/SUNWspro/bin/cc -DHAVE_CONFIG_H -I. -I./src -I./src -I./src/exceptions -I./src/io -I./src/net -I./src/util -I./src/thread -I/opt/csw/include -I/opt/csw/include -xO3 -m32 -xarch=v8 -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -D__EXTENSIONS__ -m64 -mtune=v9 -c src/Bootstrap.c -KPIC -DPIC -o src/.libs/Bootstrap.o -#cc: Warning: illegal option -mtune=v9 -#cc: -xarch=v8 is 32-bit only -# NAME = monit VERSION = 5.3.1 GARTYPE = v2 @@ -18,10 +11,15 @@ Long description endef +PACKAGING_PLATFORMS = solaris10-i386 solaris10-sparc + VENDOR_URL = http://mmonit.com/monit/ MASTER_SITES = http://mmonit.com/monit/dist/ DISTFILES = $(DISTNAME).tar.gz +PATCHFILES += 0001-Drop-some-build-flags-that-get-hard-coded-by-configu.patch +GARCOMPILER = GNU + CONFIGURE_ARGS = $(DIRPATHS) include gar/category.mk Added: csw/mgar/pkg/monit/trunk/files/0001-Drop-some-build-flags-that-get-hard-coded-by-configu.patch =================================================================== --- csw/mgar/pkg/monit/trunk/files/0001-Drop-some-build-flags-that-get-hard-coded-by-configu.patch (rev 0) +++ csw/mgar/pkg/monit/trunk/files/0001-Drop-some-build-flags-that-get-hard-coded-by-configu.patch 2012-06-16 02:20:22 UTC (rev 18429) @@ -0,0 +1,82 @@ +From 66286914b5363a48bb4984f02748a7ce2a58c160 Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Sat, 16 Jun 2012 04:03:55 +0200 +Subject: [PATCH] Drop some build flags that get hard coded by configure + +We set sane build flags, so don't rely on the hard coded stuff that +gets in the way. + +Signed-off-by: Ben Walton +--- + configure | 20 ++++++++++---------- + libmonit/configure | 8 ++++---- + 2 files changed, 14 insertions(+), 14 deletions(-) + +diff --git a/configure b/configure +index 976698c..b7566ee 100755 +--- a/configure ++++ b/configure +@@ -12703,8 +12703,8 @@ architecture=`uname` + if test "$architecture" = "SunOS" + then + ARCH="SOLARIS" +- CFLAGS="$CFLAGS -D _REENTRANT -D_POSIX_PTHREAD_SEMANTICS -D__EXTENSIONS__ -m64" +- LDFLAGS="$LDFLAGS -m64" ++ CFLAGS="$CFLAGS -D _REENTRANT -D_POSIX_PTHREAD_SEMANTICS -D__EXTENSIONS__" ++ LDFLAGS="$LDFLAGS" + test_kstat="true" + + $as_echo "#define HAVE_CPU_WAIT 1" >>confdefs.h +@@ -12713,20 +12713,20 @@ $as_echo "#define HAVE_CPU_WAIT 1" >>confdefs.h + then + if test "x$GCC" = "xyes" + then +- CFLAGS="$CFLAGS -mtune=opteron" +- LDFLAGS="$LDFLAGS -mtune=opteron" ++ CFLAGS="$CFLAGS" ++ LDFLAGS="$LDFLAGS" + else +- CFLAGS="$CFLAGS -xarch=sse2" +- LDFLAGS="$LDFLAGS -xarch=sse2" ++ CFLAGS="$CFLAGS" ++ LDFLAGS="$LDFLAGS" + fi + else + if test "x$GCC" = "xyes" + then +- CFLAGS="$CFLAGS -mtune=v9" +- LDFLAGS="$LDFLAGS -mtune=v9" ++ CFLAGS="$CFLAGS" ++ LDFLAGS="$LDFLAGS" + else +- CFLAGS="$CFLAGS -xarch=sparc" +- LDFLAGS="$LDFLAGS -xarch=sparc" ++ CFLAGS="$CFLAGS" ++ LDFLAGS="$LDFLAGS" + fi + fi + elif test "$architecture" = "Linux" +diff --git a/libmonit/configure b/libmonit/configure +index 8e69bfd..aba7f8c 100755 +--- a/libmonit/configure ++++ b/libmonit/configure +@@ -10877,12 +10877,12 @@ $as_echo "#define DARWIN 1" >>confdefs.h + elif test "$architecture" = "SunOS" + then + LIBS="$LIBS -lsocket -lnsl" +- CFLAGS="$CFLAGS -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -D__EXTENSIONS__ -m64" +- LDFLAGS="$LDFLAGS -m64" ++ CFLAGS="$CFLAGS -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -D__EXTENSIONS__" ++ LDFLAGS="$LDFLAGS" + if test `uname -m` != "i86pc" + then +- CFLAGS="$CFLAGS -mtune=v9" +- LDFLAGS="$LDFLAGS -mtune=v9" ++ CFLAGS="$CFLAGS" ++ LDFLAGS="$LDFLAGS" + fi + + $as_echo "#define SOLARIS 1" >>confdefs.h +-- +1.7.10.3 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sat Jun 16 04:30:24 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 16 Jun 2012 02:30:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[18430] csw/mgar/pkg/monit/trunk/Makefile Message-ID: Revision: 18430 http://gar.svn.sourceforge.net/gar/?rev=18430&view=rev Author: bdwalton Date: 2012-06-16 02:30:23 +0000 (Sat, 16 Jun 2012) Log Message: ----------- monit/trunk: we need to build 64-bit-only for some /procfs stuff that does not mix with 32-bit binaries using LFS Modified Paths: -------------- csw/mgar/pkg/monit/trunk/Makefile Modified: csw/mgar/pkg/monit/trunk/Makefile =================================================================== --- csw/mgar/pkg/monit/trunk/Makefile 2012-06-16 02:20:22 UTC (rev 18429) +++ csw/mgar/pkg/monit/trunk/Makefile 2012-06-16 02:30:23 UTC (rev 18430) @@ -19,6 +19,7 @@ PATCHFILES += 0001-Drop-some-build-flags-that-get-hard-coded-by-configu.patch GARCOMPILER = GNU +BUILD64_ONLY = 1 CONFIGURE_ARGS = $(DIRPATHS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sat Jun 16 04:36:26 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 16 Jun 2012 02:36:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[18432] csw/mgar/pkg/monit/trunk/Makefile Message-ID: Revision: 18432 http://gar.svn.sourceforge.net/gar/?rev=18432&view=rev Author: bdwalton Date: 2012-06-16 02:36:25 +0000 (Sat, 16 Jun 2012) Log Message: ----------- monit/trunk: ensure we use opencsw libssl Modified Paths: -------------- csw/mgar/pkg/monit/trunk/Makefile Modified: csw/mgar/pkg/monit/trunk/Makefile =================================================================== --- csw/mgar/pkg/monit/trunk/Makefile 2012-06-16 02:36:21 UTC (rev 18431) +++ csw/mgar/pkg/monit/trunk/Makefile 2012-06-16 02:36:25 UTC (rev 18432) @@ -22,6 +22,7 @@ BUILD64_ONLY = 1 CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-ssl-dir=$(prefix) include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sat Jun 16 04:36:22 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 16 Jun 2012 02:36:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[18431] csw/mgar/pkg/gdal/trunk Message-ID: Revision: 18431 http://gar.svn.sourceforge.net/gar/?rev=18431&view=rev Author: bdwalton Date: 2012-06-16 02:36:21 +0000 (Sat, 16 Jun 2012) Log Message: ----------- gdal/trunk: version bump and add two patches - one is from upstream to handle new libgif the other is to fix a compilation error with gcc; http://trac.osgeo.org/gdal/ticket/4705 Modified Paths: -------------- csw/mgar/pkg/gdal/trunk/Makefile csw/mgar/pkg/gdal/trunk/checksums Added Paths: ----------- csw/mgar/pkg/gdal/trunk/files/0001-Force-use-of-double-data-type-before-checking-for-is.patch csw/mgar/pkg/gdal/trunk/files/0002-apply-patch-from-upstream-to-handle-building-with-a-.patch Modified: csw/mgar/pkg/gdal/trunk/Makefile =================================================================== --- csw/mgar/pkg/gdal/trunk/Makefile 2012-06-16 02:30:23 UTC (rev 18430) +++ csw/mgar/pkg/gdal/trunk/Makefile 2012-06-16 02:36:21 UTC (rev 18431) @@ -1,6 +1,6 @@ # $Id$ NAME = gdal -VERSION = 1.8.0 +VERSION = 1.9.1 CATEGORIES = lib GARTYPE = v2 @@ -13,7 +13,9 @@ MASTER_SITES = http://download.osgeo.org/$(NAME)/ DISTFILES = $(DISTNAME).tar.gz -PATCHFILES += 0001-Force-the-use-of-CSWbash.patch +PATCHFILES += 0001-Force-use-of-double-data-type-before-checking-for-is.patch +PATCHFILES += 0002-apply-patch-from-upstream-to-handle-building-with-a-.patch +#PATCHFILES += 0001-Force-the-use-of-CSWbash.patch PACKAGES += CSWgdal CATALOGNAME_CSWgdal = gdal Modified: csw/mgar/pkg/gdal/trunk/checksums =================================================================== --- csw/mgar/pkg/gdal/trunk/checksums 2012-06-16 02:30:23 UTC (rev 18430) +++ csw/mgar/pkg/gdal/trunk/checksums 2012-06-16 02:36:21 UTC (rev 18431) @@ -1 +1 @@ -c762cdab0f7e51a677ba49278a8a263d gdal-1.8.0.tar.gz +c5cf09b92dac1f5775db056e165b34f5 gdal-1.9.1.tar.gz Added: csw/mgar/pkg/gdal/trunk/files/0001-Force-use-of-double-data-type-before-checking-for-is.patch =================================================================== --- csw/mgar/pkg/gdal/trunk/files/0001-Force-use-of-double-data-type-before-checking-for-is.patch (rev 0) +++ csw/mgar/pkg/gdal/trunk/files/0001-Force-use-of-double-data-type-before-checking-for-is.patch 2012-06-16 02:36:21 UTC (rev 18431) @@ -0,0 +1,38 @@ +From 48b717d14411826609a81331055818ed2d77784d Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Fri, 15 Jun 2012 02:40:47 +0200 +Subject: [PATCH] Force use of double data type before checking for isnan + +On Solaris 10 the netCDFRasterBand::CheckValidData function was +triggering errors of the form: + +non-floating-point argument in call to function '__builtin_isnan' + +This is because math.h includes iso/math_c99.h where isnan is defined +as __builtin_isnan when GCC v4 or greater is used. This method +requires a floating point data type. + +Fix this issue by casting all values checked by CPLIsNan in this +function to double. + +Signed-off-by: Ben Walton +--- + frmts/netcdf/netcdfdataset.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/frmts/netcdf/netcdfdataset.cpp b/frmts/netcdf/netcdfdataset.cpp +index 1634360..ebdce25 100644 +--- a/frmts/netcdf/netcdfdataset.cpp ++++ b/frmts/netcdf/netcdfdataset.cpp +@@ -964,7 +964,7 @@ void netCDFRasterBand::CheckValidData ( void * pImage, int bCheckIsNan ) + /* check for nodata and nan */ + if ( CPLIsEqual( (double) ((T *)pImage)[i], dfNoDataValue ) ) + continue; +- if( bCheckIsNan && CPLIsNan( ( (T *) pImage)[i] ) ) { ++ if( bCheckIsNan && CPLIsNan( (double)(( (T *) pImage))[i] ) ) { + ( (T *)pImage )[i] = (T)dfNoDataValue; + continue; + } +-- +1.7.10.3 + Added: csw/mgar/pkg/gdal/trunk/files/0002-apply-patch-from-upstream-to-handle-building-with-a-.patch =================================================================== --- csw/mgar/pkg/gdal/trunk/files/0002-apply-patch-from-upstream-to-handle-building-with-a-.patch (rev 0) +++ csw/mgar/pkg/gdal/trunk/files/0002-apply-patch-from-upstream-to-handle-building-with-a-.patch 2012-06-16 02:36:21 UTC (rev 18431) @@ -0,0 +1,70 @@ +From 0ea01de68d4fb8b80a141d4607f463e37902e8cd Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Sat, 16 Jun 2012 02:06:45 +0200 +Subject: [PATCH] apply patch from upstream to handle building with a newer + libgif + +Signed-off-by: Ben Walton +--- + frmts/gif/gifdataset.cpp | 31 +++++++++++++++++++++++++------ + 1 file changed, 25 insertions(+), 6 deletions(-) + +diff --git a/frmts/gif/gifdataset.cpp b/frmts/gif/gifdataset.cpp +index c89f34c..67fdb1f 100644 +--- a/frmts/gif/gifdataset.cpp ++++ b/frmts/gif/gifdataset.cpp +@@ -469,6 +469,29 @@ GDALDataset *GIFDataset::Open( GDALOpenInfo * poOpenInfo ) + return poDS; + } + ++/************************************************************************/ ++/* GDALPrintGifError() */ ++/************************************************************************/ ++ ++static void GDALPrintGifError(const char* pszMsg) ++{ ++/* GIFLIB_MAJOR is only defined in libgif >= 4.2.0 */ ++/* libgif 4.2.0 has retired PrintGifError() and added GifErrorString() */ ++#if defined(GIFLIB_MAJOR) && defined(GIFLIB_MINOR) && \ ++ ((GIFLIB_MAJOR == 4 && GIFLIB_MINOR >= 2) || GIFLIB_MAJOR > 4) ++ /* Static string actually, hence the const char* cast */ ++ const char* pszGIFLIBError = (const char*) GifErrorString(); ++ if (pszGIFLIBError == NULL) ++ pszGIFLIBError = "Unknown error"; ++ ++ CPLError( CE_Failure, CPLE_AppDefined, ++ "%s. GIFLib Error : %s", pszMsg, pszGIFLIBError ); ++#else ++ PrintGifError(); ++ CPLError( CE_Failure, CPLE_AppDefined, "%s", pszMsg ); ++#endif ++} ++ + /************************************************************************/ + /* CreateCopy() */ + /************************************************************************/ +@@ -596,9 +619,7 @@ GIFDataset::CreateCopy( const char * pszFilename, GDALDataset *poSrcDS, + psGifCT->ColorCount, 255, psGifCT) == GIF_ERROR) + { + FreeMapObject(psGifCT); +- PrintGifError(); +- CPLError( CE_Failure, CPLE_AppDefined, +- "Error writing gif file." ); ++ GDALPrintGifError("Error writing gif file." ); + EGifCloseFile(hGifFile); + VSIFCloseL( fp ); + return NULL; +@@ -622,9 +643,7 @@ GIFDataset::CreateCopy( const char * pszFilename, GDALDataset *poSrcDS, + + if (EGifPutImageDesc(hGifFile, 0, 0, nXSize, nYSize, bInterlace, NULL) == GIF_ERROR ) + { +- PrintGifError(); +- CPLError( CE_Failure, CPLE_AppDefined, +- "Error writing gif file." ); ++ GDALPrintGifError("Error writing gif file." ); + EGifCloseFile(hGifFile); + VSIFCloseL( fp ); + return NULL; +-- +1.7.10.3 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sat Jun 16 04:38:24 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 16 Jun 2012 02:38:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[18433] csw/mgar/pkg/monit/trunk/Makefile Message-ID: Revision: 18433 http://gar.svn.sourceforge.net/gar/?rev=18433&view=rev Author: bdwalton Date: 2012-06-16 02:38:23 +0000 (Sat, 16 Jun 2012) Log Message: ----------- monit/trunk: add ssl build and runtime dependencies Modified Paths: -------------- csw/mgar/pkg/monit/trunk/Makefile Modified: csw/mgar/pkg/monit/trunk/Makefile =================================================================== --- csw/mgar/pkg/monit/trunk/Makefile 2012-06-16 02:36:25 UTC (rev 18432) +++ csw/mgar/pkg/monit/trunk/Makefile 2012-06-16 02:38:23 UTC (rev 18433) @@ -21,8 +21,12 @@ GARCOMPILER = GNU BUILD64_ONLY = 1 +BUILD_DEP_PKGS += CSWlibssl-dev + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-ssl-dir=$(prefix) +RUNTIME_DEP_PKGS_CSWmonit += CSWlibssl1-0-0 + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sat Jun 16 05:03:08 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 16 Jun 2012 03:03:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[18434] csw/mgar/pkg/monit/trunk Message-ID: Revision: 18434 http://gar.svn.sourceforge.net/gar/?rev=18434&view=rev Author: bdwalton Date: 2012-06-16 03:03:08 +0000 (Sat, 16 Jun 2012) Log Message: ----------- monit/trunk: patch out usr/local references (disable /usr/local/etc/monitrc as a config file location) Modified Paths: -------------- csw/mgar/pkg/monit/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/monit/trunk/files/0002-fix-usr-local-references-drop-usr-local-etc-monitrc-.patch Modified: csw/mgar/pkg/monit/trunk/Makefile =================================================================== --- csw/mgar/pkg/monit/trunk/Makefile 2012-06-16 02:38:23 UTC (rev 18433) +++ csw/mgar/pkg/monit/trunk/Makefile 2012-06-16 03:03:08 UTC (rev 18434) @@ -17,6 +17,7 @@ MASTER_SITES = http://mmonit.com/monit/dist/ DISTFILES = $(DISTNAME).tar.gz PATCHFILES += 0001-Drop-some-build-flags-that-get-hard-coded-by-configu.patch +PATCHFILES += 0002-fix-usr-local-references-drop-usr-local-etc-monitrc-.patch GARCOMPILER = GNU BUILD64_ONLY = 1 Added: csw/mgar/pkg/monit/trunk/files/0002-fix-usr-local-references-drop-usr-local-etc-monitrc-.patch =================================================================== --- csw/mgar/pkg/monit/trunk/files/0002-fix-usr-local-references-drop-usr-local-etc-monitrc-.patch (rev 0) +++ csw/mgar/pkg/monit/trunk/files/0002-fix-usr-local-references-drop-usr-local-etc-monitrc-.patch 2012-06-16 03:03:08 UTC (rev 18434) @@ -0,0 +1,315 @@ +From 37a0f9a55f325d568fae29bf7eb6a6846d9047bf Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Sat, 16 Jun 2012 04:56:23 +0200 +Subject: [PATCH] fix usr/local references (drop /usr/local/etc/monitrc as an + option) + +Signed-off-by: Ben Walton +--- + libmonit/src/system/Command.c | 2 +- + libmonit/src/system/Command.h | 2 +- + libmonit/test/CommandTest.c | 4 ++-- + monit.1 | 50 ++++++++++++++++++++--------------------- + monitrc | 4 ++-- + src/file.c | 10 +++------ + src/file.h | 5 ++--- + 7 files changed, 36 insertions(+), 41 deletions(-) + +diff --git a/libmonit/src/system/Command.c b/libmonit/src/system/Command.c +index cd7b001..8d72952 100644 +--- a/libmonit/src/system/Command.c ++++ b/libmonit/src/system/Command.c +@@ -78,7 +78,7 @@ struct Process_T { + OutputStream_T out; + char *working_directory; + }; +-const char *Command_Path = "PATH=/bin:/usr/bin:/usr/local/bin:/opt/csw/bin:/usr/sfw/bin"; ++const char *Command_Path = "PATH=/bin:/usr/bin:/opt/csw/bin:/usr/sfw/bin"; + + + /* --------------------------------------------------------------- Private */ +diff --git a/libmonit/src/system/Command.h b/libmonit/src/system/Command.h +index c2a364a..ba62123 100644 +--- a/libmonit/src/system/Command.h ++++ b/libmonit/src/system/Command.h +@@ -49,7 +49,7 @@ + #define T Command_T + typedef struct T *T; + /** +- * Default Path for Command: PATH=/bin:/usr/bin:/usr/local/bin:/opt/csw/bin:/usr/sfw/bin. ++ * Default Path for Command: PATH=/bin:/usr/bin:/opt/csw/bin:/usr/sfw/bin. + * May be overridden by Command_setEnv() + */ + extern const char *Command_Path; +diff --git a/libmonit/test/CommandTest.c b/libmonit/test/CommandTest.c +index 1428401..013e454 100644 +--- a/libmonit/test/CommandTest.c ++++ b/libmonit/test/CommandTest.c +@@ -136,7 +136,7 @@ int main(void) { + Command_T c = Command_new("/bin/sh", "-c", "ps -aef|grep monit", NULL); + assert(c); + // Check default PATH +- assert(Str_isEqual(Command_getEnv(c, "PATH"), "/bin:/usr/bin:/usr/local/bin:/opt/csw/bin:/usr/sfw/bin")); ++ assert(Str_isEqual(Command_getEnv(c, "PATH"), "/bin:/usr/bin:/opt/csw/bin:/usr/sfw/bin")); + // Set and get + Command_setEnv(c, "LANG", "C"); + assert(Str_isEqual(Command_getEnv(c, "LANG"), "C")); +@@ -144,7 +144,7 @@ int main(void) { + assert(Str_isEqual(Command_getEnv(c, "SHELL"), "/bin/bash")); + // setEnvString + // Check default PATH +- assert(Str_isEqual(Command_getEnv(c, "PATH"), "/bin:/usr/bin:/usr/local/bin:/opt/csw/bin:/usr/sfw/bin")); ++ assert(Str_isEqual(Command_getEnv(c, "PATH"), "/bin:/usr/bin:/opt/csw/bin:/usr/sfw/bin")); + // Set and get env string + Command_vSetEnv(c, "PATH=/usr/bin;SHELL=/bin/bash"); + assert(Str_isEqual(Command_getEnv(c, "PATH"), "/usr/bin")); +diff --git a/monit.1 b/monit.1 +index d95d6fc..8d8803b 100644 +--- a/monit.1 ++++ b/monit.1 +@@ -461,7 +461,7 @@ command line. Here is what you must add to /etc/inittab: + .PP + .Vb 2 + \& # Run Monit in standard run\-levels +-\& mo:2345:respawn:/usr/local/bin/monit \-Ic /etc/monitrc ++\& mo:2345:respawn:/usr/foo/bin/monit \-Ic /etc/monitrc + .Ve + .PP + After you have modified init's configuration file, you can run +@@ -1245,7 +1245,7 @@ optionally specify the uid and gid the executed program should + switch to upon start. For instance: + .Sp + .Vb 2 +-\& exec "/usr/local/tomcat/bin/startup.sh" ++\& exec "/usr/foo/tomcat/bin/startup.sh" + \& as uid nobody and gid nobody + .Ve + .Sp +@@ -1408,9 +1408,9 @@ changed. The following illustrates this for the apache web + server: + .PP + .Vb 3 +-\& check file httpd.conf path /usr/local/apache/conf/httpd.conf ++\& check file httpd.conf path /usr/foo/apache/conf/httpd.conf + \& if changed sha1 checksum +-\& then exec "/usr/local/apache/bin/apachectl graceful" ++\& then exec "/usr/foo/apache/bin/apachectl graceful" + .Ve + .PP + If you plan to use the checksum statement for security reasons, +@@ -1458,9 +1458,9 @@ reload apache if the \fIhttpd.conf\fR (apache's configuration file) + was changed. Like so: + .PP + .Vb 3 +-\& check file httpd.conf with path /usr/local/apache/conf/httpd.conf ++\& check file httpd.conf with path /usr/foo/apache/conf/httpd.conf + \& if changed timestamp +-\& then exec "/usr/local/apache/bin/apachectl graceful" ++\& then exec "/usr/foo/apache/bin/apachectl graceful" + .Ve + .PP + The constant timestamp version is useful for monitoring systems +@@ -1511,7 +1511,7 @@ third-party applications, until the vendor fix a problem: + .Vb 3 + \& check file server.pid path /var/run/server.pid + \& if timestamp > 7 days +-\& then exec "/usr/local/server/restart\-server" ++\& then exec "/usr/foo/server/restart\-server" + .Ve + .SS "\s-1FILE\s0 \s-1SIZE\s0 \s-1TESTING\s0" + .IX Subsection "FILE SIZE TESTING" +@@ -1579,10 +1579,10 @@ To rotate a log file: + .Vb 3 + \& check file myapp.log with path /var/log/myapp.log + \& if size > 50 MB then +-\& exec "/usr/local/bin/rotate /var/log/myapp.log myapp" ++\& exec "/usr/foo/bin/rotate /var/log/myapp.log myapp" + .Ve + .PP +-where /usr/local/bin/rotate may be a simple script, such as: ++where /usr/foo/bin/rotate may be a simple script, such as: + .PP + .Vb 3 + \& #/bin/bash +@@ -1778,7 +1778,7 @@ Monit does not start a possible cracked program or script. + Example: + .PP + .Vb 2 +-\& check file monit.bin with path "/usr/local/bin/monit" ++\& check file monit.bin with path "/usr/foo/bin/monit" + \& if failed permission 0555 then unmonitor + .Ve + .PP +@@ -2558,7 +2558,7 @@ control file. + An example: + .PP + .Vb 2 +-\& check program myscript with path "/usr/local/bin/myscript.sh" ++\& check program myscript with path "/usr/foo/bin/myscript.sh" + \& if status != 0 then alert + .Ve + .PP +@@ -3028,11 +3028,11 @@ possibly cracked apache binary. + .PP + .Vb 7 + \& (1) check process apache +-\& (2) with pidfile "/usr/local/apache/logs/httpd.pid" ++\& (2) with pidfile "/usr/foo/apache/logs/httpd.pid" + \& (3) ... + \& (4) depends on httpd + \& (5) +-\& (6) check file httpd with path /usr/local/apache/bin/httpd ++\& (6) check file httpd with path /usr/foo/apache/bin/httpd + \& (7) if failed checksum then unmonitor + .Ve + .PP +@@ -3506,7 +3506,7 @@ The simplest form is just the check statement. In this example we + check to see if the server is running and log a message if not: + .PP + .Vb 1 +-\& check process resin with pidfile /usr/local/resin/srun.pid ++\& check process resin with pidfile /usr/foo/resin/srun.pid + .Ve + .PP + Checking process without pidfile: +@@ -3519,9 +3519,9 @@ To have Monit start the server if it's not running, add a start + statement: + .PP + .Vb 3 +-\& check process resin with pidfile /usr/local/resin/srun.pid +-\& start program = "/usr/local/resin/bin/srun.sh start" +-\& stop program = "/usr/local/resin/bin/srun.sh stop" ++\& check process resin with pidfile /usr/foo/resin/srun.pid ++\& start program = "/usr/foo/resin/bin/srun.sh start" ++\& stop program = "/usr/foo/resin/bin/srun.sh stop" + .Ve + .PP + Here's a more advanced example for monitoring an apache +@@ -3669,7 +3669,7 @@ binary: + \& if failed host www.tildeslash.com port 80 then restart + \& depends on apache_bin + \& +-\& check file apache_bin with path /usr/local/apache/bin/httpd ++\& check file apache_bin with path /usr/foo/apache/bin/httpd + \& if failed checksum then unmonitor + .Ve + .PP +@@ -3690,9 +3690,9 @@ server and then an Asterisk server + .PP + .Vb 12 + \& check process freeswitch +-\& with pidfile /usr/local/freeswitch/log/freeswitch.pid +-\& start program = a\*^XX/usr/local/freeswitch/bin/freeswitch \-nc \-hpa\*^XX +-\& stop program = a\*^XX/usr/local/freeswitch/bin/freeswitch \-stopa\*^XX ++\& with pidfile /usr/foo/freeswitch/log/freeswitch.pid ++\& start program = a\*^XX/usr/foo/freeswitch/bin/freeswitch \-nc \-hpa\*^XX ++\& stop program = a\*^XX/usr/foo/freeswitch/bin/freeswitch \-stopa\*^XX + \& if totalmem > 1000.0 MB for 5 cycles then alert + \& if totalmem > 1500.0 MB for 5 cycles then alert + \& if totalmem > 2000.0 MB for 5 cycles then restart +@@ -3797,7 +3797,7 @@ statement and a file check dependency: + \& depend httpd_bin + \& group apache + \& +-\& check file httpd_bin with path /usr/local/apache/bin/httpd ++\& check file httpd_bin with path /usr/foo/apache/bin/httpd + \& alert security at bar on {checksum, timestamp, + \& permission, uid, gid} + \& with mail\-format {subject: Alaaarrm! on $HOST} +@@ -3878,7 +3878,7 @@ Finally an example with all statements: + \& depends on datafs + \& group server + \& +-\& check file httpd.pid with path /usr/local/apache/logs/httpd.pid ++\& check file httpd.pid with path /usr/foo/apache/logs/httpd.pid + \& group server + \& if timestamp > 7 days then restart + \& every 2 cycles +@@ -3888,12 +3888,12 @@ Finally an example with all statements: + \& check file httpd.conf with path /etc/httpd/httpd.conf + \& group server + \& if timestamp was changed +-\& then exec "/usr/local/apache/bin/apachectl graceful" ++\& then exec "/usr/foo/apache/bin/apachectl graceful" + \& every 2 cycles + \& alert bofh at bar with mail\-format {from: monit at foo.bar.no} + \& depends on datafs + \& +-\& check file httpd_bin with path /usr/local/apache/bin/httpd ++\& check file httpd_bin with path /usr/foo/apache/bin/httpd + \& group server + \& if failed checksum and expect the sum + \& 8f7f419955cefa0b33a2ba316cba3659 then unmonitor +diff --git a/monitrc b/monitrc +index 82d1648..77ae611 100644 +--- a/monitrc ++++ b/monitrc +@@ -144,7 +144,7 @@ set httpd port 2812 and + ## be grouped using the GROUP option. More than one group can be specified by + ## repeating the 'group name' statement. + # +-# check file apache_bin with path /usr/local/apache/bin/httpd ++# check file apache_bin with path /usr/foo/apache/bin/httpd + # if failed checksum and + # expect the sum 8f7f419955cefa0b33a2ba316cba3659 then unmonitor + # if failed permission 755 then unmonitor +@@ -164,7 +164,7 @@ set httpd port 2812 and + ## statement. This service depends on another service (apache_bin) which + ## is defined above. + # +-# check process apache with pidfile /usr/local/apache/logs/httpd.pid ++# check process apache with pidfile /usr/foo/apache/logs/httpd.pid + # start program = "/etc/init.d/httpd start" with timeout 60 seconds + # stop program = "/etc/init.d/httpd stop" + # if cpu > 60% for 2 cycles then alert +diff --git a/src/file.c b/src/file.c +index 82bffb6..42e4d6d 100644 +--- a/src/file.c ++++ b/src/file.c +@@ -161,8 +161,8 @@ time_t file_getTimestamp(char *object, mode_t type) { + + /** + * Search the system for the monit control file. Try first ~/.monitrc, +- * if that fails try /etc/monitrc, then SYSCONFDIR/monitrc (default: +- * /usr/local/etc/monitrc) and finally ./monitrc. ++ * if that fails try /etc/monitrc, then SYSCONFDIR/monitrc ++ * and finally ./monitrc. + * Exit the application if the control file was not found. + * @return The location of monits control file (monitrc) + */ +@@ -182,15 +182,11 @@ char *file_findControlFile() { + if(file_exist(rcfile)) { + return rcfile; + } +- snprintf(rcfile, STRLEN, "/usr/local/etc/%s", MONITRC); +- if(file_exist(rcfile)) { +- return rcfile; +- } + if(file_exist(MONITRC)) { + snprintf(rcfile, STRLEN, "%s/%s", Run.Env.cwd, MONITRC); + return rcfile; + } +- LogError("%s: Cannot find the control file at ~/.%s, /etc/%s, %s/%s, /usr/local/etc/%s or at ./%s \n", ++ LogError("%s: Cannot find the control file at ~/.%s, /etc/%s, %s/%s or at ./%s \n", + prog, MONITRC, MONITRC, SYSCONFDIR, MONITRC, MONITRC, MONITRC); + exit(1); + +diff --git a/src/file.h b/src/file.h +index 453b8b0..31278f7 100644 +--- a/src/file.h ++++ b/src/file.h +@@ -58,9 +58,8 @@ time_t file_getTimestamp(char *object, mode_t type); + + /** + * Search the system for the monit control file. Try first ~/.monitrc, +- * if that fails try /etc/monitrc, then /usr/local/etc/monitrc and +- * finally ./monitrc. Exit the application if the control file was +- * not found. ++ * if that fails try /etc/monitrc and finally ./monitrc. Exit the ++ * application if the control file was not found. + * @return The location of monits control file (monitrc) + */ + char *file_findControlFile(); +-- +1.7.10.3 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sat Jun 16 12:29:55 2012 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sat, 16 Jun 2012 10:29:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[18435] csw/mgar/pkg/tokyocabinet/trunk/Makefile Message-ID: Revision: 18435 http://gar.svn.sourceforge.net/gar/?rev=18435&view=rev Author: guengel Date: 2012-06-16 10:29:55 +0000 (Sat, 16 Jun 2012) Log Message: ----------- tokyocabinet/trunk: Added comment on failing mgar test on unstable10x Modified Paths: -------------- csw/mgar/pkg/tokyocabinet/trunk/Makefile Modified: csw/mgar/pkg/tokyocabinet/trunk/Makefile =================================================================== --- csw/mgar/pkg/tokyocabinet/trunk/Makefile 2012-06-16 03:03:08 UTC (rev 18434) +++ csw/mgar/pkg/tokyocabinet/trunk/Makefile 2012-06-16 10:29:55 UTC (rev 18435) @@ -1,6 +1,19 @@ # $Id$ -# TODO (release-critical prefixed with !, non release-critical with *) # +# Note +# ---- +# +# For some reason or another, mgar test fails sometims on unstable10x. +# Calling mgar test again succeeds. My first gues was that this +# behavior is related to NFS mounted homes on unstable10x. Thus, I +# made the tests being executed in a local directory /var/tmp (see +# patch 0002-Huge-Makefile.in-patch.patch). However, this did not +# remedy the problem. I did not further investigate the issue, though. +# +# mgar test on unstable10s does not exhibit this behavior. +# +# --raos +# NAME = tokyocabinet VERSION = 1.4.47 GARTYPE = v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sat Jun 16 13:10:29 2012 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sat, 16 Jun 2012 11:10:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[18436] csw/mgar/pkg/tokyocabinet/trunk/Makefile Message-ID: Revision: 18436 http://gar.svn.sourceforge.net/gar/?rev=18436&view=rev Author: guengel Date: 2012-06-16 11:10:29 +0000 (Sat, 16 Jun 2012) Log Message: ----------- tokyocabinet/trunk: Added CHECKPKG_OVERRIDES Modified Paths: -------------- csw/mgar/pkg/tokyocabinet/trunk/Makefile Modified: csw/mgar/pkg/tokyocabinet/trunk/Makefile =================================================================== --- csw/mgar/pkg/tokyocabinet/trunk/Makefile 2012-06-16 10:29:55 UTC (rev 18435) +++ csw/mgar/pkg/tokyocabinet/trunk/Makefile 2012-06-16 11:10:29 UTC (rev 18436) @@ -57,6 +57,7 @@ RUNTIME_DEP_PKGS_CSWlibtokyocabinet9 += CSWlibz1 CHECKPKG_OVERRIDES_CSWlibtokyocabinet9 += file-with-bad-content|/usr/local|root/opt/csw/lib/libtokyocabinet.so.9.10.0 CHECKPKG_OVERRIDES_CSWlibtokyocabinet9 += file-with-bad-content|/usr/local|root/opt/csw/lib/sparcv9/libtokyocabinet.so.9.10.0 +CHECKPKG_OVERRIDES_CSWlibtokyocabinet9 += file-with-bad-content|/usr/local|root/opt/csw/lib/amd64/libtokyocabinet.so.9.10.0 PACKAGES += CSWlibtokyocabinet-dev SPKG_DESC_CSWlibtokyocabinet-dev = Tokyocabinet - development files This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sat Jun 16 13:14:21 2012 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sat, 16 Jun 2012 11:14:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[18437] csw/mgar/pkg/spamass-milter/trunk/files Message-ID: Revision: 18437 http://gar.svn.sourceforge.net/gar/?rev=18437&view=rev Author: guengel Date: 2012-06-16 11:14:21 +0000 (Sat, 16 Jun 2012) Log Message: ----------- spamass-milter/trunk: Fixed comments in spamass-milter.m4 in order to avoid recursive inclusion of spamass-milter.m4 Modified Paths: -------------- csw/mgar/pkg/spamass-milter/trunk/files/changelog.CSW csw/mgar/pkg/spamass-milter/trunk/files/spamass-milter.m4 Property Changed: ---------------- csw/mgar/pkg/spamass-milter/trunk/files/spamass-milter.m4 Modified: csw/mgar/pkg/spamass-milter/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/spamass-milter/trunk/files/changelog.CSW 2012-06-16 11:10:29 UTC (rev 18436) +++ csw/mgar/pkg/spamass-milter/trunk/files/changelog.CSW 2012-06-16 11:14:21 UTC (rev 18437) @@ -1,3 +1,11 @@ +spamass-milter (0.3.2,REV=2012.06.16) + + * Fixed comments spamass-milter.m4 in order to avoid recursive + inclusion of spamass-milter.m4 + + -- Rafael Ostertag Sat, 16 Jun 2012 13:10:19 +0200 + + spamass-milter (0.3.2,REV=2012.02.12) * Documented spamass-milter.m4 Modified: csw/mgar/pkg/spamass-milter/trunk/files/spamass-milter.m4 =================================================================== --- csw/mgar/pkg/spamass-milter/trunk/files/spamass-milter.m4 2012-06-16 11:10:29 UTC (rev 18436) +++ csw/mgar/pkg/spamass-milter/trunk/files/spamass-milter.m4 2012-06-16 11:14:21 UTC (rev 18437) @@ -1,32 +1,29 @@ divert(-1) -# Sendmail feature for simple integration of spamass-milter -# -# Part of CSWspamass-milter. -# -# -# Use it like this in your sendmail.mc file: -# -# FEATURE(`spamass-milter')dnl -# -# This will add the necessary configuration to use spamass-milter. It -# expects the spamass-milter socket to be /var/run/spamass.sock. -# -# If your spamass-milter socket is not at the default location, add -# something like -# -# FEATURE(`spamass-milter', `')dnl -# -# to your sendmail.mc file. is the absolute path to the -# spamass-milter socket. -# -# In any case, the filter will be called `spamass-milter'. -# -# Direct comments and/or suggestions to raos at opencsw.org. - +dnl Sendmail feature for simple integration of spamass-milter +dnl +dnl Part of CSWspamass-milter. +dnl +dnl +dnl Use it like this in your sendmail.mc file: +dnl +dnl FEATURE(`spamass-milter')dnl +dnl +dnl This will add the necessary configuration to use spamass-milter. It +dnl expects the spamass-milter socket to be /var/run/spamass.sock. +dnl +dnl If your spamass-milter socket is not at the default location, add +dnl something like +dnl +dnl FEATURE(`spamass-milter', `')dnl +dnl +dnl to your sendmail.mc file. is the absolute path to the +dnl spamass-milter socket. +dnl +dnl In any case, the filter will be called `spamass-milter'. +dnl +dnl Direct comments and/or suggestions to raos at opencsw.org. divert(0) VERSIONID(`$Id')dnl -divert(-1) - ifdef(`_ARG_',dnl define(`__SPAMASS_SOCK__',defn(`_ARG_')),dnl define(`__SPAMASS_SOCK__',`/var/run/spamass.sock'))dnl Property changes on: csw/mgar/pkg/spamass-milter/trunk/files/spamass-milter.m4 ___________________________________________________________________ Added: svn:keyword + Id This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Sat Jun 16 15:14:17 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Sat, 16 Jun 2012 13:14:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[18438] csw/mgar/pkg/libgnet/trunk Message-ID: Revision: 18438 http://gar.svn.sourceforge.net/gar/?rev=18438&view=rev Author: pfelecan Date: 2012-06-16 13:14:17 +0000 (Sat, 16 Jun 2012) Log Message: ----------- - documentation adjustments - finished splitting in multiple packages - overrides verified and validated Modified Paths: -------------- csw/mgar/pkg/libgnet/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/libgnet/trunk/files/GNUMakefile Modified: csw/mgar/pkg/libgnet/trunk/Makefile =================================================================== --- csw/mgar/pkg/libgnet/trunk/Makefile 2012-06-16 11:14:21 UTC (rev 18437) +++ csw/mgar/pkg/libgnet/trunk/Makefile 2012-06-16 13:14:17 UTC (rev 18438) @@ -12,8 +12,9 @@ endef DISTNAME = gnet-$(VERSION) -MASTER_SITES = http://ftp.gnome.org/pub/GNOME/sources/gnet/2.0/ -DISTFILES = $(DISTNAME).tar.gz +MASTER_SITES = http://ftp.gnome.org/pub/GNOME/sources/gnet/2.0/ +DISTFILES = $(DISTNAME).tar.gz +DISTFILES += GNUMakefile # until the glib development package is installed on Solaris 9 we # limit the scope: @@ -23,40 +24,50 @@ BUILD_DEP_PKGS += CSWlibglib2-dev BUILD_DEP_PKGS += CSWlibiconv-dev -RUNTIME_DEP_PKGS += CSWlibgcc-s1 -RUNTIME_DEP_PKGS += CSWlibglib2-0-0 -RUNTIME_DEP_PKGS += CSWlibgthread2-0-0 -RUNTIME_DEP_PKGS += CSWlibiconv2 -RUNTIME_DEP_PKGS += CSWlibintl8 - CONFIGURE_ARGS = $(DIRPATHS) GARCOMPILER = GNU +INSTALL_ARGS += TARGET_DIR=$(docdir)/$(NAME)2_doc/html + PACKAGES += CSWlibgnet2-doc SPKG_DESC_CSWlibgnet2-doc = $(DESCRIPTION), documentation OBSOLETED_BY_CSWlibgnet2-doc= CSWlibgnet2doc CATALOGNAME_CSWlibgnet2doc = libgnet2_doc_stub ARCHALL_CSWlibgnet2-doc = 1 -PACKAGES += CSWlibgnet2-0-0 -CATALOGNAME_CSWlibgnet2-0-0 = libgnet2_0_0 -PKGFILES_CSWlibgnet2-0-0 += $(call baseisadirs,$(libdir),libgnet-2\.0\.so\.0\.8\.0) -PKGFILES_CSWlibgnet2-0-0 += $(call baseisadirs,$(libdir),libgnet-2\.0\.so\.0(\.\d+)*) -SPKG_DESC_CSWlibgnet2-0-0 = $(DESCRIPTION), libgnet-2.0.so.0 -OBSOLETED_BY_CSWlibgnet2-0-0= CSWlibgnet2rt -CATALOGNAME_CSWlibgnet2rt = libgnet2_rt_stub +PACKAGES += CSWlibgnet2-0-0 +CATALOGNAME_CSWlibgnet2-0-0 = libgnet2_0_0 +PKGFILES_CSWlibgnet2-0-0 += $(call baseisadirs,$(libdir),libgnet-2\.0\.so\.0\.8\.0) +PKGFILES_CSWlibgnet2-0-0 += $(call baseisadirs,$(libdir),libgnet-2\.0\.so\.0(\.\d+)*) +SPKG_DESC_CSWlibgnet2-0-0 = $(DESCRIPTION), libgnet-2.0.so.0 +OBSOLETED_BY_CSWlibgnet2-0-0 = CSWlibgnet2rt +CATALOGNAME_CSWlibgnet2rt = libgnet2_rt_stub +RUNTIME_DEP_PKGS_CSWlibgnet2-0-0 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibgnet2-0-0 += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibgnet2-0-0 += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWlibgnet2-0-0 += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWlibgnet2-0-0 += CSWlibintl8 -PACKAGES += CSWlibgnet2-dev -SPKG_DESC_CSWlibgnet2-dev = $(DESCRIPTION), development files -PKGFILES_CSWlibgnet2-dev += /opt/csw/lib/libgnet-2.0.so -PKGFILES_CSWlibgnet2-dev += $(PKGFILES_DEVEL) -OBSOLETED_BY_CSWlibgnet2-dev= CSWlibgnet2 -CATALOGNAME_CSWlibgnet2 = libgnet2_stub -ARCHALL_CSWlibgnet2-dev = 1 +PACKAGES += CSWlibgnet2-dev +SPKG_DESC_CSWlibgnet2-dev = $(DESCRIPTION), development files +PKGFILES_CSWlibgnet2-dev += /opt/csw/lib/libgnet-2.0.so +PKGFILES_CSWlibgnet2-dev += $(PKGFILES_DEVEL) +PKGFILES_CSWlibgnet2-dev += /opt/csw/lib/gnet-2.0/include/gnetconfig.h +OBSOLETED_BY_CSWlibgnet2-dev = CSWlibgnet2 +CATALOGNAME_CSWlibgnet2 = libgnet2_stub +ARCHALL_CSWlibgnet2-dev = 1 +RUNTIME_DEP_PKGS_CSWlibgnet2-dev += CSWlibgnet2-0-0 + include gar/category.mk +post-install-modulated: + ginstall --directory $(DESTDIR)$(docdir)/$(NAME)2_doc/examples + cd $(WORKSRC)/examples && ginstall --preserve-timestamps --mode=u=rw,go=r *.c $(DESTDIR)$(docdir)/$(NAME)2_doc/examples + ginstall --preserve-timestamps --mode=u=rw,go=r $(WORKDIR)/GNUMakefile $(DESTDIR)$(docdir)/$(NAME)2_doc/examples + $(MAKECOOKIE) + # this is private and not available publicly mydependencies: $(HOME)/bin/ocswdeplist --package $(NAME) Added: csw/mgar/pkg/libgnet/trunk/files/GNUMakefile =================================================================== --- csw/mgar/pkg/libgnet/trunk/files/GNUMakefile (rev 0) +++ csw/mgar/pkg/libgnet/trunk/files/GNUMakefile 2012-06-16 13:14:17 UTC (rev 18438) @@ -0,0 +1,74 @@ +# $Id$ +# provided by CSW +# Caveat: uses GNU make extensions + + CC = gcc +export PKG_CONFIG_PATH = /opt/csw/lib/pkgconfig + buildFlags = $(shell pkg-config gnet-2.0 --cflags --libs) + +ifeq ($(strip $(buildFlags)),) + $(error "unknown build flags!") +endif + +all: \ + dnslookup \ + echoclient-async \ + echoclient-gconn \ + echoclient-udp \ + echoclient-unix \ + echoclient \ + echoserver-async \ + echoserver-gserver \ + echoserver-udp \ + echoserver-unix \ + echoserver \ + hash \ + hfetch \ + hostinfo \ + sdr + : $@ done + +dnslookup: dnslookup.c + $(CC) dnslookup.c $(buildFlags) -o dnslookup + +echoclient-async: echoclient-async.c + $(CC) echoclient-async.c $(buildFlags) -o echoclient-async + +echoclient-gconn: echoclient-gconn.c + $(CC) echoclient-gconn.c $(buildFlags) -o echoclient-gconn + +echoclient-udp: echoclient-udp.c + $(CC) echoclient-udp.c $(buildFlags) -o echoclient-udp + +echoclient-unix: echoclient-unix.c + $(CC) echoclient-unix.c $(buildFlags) -o echoclient-unix + +echoclient: echoclient.c + $(CC) echoclient.c $(buildFlags) -o echoclient + +echoserver-async: echoserver-async.c + $(CC) echoserver-async.c $(buildFlags) -o echoserver-async + +echoserver-gserver: echoserver-gserver.c + $(CC) echoserver-gserver.c $(buildFlags) -o echoserver-gserver + +echoserver-udp: echoserver-udp.c + $(CC) echoserver-udp.c $(buildFlags) -o echoserver-udp + +echoserver-unix: echoserver-unix.c + $(CC) echoserver-unix.c $(buildFlags) -o echoserver-unix + +echoserver: echoserver.c + $(CC) echoserver.c $(buildFlags) -o echoserver + +hash: hash.c + $(CC) hash.c $(buildFlags) -o hash + +hfetch: hfetch.c + $(CC) hfetch.c $(buildFlags) -o hfetch + +hostinfo: hostinfo.c + $(CC) hostinfo.c $(buildFlags) -o hostinfo + +sdr: sdr.c + $(CC) sdr.c $(buildFlags) -o sdr This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Sat Jun 16 15:28:35 2012 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Sat, 16 Jun 2012 13:28:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[18439] csw/mgar/pkg/mule/trunk/Makefile Message-ID: Revision: 18439 http://gar.svn.sourceforge.net/gar/?rev=18439&view=rev Author: idogan23 Date: 2012-06-16 13:28:34 +0000 (Sat, 16 Jun 2012) Log Message: ----------- mule: Delete non Solaris files, otherwise checkpkg crashes Modified Paths: -------------- csw/mgar/pkg/mule/trunk/Makefile Modified: csw/mgar/pkg/mule/trunk/Makefile =================================================================== --- csw/mgar/pkg/mule/trunk/Makefile 2012-06-16 13:14:17 UTC (rev 18438) +++ csw/mgar/pkg/mule/trunk/Makefile 2012-06-16 13:28:34 UTC (rev 18439) @@ -16,6 +16,8 @@ DISTFILES += cswmule DISTFILES += CSWmule.postinstall +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + PATCHFILES += 0001-javapath.patch PATCHFILES += 0001-runasusermule.patch PATCHFILES += 0001-piddir.patch @@ -24,6 +26,8 @@ ARCHALL = 1 +LICENSE = LICENSE.txt + # File name regex to get notifications about upstream software releases # NOTE: Use this only if the automatic regex creation # does not work for your package @@ -33,12 +37,13 @@ # uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES # UPSTREAM_MASTER_SITES = +RUNTIME_DEP_PKGS_CSWmule += CSWpython + CONFIGURE_SCRIPTS = BUILD_SCRIPTS = TEST_SCRIPTS = INSTALL_SCRIPTS = custom -SPKG_CLASSES = none cswinitsmf cswsampleconf cswusergroup ugfiles INITSMF = /etc/opt/csw/init.d/cswmule PRESERVECONF = /etc/opt/csw/mule/.* USERGROUP = /etc/opt/csw/pkg/CSWmule/cswusergroup @@ -50,8 +55,39 @@ PROTOTYPE_GROUP_mule_ugfiles = mule PROTOTYPE_CLASS_mule_ugfiles = ugfiles +CHECKPKG_OVERRIDES_CSWmule += binary-architecture-does-not-match-placement|file=opt/csw/mule/lib/boot/libwrapper-solaris-sparc-64.so|arch_id=43|arch_name=sparcv9 +CHECKPKG_OVERRIDES_CSWmule += binary-architecture-does-not-match-placement|file=opt/csw/mule/lib/boot/exec/wrapper-solaris-sparc-64|arch_id=43|arch_name=sparcv9 +CHECKPKG_OVERRIDES_CSWmule += archall-with-binaries|opt/csw/mule/lib/boot/exec/wrapper-solaris-sparc-32 +CHECKPKG_OVERRIDES_CSWmule += archall-with-binaries|opt/csw/mule/lib/boot/exec/wrapper-solaris-sparc-64 +CHECKPKG_OVERRIDES_CSWmule += archall-with-binaries|opt/csw/mule/lib/boot/exec/wrapper-solaris-x86-32 +CHECKPKG_OVERRIDES_CSWmule += archall-with-binaries|opt/csw/mule/lib/boot/libwrapper-solaris-sparc-32.so +CHECKPKG_OVERRIDES_CSWmule += archall-with-binaries|opt/csw/mule/lib/boot/libwrapper-solaris-sparc-64.so +CHECKPKG_OVERRIDES_CSWmule += archall-with-binaries|opt/csw/mule/lib/boot/libwrapper-solaris-x86-32.so +CHECKPKG_OVERRIDES_CSWmule += file-with-bad-content|/usr/share|root/var/opt/csw/svc/manifest/application/cswmule.xml +CHECKPKG_OVERRIDES_CSWmule += binary-wrong-architecture|file=opt/csw/mule/lib/boot/libwrapper-solaris-sparc-32.so|pkginfo-says=all|actual-binary=sparc +CHECKPKG_OVERRIDES_CSWmule += binary-wrong-architecture|file=opt/csw/mule/lib/boot/libwrapper-solaris-sparc-64.so|pkginfo-says=all|actual-binary=sparc +CHECKPKG_OVERRIDES_CSWmule += binary-wrong-architecture|file=opt/csw/mule/lib/boot/libwrapper-solaris-x86-32.so|pkginfo-says=all|actual-binary=i386 +CHECKPKG_OVERRIDES_CSWmule += binary-wrong-architecture|file=opt/csw/mule/lib/boot/exec/wrapper-solaris-sparc-32|pkginfo-says=all|actual-binary=sparc +CHECKPKG_OVERRIDES_CSWmule += binary-wrong-architecture|file=opt/csw/mule/lib/boot/exec/wrapper-solaris-sparc-64|pkginfo-says=all|actual-binary=sparc +CHECKPKG_OVERRIDES_CSWmule += binary-wrong-architecture|file=opt/csw/mule/lib/boot/exec/wrapper-solaris-x86-32|pkginfo-says=all|actual-binary=i386 + install-custom: @ginstall -d $(DESTDIR)/opt/csw/$(NAME) + @rm $(WORKDIR)/$(DISTNAME)/lib/boot/exec/wrapper-freebsd-x86-32 + @rm $(WORKDIR)/$(DISTNAME)/lib/boot/exec/wrapper-hpux-parisc-32 + @rm $(WORKDIR)/$(DISTNAME)/lib/boot/exec/wrapper-linux-ia-64 + @rm $(WORKDIR)/$(DISTNAME)/lib/boot/exec/wrapper-linux-ppc-64 + @rm $(WORKDIR)/$(DISTNAME)/lib/boot/exec/wrapper-linux-x86-32 + @rm $(WORKDIR)/$(DISTNAME)/lib/boot/exec/wrapper-linux-x86-64 + @rm $(WORKDIR)/$(DISTNAME)/lib/boot/exec/wrapper-macosx-ppc-32 + @rm $(WORKDIR)/$(DISTNAME)/lib/boot/exec/wrapper-macosx-universal-32 + @rm $(WORKDIR)/$(DISTNAME)/lib/boot/exec/wrapper-windows-x86-32.exe + @rm $(WORKDIR)/$(DISTNAME)/lib/boot/libwrapper-linux-ia-64.so + @rm $(WORKDIR)/$(DISTNAME)/lib/boot/libwrapper-linux-ppc-64.so + @rm $(WORKDIR)/$(DISTNAME)/lib/boot/libwrapper-linux-x86-32.so + @rm $(WORKDIR)/$(DISTNAME)/lib/boot/libwrapper-linux-x86-64.so + @rm $(WORKDIR)/$(DISTNAME)/lib/boot/libwrapper-macosx-ppc-32.jnilib + @rm $(WORKDIR)/$(DISTNAME)/lib/boot/libwrapper-macosx-universal-32.jnilib @cp -rp $(WORKDIR)/$(DISTNAME)/* $(DESTDIR)/opt/csw/$(NAME) @ginstall -d $(DESTDIR)/var/opt/csw/mule @mv $(DESTDIR)/opt/csw/mule/logs $(DESTDIR)/var/opt/csw/mule This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Sat Jun 16 16:06:34 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Sat, 16 Jun 2012 14:06:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[18440] csw/mgar/pkg/libgnet/trunk/Makefile Message-ID: Revision: 18440 http://gar.svn.sourceforge.net/gar/?rev=18440&view=rev Author: pfelecan Date: 2012-06-16 14:06:34 +0000 (Sat, 16 Jun 2012) Log Message: ----------- - finalized overrides - changed internal name to old name Modified Paths: -------------- csw/mgar/pkg/libgnet/trunk/Makefile Modified: csw/mgar/pkg/libgnet/trunk/Makefile =================================================================== --- csw/mgar/pkg/libgnet/trunk/Makefile 2012-06-16 13:28:34 UTC (rev 18439) +++ csw/mgar/pkg/libgnet/trunk/Makefile 2012-06-16 14:06:34 UTC (rev 18440) @@ -1,6 +1,6 @@ # $Id$ -NAME = libgnet +NAME = libgnet2 VERSION = 2.0.8 GARTYPE = v2 CATEGORIES = lib @@ -28,7 +28,7 @@ GARCOMPILER = GNU -INSTALL_ARGS += TARGET_DIR=$(docdir)/$(NAME)2_doc/html +INSTALL_ARGS += TARGET_DIR=$(docdir)/$(NAME)_doc/html PACKAGES += CSWlibgnet2-doc SPKG_DESC_CSWlibgnet2-doc = $(DESCRIPTION), documentation @@ -48,8 +48,8 @@ RUNTIME_DEP_PKGS_CSWlibgnet2-0-0 += CSWlibgthread2-0-0 RUNTIME_DEP_PKGS_CSWlibgnet2-0-0 += CSWlibiconv2 RUNTIME_DEP_PKGS_CSWlibgnet2-0-0 += CSWlibintl8 +CHECKPKG_OVERRIDES_CSWlibgnet2-0-0 += surplus-dependency|CSWlibiconv2 - PACKAGES += CSWlibgnet2-dev SPKG_DESC_CSWlibgnet2-dev = $(DESCRIPTION), development files PKGFILES_CSWlibgnet2-dev += /opt/csw/lib/libgnet-2.0.so @@ -59,13 +59,14 @@ CATALOGNAME_CSWlibgnet2 = libgnet2_stub ARCHALL_CSWlibgnet2-dev = 1 RUNTIME_DEP_PKGS_CSWlibgnet2-dev += CSWlibgnet2-0-0 +CHECKPKG_OVERRIDES_CSWlibgnet2-dev += archall-devel-package include gar/category.mk post-install-modulated: - ginstall --directory $(DESTDIR)$(docdir)/$(NAME)2_doc/examples - cd $(WORKSRC)/examples && ginstall --preserve-timestamps --mode=u=rw,go=r *.c $(DESTDIR)$(docdir)/$(NAME)2_doc/examples - ginstall --preserve-timestamps --mode=u=rw,go=r $(WORKDIR)/GNUMakefile $(DESTDIR)$(docdir)/$(NAME)2_doc/examples + ginstall --directory $(DESTDIR)$(docdir)/$(NAME)_doc/examples + cd $(WORKSRC)/examples && ginstall --preserve-timestamps --mode=u=rw,go=r *.c $(DESTDIR)$(docdir)/$(NAME)_doc/examples + ginstall --preserve-timestamps --mode=u=rw,go=r $(WORKDIR)/GNUMakefile $(DESTDIR)$(docdir)/$(NAME)_doc/examples $(MAKECOOKIE) # this is private and not available publicly This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Sat Jun 16 18:37:58 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Sat, 16 Jun 2012 16:37:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[18441] csw/mgar/pkg Message-ID: Revision: 18441 http://gar.svn.sourceforge.net/gar/?rev=18441&view=rev Author: pfelecan Date: 2012-06-16 16:37:57 +0000 (Sat, 16 Jun 2012) Log Message: ----------- recipe name changed to fit the previous package name root. Added Paths: ----------- csw/mgar/pkg/libgnet2/ csw/mgar/pkg/libgnet2/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/libgnet/ csw/mgar/pkg/libgnet2/trunk/Makefile Deleted: csw/mgar/pkg/libgnet2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libgnet/trunk/Makefile 2012-06-16 13:14:17 UTC (rev 18438) +++ csw/mgar/pkg/libgnet2/trunk/Makefile 2012-06-16 16:37:57 UTC (rev 18441) @@ -1,73 +0,0 @@ -# $Id$ - -NAME = libgnet -VERSION = 2.0.8 -GARTYPE = v2 -CATEGORIES = lib - -DESCRIPTION = Network library based on glib2 -define BLURB - GNet is a simple network library. It is written in C, object-oriented, - and built upon GLib. It is intended to be easy to use and port. -endef - -DISTNAME = gnet-$(VERSION) -MASTER_SITES = http://ftp.gnome.org/pub/GNOME/sources/gnet/2.0/ -DISTFILES = $(DISTNAME).tar.gz -DISTFILES += GNUMakefile - -# until the glib development package is installed on Solaris 9 we -# limit the scope: -PACKAGING_PLATFORMS = solaris10-sparc -PACKAGING_PLATFORMS += solaris10-i386 - -BUILD_DEP_PKGS += CSWlibglib2-dev -BUILD_DEP_PKGS += CSWlibiconv-dev - -CONFIGURE_ARGS = $(DIRPATHS) - -GARCOMPILER = GNU - -INSTALL_ARGS += TARGET_DIR=$(docdir)/$(NAME)2_doc/html - -PACKAGES += CSWlibgnet2-doc -SPKG_DESC_CSWlibgnet2-doc = $(DESCRIPTION), documentation -OBSOLETED_BY_CSWlibgnet2-doc= CSWlibgnet2doc -CATALOGNAME_CSWlibgnet2doc = libgnet2_doc_stub -ARCHALL_CSWlibgnet2-doc = 1 - -PACKAGES += CSWlibgnet2-0-0 -CATALOGNAME_CSWlibgnet2-0-0 = libgnet2_0_0 -PKGFILES_CSWlibgnet2-0-0 += $(call baseisadirs,$(libdir),libgnet-2\.0\.so\.0\.8\.0) -PKGFILES_CSWlibgnet2-0-0 += $(call baseisadirs,$(libdir),libgnet-2\.0\.so\.0(\.\d+)*) -SPKG_DESC_CSWlibgnet2-0-0 = $(DESCRIPTION), libgnet-2.0.so.0 -OBSOLETED_BY_CSWlibgnet2-0-0 = CSWlibgnet2rt -CATALOGNAME_CSWlibgnet2rt = libgnet2_rt_stub -RUNTIME_DEP_PKGS_CSWlibgnet2-0-0 += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWlibgnet2-0-0 += CSWlibglib2-0-0 -RUNTIME_DEP_PKGS_CSWlibgnet2-0-0 += CSWlibgthread2-0-0 -RUNTIME_DEP_PKGS_CSWlibgnet2-0-0 += CSWlibiconv2 -RUNTIME_DEP_PKGS_CSWlibgnet2-0-0 += CSWlibintl8 - - -PACKAGES += CSWlibgnet2-dev -SPKG_DESC_CSWlibgnet2-dev = $(DESCRIPTION), development files -PKGFILES_CSWlibgnet2-dev += /opt/csw/lib/libgnet-2.0.so -PKGFILES_CSWlibgnet2-dev += $(PKGFILES_DEVEL) -PKGFILES_CSWlibgnet2-dev += /opt/csw/lib/gnet-2.0/include/gnetconfig.h -OBSOLETED_BY_CSWlibgnet2-dev = CSWlibgnet2 -CATALOGNAME_CSWlibgnet2 = libgnet2_stub -ARCHALL_CSWlibgnet2-dev = 1 -RUNTIME_DEP_PKGS_CSWlibgnet2-dev += CSWlibgnet2-0-0 - -include gar/category.mk - -post-install-modulated: - ginstall --directory $(DESTDIR)$(docdir)/$(NAME)2_doc/examples - cd $(WORKSRC)/examples && ginstall --preserve-timestamps --mode=u=rw,go=r *.c $(DESTDIR)$(docdir)/$(NAME)2_doc/examples - ginstall --preserve-timestamps --mode=u=rw,go=r $(WORKDIR)/GNUMakefile $(DESTDIR)$(docdir)/$(NAME)2_doc/examples - $(MAKECOOKIE) - -# this is private and not available publicly -mydependencies: - $(HOME)/bin/ocswdeplist --package $(NAME) Copied: csw/mgar/pkg/libgnet2/trunk/Makefile (from rev 18440, csw/mgar/pkg/libgnet/trunk/Makefile) =================================================================== --- csw/mgar/pkg/libgnet2/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libgnet2/trunk/Makefile 2012-06-16 16:37:57 UTC (rev 18441) @@ -0,0 +1,74 @@ +# $Id$ + +NAME = libgnet2 +VERSION = 2.0.8 +GARTYPE = v2 +CATEGORIES = lib + +DESCRIPTION = Network library based on glib2 +define BLURB + GNet is a simple network library. It is written in C, object-oriented, + and built upon GLib. It is intended to be easy to use and port. +endef + +DISTNAME = gnet-$(VERSION) +MASTER_SITES = http://ftp.gnome.org/pub/GNOME/sources/gnet/2.0/ +DISTFILES = $(DISTNAME).tar.gz +DISTFILES += GNUMakefile + +# until the glib development package is installed on Solaris 9 we +# limit the scope: +PACKAGING_PLATFORMS = solaris10-sparc +PACKAGING_PLATFORMS += solaris10-i386 + +BUILD_DEP_PKGS += CSWlibglib2-dev +BUILD_DEP_PKGS += CSWlibiconv-dev + +CONFIGURE_ARGS = $(DIRPATHS) + +GARCOMPILER = GNU + +INSTALL_ARGS += TARGET_DIR=$(docdir)/$(NAME)_doc/html + +PACKAGES += CSWlibgnet2-doc +SPKG_DESC_CSWlibgnet2-doc = $(DESCRIPTION), documentation +OBSOLETED_BY_CSWlibgnet2-doc= CSWlibgnet2doc +CATALOGNAME_CSWlibgnet2doc = libgnet2_doc_stub +ARCHALL_CSWlibgnet2-doc = 1 + +PACKAGES += CSWlibgnet2-0-0 +CATALOGNAME_CSWlibgnet2-0-0 = libgnet2_0_0 +PKGFILES_CSWlibgnet2-0-0 += $(call baseisadirs,$(libdir),libgnet-2\.0\.so\.0\.8\.0) +PKGFILES_CSWlibgnet2-0-0 += $(call baseisadirs,$(libdir),libgnet-2\.0\.so\.0(\.\d+)*) +SPKG_DESC_CSWlibgnet2-0-0 = $(DESCRIPTION), libgnet-2.0.so.0 +OBSOLETED_BY_CSWlibgnet2-0-0 = CSWlibgnet2rt +CATALOGNAME_CSWlibgnet2rt = libgnet2_rt_stub +RUNTIME_DEP_PKGS_CSWlibgnet2-0-0 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibgnet2-0-0 += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibgnet2-0-0 += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWlibgnet2-0-0 += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWlibgnet2-0-0 += CSWlibintl8 +CHECKPKG_OVERRIDES_CSWlibgnet2-0-0 += surplus-dependency|CSWlibiconv2 + +PACKAGES += CSWlibgnet2-dev +SPKG_DESC_CSWlibgnet2-dev = $(DESCRIPTION), development files +PKGFILES_CSWlibgnet2-dev += /opt/csw/lib/libgnet-2.0.so +PKGFILES_CSWlibgnet2-dev += $(PKGFILES_DEVEL) +PKGFILES_CSWlibgnet2-dev += /opt/csw/lib/gnet-2.0/include/gnetconfig.h +OBSOLETED_BY_CSWlibgnet2-dev = CSWlibgnet2 +CATALOGNAME_CSWlibgnet2 = libgnet2_stub +ARCHALL_CSWlibgnet2-dev = 1 +RUNTIME_DEP_PKGS_CSWlibgnet2-dev += CSWlibgnet2-0-0 +CHECKPKG_OVERRIDES_CSWlibgnet2-dev += archall-devel-package + +include gar/category.mk + +post-install-modulated: + ginstall --directory $(DESTDIR)$(docdir)/$(NAME)_doc/examples + cd $(WORKSRC)/examples && ginstall --preserve-timestamps --mode=u=rw,go=r *.c $(DESTDIR)$(docdir)/$(NAME)_doc/examples + ginstall --preserve-timestamps --mode=u=rw,go=r $(WORKDIR)/GNUMakefile $(DESTDIR)$(docdir)/$(NAME)_doc/examples + $(MAKECOOKIE) + +# this is private and not available publicly +mydependencies: + $(HOME)/bin/ocswdeplist --package $(NAME) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sat Jun 16 19:20:15 2012 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sat, 16 Jun 2012 17:20:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[18442] csw/mgar/pkg/cfengine3/trunk Message-ID: Revision: 18442 http://gar.svn.sourceforge.net/gar/?rev=18442&view=rev Author: guengel Date: 2012-06-16 17:20:14 +0000 (Sat, 16 Jun 2012) Log Message: ----------- cfengine3/trunk: Removed spaces for defines. Modified Paths: -------------- csw/mgar/pkg/cfengine3/trunk/Makefile csw/mgar/pkg/cfengine3/trunk/files/cfengine3rc csw/mgar/pkg/cfengine3/trunk/files/cswcfengine3-cfexecd csw/mgar/pkg/cfengine3/trunk/files/cswcfengine3-cfmonitord csw/mgar/pkg/cfengine3/trunk/files/cswcfengine3-cfserverd Modified: csw/mgar/pkg/cfengine3/trunk/Makefile =================================================================== --- csw/mgar/pkg/cfengine3/trunk/Makefile 2012-06-16 16:37:57 UTC (rev 18441) +++ csw/mgar/pkg/cfengine3/trunk/Makefile 2012-06-16 17:20:14 UTC (rev 18442) @@ -1,7 +1,7 @@ # $Id$ # NAME = cfengine3 -VERSION = 3.2.3 +VERSION = 3.3.3 CATEGORIES = utils GARTYPE = v2 Modified: csw/mgar/pkg/cfengine3/trunk/files/cfengine3rc =================================================================== --- csw/mgar/pkg/cfengine3/trunk/files/cfengine3rc 2012-06-16 16:37:57 UTC (rev 18441) +++ csw/mgar/pkg/cfengine3/trunk/files/cfengine3rc 2012-06-16 17:20:14 UTC (rev 18442) @@ -10,8 +10,8 @@ # cf-serverd. # Options passed to cf-serverd -CFSERVERD_OPTS="-D opencsw" +CFSERVERD_OPTS="-Dopencsw" # Options passed to cf-execd -CFEXECD_OPTS="-D opencsw" +CFEXECD_OPTS="-Dopencsw" # Options passed to cf-monitord CFMONITORD_OPTS="" Modified: csw/mgar/pkg/cfengine3/trunk/files/cswcfengine3-cfexecd =================================================================== --- csw/mgar/pkg/cfengine3/trunk/files/cswcfengine3-cfexecd 2012-06-16 16:37:57 UTC (rev 18441) +++ csw/mgar/pkg/cfengine3/trunk/files/cswcfengine3-cfexecd 2012-06-16 17:20:14 UTC (rev 18442) @@ -27,7 +27,7 @@ } -stop() { +_stop() { if [ -r ${PIDFILE} ] then PID=`/bin/cat ${PIDFILE}` @@ -44,7 +44,7 @@ return 0 } -start() { +_start() { if [ -r ${PIDFILE} ] then /bin/kill -0 `/bin/cat ${PIDFILE}` > /dev/null 2>&1 @@ -84,7 +84,7 @@ return 0 } -status() { +_status() { if [ -r ${PIDFILE} ] then /bin/kill -0 `/bin/cat ${PIDFILE}` > /dev/null 2>&1 @@ -101,17 +101,17 @@ case "$1" in start) - start + _start ;; stop) - stop + _stop ;; restart) - stop - start + _stop + _start ;; status) - status + _status ;; *) echo "$0 {start|stop|restart|status}" Modified: csw/mgar/pkg/cfengine3/trunk/files/cswcfengine3-cfmonitord =================================================================== --- csw/mgar/pkg/cfengine3/trunk/files/cswcfengine3-cfmonitord 2012-06-16 16:37:57 UTC (rev 18441) +++ csw/mgar/pkg/cfengine3/trunk/files/cswcfengine3-cfmonitord 2012-06-16 17:20:14 UTC (rev 18442) @@ -27,7 +27,7 @@ } -stop() { +_stop() { if [ -r ${PIDFILE} ] then PID=`/bin/cat ${PIDFILE}` @@ -44,7 +44,7 @@ return 0 } -start() { +_start() { if [ -r ${PIDFILE} ] then /bin/kill -0 `/bin/cat ${PIDFILE}` > /dev/null 2>&1 @@ -84,7 +84,7 @@ return 0 } -status() { +_status() { if [ -r ${PIDFILE} ] then /bin/kill -0 `/bin/cat ${PIDFILE}` > /dev/null 2>&1 @@ -101,17 +101,17 @@ case "$1" in start) - start + _start ;; stop) - stop + _stop ;; restart) - stop - start + _stop + _start ;; status) - status + _status ;; *) echo "$0 {start|stop|restart|status}" Modified: csw/mgar/pkg/cfengine3/trunk/files/cswcfengine3-cfserverd =================================================================== --- csw/mgar/pkg/cfengine3/trunk/files/cswcfengine3-cfserverd 2012-06-16 16:37:57 UTC (rev 18441) +++ csw/mgar/pkg/cfengine3/trunk/files/cswcfengine3-cfserverd 2012-06-16 17:20:14 UTC (rev 18442) @@ -27,7 +27,7 @@ } -stop() { +_stop() { if [ -r ${PIDFILE} ] then PID=`/bin/cat ${PIDFILE}` @@ -44,7 +44,7 @@ return 0 } -start() { +_start() { if [ -r ${PIDFILE} ] then /bin/kill -0 `/bin/cat ${PIDFILE}` > /dev/null 2>&1 @@ -84,7 +84,7 @@ return 0 } -status() { +_status() { if [ -r ${PIDFILE} ] then /bin/kill -0 `/bin/cat ${PIDFILE}` > /dev/null 2>&1 @@ -101,17 +101,17 @@ case "$1" in start) - start + _start ;; stop) - stop + _stop ;; restart) - stop - start + _stop + _start ;; status) - status + _status ;; *) echo "$0 {start|stop|restart|status}" 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 17 10:19:05 2012 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Sun, 17 Jun 2012 08:19:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[18443] csw/mgar/pkg/nrpe/trunk/files/cswnrpe Message-ID: Revision: 18443 http://gar.svn.sourceforge.net/gar/?rev=18443&view=rev Author: j_arndt Date: 2012-06-17 08:19:04 +0000 (Sun, 17 Jun 2012) Log Message: ----------- nrpe/trunk: use of full paths in start-stopp script Modified Paths: -------------- csw/mgar/pkg/nrpe/trunk/files/cswnrpe Modified: csw/mgar/pkg/nrpe/trunk/files/cswnrpe =================================================================== --- csw/mgar/pkg/nrpe/trunk/files/cswnrpe 2012-06-16 17:20:14 UTC (rev 18442) +++ csw/mgar/pkg/nrpe/trunk/files/cswnrpe 2012-06-17 08:19:04 UTC (rev 18443) @@ -17,7 +17,7 @@ if [ $SOLREL -ge 10 ] then - ZONENAME=`zonename` + ZONENAME=`/sbin/zonename` . /lib/svc/share/smf_include.sh fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sun Jun 17 14:17:32 2012 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sun, 17 Jun 2012 12:17:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[18444] csw/mgar/pkg/cfengine3/trunk Message-ID: Revision: 18444 http://gar.svn.sourceforge.net/gar/?rev=18444&view=rev Author: guengel Date: 2012-06-17 12:17:32 +0000 (Sun, 17 Jun 2012) Log Message: ----------- cfengine3/trunk: New upstream release CFEngine 3.3.3. Support for Sol9 was dropped. Tokyocabinet used as replacement for BDB. Modified Paths: -------------- csw/mgar/pkg/cfengine3/trunk/Makefile csw/mgar/pkg/cfengine3/trunk/checksums csw/mgar/pkg/cfengine3/trunk/files/README.CSW csw/mgar/pkg/cfengine3/trunk/files/changelog.CSW Added Paths: ----------- csw/mgar/pkg/cfengine3/trunk/files/0000-Avoid-passing-NULL-pointer-to-CfOut-in-FnCallHostInN.patch csw/mgar/pkg/cfengine3/trunk/files/0000-Do-not-perform-acceptance-test.patch csw/mgar/pkg/cfengine3/trunk/files/0000-Optimization-debug-flags-adjusted-for-use-with-SunSt.patch csw/mgar/pkg/cfengine3/trunk/files/0001-Remove-unsupported-compiler-options.patch csw/mgar/pkg/cfengine3/trunk/files/0002-Add-include-alloca.h-in-gcov-stub.c.patch Modified: csw/mgar/pkg/cfengine3/trunk/Makefile =================================================================== --- csw/mgar/pkg/cfengine3/trunk/Makefile 2012-06-17 08:19:04 UTC (rev 18443) +++ csw/mgar/pkg/cfengine3/trunk/Makefile 2012-06-17 12:17:32 UTC (rev 18444) @@ -4,7 +4,10 @@ VERSION = 3.3.3 CATEGORIES = utils GARTYPE = v2 +GARCOMPILER = SOS12U1 +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + DESCRIPTION = Open source configuration management system define BLURB CFEngine Community is the Open Source foundation of CFEngine's innovative @@ -27,10 +30,6 @@ UFILES_REGEX = cfengine-(\d+(?:\.\d+)*).tar.gz -# Cfengine probes for Solaris 10 specific functionality (i.e. zones), -# so a we build it for Sol9 and Sol10 -PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 solaris9-sparc solaris9-i386 - # File name regex to get notifications about upstream software releases # NOTE: Use this only if the automatic regex creation # does not work for your package @@ -40,6 +39,13 @@ # uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES # UPSTREAM_MASTER_SITES = +PATCHFILES += 0001-Remove-unsupported-compiler-options.patch +PATCHFILES += 0002-Add-include-alloca.h-in-gcov-stub.c.patch +PATCHFILES += 0000-Avoid-passing-NULL-pointer-to-CfOut-in-FnCallHostInN.patch +PATCHFILES += 0000-Optimization-debug-flags-adjusted-for-use-with-SunSt.patch +# See comment in patch +PATCHFILES += 0000-Do-not-perform-acceptance-test.patch + # # CUSTOM VARIABLES # @@ -51,9 +57,9 @@ # Catch all CATALOGNAME_CSW$(NAME)utils = $(NAME)_utils SPKG_DESC_CSW$(NAME)utils = CFEngine 3 utilities and documentation -RUNTIME_DEP_PKGS_CSW$(NAME)utils += CSWbdb48 -RUNTIME_DEP_PKGS_CSW$(NAME)utils += CSWosslrt -RUNTIME_DEP_PKGS_CSW$(NAME)utils += CSWlibpcre0 +RUNTIME_DEP_PKGS_CSW$(NAME)utils += CSWlibtokyocabinet9 +RUNTIME_DEP_PKGS_CSW$(NAME)utils += CSWlibssl1-0-0 +RUNTIME_DEP_PKGS_CSW$(NAME)utils += CSWlibpcre1 CHECKPKG_OVERRIDES_CSW$(NAME)utils += catalogname-does-not-match-pkgname|pkgname=CSW$(NAME)utils|catalogname=$(NAME)_utils|expected-catalogname=$(NAME)utils OBSOLETED_BY_CSW$(NAME)utils = CSWlibpromises1 CSW$(NAME)rt CATALOGNAME_CSWlibpromises1 = libpromises1_stub @@ -62,9 +68,9 @@ PACKAGES += CSW$(NAME)server CATALOGNAME_CSW$(NAME)server = $(NAME)_server SPKG_DESC_CSW$(NAME)server = CFEngine 3 server binary -RUNTIME_DEP_PKGS_CSW$(NAME)server += CSWbdb48 -RUNTIME_DEP_PKGS_CSW$(NAME)server += CSWosslrt -RUNTIME_DEP_PKGS_CSW$(NAME)server += CSWlibpcre0 +RUNTIME_DEP_PKGS_CSW$(NAME)server += CSWlibtokyocabinet9 +RUNTIME_DEP_PKGS_CSW$(NAME)server += CSWlibssl1-0-0 +RUNTIME_DEP_PKGS_CSW$(NAME)server += CSWlibpcre1 RUNTIME_DEP_PKGS_CSW$(NAME)server += CSW$(NAME)utils PKGFILES_CSW$(NAME)server += $(sbindir)/cf-serverd PKGFILES_CSW$(NAME)server += $(sbindir)/cf-runagent @@ -77,9 +83,9 @@ PACKAGES += CSW$(NAME)client CATALOGNAME_CSW$(NAME)client = $(NAME)_client SPKG_DESC_CSW$(NAME)client = CFEngine 3 client binaries -RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWbdb48 -RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWosslrt -RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibpcre0 +RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibtokyocabinet9 +RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibssl1-0-0 +RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibpcre1 RUNTIME_DEP_PKGS_CSW$(NAME)client += CSW$(NAME)utils PKGFILES_CSW$(NAME)client += $(sbindir)/cf-agent PKGFILES_CSW$(NAME)client += $(sbindir)/cf-execd @@ -107,30 +113,25 @@ # the server and client component PRESERVECONF = $(sysconfdir)/$(NAME)rc -BUILD64_LIBS_ONLY = 1 - -BUILD_DEP_PKGS = CSWbdb48devel +BUILD_DEP_PKGS = CSWlibssl-dev BUILD_DEP_PKGS += CSWlibpcre-dev -BUILD_DEP_PKGS += CSWossldevel +BUILD_DEP_PKGS += CSWlibtokyocabinet-dev BUILD_DEP_PKGS += CSWflex BUILD_DEP_PKGS += CSWbison CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --disable-silent-rules -CONFIGURE_ARGS += --with-berkeleydb=$(prefix)/bdb48 +CONFIGURE_ARGS += --with-tokyocabinet=$(prefix) CONFIGURE_ARGS += --with-openssl=$(prefix) CONFIGURE_ARGS += --with-pcre=$(prefix) CONFIGURE_ARGS += --with-workdir=$(cfengine_workdir) -CONFIGURE_ARGS += --without-sqlite3 CONFIGURE_ARGS += --without-qdbm CONFIGURE_ARGS += --without-postgresql CONFIGURE_ARGS += --without-mysql -EXTRA_INC = $(prefix)/bdb48/include +EXTRA_CPPFLAGS = -xc99=all +EXTRA_CFLAGS = -xc99=all -EXTRA_RUNPATH_DIRS = $(prefix)/bdb48/lib -EXTRA_RUNPATH_ISALIST = $(EXTRA_RUNPATH_DIRS) -EXTRA_LDFLAGS = -L$(prefix)/bdb48/lib/$(MM_LIBDIR) # We use this because libpromises will be moved to this private # directory (see also move-libpromises:) EXTRA_LDFLAGS += -R$(libdir)/$(NAME) @@ -140,16 +141,17 @@ include gar/category.mk -post-install-modulated: rename-cfengine-dir make-cfengine-workdir install-cfengine-links install-smf-manifests install-cfengine3rc install-cfengine3-csw-doc fix-paths-in-files move-libpromises +post-install-modulated: rename-cfengine-dir make-cfengine-workdir install-cfengine-links install-smf-manifests install-cfengine3rc install-cfengine3-csw-doc fix-paths-in-files move-libpromises move-binaries @$(MAKECOOKIE) rename-cfengine-dir: - if test -d $(DESTDIR)$(datadir)/cfengine ; then \ - mv $(DESTDIR)$(datadir)/cfengine $(DESTDIR)$(datadir)/$(NAME) ;\ + ginstall -d $(DESTDIR)$(docdir)/$(NAME)_utils + if [ -d $(DESTDIR)$(datadir)/CoreBase ] ; then \ + mv $(DESTDIR)$(datadir)/CoreBase $(DESTDIR)$(docdir)/$(NAME)_utils ; \ fi - if test -d $(DESTDIR)$(docdir)/cfengine ; then \ - mv $(DESTDIR)$(docdir)/cfengine $(DESTDIR)$(docdir)/$(NAME) ;\ - fi + for f in example_config README ChangeLog examples ; do \ + mv $(DESTDIR)$(docdir)/$$f $(DESTDIR)$(docdir)/$(NAME)_utils/ || echo "Unable to move $$f" ; \ + done install-smf-manifests: ginstall -d $(DESTDIR)$(initddir) @@ -177,10 +179,10 @@ ginstall $(WORKDIR)/$(NAME)rc $(DESTDIR)$(sysconfdir)/$(NAME)rc.CSW install-cfengine3-csw-doc: rename-cfengine-dir - ginstall $(WORKDIR)/README.CSW $(DESTDIR)$(docdir)/$(NAME) + ginstall -m 644 $(WORKDIR)/README.CSW $(DESTDIR)$(docdir)/$(NAME)_utils/ fix-paths-in-files: rename-cfengine-dir - for d in $(DESTDIR)$(docdir)/$(NAME)/example_config $(DESTDIR)$(docdir)/$(NAME)/examples $(DESTDIR)$(datadir)/$(NAME)/masterfiles ; do \ + for d in $(DESTDIR)$(docdir)/$(NAME)_utils/example_config $(DESTDIR)$(docdir)/$(NAME)_utils/examples $(DESTDIR)$(docdir)/$(NAME)_utils/CoreBase; do \ if test -d $$d ; then \ for f in $${d}/*.cf ; do \ sed -e 's|/var/cfengine/|/var/opt/csw/$(NAME)/|g' \ @@ -196,9 +198,21 @@ # available API. Please note, the rpath has to be set appropriately move-libpromises: ginstall -d $(DESTDIR)$(libdir)/$(NAME) - mv $(DESTDIR)$(libdir)/libpromises.* $(DESTDIR)$(libdir)/$(NAME)/ + if test -f $(DESTDIR)$(libdir)/libpromises.so.1.0.0 ; then \ + mv $(DESTDIR)$(libdir)/libpromises.* $(DESTDIR)$(libdir)/$(NAME)/ ; \ + fi +# The cfengine guys decided to put binaries into $(prefix)/bin starting +# with 3.3.0. I don't see the point and keep the binaries in $(prefix)/sbin +move-binaries: + ginstall -d $(DESTDIR)$(prefix)/sbin + if test -f $(DESTDIR)$(prefix)/bin/cf-agent ; then \ + mv $(DESTDIR)$(prefix)/bin/* $(DESTDIR)$(prefix)/sbin/ ; \ + rmdir $(DESTDIR)$(prefix)/bin ; \ + fi + post-merge: # Get rid of the .so files. Since there are no header files provided, # .so files are pretty much useless find $(PKGROOT)$(libdir) -name libpromises.so -exec rm \{\} \; + Modified: csw/mgar/pkg/cfengine3/trunk/checksums =================================================================== --- csw/mgar/pkg/cfengine3/trunk/checksums 2012-06-17 08:19:04 UTC (rev 18443) +++ csw/mgar/pkg/cfengine3/trunk/checksums 2012-06-17 12:17:32 UTC (rev 18444) @@ -1 +1 @@ -be118dd95537221da38008845fc0d84a cfengine-3.2.3.tar.gz +f80c7002eae0c4b832f814529babe3f9 cfengine-3.3.3.tar.gz Added: csw/mgar/pkg/cfengine3/trunk/files/0000-Avoid-passing-NULL-pointer-to-CfOut-in-FnCallHostInN.patch =================================================================== --- csw/mgar/pkg/cfengine3/trunk/files/0000-Avoid-passing-NULL-pointer-to-CfOut-in-FnCallHostInN.patch (rev 0) +++ csw/mgar/pkg/cfengine3/trunk/files/0000-Avoid-passing-NULL-pointer-to-CfOut-in-FnCallHostInN.patch 2012-06-17 12:17:32 UTC (rev 18444) @@ -0,0 +1,34 @@ +From 52fbe289f9e86c525aae84eba5035b581c04c712 Mon Sep 17 00:00:00 2001 +From: Rafael Ostertag +Date: Sun, 17 Jun 2012 10:31:12 +0200 +Subject: [PATCH] Avoid passing NULL pointer to CfOut in + FnCallHostInNetgroup() + +--- + src/evalfunction.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/evalfunction.c b/src/evalfunction.c +index f310d7c..92d8bd5 100644 +--- a/src/evalfunction.c ++++ b/src/evalfunction.c +@@ -2183,14 +2183,14 @@ FnCallResult FnCallHostInNetgroup(FnCall *fp, Rlist *finalargs) + { + if (host == NULL || strcmp(host, VUQNAME) == 0) + { +- CfOut(cf_verbose, "", "Matched %s in netgroup %s\n", host, ScalarValue(finalargs)); ++ CfOut(cf_verbose, "", "Matched %s in netgroup %s\n", host == NULL ? "(nil)" : host, ScalarValue(finalargs)); + strcpy(buffer, "any"); + break; + } + + if (host == NULL || strcmp(host, VFQNAME) == 0) + { +- CfOut(cf_verbose, "", "Matched %s in netgroup %s\n", host, ScalarValue(finalargs)); ++ CfOut(cf_verbose, "", "Matched %s in netgroup %s\n", host == NULL ? "(nil)" : host, ScalarValue(finalargs)); + strcpy(buffer, "any"); + break; + } +-- +1.7.10.3 + Added: csw/mgar/pkg/cfengine3/trunk/files/0000-Do-not-perform-acceptance-test.patch =================================================================== --- csw/mgar/pkg/cfengine3/trunk/files/0000-Do-not-perform-acceptance-test.patch (rev 0) +++ csw/mgar/pkg/cfengine3/trunk/files/0000-Do-not-perform-acceptance-test.patch 2012-06-17 12:17:32 UTC (rev 18444) @@ -0,0 +1,37 @@ +From b90694842d4649a191c43dd004e4052786389fda Mon Sep 17 00:00:00 2001 +From: Rafael Ostertag +Date: Sun, 17 Jun 2012 11:30:48 +0200 +Subject: [PATCH] Do not perform acceptance test + +Why? Accpetance tests are using CFEngine's $(WORKDIR) which is set to /var/opt/csw/cfengine3 and regular users, i.e. the guy who is building CFEngine does not have rw access to it, nor can it be created by non-root users. Thus, all tests fail. + +Having CFEngine running on several Sol10 machines, I guess this counts as test. +--- + tests/Makefile.am | 2 +- + tests/Makefile.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tests/Makefile.am b/tests/Makefile.am +index 7e9bf2c..ed152e7 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -1 +1 @@ +-SUBDIRS = unit load acceptance +\ No newline at end of file ++SUBDIRS = unit load +diff --git a/tests/Makefile.in b/tests/Makefile.in +index 8f67654..76974c4 100644 +--- a/tests/Makefile.in ++++ b/tests/Makefile.in +@@ -276,7 +276,7 @@ top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + workdir = @workdir@ +-SUBDIRS = unit load acceptance ++SUBDIRS = unit load + all: all-recursive + + .SUFFIXES: +-- +1.7.10.3 + Added: csw/mgar/pkg/cfengine3/trunk/files/0000-Optimization-debug-flags-adjusted-for-use-with-SunSt.patch =================================================================== --- csw/mgar/pkg/cfengine3/trunk/files/0000-Optimization-debug-flags-adjusted-for-use-with-SunSt.patch (rev 0) +++ csw/mgar/pkg/cfengine3/trunk/files/0000-Optimization-debug-flags-adjusted-for-use-with-SunSt.patch 2012-06-17 12:17:32 UTC (rev 18444) @@ -0,0 +1,28 @@ +From 4ab202a1367d352937b101c7994cd99100950822 Mon Sep 17 00:00:00 2001 +From: Rafael Ostertag +Date: Sun, 17 Jun 2012 10:46:20 +0200 +Subject: [PATCH] Optimization/debug flags adjusted for use with SunStudio + +--- + configure | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure b/configure +index d8df74d..c929f0a 100755 +--- a/configure ++++ b/configure +@@ -13685,9 +13685,9 @@ fi + + + if test x"$debug" = x"yes"; then +- CFLAGS="$CFLAGS -g3 -O0" ++ CFLAGS="$CFLAGS -g -xO0" + else +- CFLAGS="$CFLAGS -O2 -DNDEBUG" ++ CFLAGS="$CFLAGS -xO3 -DNDEBUG" + fi + + +-- +1.7.10.3 + Added: csw/mgar/pkg/cfengine3/trunk/files/0001-Remove-unsupported-compiler-options.patch =================================================================== --- csw/mgar/pkg/cfengine3/trunk/files/0001-Remove-unsupported-compiler-options.patch (rev 0) +++ csw/mgar/pkg/cfengine3/trunk/files/0001-Remove-unsupported-compiler-options.patch 2012-06-17 12:17:32 UTC (rev 18444) @@ -0,0 +1,39 @@ +From 39d1ba5a51f4308a135265690988e91af536ea0a Mon Sep 17 00:00:00 2001 +From: Rafael Ostertag +Date: Sat, 16 Jun 2012 20:20:27 +0200 +Subject: [PATCH] Remove unsupported compiler options + +--- + tests/unit/Makefile.am | 2 +- + tests/unit/Makefile.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am +index 86f52d0..176ccfc 100644 +--- a/tests/unit/Makefile.am ++++ b/tests/unit/Makefile.am +@@ -68,7 +68,7 @@ xml_writer_test_LDADD = libtest.la + # + file_writer_test_SOURCES = file_writer_test.c gcov-stub.c \ + ../../src/writer.c +-file_writer_test_CFLAGS = $(AM_CFLAGS) -fno-profile-arcs -fno-test-coverage ++file_writer_test_CFLAGS = $(AM_CFLAGS) + file_writer_test_LDADD = libtest.la + file_writer_test_LDLFAGS = + +diff --git a/tests/unit/Makefile.in b/tests/unit/Makefile.in +index 36e04fb..884df9d 100644 +--- a/tests/unit/Makefile.in ++++ b/tests/unit/Makefile.in +@@ -445,7 +445,7 @@ xml_writer_test_LDADD = libtest.la + file_writer_test_SOURCES = file_writer_test.c gcov-stub.c \ + ../../src/writer.c + +-file_writer_test_CFLAGS = $(AM_CFLAGS) -fno-profile-arcs -fno-test-coverage ++file_writer_test_CFLAGS = $(AM_CFLAGS) + file_writer_test_LDADD = libtest.la + file_writer_test_LDLFAGS = + db_test_SOURCES = db_test.c +-- +1.7.10.3 + Added: csw/mgar/pkg/cfengine3/trunk/files/0002-Add-include-alloca.h-in-gcov-stub.c.patch =================================================================== --- csw/mgar/pkg/cfengine3/trunk/files/0002-Add-include-alloca.h-in-gcov-stub.c.patch (rev 0) +++ csw/mgar/pkg/cfengine3/trunk/files/0002-Add-include-alloca.h-in-gcov-stub.c.patch 2012-06-17 12:17:32 UTC (rev 18444) @@ -0,0 +1,23 @@ +From 9063c218bfd3fcdeeeab7a2f40d46312bb3d5f23 Mon Sep 17 00:00:00 2001 +From: Rafael Ostertag +Date: Sat, 16 Jun 2012 21:15:44 +0200 +Subject: [PATCH] Add include alloca.h in gcov-stub.c + +--- + tests/unit/gcov-stub.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tests/unit/gcov-stub.c b/tests/unit/gcov-stub.c +index 39cfd00..241b92a 100644 +--- a/tests/unit/gcov-stub.c ++++ b/tests/unit/gcov-stub.c +@@ -1,5 +1,6 @@ + #include "cf3.defs.h" + #include "cf3.extern.h" ++#include + + /* + * Stubs which allow CFEngine compiled with gcov support to link against unit +-- +1.7.10.3 + Modified: csw/mgar/pkg/cfengine3/trunk/files/README.CSW =================================================================== --- csw/mgar/pkg/cfengine3/trunk/files/README.CSW 2012-06-17 08:19:04 UTC (rev 18443) +++ csw/mgar/pkg/cfengine3/trunk/files/README.CSW 2012-06-17 12:17:32 UTC (rev 18444) @@ -23,3 +23,6 @@ lead to the service going in maintenance mode when using SMF (or just not having the daemon started when using legacy startup scritps). This is due to the locking mechanism used by CFEngine. + +* Starting with CFEngine 3.3.0, support for Berkeley DB was dropped by + CFEngine, and Tokyocabinet is used instead. \ No newline at end of file Modified: csw/mgar/pkg/cfengine3/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/cfengine3/trunk/files/changelog.CSW 2012-06-17 08:19:04 UTC (rev 18443) +++ csw/mgar/pkg/cfengine3/trunk/files/changelog.CSW 2012-06-17 12:17:32 UTC (rev 18444) @@ -1,3 +1,15 @@ +cfengine3 (3.3.3,REV=2012.06.17) + + * New upstream release 3.3.3. + + * Starting with CFEngine 3.3.0, Berkeley DB support was + dropped. Tokyocabinet is used instead. + + * Dropped support for Solaris 9. + + -- Rafael Ostertag Sun, 17 Jun 2012 14:09:15 +0200 + + cfengine3 (3.2.3,REV=2012.01.06) * Obsoleted CSWlibpromises1. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From guengel at users.sourceforge.net Sun Jun 17 15:21:58 2012 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sun, 17 Jun 2012 13:21:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[18445] csw/mgar/pkg/cfengine3/trunk/files/README.CSW Message-ID: Revision: 18445 http://gar.svn.sourceforge.net/gar/?rev=18445&view=rev Author: guengel Date: 2012-06-17 13:21:58 +0000 (Sun, 17 Jun 2012) Log Message: ----------- cfengine3/trunk: Added note on stale *.db files. Modified Paths: -------------- csw/mgar/pkg/cfengine3/trunk/files/README.CSW Modified: csw/mgar/pkg/cfengine3/trunk/files/README.CSW =================================================================== --- csw/mgar/pkg/cfengine3/trunk/files/README.CSW 2012-06-17 12:17:32 UTC (rev 18444) +++ csw/mgar/pkg/cfengine3/trunk/files/README.CSW 2012-06-17 13:21:58 UTC (rev 18445) @@ -1,4 +1,4 @@ -CFEngine 3 +BCFEngine 3 ---------- * The working directory is located at /var/opt/csw/cfengine3. @@ -25,4 +25,7 @@ scritps). This is due to the locking mechanism used by CFEngine. * Starting with CFEngine 3.3.0, support for Berkeley DB was dropped by - CFEngine, and Tokyocabinet is used instead. \ No newline at end of file + CFEngine developers, and Tokyocabinet is used instead. Therefore, if + you upgrade from pre 3.3.0 CFEngine, there will be stale *.db files + in $(sys.workdir) (/var/opt/csw/cfengine3 by default). Those can be + removed. 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 17 18:33:17 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 17 Jun 2012 16:33:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[18446] csw/mgar/pkg/gdal/trunk Message-ID: Revision: 18446 http://gar.svn.sourceforge.net/gar/?rev=18446&view=rev Author: bdwalton Date: 2012-06-17 16:33:17 +0000 (Sun, 17 Jun 2012) Log Message: ----------- gdal/trunk: switch back to studio for testing, add patches required to make it build understduio; update mysql deps Modified Paths: -------------- csw/mgar/pkg/gdal/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/gdal/trunk/files/0003-Cast-inbuf-parameter-to-iconv-call-to-work-with-Sun-.patch csw/mgar/pkg/gdal/trunk/files/0004-Ensure-that-__FUNCTION__-is-mapped-to-__func__-when-.patch csw/mgar/pkg/gdal/trunk/files/0005-Pass-proper-types-to-std-make_pair-to-satisfy-Sun-St.patch Modified: csw/mgar/pkg/gdal/trunk/Makefile =================================================================== --- csw/mgar/pkg/gdal/trunk/Makefile 2012-06-17 13:21:58 UTC (rev 18445) +++ csw/mgar/pkg/gdal/trunk/Makefile 2012-06-17 16:33:17 UTC (rev 18446) @@ -15,6 +15,9 @@ DISTFILES = $(DISTNAME).tar.gz PATCHFILES += 0001-Force-use-of-double-data-type-before-checking-for-is.patch PATCHFILES += 0002-apply-patch-from-upstream-to-handle-building-with-a-.patch +PATCHFILES += 0003-Cast-inbuf-parameter-to-iconv-call-to-work-with-Sun-.patch +PATCHFILES += 0004-Ensure-that-__FUNCTION__-is-mapped-to-__func__-when-.patch +PATCHFILES += 0005-Pass-proper-types-to-std-make_pair-to-satisfy-Sun-St.patch #PATCHFILES += 0001-Force-the-use-of-CSWbash.patch PACKAGES += CSWgdal @@ -38,7 +41,7 @@ RUNTIME_DEP_PKGS_CSWgdal += CSWlibnetcdf7 RUNTIME_DEP_PKGS_CSWgdal += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWgdal += CSWlibpq5 -RUNTIME_DEP_PKGS_CSWgdal += CSWlibmysqlclient15 +RUNTIME_DEP_PKGS_CSWgdal += CSWlibmysqlclient18 PACKAGES += CSWlibgdal1 CATALOGNAME_CSWlibgdal1 = libgdal1 @@ -56,7 +59,7 @@ RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibtiff3 RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibz1 RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibnetcdf7 -RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibmysqlclient15 +RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibmysqlclient18 RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibpq5 RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibgif4 @@ -69,11 +72,9 @@ RUNTIME_DEP_PKGS_CSWgdal-dev += CSWlibgdal1 PKGFILES_CSWgdal-dev += $(PKGFILES_DEVEL) /opt/csw/bin/gdal-config -GARCOMPILER = GNU +# enable use of __func__ as required by patch 0004 +EXTRA_CXXFLAGS += -features=extensions -# c++ libraries, so move things around a bit -libdir = $(abspath /opt/csw/gxx/lib/$(MM_LIBDIR)) - CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-libz=$(prefix) CONFIGURE_ARGS += --with-png=$(prefix) Added: csw/mgar/pkg/gdal/trunk/files/0003-Cast-inbuf-parameter-to-iconv-call-to-work-with-Sun-.patch =================================================================== --- csw/mgar/pkg/gdal/trunk/files/0003-Cast-inbuf-parameter-to-iconv-call-to-work-with-Sun-.patch (rev 0) +++ csw/mgar/pkg/gdal/trunk/files/0003-Cast-inbuf-parameter-to-iconv-call-to-work-with-Sun-.patch 2012-06-17 16:33:17 UTC (rev 18446) @@ -0,0 +1,40 @@ +From 17b4f095d0f109e7b8c4865395945f643e6b9dd0 Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Sun, 17 Jun 2012 04:15:19 +0200 +Subject: [PATCH] Cast inbuf parameter to iconv call to work with Sun Studio + +Studio 12 was dieing due to passing the inbuf parameter to iconv as +char** instead of const char**. Gcc had no issues with this. + +Apply the appropriate cast so that the compiler is happy. + +Signed-off-by: Ben Walton +--- + port/cpl_recode_iconv.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/port/cpl_recode_iconv.cpp b/port/cpl_recode_iconv.cpp +index ec7118c..40b466d 100644 +--- a/port/cpl_recode_iconv.cpp ++++ b/port/cpl_recode_iconv.cpp +@@ -89,7 +89,7 @@ char *CPLRecodeIconv( const char *pszSource, + while ( nSrcLen > 0 ) + { + size_t nConverted = +- iconv( sConv, &pszSrcBuf, &nSrcLen, &pszDstBuf, &nDstLen ); ++ iconv( sConv, (const char **)&pszSrcBuf, &nSrcLen, &pszDstBuf, &nDstLen ); + + if ( nConverted == (size_t)-1 ) + { +@@ -240,7 +240,7 @@ char *CPLRecodeFromWCharIconv( const wchar_t *pwszSource, + while ( nSrcLen > 0 ) + { + size_t nConverted = +- iconv( sConv, &pszSrcBuf, &nSrcLen, &pszDstBuf, &nDstLen ); ++ iconv( sConv, (const char**)&pszSrcBuf, &nSrcLen, &pszDstBuf, &nDstLen ); + + if ( nConverted == (size_t)-1 ) + { +-- +1.7.10.3 + Added: csw/mgar/pkg/gdal/trunk/files/0004-Ensure-that-__FUNCTION__-is-mapped-to-__func__-when-.patch =================================================================== --- csw/mgar/pkg/gdal/trunk/files/0004-Ensure-that-__FUNCTION__-is-mapped-to-__func__-when-.patch (rev 0) +++ csw/mgar/pkg/gdal/trunk/files/0004-Ensure-that-__FUNCTION__-is-mapped-to-__func__-when-.patch 2012-06-17 16:33:17 UTC (rev 18446) @@ -0,0 +1,37 @@ +From 683f4ab02dcf02453c67411de33cc4dcba1f2eb7 Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Sun, 17 Jun 2012 04:52:24 +0200 +Subject: [PATCH] Ensure that __FUNCTION__ is mapped to __func__ when using + Studio CC + +Sun Studio doesn't define __FUNCTION__ like g++ does. Instead, it +defines __func__, but only when -features=extensions is passed in +CXXFLAGS. Define __FUNCTION__ as __func__ if __STUDIO_CC is defined +so that the NCDF_ERR macro can function without a complier specific +version. + +Signed-off-by: Ben Walton +--- + frmts/netcdf/netcdfdataset.h | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/frmts/netcdf/netcdfdataset.h b/frmts/netcdf/netcdfdataset.h +index 7c06085..0689786 100644 +--- a/frmts/netcdf/netcdfdataset.h ++++ b/frmts/netcdf/netcdfdataset.h +@@ -84,6 +84,12 @@ + #define NCDF_DEFLATE_LEVEL 1 /* best time/size ratio */ + #define NCDF_COMPRESS_SZIP 3 /* no support for writting */ + ++/* gcc defines __FUNCTION__ but sun studio CC defines __func__ (only ++ when -features=extensions is used; add to CXXFLAGS) */ ++#if defined(__SUNPRO_CC) ++#define __FUNCTION__ __func__ ++#endif ++ + /* helper for libnetcdf errors */ + #define NCDF_ERR(status) if ( status != NC_NOERR ){ \ + CPLError( CE_Failure,CPLE_AppDefined, \ +-- +1.7.10.3 + Added: csw/mgar/pkg/gdal/trunk/files/0005-Pass-proper-types-to-std-make_pair-to-satisfy-Sun-St.patch =================================================================== --- csw/mgar/pkg/gdal/trunk/files/0005-Pass-proper-types-to-std-make_pair-to-satisfy-Sun-St.patch (rev 0) +++ csw/mgar/pkg/gdal/trunk/files/0005-Pass-proper-types-to-std-make_pair-to-satisfy-Sun-St.patch 2012-06-17 16:33:17 UTC (rev 18446) @@ -0,0 +1,50 @@ +From 3f4d3eafbf74ca803d696f4b1f6a81902222377a Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Sun, 17 Jun 2012 17:13:29 +0200 +Subject: [PATCH] Pass proper types to std::make_pair to satisfy Sun Studio CC + +Studio CC doesn't automatically convert a const char[] to std::string in +calls to std::make_pair. Wrap these values as std::string. + +Signed-off-by: Ben Walton +--- + frmts/netcdf/netcdfdataset.cpp | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/frmts/netcdf/netcdfdataset.cpp b/frmts/netcdf/netcdfdataset.cpp +index ebdce25..b0be750 100644 +--- a/frmts/netcdf/netcdfdataset.cpp ++++ b/frmts/netcdf/netcdfdataset.cpp +@@ -5096,7 +5096,7 @@ void NCDFWriteProjAttribs( const OGR_SRSNode *poPROJCS, + double dfLatPole = 0.0; + if ( dfValue > 0.0) dfLatPole = 90.0; + else dfLatPole = -90.0; +- oOutList.push_back( std::make_pair( CF_PP_LAT_PROJ_ORIGIN, ++ oOutList.push_back( std::make_pair( std::string(CF_PP_LAT_PROJ_ORIGIN), + dfLatPole ) ); + } + +@@ -5120,7 +5120,7 @@ void NCDFWriteProjAttribs( const OGR_SRSNode *poPROJCS, + else { + oValIter2 = oValMap.find( std::string(SRS_PP_LATITUDE_OF_ORIGIN) ); + if (oValIter2 != oValMap.end() ) { +- oOutList.push_back( std::make_pair( CF_PP_STD_PARALLEL_1, ++ oOutList.push_back( std::make_pair( std::string(CF_PP_STD_PARALLEL_1), + oValIter2->second) ); + } + else { +@@ -5153,9 +5153,9 @@ void NCDFWriteProjAttribs( const OGR_SRSNode *poPROJCS, + } + /* for SRS_PP_SCALE_FACTOR write 2 mappings */ + else if ( EQUAL(pszGDALAtt->c_str(), SRS_PP_SCALE_FACTOR) ) { +- oOutList.push_back( std::make_pair( CF_PP_SCALE_FACTOR_MERIDIAN, ++ oOutList.push_back( std::make_pair( std::string(CF_PP_SCALE_FACTOR_MERIDIAN), + dfValue ) ); +- oOutList.push_back( std::make_pair( CF_PP_SCALE_FACTOR_ORIGIN, ++ oOutList.push_back( std::make_pair( std::string(CF_PP_SCALE_FACTOR_ORIGIN), + dfValue ) ); + } + /* if not found insert the GDAL name */ +-- +1.7.10.3 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Mon Jun 18 10:28:03 2012 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Mon, 18 Jun 2012 08:28:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[18447] csw/mgar/pkg/unbound/trunk Message-ID: Revision: 18447 http://gar.svn.sourceforge.net/gar/?rev=18447&view=rev Author: idogan23 Date: 2012-06-18 08:28:03 +0000 (Mon, 18 Jun 2012) Log Message: ----------- unbound: bump version to 1.4.17 Modified Paths: -------------- csw/mgar/pkg/unbound/trunk/Makefile csw/mgar/pkg/unbound/trunk/checksums Modified: csw/mgar/pkg/unbound/trunk/Makefile =================================================================== --- csw/mgar/pkg/unbound/trunk/Makefile 2012-06-17 16:33:17 UTC (rev 18446) +++ csw/mgar/pkg/unbound/trunk/Makefile 2012-06-18 08:28:03 UTC (rev 18447) @@ -1,5 +1,5 @@ NAME = unbound -VERSION = 1.4.16 +VERSION = 1.4.17 CATEGORIES = server GARTYPE = v2 DESCRIPTION = A validating, recursive, and caching DNS resolver Modified: csw/mgar/pkg/unbound/trunk/checksums =================================================================== --- csw/mgar/pkg/unbound/trunk/checksums 2012-06-17 16:33:17 UTC (rev 18446) +++ csw/mgar/pkg/unbound/trunk/checksums 2012-06-18 08:28:03 UTC (rev 18447) @@ -1 +1 @@ -5158d03d2ab0a8e60925c7a9b9903631 unbound-1.4.16.tar.gz +812d49064a78c92765970a1364736da7 unbound-1.4.17.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Mon Jun 18 10:32:11 2012 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Mon, 18 Jun 2012 08:32:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[18448] csw/mgar/pkg/unbound/trunk/Makefile Message-ID: Revision: 18448 http://gar.svn.sourceforge.net/gar/?rev=18448&view=rev Author: idogan23 Date: 2012-06-18 08:32:10 +0000 (Mon, 18 Jun 2012) Log Message: ----------- unbound: We have now OpenSSL 1.0, there is no need to disable gost. Modified Paths: -------------- csw/mgar/pkg/unbound/trunk/Makefile Modified: csw/mgar/pkg/unbound/trunk/Makefile =================================================================== --- csw/mgar/pkg/unbound/trunk/Makefile 2012-06-18 08:28:03 UTC (rev 18447) +++ csw/mgar/pkg/unbound/trunk/Makefile 2012-06-18 08:32:10 UTC (rev 18448) @@ -34,9 +34,6 @@ CONFIGURE_ARGS += --with-pidfile=/var/run/unbound.pid CONFIGURE_ARGS += --sysconfdir=/etc/opt/csw -# Gost requiers OpenSSL 1.0 -CONFIGURE_ARGS += --disable-gost - STRIP_LIBTOOL = 0 # make test doesn't work for the moment on Solaris This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Mon Jun 18 10:32:44 2012 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Mon, 18 Jun 2012 08:32:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[18449] csw/mgar/pkg/unbound/trunk/Makefile Message-ID: Revision: 18449 http://gar.svn.sourceforge.net/gar/?rev=18449&view=rev Author: idogan23 Date: 2012-06-18 08:32:44 +0000 (Mon, 18 Jun 2012) Log Message: ----------- unbound: Drop Solaris 9 support Modified Paths: -------------- csw/mgar/pkg/unbound/trunk/Makefile Modified: csw/mgar/pkg/unbound/trunk/Makefile =================================================================== --- csw/mgar/pkg/unbound/trunk/Makefile 2012-06-18 08:32:10 UTC (rev 18448) +++ csw/mgar/pkg/unbound/trunk/Makefile 2012-06-18 08:32:44 UTC (rev 18449) @@ -15,7 +15,7 @@ DISTFILES += cswunbound DISTFILES += cswusergroup -PACKAGING_PLATFORMS += solaris9-sparc solaris9-i386 +PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 PACKAGES = CSWunbound CSWlibunbound2 CSWunbound-devel CSWunbound-host # We define upstream file regex so we can be notifed of new upstream software release This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Mon Jun 18 11:05:11 2012 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Mon, 18 Jun 2012 09:05:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[18450] csw/mgar/pkg/mule/trunk Message-ID: Revision: 18450 http://gar.svn.sourceforge.net/gar/?rev=18450&view=rev Author: idogan23 Date: 2012-06-18 09:05:11 +0000 (Mon, 18 Jun 2012) Log Message: ----------- mule: fix OS detection Modified Paths: -------------- csw/mgar/pkg/mule/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/mule/trunk/files/0001-OS-detection.patch Modified: csw/mgar/pkg/mule/trunk/Makefile =================================================================== --- csw/mgar/pkg/mule/trunk/Makefile 2012-06-18 08:32:44 UTC (rev 18449) +++ csw/mgar/pkg/mule/trunk/Makefile 2012-06-18 09:05:11 UTC (rev 18450) @@ -21,6 +21,7 @@ PATCHFILES += 0001-javapath.patch PATCHFILES += 0001-runasusermule.patch PATCHFILES += 0001-piddir.patch +PATCHFILES += 0001-OS-detection.patch PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 Added: csw/mgar/pkg/mule/trunk/files/0001-OS-detection.patch =================================================================== --- csw/mgar/pkg/mule/trunk/files/0001-OS-detection.patch (rev 0) +++ csw/mgar/pkg/mule/trunk/files/0001-OS-detection.patch 2012-06-18 09:05:11 UTC (rev 18450) @@ -0,0 +1,34 @@ +From 7d6bb499bb6b6254b55dc4899ae7918ebdb88bb8 Mon Sep 17 00:00:00 2001 +From: Ihsan Dogan +Date: Mon, 18 Jun 2012 11:01:31 +0200 +Subject: [PATCH] OS-detection + +--- + bin/mule | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/bin/mule b/bin/mule +index 467b4c6..25a448b 100755 +--- a/bin/mule ++++ b/bin/mule +@@ -201,7 +201,7 @@ fi + PSKEYWORD="args" + + # Resolve the os +-DIST_OS=`uname -s | tr [:upper:] [:lower:] | tr -d [:blank:]` ++DIST_OS=`uname -s | tr '[A-Z]' '[a-z]' | tr -d ' '` + case "$DIST_OS" in + 'sunos') + DIST_OS="solaris" +@@ -231,7 +231,7 @@ if [ "$DIST_OS" = "aix" ]; then + UNAME_PROC_OPTION="-p" + fi + +-PROC_ARCH=`uname $UNAME_PROC_OPTION | tr [:upper:] [:lower:] | tr -d [:blank:]` ++PROC_ARCH=`uname $UNAME_PROC_OPTION | tr '[A-Z]' '[a-z]' | tr -d ' '` + + # The previous approach was this: + # If a 32-bit wrapper binary exists then it will work on 32 or 64 bit +-- +1.7.10.3 + 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 18 17:42:01 2012 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 18 Jun 2012 15:42:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[18451] csw/mgar/pkg/clamav/trunk Message-ID: Revision: 18451 http://gar.svn.sourceforge.net/gar/?rev=18451&view=rev Author: bonivart Date: 2012-06-18 15:42:00 +0000 (Mon, 18 Jun 2012) Log Message: ----------- clamav/trunk: update to 0.97.5 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 2012-06-18 09:05:11 UTC (rev 18450) +++ csw/mgar/pkg/clamav/trunk/Makefile 2012-06-18 15:42:00 UTC (rev 18451) @@ -1,5 +1,5 @@ NAME = clamav -VERSION = 0.97.4 +VERSION = 0.97.5 #VERSION = 0.97rc #DISTNAME = $(NAME)-devel-latest CATEGORIES = apps @@ -108,6 +108,7 @@ SPKG_SOURCEURL = http://www.clamav.net #SKIPTEST = 1 + # 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 @@ -119,9 +120,9 @@ 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.13|soname=libclamav.so.6|pkgname=CSWlibclam6|expected=CSWlibclamav6 -CHECKPKG_OVERRIDES_CSWlibclam6 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamunrar.so.6.1.13|soname=libclamunrar.so.6|pkgname=CSWlibclam6|expected=CSWlibclamunrar6 -CHECKPKG_OVERRIDES_CSWlibclam6 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamunrar_iface.so.6.1.13|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.14|soname=libclamav.so.6|pkgname=CSWlibclam6|expected=CSWlibclamav6 +CHECKPKG_OVERRIDES_CSWlibclam6 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamunrar.so.6.1.14|soname=libclamunrar.so.6|pkgname=CSWlibclam6|expected=CSWlibclamunrar6 +CHECKPKG_OVERRIDES_CSWlibclam6 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libclamunrar_iface.so.6.1.14|soname=libclamunrar_iface.so.6|pkgname=CSWlibclam6|expected=CSWlibclamunrar-iface6 include gar/category.mk Modified: csw/mgar/pkg/clamav/trunk/checksums =================================================================== --- csw/mgar/pkg/clamav/trunk/checksums 2012-06-18 09:05:11 UTC (rev 18450) +++ csw/mgar/pkg/clamav/trunk/checksums 2012-06-18 15:42:00 UTC (rev 18451) @@ -1 +1 @@ -dc1e5abc093b11f120e4eac94a7f78aa clamav-0.97.4.tar.gz +4d4b93243a5add0216acc4f24f43a895 clamav-0.97.5.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Tue Jun 19 02:51:42 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 19 Jun 2012 00:51:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[18452] csw/mgar/pkg/git/trunk Message-ID: Revision: 18452 http://gar.svn.sourceforge.net/gar/?rev=18452&view=rev Author: bdwalton Date: 2012-06-19 00:51:42 +0000 (Tue, 19 Jun 2012) 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 2012-06-18 15:42:00 UTC (rev 18451) +++ csw/mgar/pkg/git/trunk/Makefile 2012-06-19 00:51:42 UTC (rev 18452) @@ -1,5 +1,5 @@ NAME = git -VERSION = 1.7.10.3 +VERSION = 1.7.11 #PATCHLEVEL = rc4 DISTNAME = $(NAME)-$(VERSION) CATEGORIES = devel Modified: csw/mgar/pkg/git/trunk/checksums =================================================================== --- csw/mgar/pkg/git/trunk/checksums 2012-06-18 15:42:00 UTC (rev 18451) +++ csw/mgar/pkg/git/trunk/checksums 2012-06-19 00:51:42 UTC (rev 18452) @@ -1 +1 @@ -549d1863eaf9f680c81f471ff8abcc1a git-1.7.10.3.tar.gz +0beee35ec7d11756f51ca1d3ec5c0e16 git-1.7.11.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From romeotheriault at opencsw.org Tue Jun 19 05:01:17 2012 From: romeotheriault at opencsw.org (Romeo Theriault) Date: Mon, 18 Jun 2012 17:01:17 -1000 Subject: [csw-devel] SF.net SVN: gar:[18417] csw/mgar/pkg/zeromq/trunk/Makefile In-Reply-To: <110F0D8C-6CD6-4844-B70B-499E467089A3@opencsw.org> References: <1339725364-sup-75@pinkfloyd.chass.utoronto.ca> <110F0D8C-6CD6-4844-B70B-499E467089A3@opencsw.org> Message-ID: On Fri, Jun 15, 2012 at 9:18 AM, Dagobert Michelsen wrote: > I just read that libtool keeps -Wl, if you have some spare cycles it would be cool > if you could test adding > ?-Wl,-norunpath > without the libtool patch and see if the option makes it to the linker. I've been trying to get it to compile with the following: EXTRA_LINKER_FLAGS += -Wl EXTRA_LINKER_FLAGS += -norunpath and also tried EXTRA_LINKER_FLAGS += -Wl,-norunpath and also, EXTRA_LINKER_FLAGS += -Wl -norunpath and they are all failing on: checking how to create a ustar tar archive... pax checking for gcc... /opt/SUNWspro/bin/cc checking whether the C compiler works... no configure: error: in `/home/romeotheriault/opencsw/zeromq/trunk/work/solaris10-sparc/build-isa-sparcv8plus/zeromq-2.2.0': configure: error: C compiler cannot create executables See `config.log' for more details gmake[2]: *** [configure-work/solaris10-sparc/build-isa-sparcv8plus/zeromq-2.2.0/configure] Error 77 gmake[2]: Leaving directory `/home/romeotheriault/opencsw/zeromq/trunk' gmake[1]: *** [merge-isa-sparcv8plus] Error 2 gmake[1]: Leaving directory `/home/romeotheriault/opencsw/zeromq/trunk' gmake: *** [platforms] Error 2 Not sure if I'm doing it wrong or not? Romeo From wahwah at users.sourceforge.net Tue Jun 19 11:10:48 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 19 Jun 2012 09:10:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[18453] csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile Message-ID: Revision: 18453 http://gar.svn.sourceforge.net/gar/?rev=18453&view=rev Author: wahwah Date: 2012-06-19 09:10:47 +0000 (Tue, 19 Jun 2012) Log Message: ----------- mysql5/branches/mysql-5.5.x: work towards building it with Studio Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2012-06-19 00:51:42 UTC (rev 18452) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2012-06-19 09:10:47 UTC (rev 18453) @@ -21,6 +21,8 @@ # Useful when making a series of builds on the same day # GARFLAVOR ?= DBG +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + # There is some assembler code, which doesn't work on sparcv8, and I don't see # an easy way to switch it off. ISA_DEFAULT_sparc-5.9 = sparcv8plus @@ -36,9 +38,9 @@ # There are problems with the build using Sun Studio. # GARCOMPILER = SOS12 -# EXTRA_CFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ -# EXTRA_CXXFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ -GARCOMPILER = GNU +EXTRA_CFLAGS += -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ +EXTRA_CXXFLAGS += -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ +# GARCOMPILER = GNU INITSMF = $(sysconfdir)/init\.d/csw$(NAME) @@ -209,6 +211,9 @@ # CMAKE_ARGS += -DOPENSSL_CRYPTO_LIBRARIES=$(libdir)/$(MM_LIBDIR)/libcrypto.so CMAKE_ARGS += -DCMAKE_INCLUDE_PATH="$(includedir)" CMAKE_ARGS += -DCMAKE_LIBRARY_PATH="$(libdir)" +CMAKE_ARGS += "-DCMAKE_C_FLAGS=$(CFLAGS)" +CMAKE_ARGS += "-DCMAKE_CXX_FLAGS=$(CXXFLAGS)" +CMAKE_ARGS += -DCMAKE_VERBOSE_MAKEFILE=ON # TODO: Make the tests pass. They don't at the moment. SKIPTEST ?= 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Tue Jun 19 12:05:32 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Tue, 19 Jun 2012 10:05:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[18454] csw/mgar/pkg Message-ID: Revision: 18454 http://gar.svn.sourceforge.net/gar/?rev=18454&view=rev Author: wilbury Date: 2012-06-19 10:05:32 +0000 (Tue, 19 Jun 2012) Log Message: ----------- mailwrapper/trunk: Initial stub commit. Added Paths: ----------- csw/mgar/pkg/mailwrapper/ csw/mgar/pkg/mailwrapper/Makefile csw/mgar/pkg/mailwrapper/branches/ csw/mgar/pkg/mailwrapper/tags/ csw/mgar/pkg/mailwrapper/trunk/ csw/mgar/pkg/mailwrapper/trunk/Makefile csw/mgar/pkg/mailwrapper/trunk/checksums csw/mgar/pkg/mailwrapper/trunk/files/ Added: csw/mgar/pkg/mailwrapper/Makefile =================================================================== --- csw/mgar/pkg/mailwrapper/Makefile (rev 0) +++ csw/mgar/pkg/mailwrapper/Makefile 2012-06-19 10:05:32 UTC (rev 18454) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/mailwrapper/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/mailwrapper/trunk/Makefile =================================================================== --- csw/mgar/pkg/mailwrapper/trunk/Makefile (rev 0) +++ csw/mgar/pkg/mailwrapper/trunk/Makefile 2012-06-19 10:05:32 UTC (rev 18454) @@ -0,0 +1,29 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = mailwrapper +VERSION = 1.0 +GARTYPE = v2 +CATEGORIES = category + +DESCRIPTION = Brief description +define BLURB + Long description +endef + +MASTER_SITES = +DISTFILES = $(DISTNAME).tar.gz + +# File name regex to get notifications about upstream software releases +# NOTE: Use this only if the automatic regex creation +# does not work for your package +# 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/mailwrapper/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/mailwrapper/trunk/checksums =================================================================== This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Tue Jun 19 12:13:17 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Tue, 19 Jun 2012 10:13:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[18455] csw/mgar/pkg/mailwrapper/trunk Message-ID: Revision: 18455 http://gar.svn.sourceforge.net/gar/?rev=18455&view=rev Author: wilbury Date: 2012-06-19 10:13:17 +0000 (Tue, 19 Jun 2012) Log Message: ----------- mailwrapper/trunk: Fix build et al. Modified Paths: -------------- csw/mgar/pkg/mailwrapper/trunk/Makefile csw/mgar/pkg/mailwrapper/trunk/checksums Modified: csw/mgar/pkg/mailwrapper/trunk/Makefile =================================================================== --- csw/mgar/pkg/mailwrapper/trunk/Makefile 2012-06-19 10:05:32 UTC (rev 18454) +++ csw/mgar/pkg/mailwrapper/trunk/Makefile 2012-06-19 10:13:17 UTC (rev 18455) @@ -4,26 +4,21 @@ NAME = mailwrapper VERSION = 1.0 GARTYPE = v2 -CATEGORIES = category +CATEGORIES = apps -DESCRIPTION = Brief description +DESCRIPTION = Run substitute program define BLURB - Long description + Run substitute program endef -MASTER_SITES = -DISTFILES = $(DISTNAME).tar.gz +MASTER_SITES = http://sk.freebsd.org/pub/local/distfiles/ +DISTNAME = $(NAME)-opencsw-$(VERSION) +DISTFILES = $(DISTNAME).tar.bz2 -# File name regex to get notifications about upstream software releases -# NOTE: Use this only if the automatic regex creation -# does not work for your package -# UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +# No configure script +CONFIGURE_SCRIPTS= +SKIPTEST=1 +ENABLE_CHECK=0 -# 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 Modified: csw/mgar/pkg/mailwrapper/trunk/checksums =================================================================== --- csw/mgar/pkg/mailwrapper/trunk/checksums 2012-06-19 10:05:32 UTC (rev 18454) +++ csw/mgar/pkg/mailwrapper/trunk/checksums 2012-06-19 10:13:17 UTC (rev 18455) @@ -0,0 +1 @@ +a36eb34c598289f5430336dcee488372 mailwrapper-opencsw-1.0.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Tue Jun 19 12:17:42 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Tue, 19 Jun 2012 10:17:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[18456] csw/mgar/pkg/mailwrapper/trunk/Makefile Message-ID: Revision: 18456 http://gar.svn.sourceforge.net/gar/?rev=18456&view=rev Author: wilbury Date: 2012-06-19 10:17:42 +0000 (Tue, 19 Jun 2012) Log Message: ----------- mailwrapper/trunk: Sample and preserve conf. Modified Paths: -------------- csw/mgar/pkg/mailwrapper/trunk/Makefile Modified: csw/mgar/pkg/mailwrapper/trunk/Makefile =================================================================== --- csw/mgar/pkg/mailwrapper/trunk/Makefile 2012-06-19 10:13:17 UTC (rev 18455) +++ csw/mgar/pkg/mailwrapper/trunk/Makefile 2012-06-19 10:17:42 UTC (rev 18456) @@ -20,5 +20,8 @@ SKIPTEST=1 ENABLE_CHECK=0 +PRESERVECONF += $(sysconfdir)/mailer.conf +SAMPLECONF += $(sysconfdir)/mailer.conf + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Tue Jun 19 13:45:13 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Tue, 19 Jun 2012 11:45:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[18457] csw/mgar/pkg Message-ID: Revision: 18457 http://gar.svn.sourceforge.net/gar/?rev=18457&view=rev Author: pfelecan Date: 2012-06-19 11:45:13 +0000 (Tue, 19 Jun 2012) Log Message: ----------- migrated from a private recipe to a GAR based one; not for release: the splitting is not done yet. Added Paths: ----------- csw/mgar/pkg/plotutils/ csw/mgar/pkg/plotutils/Makefile csw/mgar/pkg/plotutils/branches/ csw/mgar/pkg/plotutils/tags/ csw/mgar/pkg/plotutils/trunk/ csw/mgar/pkg/plotutils/trunk/Makefile csw/mgar/pkg/plotutils/trunk/checksums csw/mgar/pkg/plotutils/trunk/files/ Added: csw/mgar/pkg/plotutils/Makefile =================================================================== --- csw/mgar/pkg/plotutils/Makefile (rev 0) +++ csw/mgar/pkg/plotutils/Makefile 2012-06-19 11:45:13 UTC (rev 18457) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/plotutils/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/plotutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/plotutils/trunk/Makefile (rev 0) +++ csw/mgar/pkg/plotutils/trunk/Makefile 2012-06-19 11:45:13 UTC (rev 18457) @@ -0,0 +1,51 @@ +# $Id$ + +NAME = plotutils +VERSION = 2.6 +GARTYPE = v2 +CATEGORIES = lib + +DESCRIPTION = the GNU plotutils (plotting utilities) package +define BLURB + The GNU plotutils package contains software for both programmers and + technical users. Its centerpiece is libplot, a powerful C/C++ function + library for exporting 2-D vector graphics in many file formats, both + vector and bitmap. On the X Window System, it can also do 2-D vector + graphics animations. +endef + +MASTER_SITES = $(GNU_MIRROR) +DISTFILES = $(DISTNAME).tar.gz + +GARCOMPILER = GNU + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-libplotter +CONFIGURE_ARGS += --enable-libxmi +CONFIGURE_ARGS += --enable-lj-fonts-in-x +CONFIGURE_ARGS += --enable-ps-fonts-in-pcl +CONFIGURE_ARGS += --enable-lj-fonts-in-ps + +INSTALL_ARGS = datadir=$(docdir)/$(NAME) + +TEST_SCRIPTS = custom + +BUILD_DEP_PKGS += CSWlibpng-dev +BUILD_DEP_PKGS += CSWlibz-dev + +RUNTIME_DEP_PKGS += CSWlibgcc-s1 +RUNTIME_DEP_PKGS += CSWlibpng12-0 +RUNTIME_DEP_PKGS += CSWlibstdc++6 +RUNTIME_DEP_PKGS += CSWlibz1 + +include gar/category.mk + +# there are test failing (plot2hpgl.test and plot2pcl.test) and I +# choose to ignore them as the remaining ones pass. +test-custom: + -$(MAKE) -k -C $(WORKSRC) check + $(MAKECOOKIE) + +# this is private and not available publicly +mydependencies: + $(HOME)/bin/ocswdeplist --package $(NAME) Property changes on: csw/mgar/pkg/plotutils/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/plotutils/trunk/checksums =================================================================== --- csw/mgar/pkg/plotutils/trunk/checksums (rev 0) +++ csw/mgar/pkg/plotutils/trunk/checksums 2012-06-19 11:45:13 UTC (rev 18457) @@ -0,0 +1 @@ +c08a424bd2438c80a786a7f4b5bb6a40 plotutils-2.6.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Jun 19 14:42:58 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 19 Jun 2012 12:42:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[18458] csw/mgar/pkg/gcc4/trunk Message-ID: Revision: 18458 http://gar.svn.sourceforge.net/gar/?rev=18458&view=rev Author: wahwah Date: 2012-06-19 12:42:58 +0000 (Tue, 19 Jun 2012) Log Message: ----------- gcc4/trunk: a patch for Ada and PIC Modified Paths: -------------- csw/mgar/pkg/gcc4/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/gcc4/trunk/files/Append-PICFLAG_FOR_TARGET.patch Modified: csw/mgar/pkg/gcc4/trunk/Makefile =================================================================== --- csw/mgar/pkg/gcc4/trunk/Makefile 2012-06-19 11:45:13 UTC (rev 18457) +++ csw/mgar/pkg/gcc4/trunk/Makefile 2012-06-19 12:42:58 UTC (rev 18458) @@ -26,6 +26,9 @@ # PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 +# http://gcc.gnu.org/ml/gcc-help/2012-06/msg00158.html +PATCHFILES += Append-PICFLAG_FOR_TARGET.patch + # GIT init takes a long time. NOGITPATCH ?= 1 @@ -50,60 +53,32 @@ ## build options # http://gcc.gnu.org/install/configure.html -CONFIGURE_ARGS += --program-suffix=$(PROGRAM_SUFFIX) CONFIGURE_ARGS += $(DIRPATHS) -CONFIGURE_ARGS += --with-gnu-as -CONFIGURE_ARGS += --with-as=/opt/csw/bin/gas -CONFIGURE_ARGS += --without-gnu-ld -CONFIGURE_ARGS += --with-ld=/usr/ccs/bin/ld -CONFIGURE_ARGS += --enable-nls -CONFIGURE_ARGS += --with-included-gettext -CONFIGURE_ARGS += --with-libiconv-prefix=$(BUILD_PREFIX) -CONFIGURE_ARGS += --with-x -CONFIGURE_ARGS += --with-mpfr=$(BUILD_PREFIX) -CONFIGURE_ARGS += --with-gmp=$(BUILD_PREFIX) -CONFIGURE_ARGS += --with-ppl=$(BUILD_PREFIX) -CONFIGURE_ARGS += --with-cloog=$(BUILD_PREFIX) CONFIGURE_ARGS += --enable-cloog-backend=isl CONFIGURE_ARGS += --enable-java-awt=xlib +CONFIGURE_ARGS += --enable-languages=ada,c,c++,fortran,go,java,objc CONFIGURE_ARGS += --enable-libada CONFIGURE_ARGS += --enable-libssp +CONFIGURE_ARGS += --enable-nls CONFIGURE_ARGS += --enable-objc-gc CONFIGURE_ARGS += --enable-threads=posix -CONFIGURE_ARGS += --enable-languages=ada,c,c++,fortran,go,java,objc +CONFIGURE_ARGS += --program-suffix=$(PROGRAM_SUFFIX) +CONFIGURE_ARGS += --with-as=/opt/csw/bin/gas +CONFIGURE_ARGS += --with-cloog=$(BUILD_PREFIX) +CONFIGURE_ARGS += --with-gmp=$(BUILD_PREFIX) +CONFIGURE_ARGS += --with-gnu-as +CONFIGURE_ARGS += --with-included-gettext +CONFIGURE_ARGS += --with-ld=/usr/ccs/bin/ld +CONFIGURE_ARGS += --without-gnu-ld +CONFIGURE_ARGS += --with-libiconv-prefix=$(BUILD_PREFIX) +CONFIGURE_ARGS += --with-mpfr=$(BUILD_PREFIX) +CONFIGURE_ARGS += --with-ppl=$(BUILD_PREFIX) CONFIGURE_ARGS += --with-system-zlib=$(BUILD_PREFIX) -# there could be some abstractions in gar.conf.mk, but at the moment there -# aren't so let's specify architectures by hand. -# -# // This avoids the sparcv8+ binaries. -# We no longer avoid sparcv8+ binaries. -ISA_DEFAULT_sparc = sparcv8plus -CPU_sparc_32 = v9 -CPU_sparc_64 = v9 -CPU_i386_32 = i386 -CPU_i386_64 = x86-64 - - -CONFIGURE_ARGS_sparc += --with-cpu=$(CPU_$(GARCH)_32) -CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARCH)) - # GCC can't be built in the same directory with the sources. # It also can't be built in a subdirectory of the sources. OBJDIR = $(abspath $(WORKDIR)/objdir) -# These flags are passed when gcc is built with gcc. -# Needed to remove FLAVOR_FLAGS, because they were Sun Studio specific. -CFLAGS_FOR_TARGET_sparc = -O2 $(ARCHFLAGS_GCC4_$(ISA)) $(EXTRA_GCC4_CC_FLAGS) $(EXTRA_GCC_CC_FLAGS) $(EXTRA_CC_FLAGS) -CXXFLAGS_FOR_TARGET_sparc = -O2 $(ARCHFLAGS_GCC4_$(ISA)) $(EXTRA_GCC4_CXX_FLAGS) $(EXTRA_GCC_CXX_FLAGS) $(EXTRA_CXX_FLAGS) -CFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET_$(GARCH)) -CXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET_$(GARCH)) -EXTRA_EXPORTS += CFLAGS_FOR_TARGET -EXTRA_EXPORTS += CXXFLAGS_FOR_TARGET - -EXTRA_CONFIGURE_EXPORTS += CFLAGS_FOR_TARGET -EXTRA_CONFIGURE_EXPORTS += CXXFLAGS_FOR_TARGET - # bash must be used, otherwise: # http://fixunix.com/solaris/490396-gcc-build-fails-cannot-compute-suffix-object-files.html CONFIG_SHELL = /opt/csw/bin/bash Added: csw/mgar/pkg/gcc4/trunk/files/Append-PICFLAG_FOR_TARGET.patch =================================================================== --- csw/mgar/pkg/gcc4/trunk/files/Append-PICFLAG_FOR_TARGET.patch (rev 0) +++ csw/mgar/pkg/gcc4/trunk/files/Append-PICFLAG_FOR_TARGET.patch 2012-06-19 12:42:58 UTC (rev 18458) @@ -0,0 +1,41 @@ +From 176ff0f9a1016553978d6cf41770703e2ad90958 Mon Sep 17 00:00:00 2001 +From: jakub +Date: Thu, 14 Jun 2012 17:45:53 +0000 +Subject: [PATCH] * gcc-interface/Makefile.in (gnatlib-shared-default): Append + $(PICFLAG_FOR_TARGET) to GNATLIBCFLAGS_FOR_C passed to submake. + +git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_7-branch at 188623 138bc75d-0d04-0410-961f-82ee72b054a4 +--- + gcc/ada/ChangeLog | 5 +++++ + gcc/ada/gcc-interface/Makefile.in | 2 +- + 2 files changed, 6 insertions(+), 1 deletions(-) + +diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog +index 7e3195a..072a3f2 100644 +--- a/gcc/ada/ChangeLog ++++ b/gcc/ada/ChangeLog +@@ -1,3 +1,8 @@ ++2012-06-14 Jakub Jelinek ++ ++ * gcc-interface/Makefile.in (gnatlib-shared-default): Append ++ $(PICFLAG_FOR_TARGET) to GNATLIBCFLAGS_FOR_C passed to submake. ++ + 2012-06-14 Release Manager + + * GCC 4.7.1 released. +diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in +index ee8db38..f9e7eda 100644 +--- a/gcc/ada/gcc-interface/Makefile.in ++++ b/gcc/ada/gcc-interface/Makefile.in +@@ -2597,7 +2597,7 @@ gnatlib-shared-default: + $(MAKE) $(FLAGS_TO_PASS) \ + GNATLIBFLAGS="$(GNATLIBFLAGS)" \ + GNATLIBCFLAGS="$(GNATLIBCFLAGS) $(PICFLAG_FOR_TARGET)" \ +- GNATLIBCFLAGS_FOR_C="$(GNATLIBCFLAGS_FOR_C)" \ ++ GNATLIBCFLAGS_FOR_C="$(GNATLIBCFLAGS_FOR_C) $(PICFLAG_FOR_TARGET)" \ + MULTISUBDIR="$(MULTISUBDIR)" \ + THREAD_KIND="$(THREAD_KIND)" \ + gnatlib +-- +1.7.3.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 Tue Jun 19 14:46:34 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 19 Jun 2012 12:46:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[18459] csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile Message-ID: Revision: 18459 http://gar.svn.sourceforge.net/gar/?rev=18459&view=rev Author: wahwah Date: 2012-06-19 12:46:34 +0000 (Tue, 19 Jun 2012) Log Message: ----------- mysql5/branches/mysql-5.5.x: removing _POSIX_C_SOURCE redef Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2012-06-19 12:42:58 UTC (rev 18458) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2012-06-19 12:46:34 UTC (rev 18459) @@ -21,8 +21,6 @@ # Useful when making a series of builds on the same day # GARFLAVOR ?= DBG -PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 - # There is some assembler code, which doesn't work on sparcv8, and I don't see # an easy way to switch it off. ISA_DEFAULT_sparc-5.9 = sparcv8plus @@ -36,11 +34,8 @@ (Structured Query Language) database server. endef -# There are problems with the build using Sun Studio. -# GARCOMPILER = SOS12 -EXTRA_CFLAGS += -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ -EXTRA_CXXFLAGS += -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__ -# GARCOMPILER = GNU +EXTRA_CFLAGS += -mt -D__EXTENSIONS__ +EXTRA_CXXFLAGS += -mt -D__EXTENSIONS__ INITSMF = $(sysconfdir)/init\.d/csw$(NAME) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Tue Jun 19 16:20:00 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Tue, 19 Jun 2012 14:20:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[18460] csw/mgar/pkg/plotutils/trunk/Makefile Message-ID: Revision: 18460 http://gar.svn.sourceforge.net/gar/?rev=18460&view=rev Author: pfelecan Date: 2012-06-19 14:20:00 +0000 (Tue, 19 Jun 2012) Log Message: ----------- - split in fine grained packages - verified and validated overrides Modified Paths: -------------- csw/mgar/pkg/plotutils/trunk/Makefile Modified: csw/mgar/pkg/plotutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/plotutils/trunk/Makefile 2012-06-19 12:46:34 UTC (rev 18459) +++ csw/mgar/pkg/plotutils/trunk/Makefile 2012-06-19 14:20:00 UTC (rev 18460) @@ -5,7 +5,7 @@ GARTYPE = v2 CATEGORIES = lib -DESCRIPTION = the GNU plotutils (plotting utilities) package +DESCRIPTION = The GNU plotutils (plotting utilities) package define BLURB The GNU plotutils package contains software for both programmers and technical users. Its centerpiece is libplot, a powerful C/C++ function @@ -33,11 +33,67 @@ BUILD_DEP_PKGS += CSWlibpng-dev BUILD_DEP_PKGS += CSWlibz-dev -RUNTIME_DEP_PKGS += CSWlibgcc-s1 -RUNTIME_DEP_PKGS += CSWlibpng12-0 -RUNTIME_DEP_PKGS += CSWlibstdc++6 -RUNTIME_DEP_PKGS += CSWlibz1 +PACKAGES = CSWplotutils-doc +CATALOGNAME_CSWplotutils-doc = plotutils_doc +SPKG_DESC_CSWplotutils-doc = $(DESCRIPTION), documentation +OBSOLETED_BY_CSWplotutils-doc = CSWplotutildoc +CHECKPKG_OVERRIDES_CSWplotutils-doc += file-with-bad-content|/usr/local|root/opt/csw/share/info/plotutils.info +CHECKPKG_OVERRIDES_CSWplotutils-doc += file-with-bad-content|/usr/share|root/opt/csw/share/info/plotutils.info +PACKAGES += CSWlibplot2 +CATALOGNAME_CSWlibplot2 = libplot2 +PKGFILES_CSWlibplot2 += $(call baseisadirs,$(libdir),libplot\.so\.2\.2\.4) +PKGFILES_CSWlibplot2 += $(call baseisadirs,$(libdir),libplot\.so\.2(\.\d+)*) +SPKG_DESC_CSWlibplot2 += $(DESCRIPTION), libplot.so.2 +OBSOLETED_BY_CSWlibplot2 = CSWplotutilrt +RUNTIME_DEP_PKGS_CSWlibplot2 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibplot2 += CSWlibpng12-0 +RUNTIME_DEP_PKGS_CSWlibplot2 += CSWlibz1 + +PACKAGES += CSWlibplotter2 +CATALOGNAME_CSWlibplotter2 = libplotter2 +PKGFILES_CSWlibplotter2 += $(call baseisadirs,$(libdir),libplotter\.so\.2\.2\.4) +PKGFILES_CSWlibplotter2 += $(call baseisadirs,$(libdir),libplotter\.so\.2(\.\d+)*) +SPKG_DESC_CSWlibplotter2 += $(DESCRIPTION), libplotter.so.2 +OBSOLETED_BY_CSWlibplotter2 = CSWplotutilrt +RUNTIME_DEP_PKGS_CSWlibplotter2 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibplotter2 += CSWlibpng12-0 +RUNTIME_DEP_PKGS_CSWlibplotter2 += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWlibplotter2 += CSWlibz1 + +PACKAGES += CSWlibxmi0 +CATALOGNAME_CSWlibxmi0 = libxmi0 +PKGFILES_CSWlibxmi0 += $(call baseisadirs,$(libdir),libxmi\.so\.0\.1\.3) +PKGFILES_CSWlibxmi0 += $(call baseisadirs,$(libdir),libxmi\.so\.0(\.\d+)*) +SPKG_DESC_CSWlibxmi0 += $(DESCRIPTION), libxmi.so.0 +OBSOLETED_BY_CSWlibxmi0 = CSWplotutilrt +RUNTIME_DEP_PKGS_CSWlibxmi0 += CSWlibgcc-s1 + +PACKAGES += CSWplotutils +SPKG_DESC_CSWplotutils = $(DESCRIPTION), utilities +PKGFILES_CSWplotutils = /opt/csw/bin/double +PKGFILES_CSWplotutils += /opt/csw/bin/graph +PKGFILES_CSWplotutils += /opt/csw/bin/hersheydemo +PKGFILES_CSWplotutils += /opt/csw/bin/ode +PKGFILES_CSWplotutils += /opt/csw/bin/pic2plot +PKGFILES_CSWplotutils += /opt/csw/bin/plot +PKGFILES_CSWplotutils += /opt/csw/bin/plotfont +PKGFILES_CSWplotutils += /opt/csw/bin/spline +PKGFILES_CSWplotutils += /opt/csw/bin/tek2plot +RUNTIME_DEP_PKGS_CSWplotutils += CSWlibplot2 +RUNTIME_DEP_PKGS_CSWplotutils += CSWlibplotter2 +RUNTIME_DEP_PKGS_CSWplotutils += CSWlibxmi0 +OBSOLETED_BY_CSWplotutils = CSWplotutil + +PACKAGES += CSWplotutils-dev +CATALOGNAME_CSWplotutils-dev = plotutils_dev +SPKG_DESC_CSWplotutils-dev += $(DESCRIPTION), development files +PKGFILES_CSWplotutils-dev += /opt/csw/lib/libplot.so +PKGFILES_CSWplotutils-dev += /opt/csw/lib/libplotter.so +PKGFILES_CSWplotutils-dev += /opt/csw/lib/libxmi.so +PKGFILES_CSWplotutils-dev += $(PKGFILES_DEVEL) +OBSOLETED_BY_CSWplotutils_dev = CSWplotutildevel + include gar/category.mk # there are test failing (plot2hpgl.test and plot2pcl.test) and I 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 19 16:22:19 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 19 Jun 2012 14:22:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[18461] csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile Message-ID: Revision: 18461 http://gar.svn.sourceforge.net/gar/?rev=18461&view=rev Author: wahwah Date: 2012-06-19 14:22:18 +0000 (Tue, 19 Jun 2012) Log Message: ----------- mysql5/branches/mysql-5.5.x: update dependencies, build on 9 and 10 separately because of libssl Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2012-06-19 14:20:00 UTC (rev 18460) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2012-06-19 14:22:18 UTC (rev 18461) @@ -21,6 +21,9 @@ # Useful when making a series of builds on the same day # GARFLAVOR ?= DBG +PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 +PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 + # There is some assembler code, which doesn't work on sparcv8, and I don't see # an easy way to switch it off. ISA_DEFAULT_sparc-5.9 = sparcv8plus @@ -71,7 +74,9 @@ SPKG_DESC_CSWlibmysqlclient$(MYSQL_LIB_VER) += MySQL $(BASE_VERSION) client library, libmysqlclient.so.$(MYSQL_LIB_VER) RUNTIME_DEP_PKGS_CSWlibmysqlclient$(MYSQL_LIB_VER) += CSWlibz1 RUNTIME_DEP_PKGS_CSWlibmysqlclient$(MYSQL_LIB_VER) += CSWlibssl1-0-0 -RUNTIME_DEP_PKGS_CSWlibmysqlclient18 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibmysqlclient$(MYSQL_LIB_VER)_5.9 += CSWlibssl0-9-8 +RUNTIME_DEP_PKGS_CSWlibmysqlclient$(MYSQL_LIB_VER)_5.10 += CSWlibssl1-0-0 +RUNTIME_DEP_PKGS_CSWlibmysqlclient$(MYSQL_LIB_VER) += $(RUNTIME_DEP_PKGS_CSWlibmysqlclient$(MYSQL_LIB_VER)_$(GAROSREL)) PACKAGES += CSWlibmysqlclient-r$(MYSQL_LIB_VER) PKGFILES_CSWlibmysqlclient-r$(MYSQL_LIB_VER) += $(call baseisadirs,$(libdir),libmysqlclient_r\.so\.$(MYSQL_LIB_VER)(\.\d+)*) @@ -104,13 +109,13 @@ PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(client_programs),$(mandir)/man1/$(bin_name)\.1) PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(client_programs),/opt/csw/bin/$(bin_name)) PKGFILES_CSW$(NAME)client += $(foreach bin_name,$(client_programs),/opt/csw/sbin/$(bin_name)) -RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibgcc-s1 # RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibmysqlclient$(MYSQL_LIB_VER) # RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibmysqlclient-r$(MYSQL_LIB_VER) # RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibncursesw5 -RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibstdc++6 RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibz1 -RUNTIME_DEP_PKGS_CSW$(NAME)client += CSWlibssl1-0-0 +RUNTIME_DEP_PKGS_CSW$(NAME)client_5.9 += CSWlibssl0-9-8 +RUNTIME_DEP_PKGS_CSW$(NAME)client_5.10 += CSWlibssl1-0-0 +RUNTIME_DEP_PKGS_CSW$(NAME)client += $(RUNTIME_DEP_PKGS_CSW$(NAME)client_$(GAROSREL)) CHECKPKG_OVERRIDES_CSW$(NAME)client += bad-rpath-entry # It's intentional. There's a sparcv8-incompatible assembler code there, so we @@ -118,17 +123,18 @@ CHECKPKG_OVERRIDES_CSW$(NAME)client += binary-architecture-does-not-match-placement CHECKPKG_OVERRIDES_CSW$(NAME) += binary-architecture-does-not-match-placement CHECKPKG_OVERRIDES_CSWlibmysqlclient18 += binary-architecture-does-not-match-placement +CHECKPKG_OVERRIDES_CSWlibmysqlclient18 += bad-rpath-entry PACKAGES += CSW$(NAME) # RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibmysqlclient-r$(MYSQL_LIB_VER) # RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibmysqlclient$(MYSQL_LIB_VER) SPKG_DESC_CSW$(NAME) = Multithreaded SQL database RUNTIME_DEP_PKGS_CSW$(NAME) += CSW$(NAME)client -RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibstdc++6 # RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibwrap1 RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibz1 -RUNTIME_DEP_PKGS_CSW$(NAME) += CSWlibssl1-0-0 +RUNTIME_DEP_PKGS_CSW$(NAME)_5.9 += CSWlibssl0-9-8 +RUNTIME_DEP_PKGS_CSW$(NAME)_5.10 += CSWlibssl1-0-0 +RUNTIME_DEP_PKGS_CSW$(NAME) += $(RUNTIME_DEP_PKGS_CSW$(NAME)_$(GAROSREL)) CHECKPKG_OVERRIDES_CSW$(NAME) += bad-rpath-entry CHECKPKG_OVERRIDES_CSW$(NAME) += file-with-bad-content This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at users.sourceforge.net Tue Jun 19 16:34:34 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Tue, 19 Jun 2012 14:34:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[18462] csw/mgar/pkg/mailwrapper/trunk Message-ID: Revision: 18462 http://gar.svn.sourceforge.net/gar/?rev=18462&view=rev Author: wilbury Date: 2012-06-19 14:34:33 +0000 (Tue, 19 Jun 2012) Log Message: ----------- mailwrapper/trunk: Install man page, fix LICENSE_TEXT. Modified Paths: -------------- csw/mgar/pkg/mailwrapper/trunk/Makefile csw/mgar/pkg/mailwrapper/trunk/checksums Modified: csw/mgar/pkg/mailwrapper/trunk/Makefile =================================================================== --- csw/mgar/pkg/mailwrapper/trunk/Makefile 2012-06-19 14:22:18 UTC (rev 18461) +++ csw/mgar/pkg/mailwrapper/trunk/Makefile 2012-06-19 14:34:33 UTC (rev 18462) @@ -11,6 +11,8 @@ Run substitute program endef +LICENSE_TEXT = BSD license + MASTER_SITES = http://sk.freebsd.org/pub/local/distfiles/ DISTNAME = $(NAME)-opencsw-$(VERSION) DISTFILES = $(DISTNAME).tar.bz2 Modified: csw/mgar/pkg/mailwrapper/trunk/checksums =================================================================== --- csw/mgar/pkg/mailwrapper/trunk/checksums 2012-06-19 14:22:18 UTC (rev 18461) +++ csw/mgar/pkg/mailwrapper/trunk/checksums 2012-06-19 14:34:33 UTC (rev 18462) @@ -1 +1 @@ -a36eb34c598289f5430336dcee488372 mailwrapper-opencsw-1.0.tar.bz2 +077c18dafca25af67361b8d696d0c900 mailwrapper-opencsw-1.0.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Tue Jun 19 20:16:32 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Tue, 19 Jun 2012 18:16:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[18463] csw/mgar/pkg/plotutils/trunk/Makefile Message-ID: Revision: 18463 http://gar.svn.sourceforge.net/gar/?rev=18463&view=rev Author: pfelecan Date: 2012-06-19 18:16:32 +0000 (Tue, 19 Jun 2012) Log Message: ----------- - corrected development obsolescence - fix architecture neutralness for development and documentation - additional overrides Modified Paths: -------------- csw/mgar/pkg/plotutils/trunk/Makefile Modified: csw/mgar/pkg/plotutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/plotutils/trunk/Makefile 2012-06-19 14:34:33 UTC (rev 18462) +++ csw/mgar/pkg/plotutils/trunk/Makefile 2012-06-19 18:16:32 UTC (rev 18463) @@ -37,6 +37,7 @@ CATALOGNAME_CSWplotutils-doc = plotutils_doc SPKG_DESC_CSWplotutils-doc = $(DESCRIPTION), documentation OBSOLETED_BY_CSWplotutils-doc = CSWplotutildoc +ARCHALL_CSWplotutils-doc = 1 CHECKPKG_OVERRIDES_CSWplotutils-doc += file-with-bad-content|/usr/local|root/opt/csw/share/info/plotutils.info CHECKPKG_OVERRIDES_CSWplotutils-doc += file-with-bad-content|/usr/share|root/opt/csw/share/info/plotutils.info @@ -84,15 +85,26 @@ RUNTIME_DEP_PKGS_CSWplotutils += CSWlibplotter2 RUNTIME_DEP_PKGS_CSWplotutils += CSWlibxmi0 OBSOLETED_BY_CSWplotutils = CSWplotutil +CHECKPKG_OVERRIDES_CSWplotutils += missing-dependency|CSWlibgcc-s1 +CHECKPKG_OVERRIDES_CSWplotutils += missing-dependency|CSWlibstdc++6 +CHECKPKG_OVERRIDES_CSWplotutils += missing-dependency|CSWlibpng12-0 +CHECKPKG_OVERRIDES_CSWplotutils += missing-dependency|CSWlibz1 +CHECKPKG_OVERRIDES_CSWplotutils += surplus-dependency|CSWlibxmi0 +CHECKPKG_OVERRIDES_CSWplotutils += surplus-dependency|CSWlibplotter2 -PACKAGES += CSWplotutils-dev -CATALOGNAME_CSWplotutils-dev = plotutils_dev -SPKG_DESC_CSWplotutils-dev += $(DESCRIPTION), development files -PKGFILES_CSWplotutils-dev += /opt/csw/lib/libplot.so -PKGFILES_CSWplotutils-dev += /opt/csw/lib/libplotter.so -PKGFILES_CSWplotutils-dev += /opt/csw/lib/libxmi.so -PKGFILES_CSWplotutils-dev += $(PKGFILES_DEVEL) -OBSOLETED_BY_CSWplotutils_dev = CSWplotutildevel +PACKAGES += CSWplotutils-dev +CATALOGNAME_CSWplotutils-dev = plotutils_dev +SPKG_DESC_CSWplotutils-dev += $(DESCRIPTION), development files +PKGFILES_CSWplotutils-dev += /opt/csw/lib/libplot.so +PKGFILES_CSWplotutils-dev += /opt/csw/lib/libplotter.so +PKGFILES_CSWplotutils-dev += /opt/csw/lib/libxmi.so +PKGFILES_CSWplotutils-dev += $(PKGFILES_DEVEL) +OBSOLETED_BY_CSWplotutils-dev = CSWplotutildevel +ARCHALL_CSWplotutils-dev = 1 +RUNTIME_DEP_PKGS_CSWplotutils-dev += CSWplotutils +CHECKPKG_OVERRIDES_CSWplotutils-dev += missing-dependency|CSWlibplotter2 +CHECKPKG_OVERRIDES_CSWplotutils-dev += missing-dependency|CSWlibxmi0 +CHECKPKG_OVERRIDES_CSWplotutils-dev += missing-dependency|CSWlibplot2 include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Wed Jun 20 09:08:52 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Wed, 20 Jun 2012 07:08:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[18464] csw/mgar/pkg/plotutils/trunk/Makefile Message-ID: Revision: 18464 http://gar.svn.sourceforge.net/gar/?rev=18464&view=rev Author: pfelecan Date: 2012-06-20 07:08:52 +0000 (Wed, 20 Jun 2012) Log Message: ----------- override to confirm that the development package is architecture neutral. Modified Paths: -------------- csw/mgar/pkg/plotutils/trunk/Makefile Modified: csw/mgar/pkg/plotutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/plotutils/trunk/Makefile 2012-06-19 18:16:32 UTC (rev 18463) +++ csw/mgar/pkg/plotutils/trunk/Makefile 2012-06-20 07:08:52 UTC (rev 18464) @@ -102,6 +102,7 @@ OBSOLETED_BY_CSWplotutils-dev = CSWplotutildevel ARCHALL_CSWplotutils-dev = 1 RUNTIME_DEP_PKGS_CSWplotutils-dev += CSWplotutils +CHECKPKG_OVERRIDES_CSWplotutils-dev += archall-devel-package CHECKPKG_OVERRIDES_CSWplotutils-dev += missing-dependency|CSWlibplotter2 CHECKPKG_OVERRIDES_CSWplotutils-dev += missing-dependency|CSWlibxmi0 CHECKPKG_OVERRIDES_CSWplotutils-dev += missing-dependency|CSWlibplot2 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 20 12:15:46 2012 From: dam at opencsw.org (Dagobert Michelsen) Date: Wed, 20 Jun 2012 12:15:46 +0200 Subject: [csw-devel] SF.net SVN: gar:[18417] csw/mgar/pkg/zeromq/trunk/Makefile In-Reply-To: References: <1339725364-sup-75@pinkfloyd.chass.utoronto.ca> <110F0D8C-6CD6-4844-B70B-499E467089A3@opencsw.org> Message-ID: <7FB09E46-DBF0-4B1A-A6B0-5CABBDB1AC89@opencsw.org> Hi Romeo, Am 19.06.2012 um 05:01 schrieb Romeo Theriault: > On Fri, Jun 15, 2012 at 9:18 AM, Dagobert Michelsen wrote: >> I just read that libtool keeps -Wl, if you have some spare cycles it would be cool >> if you could test adding >> -Wl,-norunpath >> without the libtool patch and see if the option makes it to the linker. > > I've been trying to get it to compile with the following: > > EXTRA_LINKER_FLAGS += -Wl > EXTRA_LINKER_FLAGS += -norunpath > > and also tried > > EXTRA_LINKER_FLAGS += -Wl,-norunpath This would be the correct syntax, I have also reproduced it, the problem is that -W* is only understood by cc whereas the flags are needed by CC where this is called -Q* but this is also stripped by libtool, so no gain in doing it. > > and also, > > EXTRA_LINKER_FLAGS += -Wl -norunpath > > and they are all failing on: > > checking how to create a ustar tar archive... pax > checking for gcc... /opt/SUNWspro/bin/cc > checking whether the C compiler works... no > configure: error: in > `/home/romeotheriault/opencsw/zeromq/trunk/work/solaris10-sparc/build-isa-sparcv8plus/zeromq-2.2.0': > configure: error: C compiler cannot create executables > See `config.log' for more details > gmake[2]: *** [configure-work/solaris10-sparc/build-isa-sparcv8plus/zeromq-2.2.0/configure] > Error 77 > gmake[2]: Leaving directory `/home/romeotheriault/opencsw/zeromq/trunk' > gmake[1]: *** [merge-isa-sparcv8plus] Error 2 > gmake[1]: Leaving directory `/home/romeotheriault/opencsw/zeromq/trunk' > gmake: *** [platforms] Error 2 > > Not sure if I'm doing it wrong or not? If in doubt look in config.log Best regards -- 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 20 12:33:41 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 20 Jun 2012 10:33:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[18465] csw/mgar/pkg/openldap Message-ID: Revision: 18465 http://gar.svn.sourceforge.net/gar/?rev=18465&view=rev Author: dmichelsen Date: 2012-06-20 10:33:41 +0000 (Wed, 20 Jun 2012) Log Message: ----------- openldap: Roll back trunk to 2.4.28, make new branch for 2.4.3x Modified Paths: -------------- csw/mgar/pkg/openldap/trunk/Makefile csw/mgar/pkg/openldap/trunk/checksums Added Paths: ----------- csw/mgar/pkg/openldap/branches/openldap-2.4.3x/ Modified: csw/mgar/pkg/openldap/trunk/Makefile =================================================================== --- csw/mgar/pkg/openldap/trunk/Makefile 2012-06-20 07:08:52 UTC (rev 18464) +++ csw/mgar/pkg/openldap/trunk/Makefile 2012-06-20 10:33:41 UTC (rev 18465) @@ -1,7 +1,7 @@ # $Id$ NAME = openldap -VERSION = 2.4.31 +VERSION = 2.4.28 GARTYPE = v2 CATEGORIES = server @@ -52,8 +52,8 @@ RUNTIME_DEP_PKGS_CSWopenldap += CSWbdb48 RUNTIME_DEP_PKGS_CSWopenldap += CSWlibicudata48 RUNTIME_DEP_PKGS_CSWopenldap += CSWlibicuuc48 -RUNTIME_DEP_PKGS_CSWopenldap += CSWliblber2-4-3 -RUNTIME_DEP_PKGS_CSWopenldap += CSWlibldap-r2-4-3 +RUNTIME_DEP_PKGS_CSWopenldap += CSWliblber2-4-2 +RUNTIME_DEP_PKGS_CSWopenldap += CSWlibldap-r2-4-2 RUNTIME_DEP_PKGS_CSWopenldap += CSWlibltdl7 # We do not want that dependency. # RUNTIME_DEP_PKGS_CSWopenldap += CSWlibnet @@ -61,9 +61,11 @@ RUNTIME_DEP_PKGS_CSWopenldap += CSWlibodbc2 RUNTIME_DEP_PKGS_CSWopenldap += CSWlibsasl2-2 RUNTIME_DEP_PKGS_CSWopenldap += CSWlibslp1 -RUNTIME_DEP_PKGS_CSWopenldap += CSWlibssl1-0-0 +RUNTIME_DEP_PKGS_CSWopenldap += CSWlibssl0-9-8 RUNTIME_DEP_PKGS_CSWopenldap += CSWlibwrap1 RUNTIME_DEP_PKGS_CSWopenldap += CSWperl +OBSOLETED_BY_CSWopenldap += CSWoldap +CATALOGNAME_CSWoldap = openldap_stub # Evaluate later CHECKPKG_OVERRIDES_CSWopenldap += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/slapd.8 @@ -72,47 +74,58 @@ SPKG_DESC_CSWopenldap-client = OpenLDAP client executables PKGFILES_CSWopenldap-client += $(bindir)/.* PKGFILES_CSWopenldap-client += $(mandir)/man1/.* -RUNTIME_DEP_PKGS_CSWopenldap-client += CSWliblber2-4-3 -RUNTIME_DEP_PKGS_CSWopenldap-client += CSWlibldap2-4-3 +RUNTIME_DEP_PKGS_CSWopenldap-client += CSWliblber2-4-2 +RUNTIME_DEP_PKGS_CSWopenldap-client += CSWlibldap2-4-2 RUNTIME_DEP_PKGS_CSWopenldap-client += CSWlibsasl2-2 -RUNTIME_DEP_PKGS_CSWopenldap-client += CSWlibssl1-0-0 +RUNTIME_DEP_PKGS_CSWopenldap-client += CSWlibssl0-9-8 +OBSOLETED_BY_CSWopenldap-client += CSWoldapclient +CATALOGNAME_CSWoldapclient = openldap_client_stub PACKAGES += CSWopenldap-dev -SPKG_DESC_CSWopenldap-dev = OpenLDAP development files for libldap-2.4.so.3, libldap_r-2.4.so.3 and liblber-2.4.so.3 +SPKG_DESC_CSWopenldap-dev = OpenLDAP development files for libldap-2.4.so.2, libldap_r-2.4.so.2 and liblber-2.4.so.2 PKGFILES_CSWopenldap-dev += $(PKGFILES_DEVEL) PKGFILES_CSWopenldap-dev += $(mandir)/man3/.* -RUNTIME_DEP_PKGS_CSWopenldap-dev += CSWliblber2-4-3 -RUNTIME_DEP_PKGS_CSWopenldap-dev += CSWlibldap-r2-4-3 -RUNTIME_DEP_PKGS_CSWopenldap-dev += CSWlibldap2-4-3 +RUNTIME_DEP_PKGS_CSWopenldap-dev += CSWliblber2-4-2 +RUNTIME_DEP_PKGS_CSWopenldap-dev += CSWlibldap-r2-4-2 +RUNTIME_DEP_PKGS_CSWopenldap-dev += CSWlibldap2-4-2 +OBSOLETED_BY_CSWopenldap-dev += CSWoldapdevel +CATALOGNAME_CSWoldapdevel = openldap_devel_stub -PACKAGES += CSWliblber2-4-3 -SPKG_DESC_CSWliblber2-4-3 = OpenLDAP ASN.1 BER library, liblber-2.4.so.3 -PKGFILES_CSWliblber2-4-3 += $(call pkgfiles_lib,liblber-2.4.so.3) -RUNTIME_DEP_PKGS_CSWlibldap2-4-3 += CSWlibsasl2-2 -RUNTIME_DEP_PKGS_CSWlibldap2-4-3 += CSWlibssl1-0-0 +PACKAGES += CSWliblber2-4-2 +SPKG_DESC_CSWliblber2-4-2 = OpenLDAP ASN.1 BER library, liblber-2.4.so.2 +PKGFILES_CSWliblber2-4-2 += $(call pkgfiles_lib,liblber-2.4.so.2) +RUNTIME_DEP_PKGS_CSWlibldap2-4-2 += CSWlibsasl2-2 +RUNTIME_DEP_PKGS_CSWlibldap2-4-2 += CSWlibssl0-9-8 +OBSOLETED_BY_CSWliblber2-4-2 += CSWoldaprt +CATALOGNAME_CSWoldaprt = openldap_rt_stub -PACKAGES += CSWlibldap2-4-3 -SPKG_DESC_CSWlibldap2-4-3 = OpenLDAP LDAP library, libldap-2.4.so.3 -PKGFILES_CSWlibldap2-4-3 += $(call pkgfiles_lib,libldap-2.4.so.3) -PKGFILES_CSWlibldap2-4-3 += $(sysconfdir)/ldap.conf -PKGFILES_CSWlibldap2-4-3 += $(mandir)/man5/ldap.conf.5 -RUNTIME_DEP_PKGS_CSWlibldap2-4-3 += CSWliblber2-4-3 +PACKAGES += CSWlibldap2-4-2 +SPKG_DESC_CSWlibldap2-4-2 = OpenLDAP LDAP library, libldap-2.4.so.2 +PKGFILES_CSWlibldap2-4-2 += $(call pkgfiles_lib,libldap-2.4.so.2) +PKGFILES_CSWlibldap2-4-2 += $(sysconfdir)/ldap.conf +PKGFILES_CSWlibldap2-4-2 += $(mandir)/man5/ldap.conf.5 +RUNTIME_DEP_PKGS_CSWlibldap2-4-2 += CSWliblber2-4-2 +OBSOLETED_BY_CSWlibldap2-4-2 += CSWoldaprt # Evaluate later -CHECKPKG_OVERRIDES_CSWlibldap2-4-3 += file-with-bad-content|/usr/local|root/opt/csw/share/man/man5/ldap.conf.5 +CHECKPKG_OVERRIDES_CSWlibldap2-4-2 += file-with-bad-content|/usr/local|root/opt/csw/share/man/man5/ldap.conf.5 -PACKAGES += CSWlibldap-r2-4-3 -SPKG_DESC_CSWlibldap-r2-4-3 = OpenLDAP reentrant LDAP library, libldap_r-2.4.so.3 -PKGFILES_CSWlibldap-r2-4-3 += $(call pkgfiles_lib,libldap_r-2.4.so.3) -RUNTIME_DEP_PKGS_CSWlibldap-r2-4-3 += CSWliblber2-4-3 -RUNTIME_DEP_PKGS_CSWlibldap-r2-4-3 += CSWlibsasl2-2 -RUNTIME_DEP_PKGS_CSWlibldap-r2-4-3 += CSWlibssl1-0-0 +PACKAGES += CSWlibldap-r2-4-2 +SPKG_DESC_CSWlibldap-r2-4-2 = OpenLDAP reentrant LDAP library, libldap_r-2.4.so.2 +PKGFILES_CSWlibldap-r2-4-2 += $(call pkgfiles_lib,libldap_r-2.4.so.2) +RUNTIME_DEP_PKGS_CSWlibldap-r2-4-2 += CSWliblber2-4-2 +RUNTIME_DEP_PKGS_CSWlibldap-r2-4-2 += CSWlibsasl2-2 +RUNTIME_DEP_PKGS_CSWlibldap-r2-4-2 += CSWlibssl0-9-8 +OBSOLETED_BY_CSWlibldap-r2-4-2 += CSWoldaprt FOREIGN_PACKAGES += CSWliblber2-3-0 +OBSOLETED_BY_CSWliblber2-3-0 += CSWoldaprt FOREIGN_PACKAGES += CSWlibldap2-3-0 +OBSOLETED_BY_CSWlibldap2-3-0 += CSWoldaprt FOREIGN_PACKAGES += CSWlibldap-r2-3-0 +OBSOLETED_BY_CSWlibldap-r2-3-0 += CSWoldaprt EXTRA_DOCS = README.CSW $(PATCHFILES) openldaprc Modified: csw/mgar/pkg/openldap/trunk/checksums =================================================================== --- csw/mgar/pkg/openldap/trunk/checksums 2012-06-20 07:08:52 UTC (rev 18464) +++ csw/mgar/pkg/openldap/trunk/checksums 2012-06-20 10:33:41 UTC (rev 18465) @@ -1 +1 @@ -804c6cb5698db30b75ad0ff1c25baefd openldap-2.4.31.tgz +196023e552eeb259e048edcd61a9645b openldap-2.4.28.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 Wed Jun 20 12:52:00 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 20 Jun 2012 10:52:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[18466] csw/mgar Message-ID: Revision: 18466 http://gar.svn.sourceforge.net/gar/?rev=18466&view=rev Author: dmichelsen Date: 2012-06-20 10:51:59 +0000 (Wed, 20 Jun 2012) Log Message: ----------- WHOLE TREE: Remove unnecessary svn:externals Property Changed: ---------------- csw/mgar/gar/v2-ips/lib/web/ csw/mgar/pkg/389-posix-ws-plugin/trunk/ csw/mgar/pkg/antiword/trunk/ csw/mgar/pkg/aspell/trunk/ csw/mgar/pkg/bsdiff/trunk/ csw/mgar/pkg/celt/trunk/ csw/mgar/pkg/cppunit/trunk/ csw/mgar/pkg/crosstools-ng/trunk/ csw/mgar/pkg/dash/trunk/ csw/mgar/pkg/deluge/trunk/ csw/mgar/pkg/fluxbox/trunk/ csw/mgar/pkg/ganglia/branches/ganglia-3.2.0/ csw/mgar/pkg/grass/trunk/ csw/mgar/pkg/leveldb/trunk/ csw/mgar/pkg/libedit/trunk/ csw/mgar/pkg/libivykis/trunk/ csw/mgar/pkg/libmspack/trunk/ csw/mgar/pkg/libpqxx/trunk/ csw/mgar/pkg/libvirt/trunk/ csw/mgar/pkg/libxslt-ruby/trunk/ csw/mgar/pkg/meld/trunk/ csw/mgar/pkg/mongoengine/trunk/ csw/mgar/pkg/mosh/trunk/ csw/mgar/pkg/openbox/trunk/ csw/mgar/pkg/oss/trunk/ csw/mgar/pkg/pidentd/trunk/ csw/mgar/pkg/portaudio/trunk/ csw/mgar/pkg/pupnp/trunk/ csw/mgar/pkg/pypy/trunk/ csw/mgar/pkg/redis/trunk/ csw/mgar/pkg/tidy/trunk/ csw/mgar/pkg/tn5250/trunk/ csw/mgar/pkg/util-linux/trunk/ csw/mgar/pkg/vbindiff/trunk/ csw/mgar/pkg/windowmaker/trunk/ Property changes on: csw/mgar/gar/v2-ips/lib/web ___________________________________________________________________ Deleted: svn:externals - modpython http://svn.aminus.net/misc Property changes on: csw/mgar/pkg/389-posix-ws-plugin/trunk ___________________________________________________________________ Deleted: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Property changes on: csw/mgar/pkg/antiword/trunk ___________________________________________________________________ Deleted: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Property changes on: csw/mgar/pkg/aspell/trunk ___________________________________________________________________ Deleted: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Property changes on: csw/mgar/pkg/bsdiff/trunk ___________________________________________________________________ Deleted: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Property changes on: csw/mgar/pkg/celt/trunk ___________________________________________________________________ Deleted: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Property changes on: csw/mgar/pkg/cppunit/trunk ___________________________________________________________________ Deleted: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Property changes on: csw/mgar/pkg/crosstools-ng/trunk ___________________________________________________________________ Deleted: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Property changes on: csw/mgar/pkg/dash/trunk ___________________________________________________________________ Deleted: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Property changes on: csw/mgar/pkg/deluge/trunk ___________________________________________________________________ Deleted: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Property changes on: csw/mgar/pkg/fluxbox/trunk ___________________________________________________________________ Deleted: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Property changes on: csw/mgar/pkg/ganglia/branches/ganglia-3.2.0 ___________________________________________________________________ Deleted: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Property changes on: csw/mgar/pkg/grass/trunk ___________________________________________________________________ Deleted: svn:externals - Property changes on: csw/mgar/pkg/leveldb/trunk ___________________________________________________________________ Deleted: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Property changes on: csw/mgar/pkg/libedit/trunk ___________________________________________________________________ Deleted: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Property changes on: csw/mgar/pkg/libivykis/trunk ___________________________________________________________________ Deleted: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Property changes on: csw/mgar/pkg/libmspack/trunk ___________________________________________________________________ Deleted: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Property changes on: csw/mgar/pkg/libpqxx/trunk ___________________________________________________________________ Deleted: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Property changes on: csw/mgar/pkg/libvirt/trunk ___________________________________________________________________ Deleted: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Property changes on: csw/mgar/pkg/libxslt-ruby/trunk ___________________________________________________________________ Deleted: svn:externals - Property changes on: csw/mgar/pkg/meld/trunk ___________________________________________________________________ Deleted: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Property changes on: csw/mgar/pkg/mongoengine/trunk ___________________________________________________________________ Deleted: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Property changes on: csw/mgar/pkg/mosh/trunk ___________________________________________________________________ Deleted: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Property changes on: csw/mgar/pkg/openbox/trunk ___________________________________________________________________ Deleted: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Property changes on: csw/mgar/pkg/oss/trunk ___________________________________________________________________ Deleted: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Property changes on: csw/mgar/pkg/pidentd/trunk ___________________________________________________________________ Deleted: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Property changes on: csw/mgar/pkg/portaudio/trunk ___________________________________________________________________ Deleted: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Property changes on: csw/mgar/pkg/pupnp/trunk ___________________________________________________________________ Deleted: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Property changes on: csw/mgar/pkg/pypy/trunk ___________________________________________________________________ Deleted: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Property changes on: csw/mgar/pkg/redis/trunk ___________________________________________________________________ Deleted: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Property changes on: csw/mgar/pkg/tidy/trunk ___________________________________________________________________ Deleted: svn:externals - Property changes on: csw/mgar/pkg/tn5250/trunk ___________________________________________________________________ Deleted: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Property changes on: csw/mgar/pkg/util-linux/trunk ___________________________________________________________________ Deleted: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Property changes on: csw/mgar/pkg/vbindiff/trunk ___________________________________________________________________ Deleted: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Property changes on: csw/mgar/pkg/windowmaker/trunk ___________________________________________________________________ Deleted: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Wed Jun 20 13:41:48 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Wed, 20 Jun 2012 11:41:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[18467] csw/mgar/pkg Message-ID: Revision: 18467 http://gar.svn.sourceforge.net/gar/?rev=18467&view=rev Author: cgrzemba Date: 2012-06-20 11:41:47 +0000 (Wed, 20 Jun 2012) Log Message: ----------- gthumb/trunk: initial commit, public build recipe Added Paths: ----------- csw/mgar/pkg/gthumb/ csw/mgar/pkg/gthumb/Makefile csw/mgar/pkg/gthumb/branches/ csw/mgar/pkg/gthumb/tags/ csw/mgar/pkg/gthumb/trunk/ csw/mgar/pkg/gthumb/trunk/Makefile csw/mgar/pkg/gthumb/trunk/checksums csw/mgar/pkg/gthumb/trunk/files/ csw/mgar/pkg/gthumb/trunk/files/mkdtemp-patch Added: csw/mgar/pkg/gthumb/Makefile =================================================================== --- csw/mgar/pkg/gthumb/Makefile (rev 0) +++ csw/mgar/pkg/gthumb/Makefile 2012-06-20 11:41:47 UTC (rev 18467) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/gthumb/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/gthumb/trunk/Makefile =================================================================== --- csw/mgar/pkg/gthumb/trunk/Makefile (rev 0) +++ csw/mgar/pkg/gthumb/trunk/Makefile 2012-06-20 11:41:47 UTC (rev 18467) @@ -0,0 +1,113 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = gthumb +VERSION = 2.10.12 +SUBDIR=$(basename $(VERSION)) +GARTYPE = v2 +CATEGORIES = gnome + +DESCRIPTION = Brief description +define BLURB + Long description +endef + +MASTER_SITES = http://ftp.gnome.org/pub/gnome/sources/gthumb/$(SUBDIR) +DISTFILES = $(NAME)-$(VERSION).tar.gz + +# File name regex to get notifications about upstream software releases +# NOTE: Use this only if the automatic regex creation +# does not work for your package +# 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 = + +GARCOMPILER = SOS12U3 +PACKAGING_PLATFORMS = Solaris10-sparc Solaris10-i386 + +PATCHFILES += mkdtemp-patch + +PACKAGES += CSWlibgthumb +PKGFILES_CSWlibgthumb += $(call baseisadirs,$(libdir),libgthumb\.so) +SPKG_DESC_CSWlibgthumb += $(DESCRIPTION), libgthumb.so +RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibgnomeui2-0 +RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibxrender +RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibatk1-0-0 +RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibexif12 +RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibjpeg7 +RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibgnomecanvas +RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibpopt0 +RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibgnome +RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibgtk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWlibgthumb += CSWorbit2 +RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibgdk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibgconf2-4 +RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibgdk-pixbuf2-0-0 +RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibglade2 +RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWlibgthumb += CSWpango +RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibfontconfig1 +RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibbonoboui +RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibart +RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibpng12-0 +RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibtiff3 +RUNTIME_DEP_PKGS_CSWlibgthumb += CSWgnomevfs2 +RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibbonobo2 +RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibglib2-0-0 +# this is reported because lib was not split out in the old package +CHECKPKG_OVERRIDES_CSWlibgthumb += file-collision|/opt/csw/lib/libgthumb.so|CSWgthumb|CSWlibgthumb +# there is really only the .so name +CHECKPKG_OVERRIDES_CSWlibgthumb += soname-equals-filename|file=/opt/csw/lib/libgthumb.so + +RUNTIME_DEP_PKGS_CSWgthumb += CSWlibgthumb +RUNTIME_DEP_PKGS_CSWgthumb += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWgthumb += CSWlibgnomeui2-0 +RUNTIME_DEP_PKGS_CSWgthumb += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWgthumb += CSWlibxrender +RUNTIME_DEP_PKGS_CSWgthumb += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWgthumb += CSWlibexif12 +RUNTIME_DEP_PKGS_CSWgthumb += CSWlibjpeg7 +RUNTIME_DEP_PKGS_CSWgthumb += CSWlibgnomecanvas +RUNTIME_DEP_PKGS_CSWgthumb += CSWlibpopt0 +RUNTIME_DEP_PKGS_CSWgthumb += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWgthumb += CSWlibgdk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWgthumb += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWgthumb += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWgthumb += CSWlibgnome +RUNTIME_DEP_PKGS_CSWgthumb += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSWgthumb += CSWlibgtk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWgthumb += CSWorbit2 +RUNTIME_DEP_PKGS_CSWgthumb += CSWlibz1 +RUNTIME_DEP_PKGS_CSWgthumb += CSWlibgconf2-4 +RUNTIME_DEP_PKGS_CSWgthumb += CSWlibgdk-pixbuf2-0-0 +RUNTIME_DEP_PKGS_CSWgthumb += CSWlibglade2 +RUNTIME_DEP_PKGS_CSWgthumb += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWgthumb += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWgthumb += CSWpango +RUNTIME_DEP_PKGS_CSWgthumb += CSWlibfontconfig1 +RUNTIME_DEP_PKGS_CSWgthumb += CSWlibbonoboui +RUNTIME_DEP_PKGS_CSWgthumb += CSWgnomevfs2 +RUNTIME_DEP_PKGS_CSWgthumb += CSWlibpng12-0 +RUNTIME_DEP_PKGS_CSWgthumb += CSWlibtiff3 +RUNTIME_DEP_PKGS_CSWgthumb += CSWlibart +RUNTIME_DEP_PKGS_CSWgthumb += CSWlibbonobo2 +RUNTIME_DEP_PKGS_CSWgthumb += CSWlibatk1-0-0 + +# for xmllint +EXTRA_TEST_ENV += http_proxy=http://proxy:3128 + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + +PATH:=/opt/csw/gnu:$(PATH) Property changes on: csw/mgar/pkg/gthumb/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/gthumb/trunk/checksums =================================================================== --- csw/mgar/pkg/gthumb/trunk/checksums (rev 0) +++ csw/mgar/pkg/gthumb/trunk/checksums 2012-06-20 11:41:47 UTC (rev 18467) @@ -0,0 +1 @@ +14732ffc8b5cea9a80e32de6c34480b3 gthumb-2.10.12.tar.gz Added: csw/mgar/pkg/gthumb/trunk/files/mkdtemp-patch =================================================================== --- csw/mgar/pkg/gthumb/trunk/files/mkdtemp-patch (rev 0) +++ csw/mgar/pkg/gthumb/trunk/files/mkdtemp-patch 2012-06-20 11:41:47 UTC (rev 18467) @@ -0,0 +1,18 @@ +--- a/libgthumb/file-utils.c ++++ b/libgthumb/file-utils.c +@@ -2462,10 +2462,13 @@ get_temp_dir_name (void) + template = g_strconcat (best_folder, "/.gth-XXXXXX", NULL); + g_free (best_folder); + +- result = mkdtemp (template); ++ if( !mktemp( template ) || mkdir( template, 0700 ) ) { ++ g_free (template); ++ return NULL; ++ } ++ result = template; + + if ((result == NULL) || (*result == '\0')) { +- g_free (template); + result = NULL; + } + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Jun 20 13:42:59 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 20 Jun 2012 11:42:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[18468] csw/mgar/pkg/libssh2/trunk Message-ID: Revision: 18468 http://gar.svn.sourceforge.net/gar/?rev=18468&view=rev Author: dmichelsen Date: 2012-06-20 11:42:58 +0000 (Wed, 20 Jun 2012) Log Message: ----------- libssh2/trunk: Update to 1.4.2 and OpenSSL 1.0 Modified Paths: -------------- csw/mgar/pkg/libssh2/trunk/Makefile csw/mgar/pkg/libssh2/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libssh2/trunk/files/0001-Force-bash-and-GNU-grep.patch Modified: csw/mgar/pkg/libssh2/trunk/Makefile =================================================================== --- csw/mgar/pkg/libssh2/trunk/Makefile 2012-06-20 11:41:47 UTC (rev 18467) +++ csw/mgar/pkg/libssh2/trunk/Makefile 2012-06-20 11:42:58 UTC (rev 18468) @@ -1,5 +1,5 @@ NAME = libssh2 -VERSION = 1.3.0 +VERSION = 1.4.2 CATEGORIES = lib GARTYPE = v2 @@ -14,15 +14,19 @@ MASTER_SITES = http://www.libssh2.org/download/ DISTFILES += $(DISTNAME).tar.gz +PATCHFILES += 0001-Force-bash-and-GNU-grep.patch + VENDOR_URL = http://www.libssh2.org -BUILD_DEP_PKGS += CSWossldevel +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + +BUILD_DEP_PKGS += CSWlibssl-dev BUILD_DEP_PKGS += CSWlibz-dev PACKAGES += CSWlibssh2-1 SPKG_DESC_CSWlibssh2-1 = A library for impementing the SSH2 protocol, libssh2.so.1 PKGFILES_CSWlibssh2-1 += $(call pkgfiles_lib,libssh2.so.1) -RUNTIME_DEP_PKGS_CSWlibssh2-1 += CSWosslrt +RUNTIME_DEP_PKGS_CSWlibssh2-1 += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWlibssh2-1 += CSWlibz1 OBSOLETED_BY_CSWlibssh2-1 += CSWlibssh2 Modified: csw/mgar/pkg/libssh2/trunk/checksums =================================================================== --- csw/mgar/pkg/libssh2/trunk/checksums 2012-06-20 11:41:47 UTC (rev 18467) +++ csw/mgar/pkg/libssh2/trunk/checksums 2012-06-20 11:42:58 UTC (rev 18468) @@ -1 +1 @@ -6425331899ccf1015f1ed79448cb4709 libssh2-1.3.0.tar.gz +42e2b3796ac07fc1dbafc7abcc002cd3 libssh2-1.4.2.tar.gz Added: csw/mgar/pkg/libssh2/trunk/files/0001-Force-bash-and-GNU-grep.patch =================================================================== --- csw/mgar/pkg/libssh2/trunk/files/0001-Force-bash-and-GNU-grep.patch (rev 0) +++ csw/mgar/pkg/libssh2/trunk/files/0001-Force-bash-and-GNU-grep.patch 2012-06-20 11:42:58 UTC (rev 18468) @@ -0,0 +1,31 @@ +From a20cd01152e6c707a04ed75a810d705c20f2aa0a Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Wed, 20 Jun 2012 13:10:31 +0200 +Subject: [PATCH] Force bash and GNU grep + +--- + tests/mansyntax.sh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tests/mansyntax.sh b/tests/mansyntax.sh +index 3e72c25..0018709 100755 +--- a/tests/mansyntax.sh ++++ b/tests/mansyntax.sh +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/bin/bash + set -e + + # Written by Mikhail Gusarov +@@ -12,7 +12,7 @@ mandir=${srcdir}/../docs + # + # Only test if suitable man is available + # +-if ! man --help | grep -q warnings; then ++if ! man --help | ggrep -q warnings; then + exit 77 + fi + +-- +1.7.10.3 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Wed Jun 20 13:58:10 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Wed, 20 Jun 2012 11:58:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[18469] csw/mgar/pkg Message-ID: Revision: 18469 http://gar.svn.sourceforge.net/gar/?rev=18469&view=rev Author: pfelecan Date: 2012-06-20 11:58:10 +0000 (Wed, 20 Jun 2012) Log Message: ----------- migrated from private recipe to a GAR based one; not release ready as I have an issue with the license file. Added Paths: ----------- csw/mgar/pkg/ps2eps/ csw/mgar/pkg/ps2eps/Makefile csw/mgar/pkg/ps2eps/branches/ csw/mgar/pkg/ps2eps/tags/ csw/mgar/pkg/ps2eps/trunk/ csw/mgar/pkg/ps2eps/trunk/Makefile csw/mgar/pkg/ps2eps/trunk/checksums csw/mgar/pkg/ps2eps/trunk/files/ csw/mgar/pkg/ps2eps/trunk/files/0001-Fix-shebang-perl.patch Added: csw/mgar/pkg/ps2eps/Makefile =================================================================== --- csw/mgar/pkg/ps2eps/Makefile (rev 0) +++ csw/mgar/pkg/ps2eps/Makefile 2012-06-20 11:58:10 UTC (rev 18469) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/ps2eps/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/ps2eps/trunk/Makefile =================================================================== --- csw/mgar/pkg/ps2eps/trunk/Makefile (rev 0) +++ csw/mgar/pkg/ps2eps/trunk/Makefile 2012-06-20 11:58:10 UTC (rev 18469) @@ -0,0 +1,63 @@ +# $Id$ + +NAME = ps2eps +VERSION = 1.68 +GARTYPE = v2 +CATEGORIES = apps + +DESCRIPTION = Tool for generating Encapsulated Postscript Format files from one-page Postscript documents +define BLURB + ps2eps is a tool (written in Perl) to produce Encapsulated PostScript + Files (EPS/EPSF) from usual one-paged Postscript documents. It calculates + correct Bounding Boxes for those EPS files and filters some special + postscript command sequences that can produce erroneous results on printers. + EPS files are often needed for including (scalable) graphics of high quality + into TeX/LaTeX (or even Word) documents. +endef + +MASTER_SITES = http://www.tm.uka.de/~bless/ +DISTFILES = $(DISTNAME).tar.gz + +RUNTIME_DEP_PKGS = CSWperl + +CONFIGURE_ARGS = $(DIRPATHS) + +CONFIGURE_SCRIPTS = +GARCOMPILER = GNU +WORKSRC = $(WORKDIR)/$(NAME) +PATCHDIR = $(WORKSRC) +PATCHFILE = 0001-Fix-shebang-perl.patch +BUILD_SCRIPTS = custom +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom +LICENSE = LICENSE.txt + +include gar/category.mk + +build-custom: \ + $(WORKSRC)/bbox + $(MAKECOOKIE) + +$(WORKSRC)/bbox: \ + $(WORKSRC)/bbox.o + $(CC) $(LDFLAGS) $< -o $@ + +$(WORKSRC)/bbox.o: \ + $(WORKSRC)/src/C/bbox.c + $(CC) -c $(CFLAGS) $< -o $@ + + +install-custom: + cd $(WORKSRC) && ginstall --directory --mode=u=rwx,go=rx $(DESTDIR)$(bindir) + cd $(WORKSRC) && ginstall --preserve-timestamps --mode=u=rwx,go=rx bbox $(DESTDIR)$(bindir) + cd $(WORKSRC) && ginstall --preserve-timestamps --mode=u=rwx,go=rx bin/ps2eps $(DESTDIR)$(bindir) + cd $(WORKSRC) && ginstall --directory --mode=u=rwx,go=rx $(DESTDIR)$(docdir) + cd $(WORKSRC) && ginstall --preserve-timestamps --mode=u=rw,go=r doc/pdf/bbox.pdf $(DESTDIR)$(docdir) + cd $(WORKSRC) && ginstall --preserve-timestamps --mode=u=rw,go=r doc/pdf/ps2eps.pdf $(DESTDIR)$(docdir) + cd $(WORKSRC) && ginstall --preserve-timestamps --mode=u=rw,go=r doc/html/bbox.html $(DESTDIR)$(docdir) + cd $(WORKSRC) && ginstall --preserve-timestamps --mode=u=rw,go=r doc/html/ps2eps.html $(DESTDIR)$(docdir) + cd $(WORKSRC) && ginstall --preserve-timestamps --mode=u=rw,go=r Changes.txt $(DESTDIR)$(docdir) + cd $(WORKSRC) && ginstall --directory --mode=u=rwx,go=rx $(DESTDIR)$(mandir) + cd $(WORKSRC) && ginstall --preserve-timestamps --mode=u=rw,go=r doc/man/man1/bbox.1 $(DESTDIR)$(mandir) + cd $(WORKSRC) && ginstall --preserve-timestamps --mode=u=rw,go=r doc/man/man1/ps2eps.1 $(DESTDIR)$(mandir) + $(MAKECOOKIE) Property changes on: csw/mgar/pkg/ps2eps/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/ps2eps/trunk/checksums =================================================================== --- csw/mgar/pkg/ps2eps/trunk/checksums (rev 0) +++ csw/mgar/pkg/ps2eps/trunk/checksums 2012-06-20 11:58:10 UTC (rev 18469) @@ -0,0 +1 @@ +d6d2932b9d0399317a7382c94c108c44 ps2eps-1.68.tar.gz Added: csw/mgar/pkg/ps2eps/trunk/files/0001-Fix-shebang-perl.patch =================================================================== --- csw/mgar/pkg/ps2eps/trunk/files/0001-Fix-shebang-perl.patch (rev 0) +++ csw/mgar/pkg/ps2eps/trunk/files/0001-Fix-shebang-perl.patch 2012-06-20 11:58:10 UTC (rev 18469) @@ -0,0 +1,23 @@ +From cb2f6976156d04bc2329bac9dca53b03a94c25f1 Mon Sep 17 00:00:00 2001 +From: Peter Felecan +Date: Wed, 20 Jun 2012 10:12:40 +0200 +Subject: [PATCH] Fix shebang perl + +--- + bin/ps2eps | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/bin/ps2eps b/bin/ps2eps +index f02e5a2..c8898e6 100755 +--- a/bin/ps2eps ++++ b/bin/ps2eps +@@ -1,5 +1,4 @@ +-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' && eval 'exec perl -S $0 $argv:q' # -*-perl-*- +- if 0; ++#! /usr/bin/env perl + # The expression in the previous line replaces the unix specific line + # {#!/usr/bin/perl}. + # ps2eps - convert PostScript to EPS (Encapsulated PostScript) files +-- +1.7.10.3 + Property changes on: csw/mgar/pkg/ps2eps/trunk/files/0001-Fix-shebang-perl.patch ___________________________________________________________________ Added: svn:keywords + Author Date HeadURL Id Revision 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 20 14:23:23 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 20 Jun 2012 12:23:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[18470] csw/mgar/pkg/ps2eps/trunk/Makefile Message-ID: Revision: 18470 http://gar.svn.sourceforge.net/gar/?rev=18470&view=rev Author: dmichelsen Date: 2012-06-20 12:23:23 +0000 (Wed, 20 Jun 2012) Log Message: ----------- ps2eps/trunk: Fix directory locations Modified Paths: -------------- csw/mgar/pkg/ps2eps/trunk/Makefile Modified: csw/mgar/pkg/ps2eps/trunk/Makefile =================================================================== --- csw/mgar/pkg/ps2eps/trunk/Makefile 2012-06-20 11:58:10 UTC (rev 18469) +++ csw/mgar/pkg/ps2eps/trunk/Makefile 2012-06-20 12:23:23 UTC (rev 18470) @@ -16,15 +16,17 @@ endef MASTER_SITES = http://www.tm.uka.de/~bless/ -DISTFILES = $(DISTNAME).tar.gz +DISTNAME = $(NAME) +DISTFILES = $(NAME)-$(VERSION).tar.gz RUNTIME_DEP_PKGS = CSWperl +# This cannot be tracked with checkpkg +CHECKPKG_OVERRIDES_CSWps2eps += surplus-dependency|CSWperl CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_SCRIPTS = GARCOMPILER = GNU -WORKSRC = $(WORKDIR)/$(NAME) PATCHDIR = $(WORKSRC) PATCHFILE = 0001-Fix-shebang-perl.patch BUILD_SCRIPTS = custom @@ -47,17 +49,18 @@ $(CC) -c $(CFLAGS) $< -o $@ +install-custom: pkgdocdir = $(docdir)/ps2eps install-custom: cd $(WORKSRC) && ginstall --directory --mode=u=rwx,go=rx $(DESTDIR)$(bindir) cd $(WORKSRC) && ginstall --preserve-timestamps --mode=u=rwx,go=rx bbox $(DESTDIR)$(bindir) cd $(WORKSRC) && ginstall --preserve-timestamps --mode=u=rwx,go=rx bin/ps2eps $(DESTDIR)$(bindir) - cd $(WORKSRC) && ginstall --directory --mode=u=rwx,go=rx $(DESTDIR)$(docdir) - cd $(WORKSRC) && ginstall --preserve-timestamps --mode=u=rw,go=r doc/pdf/bbox.pdf $(DESTDIR)$(docdir) - cd $(WORKSRC) && ginstall --preserve-timestamps --mode=u=rw,go=r doc/pdf/ps2eps.pdf $(DESTDIR)$(docdir) - cd $(WORKSRC) && ginstall --preserve-timestamps --mode=u=rw,go=r doc/html/bbox.html $(DESTDIR)$(docdir) - cd $(WORKSRC) && ginstall --preserve-timestamps --mode=u=rw,go=r doc/html/ps2eps.html $(DESTDIR)$(docdir) - cd $(WORKSRC) && ginstall --preserve-timestamps --mode=u=rw,go=r Changes.txt $(DESTDIR)$(docdir) - cd $(WORKSRC) && ginstall --directory --mode=u=rwx,go=rx $(DESTDIR)$(mandir) - cd $(WORKSRC) && ginstall --preserve-timestamps --mode=u=rw,go=r doc/man/man1/bbox.1 $(DESTDIR)$(mandir) - cd $(WORKSRC) && ginstall --preserve-timestamps --mode=u=rw,go=r doc/man/man1/ps2eps.1 $(DESTDIR)$(mandir) + cd $(WORKSRC) && ginstall --directory --mode=u=rwx,go=rx $(DESTDIR)$(pkgdocdir) + cd $(WORKSRC) && ginstall --preserve-timestamps --mode=u=rw,go=r doc/pdf/bbox.pdf $(DESTDIR)$(pkgdocdir) + cd $(WORKSRC) && ginstall --preserve-timestamps --mode=u=rw,go=r doc/pdf/ps2eps.pdf $(DESTDIR)$(pkgdocdir) + cd $(WORKSRC) && ginstall --preserve-timestamps --mode=u=rw,go=r doc/html/bbox.html $(DESTDIR)$(pkgdocdir) + cd $(WORKSRC) && ginstall --preserve-timestamps --mode=u=rw,go=r doc/html/ps2eps.html $(DESTDIR)$(pkgdocdir) + cd $(WORKSRC) && ginstall --preserve-timestamps --mode=u=rw,go=r Changes.txt $(DESTDIR)$(pkgdocdir) + cd $(WORKSRC) && ginstall --directory --mode=u=rwx,go=rx $(DESTDIR)$(mandir)/man1 + cd $(WORKSRC) && ginstall --preserve-timestamps --mode=u=rw,go=r doc/man/man1/bbox.1 $(DESTDIR)$(mandir)/man1 + cd $(WORKSRC) && ginstall --preserve-timestamps --mode=u=rw,go=r doc/man/man1/ps2eps.1 $(DESTDIR)$(mandir)/man1 $(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Wed Jun 20 15:05:31 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Wed, 20 Jun 2012 13:05:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[18471] csw/mgar/pkg/gthumb/trunk/Makefile Message-ID: Revision: 18471 http://gar.svn.sourceforge.net/gar/?rev=18471&view=rev Author: cgrzemba Date: 2012-06-20 13:05:30 +0000 (Wed, 20 Jun 2012) Log Message: ----------- gthumb/trunk: omit the scrollkeeper stuff Modified Paths: -------------- csw/mgar/pkg/gthumb/trunk/Makefile Modified: csw/mgar/pkg/gthumb/trunk/Makefile =================================================================== --- csw/mgar/pkg/gthumb/trunk/Makefile 2012-06-20 12:23:23 UTC (rev 18470) +++ csw/mgar/pkg/gthumb/trunk/Makefile 2012-06-20 13:05:30 UTC (rev 18471) @@ -65,10 +65,12 @@ RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibbonobo2 RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibglib2-0-0 # this is reported because lib was not split out in the old package -CHECKPKG_OVERRIDES_CSWlibgthumb += file-collision|/opt/csw/lib/libgthumb.so|CSWgthumb|CSWlibgthumb +# CHECKPKG_OVERRIDES_CSWlibgthumb += file-collision|/opt/csw/lib/libgthumb.so|CSWgthumb|CSWlibgthumb # there is really only the .so name CHECKPKG_OVERRIDES_CSWlibgthumb += soname-equals-filename|file=/opt/csw/lib/libgthumb.so +PACKAGES += CSWgthumb +SPKG_DESC_CSWgthumb += $(DESCRIPTION) RUNTIME_DEP_PKGS_CSWgthumb += CSWlibgthumb RUNTIME_DEP_PKGS_CSWgthumb += CSWlibgthread2-0-0 RUNTIME_DEP_PKGS_CSWgthumb += CSWlibgnomeui2-0 @@ -102,6 +104,7 @@ RUNTIME_DEP_PKGS_CSWgthumb += CSWlibart RUNTIME_DEP_PKGS_CSWgthumb += CSWlibbonobo2 RUNTIME_DEP_PKGS_CSWgthumb += CSWlibatk1-0-0 +EXTRA_MERGE_EXCLUDE_FILES += /opt/csw/var/lib.* # for xmllint EXTRA_TEST_ENV += http_proxy=http://proxy:3128 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Wed Jun 20 16:33:48 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Wed, 20 Jun 2012 14:33:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[18472] csw/mgar/pkg Message-ID: Revision: 18472 http://gar.svn.sourceforge.net/gar/?rev=18472&view=rev Author: pfelecan Date: 2012-06-20 14:33:47 +0000 (Wed, 20 Jun 2012) Log Message: ----------- migrated from private recipe to a GAR based one; not release ready as I have an issue with the patch file... Added Paths: ----------- csw/mgar/pkg/pilotlink/ csw/mgar/pkg/pilotlink/Makefile csw/mgar/pkg/pilotlink/branches/ csw/mgar/pkg/pilotlink/tags/ csw/mgar/pkg/pilotlink/trunk/ csw/mgar/pkg/pilotlink/trunk/Makefile csw/mgar/pkg/pilotlink/trunk/checksums csw/mgar/pkg/pilotlink/trunk/files/ csw/mgar/pkg/pilotlink/trunk/files/0001-Fix-shebang-in-configure.patch Added: csw/mgar/pkg/pilotlink/Makefile =================================================================== --- csw/mgar/pkg/pilotlink/Makefile (rev 0) +++ csw/mgar/pkg/pilotlink/Makefile 2012-06-20 14:33:47 UTC (rev 18472) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/pilotlink/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/pilotlink/trunk/Makefile =================================================================== --- csw/mgar/pkg/pilotlink/trunk/Makefile (rev 0) +++ csw/mgar/pkg/pilotlink/trunk/Makefile 2012-06-20 14:33:47 UTC (rev 18472) @@ -0,0 +1,59 @@ +# $Id$ + +NAME = pilot-link +VERSION = 0.12.5 +GARTYPE = v2 +CATEGORIES = lib + +DESCRIPTION = Free package to manage palmos based PDAs with Unix +define BLURB + pilot-link is a suite of tools used to connect your Palm or PalmOS + compatible handheld with Unix, Linux, and any other POSIX-compatible + machine. pilot-link works with all PalmOS handhelds, including those + made by Handspring, Sony, and Palm, as well as others. + + pilot-link includes userspace "conduits" that allow you to syncronize + information to and from your Palm device, as well as libraries of + Palm-compatible functions that allow other applications to take advantage + of the code included in pilot-link. + + There are also several language "bindings" that allow you to use your + favorite development language with pilot-link, such as Java, Tcl, Perl, + and Python. +endef + +MASTER_SITES = http://downloads.pilot-link.org/ +DISTFILES = $(DISTNAME).tar.bz2 + +PACKAGING_PLATFORMS = solaris10-sparc +PACKAGING_PLATFORMS += solaris10-i386 + +BUILD_DEP_PKGS += CSWperl +BUILD_DEP_PKGS += CSWtcl +BUILD_DEP_PKGS += CSWpython + +RUNTIME_DEP_PKGS = CSWperl +RUNTIME_DEP_PKGS += CSWtcl +RUNTIME_DEP_PKGS += CSWpython +# This cannot be tracked with checkpkg +# CHECKPKG_OVERRIDES_CSWpilot-link += surplus-dependency|CSWperl +# CHECKPKG_OVERRIDES_CSWpilot-link += surplus-dependency|CSWtcl +# CHECKPKG_OVERRIDES_CSWpilot-link += surplus-dependency|CSWpython + +PATCHFILE = 0001-Fix-shebang-in-configure.patch + +GARCOMPILER = GNU +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-conduits +CONFIGURE_ARGS += --enable-libusb +CONFIGURE_ARGS += --with-perl=perlexec=$(bindir)/perl +CONFIGURE_ARGS += --with-java +CONFIGURE_ARGS += --with-tcl=$(libdir) +CONFIGURE_ARGS += --with-tclinclude +CONFIGURE_ARGS += --with-python + +#LICENCE_CSWpilot-link = COPYING +#LICENCE_CSWpilot-link-lib = COPYING.LIB + +include gar/category.mk + Property changes on: csw/mgar/pkg/pilotlink/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/pilotlink/trunk/checksums =================================================================== --- csw/mgar/pkg/pilotlink/trunk/checksums (rev 0) +++ csw/mgar/pkg/pilotlink/trunk/checksums 2012-06-20 14:33:47 UTC (rev 18472) @@ -0,0 +1 @@ +568c55bf504b044f6fbd50baa407c990 pilot-link-0.12.5.tar.bz2 Added: csw/mgar/pkg/pilotlink/trunk/files/0001-Fix-shebang-in-configure.patch =================================================================== --- csw/mgar/pkg/pilotlink/trunk/files/0001-Fix-shebang-in-configure.patch (rev 0) +++ csw/mgar/pkg/pilotlink/trunk/files/0001-Fix-shebang-in-configure.patch 2012-06-20 14:33:47 UTC (rev 18472) @@ -0,0 +1,22 @@ +From f6dc47f801735eec1bd85d49938645f0e58c13b5 Mon Sep 17 00:00:00 2001 +From: Peter Felecan +Date: Wed, 20 Jun 2012 16:16:11 +0200 +Subject: [PATCH] Fix shebang in configure + +--- + configure | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure b/configure +index b3e7e83..755f883 100755 +--- a/configure ++++ b/configure +@@ -1,4 +1,4 @@ +-#! /bin/sh ++#! /usr/bin/env bash + # Guess values for system-dependent variables and create Makefiles. + # Generated by GNU Autoconf 2.65. + # +-- +1.7.10.3 + 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 20 16:33:57 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 20 Jun 2012 14:33:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[18473] csw/mgar/pkg/xerces-c/trunk/Makefile Message-ID: Revision: 18473 http://gar.svn.sourceforge.net/gar/?rev=18473&view=rev Author: dmichelsen Date: 2012-06-20 14:33:57 +0000 (Wed, 20 Jun 2012) Log Message: ----------- xerces-c/trunk: Rework dependencies, enable ISAEXEC Modified Paths: -------------- csw/mgar/pkg/xerces-c/trunk/Makefile Modified: csw/mgar/pkg/xerces-c/trunk/Makefile =================================================================== --- csw/mgar/pkg/xerces-c/trunk/Makefile 2012-06-20 14:33:47 UTC (rev 18472) +++ csw/mgar/pkg/xerces-c/trunk/Makefile 2012-06-20 14:33:57 UTC (rev 18473) @@ -13,60 +13,53 @@ refer to the Programming Guide. endef -MASTER_SITES = http://apache.abdaal.com/xerces/c/3/sources/ +MASTER_SITES = http://www.apache.org/dist/xerces/c/3/sources/ DISTFILES += $(NAME)-$(VERSION).tar.gz PATCHFILES += 0001-Do-not-strip-norunpath.patch -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 +VENDOR_URL = http://xerces.apache.org/xerces-c/ + +LICENSE = LICENSE + PACKAGES += CSWlibxerces-c3-1 -CATALOGNAME_CSWlibxerces-c3-1 = libxerces_c3_1 SPKG_DESC_CSWlibxerces-c3-1 = Xerces XML parser for C++ providing libxerces-c-3.1.so -PKGFILES_CSWlibxerces-c3-1 = $(call baseisadirs,$(libdir),libxerces-c-3\.1\.so) -RUNTIME_DEP_PKGS_CSWlibxerces-c3-1 += CSWcurlrt -RUNTIME_DEP_PKGS_CSWlibxerces-c3-1 += CSWlibidn -RUNTIME_DEP_PKGS_CSWlibxerces-c3-1 += CSWzlib -RUNTIME_DEP_PKGS_CSWlibxerces-c3-1 += CSWlibcares -RUNTIME_DEP_PKGS_CSWlibxerces-c3-1 += CSWosslrt -RUNTIME_DEP_PKGS_CSWlibxerces-c3-1 += CSWoldaprt -RUNTIME_DEP_PKGS_CSWlibxerces-c3-1 += CSWlibicu46 +PKGFILES_CSWlibxerces-c3-1 = $(call pkgfiles_lib,libxerces-c-3.1.so) +RUNTIME_DEP_PKGS_CSWlibxerces-c3-1 += CSWlibcurl4 +RUNTIME_DEP_PKGS_CSWlibxerces-c3-1 += CSWlibidn11 +RUNTIME_DEP_PKGS_CSWlibxerces-c3-1 += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibxerces-c3-1 += CSWlibssl1-0-0 +RUNTIME_DEP_PKGS_CSWlibxerces-c3-1 += CSWlibicudata48 +RUNTIME_DEP_PKGS_CSWlibxerces-c3-1 += CSWlibicuuc48 +RUNTIME_DEP_PKGS_CSWlibxerces-c3-1 += CSWlibicui18n48 +# The version number is in the base and not appended to .so as usual +CHECKPKG_OVERRIDES_CSWlibxerces-c3-1 += soname-equals-filename + PACKAGES += CSWlibxerces-c-dev -CATALOGNAME_CSWlibxerces-c-dev = libxerces_c_dev -SPKG_DESC_CSWlibxerces-c-dev = Development files for Xerces +SPKG_DESC_CSWlibxerces-c-dev = Development files for libxerces-c-3.1.so +# PKGFILES is catchall RUNTIME_DEP_PKGS_CSWlibxerces-c-dev += CSWlibxerces-c3-1 -RUNTIME_DEP_PKGS_CSWlibxerces-c-dev += CSWcurlrt -RUNTIME_DEP_PKGS_CSWlibxerces-c-dev += CSWlibidn -RUNTIME_DEP_PKGS_CSWlibxerces-c-dev += CSWzlib -RUNTIME_DEP_PKGS_CSWlibxerces-c-dev += CSWlibcares -RUNTIME_DEP_PKGS_CSWlibxerces-c-dev += CSWosslrt -RUNTIME_DEP_PKGS_CSWlibxerces-c-dev += CSWoldaprt PACKAGES += CSWxerces-c CATALOGNAME_CSWxerces-c = xerces_c SPKG_DESC_CSWxerces-c = Utility programs from the Xerces XML parser PKGFILES_CSWxerces-c = $(bindir)/.* RUNTIME_DEP_PKGS_CSWxerces-c += CSWlibxerces-c3-1 -RUNTIME_DEP_PKGS_CSWxerces-c += CSWcurlrt -RUNTIME_DEP_PKGS_CSWxerces-c += CSWlibidn -RUNTIME_DEP_PKGS_CSWxerces-c += CSWzlib -RUNTIME_DEP_PKGS_CSWxerces-c += CSWlibcares -RUNTIME_DEP_PKGS_CSWxerces-c += CSWosslrt -RUNTIME_DEP_PKGS_CSWxerces-c += CSWoldaprt -RUNTIME_DEP_PKGS_CSWxerces-c += CSWlibicu46 +RUNTIME_DEP_PKGS_CSWxerces-c += CSWlibssl1-0-0 +RUNTIME_DEP_PKGS_CSWxerces-c += CSWlibicudata48 +RUNTIME_DEP_PKGS_CSWxerces-c += CSWlibz1 +RUNTIME_DEP_PKGS_CSWxerces-c += CSWlibcurl4 +RUNTIME_DEP_PKGS_CSWxerces-c += CSWlibicuuc48 +RUNTIME_DEP_PKGS_CSWxerces-c += CSWlibidn11 +RUNTIME_DEP_PKGS_CSWxerces-c += CSWlibicui18n48 -VENDOR_URL = http://xerces.apache.org/xerces-c/ -LICENSE = LICENSE +BUILD64 = 1 +ISAEXEC = 1 -BUILD64_LIBS_ONLY = 1 - -icu_config = $(bindir)/icu-config EXTRA_CONFIGURE_EXPORTS = icu_config +EXTRA_CONFIGURE_ENV_icu_config = $(bindir)/icu-config -CONFIGURE_ARGS = $(DIRPATHS) -# CONFIGURE_ARGS += --with-icu=$(prefix) -# CONFIGURE_ARGS += --with-curl=$(prefix) - 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 20 18:59:24 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 20 Jun 2012 16:59:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[18474] csw/mgar/pkg/x3270/trunk Message-ID: Revision: 18474 http://gar.svn.sourceforge.net/gar/?rev=18474&view=rev Author: dmichelsen Date: 2012-06-20 16:59:24 +0000 (Wed, 20 Jun 2012) Log Message: ----------- x3270/trunk: Update to 3.3.12ga7 and OpenSSL 1.0 Modified Paths: -------------- csw/mgar/pkg/x3270/trunk/Makefile csw/mgar/pkg/x3270/trunk/checksums Modified: csw/mgar/pkg/x3270/trunk/Makefile =================================================================== --- csw/mgar/pkg/x3270/trunk/Makefile 2012-06-20 14:33:57 UTC (rev 18473) +++ csw/mgar/pkg/x3270/trunk/Makefile 2012-06-20 16:59:24 UTC (rev 18474) @@ -1,6 +1,7 @@ # $Id$ NAME = x3270 -VERSION = $(BASEREL).11ga6 +BASEREL = 3.3 +VERSION = $(BASEREL).12ga7 CATEGORIES = apps GARTYPE = v2 @@ -21,22 +22,55 @@ # File name regex to get notifications about upstream software releases UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*)-src.tar.gz +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + VENDOR_URL = http://x3270.sourceforge.net/ -BASEREL = 3.3 +LICENSE = c3270-$(BASEREL)/LICENSE + +BUILD_DEP_PKGS += CSWtcl +BUILD_DEP_PKGS += CSWlibiconv-dev +BUILD_DEP_PKGS += CSWlibreadline-dev +BUILD_DEP_PKGS += CSWlibssl-dev +BUILD_DEP_PKGS += CSWlibncurses-dev + +PACKAGES += CSWx3270 +SPKG_DESC_CSWx3270 = An IBM 3270 terminal emulator +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWx3270 += CSWtcl +RUNTIME_DEP_PKGS_CSWx3270 += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWx3270 += CSWlibreadline6 +RUNTIME_DEP_PKGS_CSWx3270 += CSWlibssl1-0-0 +RUNTIME_DEP_PKGS_CSWx3270 += CSWlibncursesw5 + +# These are just docs, override for now +CHECKPKG_OVERRIDES_CSWx3270 += file-with-bad-content|/usr/local|root/opt/csw/share/doc/x3270/tcl3270/html/Build.html +CHECKPKG_OVERRIDES_CSWx3270 += file-with-bad-content|/usr/local|root/opt/csw/share/doc/x3270/tcl3270/html/Resources.html +CHECKPKG_OVERRIDES_CSWx3270 += file-with-bad-content|/usr/local|root/opt/csw/share/doc/x3270/s3270/html/Build.html +CHECKPKG_OVERRIDES_CSWx3270 += file-with-bad-content|/usr/local|root/opt/csw/share/doc/x3270/s3270/html/s3270-man.html +CHECKPKG_OVERRIDES_CSWx3270 += file-with-bad-content|/usr/local|root/opt/csw/share/doc/x3270/s3270/html/Resources.html +CHECKPKG_OVERRIDES_CSWx3270 += file-with-bad-content|/usr/local|root/opt/csw/share/doc/x3270/pr3287/README +CHECKPKG_OVERRIDES_CSWx3270 += file-with-bad-content|/usr/local|root/opt/csw/share/doc/x3270/pr3287/html/Build.html +CHECKPKG_OVERRIDES_CSWx3270 += file-with-bad-content|/usr/local|root/opt/csw/share/doc/x3270/x3270/html/Build.html +CHECKPKG_OVERRIDES_CSWx3270 += file-with-bad-content|/usr/local|root/opt/csw/share/doc/x3270/x3270/html/FAQ.html +CHECKPKG_OVERRIDES_CSWx3270 += file-with-bad-content|/usr/local|root/opt/csw/share/doc/x3270/x3270/html/Resources.html +CHECKPKG_OVERRIDES_CSWx3270 += file-with-bad-content|/usr/local|root/opt/csw/share/doc/x3270/c3270/html/c3270-man.html +CHECKPKG_OVERRIDES_CSWx3270 += file-with-bad-content|/usr/local|root/opt/csw/share/doc/x3270/c3270/html/Resources.html +CHECKPKG_OVERRIDES_CSWx3270 += file-with-bad-content|/usr/local|root/opt/csw/share/doc/x3270/c3270/html/Build.html +CHECKPKG_OVERRIDES_CSWx3270 += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/c3270.1 +CHECKPKG_OVERRIDES_CSWx3270 += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/s3270.1 + # wc3270 = windows console, we don't need that. # wpr3270 = MinGW # ws3270 = MinGW # SUBSYSTEMS = c3270 pr3287 s3270 tcl3270 wc3270 wpr3287 ws3270 x3270 SUBSYSTEMS = c3270 pr3287 s3270 tcl3270 x3270 -LICENSE = c3270-$(BASEREL)/LICENSE - -DEP_PKGS = CSWiconv CSWtcl CSWreadline CSWosslrt CSWncurses - EXTRA_LINKER_FLAGS = -liconv WORKSRC = $(WORKDIR) +PATCHDIR = $(WORKDIR) + # CONFIGURE_SCRIPTS = $(foreach S,$(SUBSYSTEMS),$(WORKDIR)/$S-$(BASEREL)/configure) CONFIGURE_SCRIPTS = $(addprefix x3270-,$(SUBSYSTEMS)) @@ -69,4 +103,4 @@ ginstall -d $(DESTDIR)$(libdir)/x3270 ginstall $(WORKSRC)/x3270-$(BASEREL)/x3270_glue.expect $(DESTDIR)$(libdir)/x3270/x3270_glue.expect $(foreach S,$(SUBSYSTEMS),ginstall -d $(DESTDIR)$(docdir)/x3270/$S; cp -rp $(WORKSRC)/$S-$(BASEREL)/README $(WORKSRC)/$S-$(BASEREL)/html $(DESTDIR)$(docdir)/x3270/$S;) - #@$(MAKECOOKIE) + @$(MAKECOOKIE) Modified: csw/mgar/pkg/x3270/trunk/checksums =================================================================== --- csw/mgar/pkg/x3270/trunk/checksums 2012-06-20 14:33:57 UTC (rev 18473) +++ csw/mgar/pkg/x3270/trunk/checksums 2012-06-20 16:59:24 UTC (rev 18474) @@ -1 +1 @@ -01d6d3809a457e6f6bd3731642e0c02d suite3270-3.3.11ga6-src.tgz +5a501ed84d522c02d3c7ed3e36a00d0a suite3270-3.3.12ga7-src.tgz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From romeotheriault at users.sourceforge.net Thu Jun 21 01:58:12 2012 From: romeotheriault at users.sourceforge.net (romeotheriault at users.sourceforge.net) Date: Wed, 20 Jun 2012 23:58:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[18475] csw/mgar/pkg/zeromq/trunk/Makefile Message-ID: Revision: 18475 http://gar.svn.sourceforge.net/gar/?rev=18475&view=rev Author: romeotheriault Date: 2012-06-20 23:58:12 +0000 (Wed, 20 Jun 2012) Log Message: ----------- zeromq/trunk: Added a EXTRA_TEST_ENV to pass custom ulimit settings to build shell. Modified Paths: -------------- csw/mgar/pkg/zeromq/trunk/Makefile Modified: csw/mgar/pkg/zeromq/trunk/Makefile =================================================================== --- csw/mgar/pkg/zeromq/trunk/Makefile 2012-06-20 16:59:24 UTC (rev 18474) +++ csw/mgar/pkg/zeromq/trunk/Makefile 2012-06-20 23:58:12 UTC (rev 18475) @@ -35,6 +35,9 @@ CONFIGURE_ARGS = $(DIRPATHS) +# For tests to succeed on i386 you need to set the ulimit higher than the default of 256. +# I set 'ulimit -S -n 10000' in my ~/.bash_profile and the tests succeed. +EXTRA_TEST_ENV += BASH_ENV=~/.bash_profile EXTRA_LINKER_FLAGS = -norunpath include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Thu Jun 21 08:01:08 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Thu, 21 Jun 2012 06:01:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[18476] csw/mgar/pkg/gthumb/trunk/Makefile Message-ID: Revision: 18476 http://gar.svn.sourceforge.net/gar/?rev=18476&view=rev Author: cgrzemba Date: 2012-06-21 06:01:08 +0000 (Thu, 21 Jun 2012) Log Message: ----------- gthumb/trunk: add strip_libtool Modified Paths: -------------- csw/mgar/pkg/gthumb/trunk/Makefile Modified: csw/mgar/pkg/gthumb/trunk/Makefile =================================================================== --- csw/mgar/pkg/gthumb/trunk/Makefile 2012-06-20 23:58:12 UTC (rev 18475) +++ csw/mgar/pkg/gthumb/trunk/Makefile 2012-06-21 06:01:08 UTC (rev 18476) @@ -26,6 +26,7 @@ GARCOMPILER = SOS12U3 PACKAGING_PLATFORMS = Solaris10-sparc Solaris10-i386 +STRIP_LIBTOOL = 1 PATCHFILES += mkdtemp-patch This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From grzemba at contac-dt.de Thu Jun 21 08:04:44 2012 From: grzemba at contac-dt.de (Carsten Grzemba) Date: Thu, 21 Jun 2012 08:04:44 +0200 Subject: [csw-devel] SF.net SVN: gar:[18475] csw/mgar/pkg/zeromq/trunk/Makefile In-Reply-To: <7400f44b380e.4fe2b976@contac-dt.de> References: <7400f44b380e.4fe2b976@contac-dt.de> Message-ID: <7400ca4f71ee.4fe2d59c@contac-dt.de> Am 21.06.12, schrieb romeotheriault at users.sourceforge.net: > Revision: 18475 > ????????? http://gar.svn.sourceforge.net/gar/?rev=18475&view=rev > Author:?? romeotheriault > Date:???? 2012-06-20 23:58:12 +0000 (Wed, 20 Jun 2012) > Log Message: > ----------- > zeromq/trunk: Added a EXTRA_TEST_ENV to pass custom ulimit settings to build shell. > > Modified Paths: > -------------- > ??? csw/mgar/pkg/zeromq/trunk/Makefile > > Modified: csw/mgar/pkg/zeromq/trunk/Makefile > =================================================================== > --- csw/mgar/pkg/zeromq/trunk/Makefile 2012-06-20 16:59:24 UTC (rev 18474) > +++ csw/mgar/pkg/zeromq/trunk/Makefile 2012-06-20 23:58:12 UTC (rev 18475) > @@ -35,6 +35,9 @@ > ? > ?CONFIGURE_ARGS = $(DIRPATHS) > ? > +# For tests to succeed on i386 you need to set the ulimit higher than the default of 256. > +# I set 'ulimit -S -n 10000' in my ~/.bash_profile and the tests succeed. > +EXTRA_TEST_ENV += BASH_ENV=~/.bash_profile? > > That is very very privat. There should be a better solution! -- Carsten Grzemba -------------- next part -------------- An HTML attachment was scrubbed... URL: From romeotheriault at opencsw.org Thu Jun 21 08:53:07 2012 From: romeotheriault at opencsw.org (Romeo Theriault) Date: Wed, 20 Jun 2012 20:53:07 -1000 Subject: [csw-devel] SF.net SVN: gar:[18475] csw/mgar/pkg/zeromq/trunk/Makefile In-Reply-To: <7400ca4f71ee.4fe2d59c@contac-dt.de> References: <7400f44b380e.4fe2b976@contac-dt.de> <7400ca4f71ee.4fe2d59c@contac-dt.de> Message-ID: On Wed, Jun 20, 2012 at 8:04 PM, Carsten Grzemba wrote: > +# For tests to succeed on i386 you need to set the ulimit higher than the > default of 256. > +# I set 'ulimit -S -n 10000' in my ~/.bash_profile and the tests succeed. > +EXTRA_TEST_ENV += BASH_ENV=~/.bash_profile > > That is very very privat. There should be a better solution! Yes, it is and there is. Dago suggested one that I think I'll use. I hadn't thought about the portability aspect of the build, but I'm glad to have now. Romeo From cgrzemba at users.sourceforge.net Thu Jun 21 11:16:34 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Thu, 21 Jun 2012 09:16:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[18477] csw/mgar/pkg Message-ID: Revision: 18477 http://gar.svn.sourceforge.net/gar/?rev=18477&view=rev Author: cgrzemba Date: 2012-06-21 09:16:34 +0000 (Thu, 21 Jun 2012) Log Message: ----------- gnokii/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/gnokii/ csw/mgar/pkg/gnokii/Makefile csw/mgar/pkg/gnokii/branches/ csw/mgar/pkg/gnokii/tags/ csw/mgar/pkg/gnokii/trunk/ csw/mgar/pkg/gnokii/trunk/Makefile csw/mgar/pkg/gnokii/trunk/checksums csw/mgar/pkg/gnokii/trunk/files/ Added: csw/mgar/pkg/gnokii/Makefile =================================================================== --- csw/mgar/pkg/gnokii/Makefile (rev 0) +++ csw/mgar/pkg/gnokii/Makefile 2012-06-21 09:16:34 UTC (rev 18477) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/gnokii/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/gnokii/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnokii/trunk/Makefile (rev 0) +++ csw/mgar/pkg/gnokii/trunk/Makefile 2012-06-21 09:16:34 UTC (rev 18477) @@ -0,0 +1,63 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = gnokii +VERSION = 0.6.31 +GARTYPE = v2 +CATEGORIES = gnome + +DESCRIPTION = Brief description +define BLURB + Long description +endef + +MASTER_SITES = http://www.gnokii.org/download/gnokii +DISTFILES = $(DISTNAME).tar.gz + +# UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz + +PACKAGING_PLATFORMS = Solaris10-sparc Solaris10-i386 + +GARCOMPILER = GNU + +PACKAGES += CSWlibgnokii7 +PKGFILES_CSWlibgnokii7 += $(call baseisadirs,$(libdir),libgnokii\.so\.7\.0\.0) +PKGFILES_CSWlibgnokii7 += $(call baseisadirs,$(libdir),libgnokii\.so\.7(\.\d+)*) +SPKG_DESC_CSWlibgnokii7 += $(DESCRIPTION), libgnokii.so.7 +RUNTIME_DEP_PKGS_CSWlibgnokii7 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibgnokii7 += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWlibgnokii7 += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibgnokii7 += CSWxpm +# for libusb is /usr/sfw/lib needed +CHECKPKG_OVERRIDES_CSWlibgnokii7 += bad-rpath-entry + +PACKAGES += CSWgnokii +SPKG_DESC_CSWgnokii += $(DESCRIPTION) +EXTRA_MERGE_EXCLUDE_FILES = .*\.so +RUNTIME_DEP_PKGS_CSWgnokii += CSWlibgnokii7 +RUNTIME_DEP_PKGS_CSWgnokii += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWgnokii += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWgnokii += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWgnokii += CSWlibncurses5 +RUNTIME_DEP_PKGS_CSWgnokii += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWgnokii += CSWxpm +RUNTIME_DEP_PKGS_CSWgnokii += CSWlibreadline6 +CHECKPKG_OVERRIDES_CSWgnokii += bad-rpath-entry +CHECKPKG_OVERRIDES_CSWgnokii += file-with-bad-content|/usr/share|root/opt/csw/share/doc/gnokii/sample/magic +CHECKPKG_OVERRIDES_CSWgnokii += file-with-bad-content|/usr/share|root/opt/csw/share/doc/gnokii/gettext-howto +CHECKPKG_OVERRIDES_CSWgnokii += file-with-bad-content|/usr/local|root/opt/csw/share/doc/gnokii/sample/gnokiirc +CHECKPKG_OVERRIDES_CSWgnokii += file-with-bad-content|/usr/local|root/opt/csw/share/doc/gnokii/DataCalls-QuickStart +CHECKPKG_OVERRIDES_CSWgnokii += file-with-bad-content|/usr/local|root/opt/csw/share/doc/gnokii/README +CHECKPKG_OVERRIDES_CSWgnokii += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/smsd.8 + + +# for libusb +EXTRA_INC = /usr/sfw/include +EXTRA_LIB = /usr/sfw/lib + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-libusb=yes + +include gar/category.mk + +PATH:=/opt/csw/gnu:$(PATH) Property changes on: csw/mgar/pkg/gnokii/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/gnokii/trunk/checksums =================================================================== --- csw/mgar/pkg/gnokii/trunk/checksums (rev 0) +++ csw/mgar/pkg/gnokii/trunk/checksums 2012-06-21 09:16:34 UTC (rev 18477) @@ -0,0 +1 @@ +b2bab39d799fd95dd18b4b454403157c gnokii-0.6.31.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Thu Jun 21 12:43:00 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Thu, 21 Jun 2012 10:43:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[18478] csw/mgar/pkg/aide/trunk Message-ID: Revision: 18478 http://gar.svn.sourceforge.net/gar/?rev=18478&view=rev Author: cgrzemba Date: 2012-06-21 10:43:00 +0000 (Thu, 21 Jun 2012) Log Message: ----------- aide/trunk: version bump, remove lipg dependency Modified Paths: -------------- csw/mgar/pkg/aide/trunk/Makefile csw/mgar/pkg/aide/trunk/checksums Added Paths: ----------- csw/mgar/pkg/aide/trunk/files/0003-fix-zlib-test_configure.in.patch Modified: csw/mgar/pkg/aide/trunk/Makefile =================================================================== --- csw/mgar/pkg/aide/trunk/Makefile 2012-06-21 09:16:34 UTC (rev 18477) +++ csw/mgar/pkg/aide/trunk/Makefile 2012-06-21 10:43:00 UTC (rev 18478) @@ -1,5 +1,5 @@ NAME = aide -VERSION = 0.13.1 +VERSION = 0.15.1 CATEGORIES = utils GARTYPE = v2 @@ -14,23 +14,34 @@ DISTFILES = $(NAME)-$(VERSION).tar.gz DISTFILES += aide.conf +GARCOMPILER = GNU # Disable Sun ACLs for now until bug #2887984 is fixed: # http://sourceforge.net/tracker/?func=detail&aid=2887984&group_id=86976&atid=581579 #PATCHFILES = 0001-Fix-ACL-ifdef-logic.patch # Add patch until bug #2888035 is fixed: # http://sourceforge.net/tracker/?func=detail&aid=2888035&group_id=86976&atid=581579 -PATCHFILES += 0002-Add-missing-prototypes-for-db_sql.patch +# PATCHFILES += 0002-Add-missing-prototypes-for-db_sql.patch +# PATCHFILES += 0003-fix-zlib-test_configure.in.patch # 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 = CSWcurlrt CSWgcrypt CSWgpgerr CSWlibidn CSWlibmhash CSWlibpq -RUNTIME_DEP_PKGS += CSWoldaprt CSWosslrt CSWzlib - sysconfdir = /etc/opt/csw/aide PRESERVECONF = $(sysconfdir)/aide.conf +CHECKPKG_OVERRIDES_CSWaide += file-with-bad-content|/usr/local|root/etc/opt/csw/aide/aide.conf.CSW + +RUNTIME_DEP_PKGS_CSWaide += CSWlibgcrypt11 +RUNTIME_DEP_PKGS_CSWaide += CSWlibz1 +RUNTIME_DEP_PKGS_CSWaide += CSWlibssl0-9-8 +RUNTIME_DEP_PKGS_CSWaide += CSWlibgpg-error0 +RUNTIME_DEP_PKGS_CSWaide += CSWlibcurl4 +RUNTIME_DEP_PKGS_CSWaide += CSWlibmhash +RUNTIME_DEP_PKGS_CSWaide += CSWlibidn11 +RUNTIME_DEP_PKGS_CSWaide += CSWlibpq5 + + EXTRA_LIB = $(prefix)/postgresql/lib EXTRA_INC = $(prefix)/postgresql/include @@ -38,6 +49,8 @@ CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-curl +# we have no libs.a +CONFIGURE_ARGS += --disable-static # Disable Sun ACLs for now until bug #2887984 is fixed (see above) #CONFIGURE_ARGS += --with-sun-acl Modified: csw/mgar/pkg/aide/trunk/checksums =================================================================== --- csw/mgar/pkg/aide/trunk/checksums 2012-06-21 09:16:34 UTC (rev 18477) +++ csw/mgar/pkg/aide/trunk/checksums 2012-06-21 10:43:00 UTC (rev 18478) @@ -1,3 +1 @@ -c0fe56738d4f293c4d5a8de164a2a01c 0002-Add-missing-prototypes-for-db_sql.patch -27978cc6bca4f0fbf3f6f5a1b330661c aide-0.13.1.tar.gz -a488b910d69ebf4edf65e350994ccbba aide.conf +d0b72535ff68b93a648e4d08b0ed7f07 aide-0.15.1.tar.gz Added: csw/mgar/pkg/aide/trunk/files/0003-fix-zlib-test_configure.in.patch =================================================================== --- csw/mgar/pkg/aide/trunk/files/0003-fix-zlib-test_configure.in.patch (rev 0) +++ csw/mgar/pkg/aide/trunk/files/0003-fix-zlib-test_configure.in.patch 2012-06-21 10:43:00 UTC (rev 18478) @@ -0,0 +1,13 @@ +diff --git a/configure.in b/configure.in +index cc3e6ff..08e7cf1 100644 +--- a/configure.in ++++ b/configure.in +@@ -666,7 +666,7 @@ AC_DEFINE_UNQUOTED(DEFAULT_DB,"$default_db",[Default location of signature datab + AC_DEFINE_UNQUOTED(DEFAULT_DB_OUT,"$default_db_out",[Default output location for newly-generated signature database]) + + dnl Do the library tests with the static flag +-LDFLAGS="$LDFLAGS $LD_STATIC_FLAG" ++EXTRA_LDFLAGS="$EXTRA_LDFLAGS $LD_STATIC_FLAG" + if test x$with_zlib = xyes; then + AC_CHECK_HEADERS(zlib.h,[], + [AC_MSG_ERROR([You don't have zlib properly installed. Install it or try --without-zlib.])]) 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 21 13:18:10 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 21 Jun 2012 11:18:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[18479] csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile Message-ID: Revision: 18479 http://gar.svn.sourceforge.net/gar/?rev=18479&view=rev Author: wahwah Date: 2012-06-21 11:18:10 +0000 (Thu, 21 Jun 2012) Log Message: ----------- mysql5/branches/mysql-5.5.x: removing an unconditional libssl dep Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2012-06-21 10:43:00 UTC (rev 18478) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2012-06-21 11:18:10 UTC (rev 18479) @@ -73,7 +73,6 @@ PKGFILES_CSWlibmysqlclient$(MYSQL_LIB_VER) += $(call baseisadirs,$(libdir),libmysqlclient\.so\.$(MYSQL_LIB_VER)(\.\d+)*) SPKG_DESC_CSWlibmysqlclient$(MYSQL_LIB_VER) += MySQL $(BASE_VERSION) client library, libmysqlclient.so.$(MYSQL_LIB_VER) RUNTIME_DEP_PKGS_CSWlibmysqlclient$(MYSQL_LIB_VER) += CSWlibz1 -RUNTIME_DEP_PKGS_CSWlibmysqlclient$(MYSQL_LIB_VER) += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWlibmysqlclient$(MYSQL_LIB_VER)_5.9 += CSWlibssl0-9-8 RUNTIME_DEP_PKGS_CSWlibmysqlclient$(MYSQL_LIB_VER)_5.10 += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWlibmysqlclient$(MYSQL_LIB_VER) += $(RUNTIME_DEP_PKGS_CSWlibmysqlclient$(MYSQL_LIB_VER)_$(GAROSREL)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Thu Jun 21 13:59:27 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Thu, 21 Jun 2012 11:59:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[18480] csw/mgar/pkg/aide/trunk Message-ID: Revision: 18480 http://gar.svn.sourceforge.net/gar/?rev=18480&view=rev Author: cgrzemba Date: 2012-06-21 11:59:26 +0000 (Thu, 21 Jun 2012) Log Message: ----------- aide/trunk: add _FILE_OFFSET_BITS patch Modified Paths: -------------- csw/mgar/pkg/aide/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/aide/trunk/files/0004-fix-_FILE_OFFSET_BITS_configure.in.patch Modified: csw/mgar/pkg/aide/trunk/Makefile =================================================================== --- csw/mgar/pkg/aide/trunk/Makefile 2012-06-21 11:18:10 UTC (rev 18479) +++ csw/mgar/pkg/aide/trunk/Makefile 2012-06-21 11:59:26 UTC (rev 18480) @@ -15,6 +15,9 @@ DISTFILES += aide.conf GARCOMPILER = GNU + +PACKAGING_PLATFORMS = Solaris10-sparc Solaris10-i386 + # Disable Sun ACLs for now until bug #2887984 is fixed: # http://sourceforge.net/tracker/?func=detail&aid=2887984&group_id=86976&atid=581579 #PATCHFILES = 0001-Fix-ACL-ifdef-logic.patch @@ -23,6 +26,7 @@ # http://sourceforge.net/tracker/?func=detail&aid=2888035&group_id=86976&atid=581579 # PATCHFILES += 0002-Add-missing-prototypes-for-db_sql.patch # PATCHFILES += 0003-fix-zlib-test_configure.in.patch +PATCHFILES += 0004-fix-_FILE_OFFSET_BITS_configure.in.patch # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz @@ -34,7 +38,7 @@ RUNTIME_DEP_PKGS_CSWaide += CSWlibgcrypt11 RUNTIME_DEP_PKGS_CSWaide += CSWlibz1 -RUNTIME_DEP_PKGS_CSWaide += CSWlibssl0-9-8 +RUNTIME_DEP_PKGS_CSWaide += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWaide += CSWlibgpg-error0 RUNTIME_DEP_PKGS_CSWaide += CSWlibcurl4 RUNTIME_DEP_PKGS_CSWaide += CSWlibmhash Added: csw/mgar/pkg/aide/trunk/files/0004-fix-_FILE_OFFSET_BITS_configure.in.patch =================================================================== --- csw/mgar/pkg/aide/trunk/files/0004-fix-_FILE_OFFSET_BITS_configure.in.patch (rev 0) +++ csw/mgar/pkg/aide/trunk/files/0004-fix-_FILE_OFFSET_BITS_configure.in.patch 2012-06-21 11:59:26 UTC (rev 18480) @@ -0,0 +1,11 @@ +--- a/configure.in ++++ b/configure.in +@@ -550,7 +550,7 @@ if test "$aide_lfs_choice" = "yes"; then + # This looks weird because Linux defines lstat64 and then screws it up + AC_CHECK_FUNC(lstat64, + [AC_CHECK_FUNC(stat64, +- AIDE_DEFS="$AIDE_DEFS -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS" ++ AIDE_DEFS="$AIDE_DEFS -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" + AIDE_LSTAT_FUNC="lstat64" + compoptionstring="${compoptionstring}WITH_LSTAT64\\n" + AIDE_STAT_FUNC="stat64" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Thu Jun 21 14:01:45 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Thu, 21 Jun 2012 12:01:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[18481] csw/mgar/pkg/aide/trunk/Makefile Message-ID: Revision: 18481 http://gar.svn.sourceforge.net/gar/?rev=18481&view=rev Author: cgrzemba Date: 2012-06-21 12:01:45 +0000 (Thu, 21 Jun 2012) Log Message: ----------- aide/trunk: fix platform names Modified Paths: -------------- csw/mgar/pkg/aide/trunk/Makefile Modified: csw/mgar/pkg/aide/trunk/Makefile =================================================================== --- csw/mgar/pkg/aide/trunk/Makefile 2012-06-21 11:59:26 UTC (rev 18480) +++ csw/mgar/pkg/aide/trunk/Makefile 2012-06-21 12:01:45 UTC (rev 18481) @@ -16,7 +16,7 @@ GARCOMPILER = GNU -PACKAGING_PLATFORMS = Solaris10-sparc Solaris10-i386 +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 # Disable Sun ACLs for now until bug #2887984 is fixed: # http://sourceforge.net/tracker/?func=detail&aid=2887984&group_id=86976&atid=581579 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 21 14:57:42 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 21 Jun 2012 12:57:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[18482] csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile Message-ID: Revision: 18482 http://gar.svn.sourceforge.net/gar/?rev=18482&view=rev Author: wahwah Date: 2012-06-21 12:57:41 +0000 (Thu, 21 Jun 2012) Log Message: ----------- mysql5/branches/mysql-5.5.x: better library paths Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2012-06-21 12:01:45 UTC (rev 18481) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2012-06-21 12:57:41 UTC (rev 18482) @@ -190,18 +190,20 @@ CMAKE_ARGS += -DINSTALL_LAYOUT=RPM CMAKE_ARGS += -DMYSQL_DATADIR=$(localstatedir) CMAKE_ARGS += -DSYSCONFDIR=$(sysconfdir) -# CMAKE_ARGS += -DINSTALL_BINDIR=$(subst $(prefix)/,,$(bindir)) -# CMAKE_ARGS += -DINSTALL_SBINDIR=$(subst $(prefix)/,,$(libexecdir)) +CMAKE_ARGS += -DINSTALL_BINDIR=$(subst $(prefix)/,,$(bindir_install)) +CMAKE_ARGS += -DINSTALL_SBINDIR=$(subst $(prefix)/,,$(libexecdir_install)) # CMAKE_ARGS += -DINSTALL_MANDIR=$(subst $(prefix)/,,$(mandir)) -# CMAKE_ARGS += -DINSTALL_LIBDIR=$(subst $(prefix)/,,$(libdir)) -CMAKE_ARGS += -DINSTALL_PLUGINDIR=$(subst $(prefix)/,,$(libdir))/$(NAME)/$(MM_LIBDIR)/plugin +CMAKE_ARGS += -DINSTALL_LIBDIR=$(subst $(prefix)/,,$(libdir_install)) +CMAKE_ARGS += -DINSTALL_PLUGINDIR=$(subst $(prefix)/,,$(libdir_install))/$(NAME)/$(MM_LIBDIR)/plugin CMAKE_ARGS += -DWITH_READLINE=1 +CMAKE_ARGS += -DWITH_LIBWRAP=1 CMAKE_ARGS += -DWITH_SSL=system CMAKE_ARGS += -DWITH_ZLIB=system CMAKE_ARGS += -DDEFAULT_CHARSET=utf8 CMAKE_ARGS += -DDEFAULT_COLLATION=utf8_general_ci CMAKE_ARGS += -DWITH_COMMENT='OpenCSW' -CMAKE_ARGS += -DCMAKE_C_FLAGS="$(CFLAGS)" -DCMAKE_CXX_FLAGS="$(CXXFLAGS)" +CMAKE_ARGS += -DCMAKE_C_FLAGS="$(CFLAGS)" +CMAKE_ARGS += -DCMAKE_CXX_FLAGS="$(CXXFLAGS)" CMAKE_ARGS += -DBUILD_CONFIG=mysql_release # CMAKE_ARGS += -DOPENSSL_INCLUDE_DIR="$(includedir)" # CMAKE_ARGS += -DCMAKE_LIBRARY_PATH="$(libdir)" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Thu Jun 21 15:31:28 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Thu, 21 Jun 2012 13:31:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[18483] csw/mgar/pkg/ps2eps/trunk/Makefile Message-ID: Revision: 18483 http://gar.svn.sourceforge.net/gar/?rev=18483&view=rev Author: pfelecan Date: 2012-06-21 13:31:27 +0000 (Thu, 21 Jun 2012) Log Message: ----------- corrected patch files list name: singular to plural; consequently the patch is activated. Modified Paths: -------------- csw/mgar/pkg/ps2eps/trunk/Makefile Modified: csw/mgar/pkg/ps2eps/trunk/Makefile =================================================================== --- csw/mgar/pkg/ps2eps/trunk/Makefile 2012-06-21 12:57:41 UTC (rev 18482) +++ csw/mgar/pkg/ps2eps/trunk/Makefile 2012-06-21 13:31:27 UTC (rev 18483) @@ -28,7 +28,7 @@ CONFIGURE_SCRIPTS = GARCOMPILER = GNU PATCHDIR = $(WORKSRC) -PATCHFILE = 0001-Fix-shebang-perl.patch +PATCHFILES = 0001-Fix-shebang-perl.patch BUILD_SCRIPTS = custom TEST_SCRIPTS = INSTALL_SCRIPTS = custom This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Jun 21 15:45:36 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 21 Jun 2012 13:45:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[18484] csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile Message-ID: Revision: 18484 http://gar.svn.sourceforge.net/gar/?rev=18484&view=rev Author: wahwah Date: 2012-06-21 13:45:35 +0000 (Thu, 21 Jun 2012) Log Message: ----------- mysql5/branches/mysql-5.5.x: add libdir_install to a post-* target Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2012-06-21 13:31:27 UTC (rev 18483) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2012-06-21 13:45:35 UTC (rev 18484) @@ -322,9 +322,9 @@ # gmv -v "$(DESTDIR)$(bindir)/$${f}" \ # "$(DESTDIR)$(bindir)/$${f}"; \ # done - (cd $(DESTDIR)$(libdir); rm libmysqlclient_r.so.18; \ + (cd $(DESTDIR)$(libdir_install); rm libmysqlclient_r.so.18; \ ln -s libmysqlclient.so.18 libmysqlclient_r.so.18) - (cd $(DESTDIR)$(libdir); rm libmysqlclient_r.so.18.0.0; \ + (cd $(DESTDIR)$(libdir_install); rm libmysqlclient_r.so.18.0.0; \ ln -s libmysqlclient.so.18.0.0 libmysqlclient_r.so.18.0.0) # gmv -vf $(DESTDIR)$(mandir)/man1/mysql_config.1 @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Thu Jun 21 16:44:41 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Thu, 21 Jun 2012 14:44:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[18485] csw/mgar/pkg/pilotlink/trunk Message-ID: Revision: 18485 http://gar.svn.sourceforge.net/gar/?rev=18485&view=rev Author: pfelecan Date: 2012-06-21 14:44:40 +0000 (Thu, 21 Jun 2012) Log Message: ----------- takeover and migration from a private recipe to a GAR based one; not ready for release as the split is not done and the language bindings are to be done, especially the TLC one. Modified Paths: -------------- csw/mgar/pkg/pilotlink/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/pilotlink/trunk/files/0001-Fix-python-binding-configuration.patch csw/mgar/pkg/pilotlink/trunk/files/0002-Fix-ctime_r-prototype.patch Removed Paths: ------------- csw/mgar/pkg/pilotlink/trunk/files/0001-Fix-shebang-in-configure.patch Modified: csw/mgar/pkg/pilotlink/trunk/Makefile =================================================================== --- csw/mgar/pkg/pilotlink/trunk/Makefile 2012-06-21 13:45:35 UTC (rev 18484) +++ csw/mgar/pkg/pilotlink/trunk/Makefile 2012-06-21 14:44:40 UTC (rev 18485) @@ -30,30 +30,65 @@ BUILD_DEP_PKGS += CSWperl BUILD_DEP_PKGS += CSWtcl -BUILD_DEP_PKGS += CSWpython +BUILD_DEP_PKGS += CSWpython-dev +BUILD_DEP_PKGS += SUNWlibusb +#BUILD_DEP_PKGS += SUNWj6dev +BUILD_DEP_PKGS += CSWdoxygen RUNTIME_DEP_PKGS = CSWperl RUNTIME_DEP_PKGS += CSWtcl RUNTIME_DEP_PKGS += CSWpython +RUNTIME_DEP_PKGS += SUNWlibusb +#RUNTIME_DEP_PKGS += SUNWj6rt + # This cannot be tracked with checkpkg # CHECKPKG_OVERRIDES_CSWpilot-link += surplus-dependency|CSWperl # CHECKPKG_OVERRIDES_CSWpilot-link += surplus-dependency|CSWtcl # CHECKPKG_OVERRIDES_CSWpilot-link += surplus-dependency|CSWpython -PATCHFILE = 0001-Fix-shebang-in-configure.patch +PATCHFILES = 0001-Fix-python-binding-configuration.patch +PATCHFILES += 0002-Fix-ctime_r-prototype.patch GARCOMPILER = GNU +EXTRA_CFLAGS = -I/usr/sfw/include +EXTRA_LDFLAGS = -L/usr/sfw/lib -R/usr/sfw/lib -lusb + CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-threads CONFIGURE_ARGS += --enable-conduits CONFIGURE_ARGS += --enable-libusb -CONFIGURE_ARGS += --with-perl=perlexec=$(bindir)/perl -CONFIGURE_ARGS += --with-java -CONFIGURE_ARGS += --with-tcl=$(libdir) -CONFIGURE_ARGS += --with-tclinclude -CONFIGURE_ARGS += --with-python +# CONFIGURE_ARGS += --with-perl=$(bindir)/perl +# #CONFIGURE_ARGS += --with-java=/usr/java +# CONFIGURE_ARGS += --with-tcl=$(libdir) +# CONFIGURE_ARGS += --with-tclinclude=$(includedir) +# CONFIGURE_ARGS += --with-python #LICENCE_CSWpilot-link = COPYING #LICENCE_CSWpilot-link-lib = COPYING.LIB include gar/category.mk +pre-configure-modulated: + @echo "executing $@" + cd $(WORKSRC) && libtoolize + cd $(WORKSRC) && aclocal -I m4 + cd $(WORKSRC) && automake -a + cd $(WORKSRC) && autoconf + $(MAKECOOKIE) + +documents = \ + doc/README \ + doc/README.libusb \ + doc/README.usb + +post-install-modulated: pkgdocdir = $(docdir)/$(NAME) +post-install-modulated: + ginstall --directory --mode=u=rwx,go=rx $(DESTDIR)$(pkgdocdir) + cd $(WORKSRC) && ginstall --preserve-timestamps --mode=u=rw,go=r $(documents) $(DESTDIR)$(pkgdocdir) + ginstall --directory --mode=u=rwx,go=rx $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man7 + cd $(WORKSRC) && ginstall --preserve-timestamps --mode=u=rw,go=r doc/man/*.1 $(DESTDIR)$(mandir)/man1 + cd $(WORKSRC) && ginstall --preserve-timestamps --mode=u=rw,go=r doc/man/*.7 $(DESTDIR)$(mandir)/man7 + +# this is private and not available publicly +mydependencies: + $(HOME)/bin/ocswdeplist --package $(NAME) Added: csw/mgar/pkg/pilotlink/trunk/files/0001-Fix-python-binding-configuration.patch =================================================================== --- csw/mgar/pkg/pilotlink/trunk/files/0001-Fix-python-binding-configuration.patch (rev 0) +++ csw/mgar/pkg/pilotlink/trunk/files/0001-Fix-python-binding-configuration.patch 2012-06-21 14:44:40 UTC (rev 18485) @@ -0,0 +1,28 @@ +From 1622b681a02e9d98243ffd31b06ac92a7249519c Mon Sep 17 00:00:00 2001 +From: Peter Felecan +Date: Thu, 21 Jun 2012 13:04:30 +0200 +Subject: [PATCH] Fix python binding configuration + +--- + m4/python.m4 | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/m4/python.m4 b/m4/python.m4 +index c24ad59..52d0668 100644 +--- a/m4/python.m4 ++++ b/m4/python.m4 +@@ -31,9 +31,9 @@ AC_DEFUN([AM_CHECK_PYTHON], + if test "$PYTHON_VERSION" != ""; then + if test -f $PYTHON_PREFIX/include/python$PYTHON_VERSION/Python.h; then + AC_MSG_RESULT($PYTHON_PREFIX/include/python$PYTHON_VERSION/Python.h) +- PYTHON_LIB_LOC="-L$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/config" ++ PYTHON_LIB_LOC="-L$PYTHON_EXEC_PREFIX/lib/python/config" + PYTHON_CFLAGS="-I$PYTHON_PREFIX/include/python$PYTHON_VERSION" +- PYTHON_MAKEFILE="$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/config/Makefile" ++ PYTHON_MAKEFILE="$PYTHON_EXEC_PREFIX/lib/python/config/Makefile" + + PYTHON_LOCALMODLIBS=`sed -n -e 's/^LOCALMODLIBS=\(.*\)/\1/p' $PYTHON_MAKEFILE` + PYTHON_BASEMODLIBS=`sed -n -e 's/^BASEMODLIBS=\(.*\)/\1/p' $PYTHON_MAKEFILE` +-- +1.7.10.3 + Deleted: csw/mgar/pkg/pilotlink/trunk/files/0001-Fix-shebang-in-configure.patch =================================================================== --- csw/mgar/pkg/pilotlink/trunk/files/0001-Fix-shebang-in-configure.patch 2012-06-21 13:45:35 UTC (rev 18484) +++ csw/mgar/pkg/pilotlink/trunk/files/0001-Fix-shebang-in-configure.patch 2012-06-21 14:44:40 UTC (rev 18485) @@ -1,22 +0,0 @@ -From f6dc47f801735eec1bd85d49938645f0e58c13b5 Mon Sep 17 00:00:00 2001 -From: Peter Felecan -Date: Wed, 20 Jun 2012 16:16:11 +0200 -Subject: [PATCH] Fix shebang in configure - ---- - configure | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure b/configure -index b3e7e83..755f883 100755 ---- a/configure -+++ b/configure -@@ -1,4 +1,4 @@ --#! /bin/sh -+#! /usr/bin/env bash - # Guess values for system-dependent variables and create Makefiles. - # Generated by GNU Autoconf 2.65. - # --- -1.7.10.3 - Added: csw/mgar/pkg/pilotlink/trunk/files/0002-Fix-ctime_r-prototype.patch =================================================================== --- csw/mgar/pkg/pilotlink/trunk/files/0002-Fix-ctime_r-prototype.patch (rev 0) +++ csw/mgar/pkg/pilotlink/trunk/files/0002-Fix-ctime_r-prototype.patch 2012-06-21 14:44:40 UTC (rev 18485) @@ -0,0 +1,41 @@ +From a1ab73bd475abdb3322102a5a172e1b2a74dba87 Mon Sep 17 00:00:00 2001 +From: Peter Felecan +Date: Thu, 21 Jun 2012 14:10:17 +0200 +Subject: [PATCH] Fix ctime_r prototype + +--- + tests/vfs-test.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/tests/vfs-test.c b/tests/vfs-test.c +index 0e617c7..949258d 100644 +--- a/tests/vfs-test.c ++++ b/tests/vfs-test.c +@@ -379,21 +379,21 @@ int main (int argc, char **argv) + result = dlp_VFSFileGetDate (sd, fileRef, vfsFileDateCreated, &t1); + CHECK_RESULT(dlp_VFSFileGetDate); + if (result >= 0) { +- ctime_r (&t1, name); ++ ctime_r (&t1, name, sizeof(name)); + LOG((PI_DBG_USER, PI_DBG_LVL_INFO, "* Date created: %s", name)); + } + + result = dlp_VFSFileGetDate (sd, fileRef, vfsFileDateModified, &t2); + CHECK_RESULT(dlp_VFSFileGetDate); + if (result >= 0) { +- ctime_r (&t2, name); ++ ctime_r (&t2, name, sizeof(name)); + LOG((PI_DBG_USER, PI_DBG_LVL_INFO, "* Date modified: %s", name)); + } + + result = dlp_VFSFileGetDate (sd, fileRef, vfsFileDateAccessed, &t2); + CHECK_RESULT(dlp_VFSFileGetDate); + if (result >= 0) { +- ctime_r (&t2, name); ++ ctime_r (&t2, name, sizeof(name)); + LOG((PI_DBG_USER, PI_DBG_LVL_INFO, "* Date accessed: %s", name)); + } + +-- +1.7.10.3 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Thu Jun 21 17:02:46 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Thu, 21 Jun 2012 15:02:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[18486] csw/mgar/pkg/cups/trunk/Makefile Message-ID: Revision: 18486 http://gar.svn.sourceforge.net/gar/?rev=18486&view=rev Author: cgrzemba Date: 2012-06-21 15:02:46 +0000 (Thu, 21 Jun 2012) Log Message: ----------- cups/trunk: add dependency for pdf tools, remove obsoleted configure args Modified Paths: -------------- csw/mgar/pkg/cups/trunk/Makefile Modified: csw/mgar/pkg/cups/trunk/Makefile =================================================================== --- csw/mgar/pkg/cups/trunk/Makefile 2012-06-21 14:44:40 UTC (rev 18485) +++ csw/mgar/pkg/cups/trunk/Makefile 2012-06-21 15:02:46 UTC (rev 18486) @@ -66,7 +66,7 @@ LICENSE = LICENSE.txt -GARCOMPILER ?= SOS12U3 # SOS12U3 +GARCOMPILER = SOS12U3 PACKAGING_PLATFORMS = solaris10-i386 solaris10-sparc BUILD_DEP_PKGS = CSWggettext-dev @@ -149,6 +149,8 @@ RUNTIME_DEP_PKGS_CSWcupsd += CSWlibslp1 RUNTIME_DEP_PKGS_CSWcupsd += CSWlibz1 RUNTIME_DEP_PKGS_CSWcupsd += CSWlibldap2-4-2 +# need /opt/csw/bin/pdftops +RUNTIME_DEP_PKGS_CSWcupsd += CSWpoppler # Just docs CHECKPKG_OVERRIDES_CSWcupsd += file-with-bad-content|/usr/share|root/opt/csw/share/doc/cups/help/spec-banner.html @@ -306,13 +308,11 @@ EXTRA_LINKER_FLAGS += -norunpath CONFIGURE_ARGS += $(DIRPATHS) -CONFIGURE_ARGS += --enable-pdftops CONFIGURE_ARGS += --with-menudir=$(datadir)/applications CONFIGURE_ARGS += --localedir=$(datadir)/locale CONFIGURE_ARGS += --with-rcdir=$(sysconfdir) CONFIGURE_ARGS += --with-icondir=$(datadir)/icons CONFIGURE_ARGS += --with-openslp-includes=/opt/csw/include -CONFIGURE_ARGS += --with-openslp-lib=/opt/csw/lib # This breaks non-global sparse zone support. The class action script is # executed in the global zone, but not in the non-global zones, if /opt is This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Thu Jun 21 17:07:38 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Thu, 21 Jun 2012 15:07:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[18487] csw/mgar/pkg/poppler/trunk/Makefile Message-ID: Revision: 18487 http://gar.svn.sourceforge.net/gar/?rev=18487&view=rev Author: cgrzemba Date: 2012-06-21 15:07:37 +0000 (Thu, 21 Jun 2012) Log Message: ----------- poppler/trunk: create CSWpoppler utils package Modified Paths: -------------- csw/mgar/pkg/poppler/trunk/Makefile Modified: csw/mgar/pkg/poppler/trunk/Makefile =================================================================== --- csw/mgar/pkg/poppler/trunk/Makefile 2012-06-21 15:02:46 UTC (rev 18486) +++ csw/mgar/pkg/poppler/trunk/Makefile 2012-06-21 15:07:37 UTC (rev 18487) @@ -36,8 +36,6 @@ PACKAGES += CSWlibpoppler-glib5 CATALOGNAME_CSWlibpoppler-glib5 = libpoppler_glib5 -OBSOLETED_BY_CSWlibpoppler-glib5 = CSWlibpoppler - PKGFILES_CSWlibpoppler-glib5 += $(call baseisadirs,$(libdir),libpoppler-glib\.so\.5\.0\.0) PKGFILES_CSWlibpoppler-glib5 += $(call baseisadirs,$(libdir),libpoppler-glib\.so\.5(\.\d+)*) SPKG_DESC_CSWlibpoppler-glib5 += $(DESCRIPTION), libpoppler-glib.so.5 @@ -51,8 +49,8 @@ RUNTIME_DEP_PKGS_CSWlibpoppler-glib5 += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWlibpoppler-glib5 += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWlibpoppler-glib5 += CSWpango -RUNTIME_DEP_PKGS_CSWlibpoppler-glib5 += CSWfconfig RUNTIME_DEP_PKGS_CSWlibpoppler-glib5 += CSWlibpoppler7 +RUNTIME_DEP_PKGS_CSWlibpoppler-glib5 += CSWlibfontconfig1 PACKAGES += CSWlibpoppler7 CATALOGNAME_CSWlibpoppler7 = libpoppler7 @@ -63,37 +61,35 @@ RUNTIME_DEP_PKGS_CSWlibpoppler7 += CSWlibfreetype6 RUNTIME_DEP_PKGS_CSWlibpoppler7 += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSWlibpoppler7 += CSWlibjpeg7 -RUNTIME_DEP_PKGS_CSWlibpoppler7 += CSWfconfig +RUNTIME_DEP_PKGS_CSWlibpoppler7 += CSWlibfontconfig1 RUNTIME_DEP_PKGS_CSWlibpoppler7 += CSWliblcms1 PACKAGES += CSWpoppler-dev CATALOGNAME_CSWpoppler-dev = poppler_dev -OBSOLETED_BY_CSWpoppler-dev = CSWlibpopplerdev SPKG_DESC_CSWpoppler-dev += $(DESCRIPTION), development files PKGFILES_CSWpoppler-dev += $(PKGFILES_DEVEL) RUNTIME_DEP_PKGS_CSWpoppler-dev += CSWlibpoppler7 RUNTIME_DEP_PKGS_CSWpoppler-dev += CSWlibpoppler-cpp0 RUNTIME_DEP_PKGS_CSWpoppler-dev += CSWlibpoppler-glib5 -RUNTIME_DEP_PKGS_CSWpoppler += CSWlibpoppler-cpp0 +PACKAGES += CSWpoppler +SPKG_DESC_CSWpoppler += $(DESCRIPTION), utils +PKGFILES_CSWpoppler += $(call baseisadirs,$(bindir),.*) +# CSWxpdf provides the same tools, but should use this package instead +INCOMPATIBLE_PKGS_CSWpoppler = CSWxpdf +CHECKPKG_OVERRIDES_CSWpoppler += file-collision|/opt/csw/bin/pdftohtml|CSWpdftohtml|CSWpoppler +CHECKPKG_OVERRIDES_CSWpoppler += file-collision|/opt/csw/bin/pdftops|CSWpoppler|CSWxpdf +CHECKPKG_OVERRIDES_CSWpoppler += file-collision|/opt/csw/bin/pdfimages|CSWpoppler|CSWxpdf +CHECKPKG_OVERRIDES_CSWpoppler += file-collision|/opt/csw/bin/pdfinfo|CSWpoppler|CSWxpdf +CHECKPKG_OVERRIDES_CSWpoppler += file-collision|/opt/csw/bin/pdftotext|CSWpoppler|CSWxpdf +CHECKPKG_OVERRIDES_CSWpoppler += file-collision|/opt/csw/bin/pdffonts|CSWpoppler|CSWxpdf RUNTIME_DEP_PKGS_CSWpoppler += CSWlibpoppler7 -RUNTIME_DEP_PKGS_CSWpoppler += CSWlibgthread2-0-0 -RUNTIME_DEP_PKGS_CSWpoppler += CSWlibiconv2 -RUNTIME_DEP_PKGS_CSWpoppler += CSWlibgmodule2-0-0 RUNTIME_DEP_PKGS_CSWpoppler += CSWlibpng12-0 -RUNTIME_DEP_PKGS_CSWpoppler += CSWlibgdk-x11-2-0-0 -RUNTIME_DEP_PKGS_CSWpoppler += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWpoppler += CSWlibgdk-pixbuf2-0-0 -RUNTIME_DEP_PKGS_CSWpoppler += CSWlibcairo2 RUNTIME_DEP_PKGS_CSWpoppler += CSWlibfreetype6 -RUNTIME_DEP_PKGS_CSWpoppler += CSWpango -RUNTIME_DEP_PKGS_CSWpoppler += CSWlibgobject2-0-0 -RUNTIME_DEP_PKGS_CSWpoppler += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWpoppler += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSWpoppler += CSWlibjpeg7 -RUNTIME_DEP_PKGS_CSWpoppler += CSWfconfig +RUNTIME_DEP_PKGS_CSWpoppler += CSWlibfontconfig1 RUNTIME_DEP_PKGS_CSWpoppler += CSWliblcms1 -RUNTIME_DEP_PKGS_CSWpoppler += CSWlibpoppler-glib5 # Fix for making sure libtool doesn't pick up libpoppler.so from /opt/csw/lib # when relinking libpoppler-glib during install phaze 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 22 01:01:33 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 21 Jun 2012 23:01:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[18488] csw/mgar/gar/v2/lib/python/safe_remove_package.py Message-ID: Revision: 18488 http://gar.svn.sourceforge.net/gar/?rev=18488&view=rev Author: wahwah Date: 2012-06-21 23:01:33 +0000 (Thu, 21 Jun 2012) Log Message: ----------- safe-remove-package: set INFO logging by default Modified Paths: -------------- csw/mgar/gar/v2/lib/python/safe_remove_package.py Modified: csw/mgar/gar/v2/lib/python/safe_remove_package.py =================================================================== --- csw/mgar/gar/v2/lib/python/safe_remove_package.py 2012-06-21 15:07:37 UTC (rev 18487) +++ csw/mgar/gar/v2/lib/python/safe_remove_package.py 2012-06-21 23:01:33 UTC (rev 18488) @@ -109,8 +109,10 @@ parser.add_option("--debug", dest="debug", action="store_true") parser.add_option("--execute", dest="execute", action="store_true") options, args = parser.parse_args() + debug_level = logging.INFO if options.debug: - logging.basicConfig(level=logging.DEBUG) + debug_level = logging.DEBUG + logging.basicConfig(level=debug_level) pr = PackageRemover() pr.RemovePackage(options.catalogname, options.execute) 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 22 01:07:38 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 21 Jun 2012 23:07:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[18489] csw/mgar/gar/v2/lib/python/safe_remove_package.py Message-ID: Revision: 18489 http://gar.svn.sourceforge.net/gar/?rev=18489&view=rev Author: wahwah Date: 2012-06-21 23:07:38 +0000 (Thu, 21 Jun 2012) Log Message: ----------- safe-remove-package: Add --os-releases This allows to remove packages for e.g. Solaris 10 and Solaris 11 only. It's useful when a reverse dependency blocks removal on Solaris 9, but not on 10 or 11. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/safe_remove_package.py Modified: csw/mgar/gar/v2/lib/python/safe_remove_package.py =================================================================== --- csw/mgar/gar/v2/lib/python/safe_remove_package.py 2012-06-21 23:01:33 UTC (rev 18488) +++ csw/mgar/gar/v2/lib/python/safe_remove_package.py 2012-06-21 23:07:38 UTC (rev 18489) @@ -68,14 +68,22 @@ class PackageRemover(object): - def RemovePackage(self, catalogname, execute=False): + def RemovePackage(self, catalogname, execute=False, os_releases=None): + if not os_releases: + os_releases = common_constants.OS_RELS # Get md5 sums rest_client = rest.RestClient() rd = RevDeps() rev_deps = {} to_remove = {} - for osrel in common_constants.OS_RELS: + for osrel in os_releases: + if osrel not in common_constants.OS_RELS: + logging.warning( + "%s not found in common_constants.OS_RELS (%s). Skipping.", + osrel, common_constants.OS_RELS) + continue if osrel in common_constants.OBSOLETE_OS_RELS: + logging.info("%s is an obsolete OS release. Skipping.", osrel) continue for arch in common_constants.PHYSICAL_ARCHITECTURES: pkg_simple = rest_client.Srv4ByCatalogAndCatalogname("unstable", arch, osrel, catalogname) @@ -106,15 +114,23 @@ def main(): parser = optparse.OptionParser() parser.add_option("-c", "--catalogname", dest="catalogname") + parser.add_option("--os-releases", dest="os_releases", + help=("Comma separated OS releases, e.g. " + "SunOS5.9,SunOS5.10")) parser.add_option("--debug", dest="debug", action="store_true") - parser.add_option("--execute", dest="execute", action="store_true") + parser.add_option("--execute", dest="execute", action="store_true", + help=("Don't just display, but execute and remove the " + "packages.")) options, args = parser.parse_args() debug_level = logging.INFO if options.debug: debug_level = logging.DEBUG logging.basicConfig(level=debug_level) + os_relases = None + if options.os_releases: + os_releases = options.os_releases.split(",") pr = PackageRemover() - pr.RemovePackage(options.catalogname, options.execute) + pr.RemovePackage(options.catalogname, options.execute, os_releases) if __name__ == '__main__': 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 22 01:33:44 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 21 Jun 2012 23:33:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[18490] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 18490 http://gar.svn.sourceforge.net/gar/?rev=18490&view=rev Author: bdwalton Date: 2012-06-21 23:33:44 +0000 (Thu, 21 Jun 2012) Log Message: ----------- php5/trunk: update mysql deps and add libssl to a few mysql modules Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2012-06-21 23:07:38 UTC (rev 18489) +++ csw/mgar/pkg/php5/trunk/Makefile 2012-06-21 23:33:44 UTC (rev 18490) @@ -165,14 +165,14 @@ PKGFILES_CSWphp5-mbstring += .*/include/php/ext/mbstring.* $(eval $(call php5_subpackage,mcrypt,CSWlibmcrypt4 CSWlibltdl7 CSWlibz1)) $(eval $(call php5_subpackage,mssql,CSWlibsybdb5 CSWlibz1)) -$(eval $(call php5_subpackage,mysql,CSWlibmysqlclient15 CSWlibz1)) -$(eval $(call php5_subpackage,mysqli,CSWlibmysqlclient15 CSWlibz1)) +$(eval $(call php5_subpackage,mysql,CSWlibmysqlclient18 CSWlibz1 CSWlibssl1-0-0)) +$(eval $(call php5_subpackage,mysqli,CSWlibmysqlclient18 CSWlibz1)) $(eval $(call php5_subpackage,odbc,CSWlibodbc2 CSWlibz1)) $(eval $(call php5_subpackage,openssl,CSWlibssl1-0-0 CSWlibgssapi-krb5-2 CSWlibkrb5-3 CSWlibk5crypto3 CSWlibcom-err3 CSWlibz1)) $(eval $(call php5_subpackage,pcntl,CSWlibz1)) $(eval $(call php5_subpackage,pdo,CSWlibz1)) PKGFILES_CSWphp5-pdo += .*/include/php/ext/pdo.* -$(eval $(call php5_subpackage,pdomysql,CSWlibmysqlclient15 CSWlibz1 CSWphp5-pdo)) +$(eval $(call php5_subpackage,pdomysql,CSWlibmysqlclient18 CSWlibz1 CSWphp5-pdo CSWlibssl1-0-0)) PKGFILES_CSWphp5-pdomysql += .*/lib/php/extensions/.*/pdo_mysql.so PKGFILES_CSWphp5-pdomysql += .*extensions/pdo_mysql CHECKPKG_OVERRIDES_CSWphp5-pdomysql += surplus-dependency|CSWphp5-pdo 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 22 02:46:36 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 22 Jun 2012 00:46:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[18491] csw/mgar/pkg/stunnel/trunk/Makefile Message-ID: Revision: 18491 http://gar.svn.sourceforge.net/gar/?rev=18491&view=rev Author: bdwalton Date: 2012-06-22 00:46:35 +0000 (Fri, 22 Jun 2012) Log Message: ----------- stunnel/trunk: update ssl dependencies, build for sol10 only Modified Paths: -------------- csw/mgar/pkg/stunnel/trunk/Makefile Modified: csw/mgar/pkg/stunnel/trunk/Makefile =================================================================== --- csw/mgar/pkg/stunnel/trunk/Makefile 2012-06-21 23:33:44 UTC (rev 18490) +++ csw/mgar/pkg/stunnel/trunk/Makefile 2012-06-22 00:46:35 UTC (rev 18491) @@ -29,7 +29,11 @@ MAJOR_VER = $(firstword $(subst ., ,$(VERSION))) MASTER_SITES += ftp://ftp.stunnel.org/stunnel/obsolete/$(MAJOR_VER).x/ -RUNTIME_DEP_PKGS += CSWosslrt +BUILD_DEP_PKGS += CSWlibssl-dev + +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + +RUNTIME_DEP_PKGS += CSWlibssl1-0-0 RUNTIME_DEP_PKGS += CSWlibwrap1 RUNTIME_DEP_PKGS += CSWlibz1 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 22 03:02:21 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 22 Jun 2012 01:02:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[18492] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 18492 http://gar.svn.sourceforge.net/gar/?rev=18492&view=rev Author: bdwalton Date: 2012-06-22 01:02:20 +0000 (Fri, 22 Jun 2012) Log Message: ----------- php5/trunk: hack around broken library versioning in c-client by forcing which -l parameter gets used Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2012-06-22 00:46:35 UTC (rev 18491) +++ csw/mgar/pkg/php5/trunk/Makefile 2012-06-22 01:02:20 UTC (rev 18492) @@ -341,6 +341,13 @@ @(cd $(WORKSRC); rm .gitignore; git add -A; git ci -m 'adding files that were previously ignored' ) @$(MAKECOOKIE) +pre-configure-modulated: + @echo Munging c-client routine in configure. + @(cd $(WORKSRC); \ + perl -pi -e "s|c-client4 c-client|c-client.2007f|g" configure; \ + git add configure; git ci -m 'modify c-client finding routine') + @$(MAKECOOKIE) + # this allows apxs to install the module. stupid, but i couldn't make # the darn thing _not_ do try to add the httpd.conf lines, even with # patching... 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 22 03:04:21 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 22 Jun 2012 01:04:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[18493] csw/mgar/pkg/stunnel/trunk Message-ID: Revision: 18493 http://gar.svn.sourceforge.net/gar/?rev=18493&view=rev Author: bdwalton Date: 2012-06-22 01:04:21 +0000 (Fri, 22 Jun 2012) Log Message: ----------- stunnel/trunk: version bump and patch update Modified Paths: -------------- csw/mgar/pkg/stunnel/trunk/Makefile csw/mgar/pkg/stunnel/trunk/checksums csw/mgar/pkg/stunnel/trunk/files/0001-Make-stunnel.conf-sample.in-honor-sysconfdir-localst.patch Modified: csw/mgar/pkg/stunnel/trunk/Makefile =================================================================== --- csw/mgar/pkg/stunnel/trunk/Makefile 2012-06-22 01:02:20 UTC (rev 18492) +++ csw/mgar/pkg/stunnel/trunk/Makefile 2012-06-22 01:04:21 UTC (rev 18493) @@ -7,7 +7,7 @@ # Test on Solaris 8 / 9 for comparison # NAME = stunnel -VERSION = 4.44 +VERSION = 4.53 CATEGORIES = net GARTYPE = v2 Modified: csw/mgar/pkg/stunnel/trunk/checksums =================================================================== --- csw/mgar/pkg/stunnel/trunk/checksums 2012-06-22 01:02:20 UTC (rev 18492) +++ csw/mgar/pkg/stunnel/trunk/checksums 2012-06-22 01:04:21 UTC (rev 18493) @@ -1 +1 @@ -c9dd51fc02b913ce5bf7b3fc12f9cb4a stunnel-4.44.tar.gz +ab3bfc915357d67da18c73f73610d593 stunnel-4.53.tar.gz Modified: csw/mgar/pkg/stunnel/trunk/files/0001-Make-stunnel.conf-sample.in-honor-sysconfdir-localst.patch =================================================================== --- csw/mgar/pkg/stunnel/trunk/files/0001-Make-stunnel.conf-sample.in-honor-sysconfdir-localst.patch 2012-06-22 01:02:20 UTC (rev 18492) +++ csw/mgar/pkg/stunnel/trunk/files/0001-Make-stunnel.conf-sample.in-honor-sysconfdir-localst.patch 2012-06-22 01:04:21 UTC (rev 18493) @@ -1,22 +1,19 @@ -From ded2818b78150049e0cf5934eb4a752e1972e291 Mon Sep 17 00:00:00 2001 -From: Sebastian Kayser -Date: Thu, 18 Aug 2011 00:02:54 +0200 -Subject: [PATCH] Make stunnel.conf-sample.in honor --sysconfdir, - --localstatedir +From 3eec5691ed3376ab91601c7d98a122ae7cf3f252 Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Fri, 22 Jun 2012 02:55:14 +0200 +Subject: [PATCH] make stunnel.conf-sample.in honour sysconfdir and + localstatedir -In case someone ./configured with a --sysconfdir or --localstatedir -rooted elsewhere than prefix, stunnel.conf-sample.in would have -disregarded it, because it only honors --prefix. This patch -introduces handling for the more specific --sysconfdir/--localstatedir. +Signed-off-by: Ben Walton --- tools/stunnel.conf-sample.in | 10 +++++----- - 1 files changed, 5 insertions(+), 5 deletions(-) + 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/stunnel.conf-sample.in b/tools/stunnel.conf-sample.in -index 37fea53..6a4ccc6 100644 +index 15dc2d9..b4c3946 100644 --- a/tools/stunnel.conf-sample.in +++ b/tools/stunnel.conf-sample.in -@@ -8,7 +8,7 @@ +@@ -9,7 +9,7 @@ ; A copy of some devices and system files is needed within the chroot jail ; Chroot conflicts with configuration file reload and many other features @@ -25,8 +22,8 @@ ; Chroot jail can be escaped if setuid option is not used setuid = nobody setgid = @DEFAULT_GROUP@ -@@ -25,8 +25,8 @@ pid = /stunnel.pid - ; ***************************************************************************** +@@ -26,8 +26,8 @@ pid = /stunnel.pid + ; ************************************************************************** ; Certificate/key is needed in server mode and optional in client mode -cert = @prefix@/etc/stunnel/mail.pem @@ -36,7 +33,7 @@ ; Authentication stuff needs to be configured to prevent MITM attacks ; It is not enabled by default! -@@ -35,12 +35,12 @@ cert = @prefix@/etc/stunnel/mail.pem +@@ -36,12 +36,12 @@ cert = @prefix@/etc/stunnel/mail.pem ; CApath is located inside chroot jail ;CApath = /certs ; It's often easier to use CAfile @@ -52,5 +49,5 @@ ; Disable support for insecure SSLv2 protocol options = NO_SSLv2 -- -1.7.6 +1.7.10.3 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Fri Jun 22 04:18:58 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 22 Jun 2012 02:18:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[18494] csw/mgar/pkg/httping/trunk Message-ID: Revision: 18494 http://gar.svn.sourceforge.net/gar/?rev=18494&view=rev Author: bdwalton Date: 2012-06-22 02:18:58 +0000 (Fri, 22 Jun 2012) Log Message: ----------- httping/trunk: version bump, ssl dependency update Modified Paths: -------------- csw/mgar/pkg/httping/trunk/Makefile csw/mgar/pkg/httping/trunk/checksums Modified: csw/mgar/pkg/httping/trunk/Makefile =================================================================== --- csw/mgar/pkg/httping/trunk/Makefile 2012-06-22 01:04:21 UTC (rev 18493) +++ csw/mgar/pkg/httping/trunk/Makefile 2012-06-22 02:18:58 UTC (rev 18494) @@ -3,10 +3,12 @@ # feedback pending. # NAME = httping -VERSION = 1.4.1 +VERSION = 1.5.3 CATEGORIES = net GARTYPE = v2 +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + DESCRIPTION = Httping is like 'ping' but for http-requests. define BLURB Httping is like 'ping' but for http-requests. Give it an url, and it'll @@ -19,7 +21,8 @@ DISTFILES = $(NAME)-$(VERSION).tgz UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tgz -RUNTIME_DEP_PKGS = CSWosslrt +BUILD_DEP_PKGS += CSWlibssl-dev +RUNTIME_DEP_PKGS += CSWlibssl1-0-0 # Makefile comes pre-set with gcc defaults and hardcoded tools # Already submitted upstream, feedback pending. Modified: csw/mgar/pkg/httping/trunk/checksums =================================================================== --- csw/mgar/pkg/httping/trunk/checksums 2012-06-22 01:04:21 UTC (rev 18493) +++ csw/mgar/pkg/httping/trunk/checksums 2012-06-22 02:18:58 UTC (rev 18494) @@ -1,2 +1 @@ -5ddf24edea5117b38507259359c27631 0001-Makefile-make-options-and-tools-configurable.patch -bde1ff3c01343d2371d8f34fbf8a1d9a httping-1.4.1.tgz +62879f0a2d70e32279081276d42aaa28 httping-1.5.3.tgz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Fri Jun 22 04:19:49 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 22 Jun 2012 02:19:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[18495] csw/mgar/pkg/httping/trunk/files/ 0001-Makefile-make-options-and-tools-configurable.patch Message-ID: Revision: 18495 http://gar.svn.sourceforge.net/gar/?rev=18495&view=rev Author: bdwalton Date: 2012-06-22 02:19:48 +0000 (Fri, 22 Jun 2012) Log Message: ----------- httping/trunk: update the Makefile patch Modified Paths: -------------- csw/mgar/pkg/httping/trunk/files/0001-Makefile-make-options-and-tools-configurable.patch Modified: csw/mgar/pkg/httping/trunk/files/0001-Makefile-make-options-and-tools-configurable.patch =================================================================== --- csw/mgar/pkg/httping/trunk/files/0001-Makefile-make-options-and-tools-configurable.patch 2012-06-22 02:18:58 UTC (rev 18494) +++ csw/mgar/pkg/httping/trunk/files/0001-Makefile-make-options-and-tools-configurable.patch 2012-06-22 02:19:48 UTC (rev 18495) @@ -1,25 +1,26 @@ -From 4d95ec1e711a77139cb3f9e53463d2b01aa1fcdb Mon Sep 17 00:00:00 2001 -From: Sebastian Kayser -Date: Fri, 15 Jan 2010 02:39:30 +0100 +From acfa6600510090092bd64b759400fbee81827f3b Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Fri, 22 Jun 2012 04:15:19 +0200 Subject: [PATCH] Makefile: make options and tools configurable +Signed-off-by: Ben Walton --- Makefile | 20 ++++++++++---------- - 1 files changed, 10 insertions(+), 10 deletions(-) + 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile -index c27bf22..0133741 100644 +index 1351e33..da3695b 100644 --- a/Makefile +++ b/Makefile -@@ -16,26 +16,26 @@ include version - +@@ -17,26 +17,26 @@ include version TARGET=httping + DEBUG=yes -WFLAGS=-Wall -W -OFLAGS=-O2 +WFLAGS?=-Wall -W +OFLAGS?=-O2 - CFLAGS+=$(WFLAGS) $(OFLAGS) -DVERSION=\"$(VERSION)\" + CFLAGS+=$(WFLAGS) $(OFLAGS) -DVERSION=\"$(VERSION)\" -g PACKAGE=$(TARGET)-$(VERSION) -PREFIX=/usr @@ -47,7 +48,7 @@ OBJS=mem.o http.o io.o str.o error.o utils.o main.o tcp.o res.o -@@ -62,7 +62,7 @@ endif +@@ -63,7 +63,7 @@ endif all: $(TARGET) $(TARGET): $(OBJS) @@ -57,5 +58,5 @@ # Oh, blatant plug: http://keetweej.vanheusden.com/wishlist.html -- -1.6.6 +1.7.10.3 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Fri Jun 22 08:27:44 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Fri, 22 Jun 2012 06:27:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[18496] csw/mgar/pkg/poppler/trunk/Makefile Message-ID: Revision: 18496 http://gar.svn.sourceforge.net/gar/?rev=18496&view=rev Author: cgrzemba Date: 2012-06-22 06:27:44 +0000 (Fri, 22 Jun 2012) Log Message: ----------- poppler/trunk: add man pages to CSWpoppler package Modified Paths: -------------- csw/mgar/pkg/poppler/trunk/Makefile Modified: csw/mgar/pkg/poppler/trunk/Makefile =================================================================== --- csw/mgar/pkg/poppler/trunk/Makefile 2012-06-22 02:19:48 UTC (rev 18495) +++ csw/mgar/pkg/poppler/trunk/Makefile 2012-06-22 06:27:44 UTC (rev 18496) @@ -75,7 +75,9 @@ PACKAGES += CSWpoppler SPKG_DESC_CSWpoppler += $(DESCRIPTION), utils PKGFILES_CSWpoppler += $(call baseisadirs,$(bindir),.*) +PKGFILES_CSWpoppler += $(call baseisadirs,$(datadir)/man,.*) # CSWxpdf provides the same tools, but should use this package instead +# interims solution until rework xpdf INCOMPATIBLE_PKGS_CSWpoppler = CSWxpdf CHECKPKG_OVERRIDES_CSWpoppler += file-collision|/opt/csw/bin/pdftohtml|CSWpdftohtml|CSWpoppler CHECKPKG_OVERRIDES_CSWpoppler += file-collision|/opt/csw/bin/pdftops|CSWpoppler|CSWxpdf @@ -83,6 +85,13 @@ CHECKPKG_OVERRIDES_CSWpoppler += file-collision|/opt/csw/bin/pdfinfo|CSWpoppler|CSWxpdf CHECKPKG_OVERRIDES_CSWpoppler += file-collision|/opt/csw/bin/pdftotext|CSWpoppler|CSWxpdf CHECKPKG_OVERRIDES_CSWpoppler += file-collision|/opt/csw/bin/pdffonts|CSWpoppler|CSWxpdf +CHECKPKG_OVERRIDES_CSWpoppler += file-collision|/opt/csw/bin/pdftoppm|CSWpoppler|CSWxpdf +CHECKPKG_OVERRIDES_CSWpoppler += file-collision|/opt/csw/share/man/man1/pdfimages.1|CSWpoppler|CSWxpdf +CHECKPKG_OVERRIDES_CSWpoppler += file-collision|/opt/csw/share/man/man1/pdfinfo.1|CSWpoppler|CSWxpdf +CHECKPKG_OVERRIDES_CSWpoppler += file-collision|/opt/csw/share/man/man1/pdftoppm.1|CSWpoppler|CSWxpdf +CHECKPKG_OVERRIDES_CSWpoppler += file-collision|/opt/csw/share/man/man1/pdftops.1|CSWpoppler|CSWxpdf +CHECKPKG_OVERRIDES_CSWpoppler += file-collision|/opt/csw/share/man/man1/pdftotext.1|CSWpoppler|CSWxpdf +CHECKPKG_OVERRIDES_CSWpoppler += file-collision|/opt/csw/share/man/man1/pdffonts.1|CSWpoppler|CSWxpdf RUNTIME_DEP_PKGS_CSWpoppler += CSWlibpoppler7 RUNTIME_DEP_PKGS_CSWpoppler += CSWlibpng12-0 RUNTIME_DEP_PKGS_CSWpoppler += CSWlibfreetype6 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Fri Jun 22 10:41:45 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Fri, 22 Jun 2012 08:41:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[18497] csw/mgar/pkg/pilotlink/trunk Message-ID: Revision: 18497 http://gar.svn.sourceforge.net/gar/?rev=18497&view=rev Author: pfelecan Date: 2012-06-22 08:41:45 +0000 (Fri, 22 Jun 2012) Log Message: ----------- all bindings but Java; still not ready for release, working on the Java binding. Modified Paths: -------------- csw/mgar/pkg/pilotlink/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/pilotlink/trunk/files/0003-Avoid-including-redundant-SFW.patch Modified: csw/mgar/pkg/pilotlink/trunk/Makefile =================================================================== --- csw/mgar/pkg/pilotlink/trunk/Makefile 2012-06-22 06:27:44 UTC (rev 18496) +++ csw/mgar/pkg/pilotlink/trunk/Makefile 2012-06-22 08:41:45 UTC (rev 18497) @@ -48,26 +48,31 @@ PATCHFILES = 0001-Fix-python-binding-configuration.patch PATCHFILES += 0002-Fix-ctime_r-prototype.patch +PATCHFILES += 0003-Avoid-including-redundant-SFW.patch -GARCOMPILER = GNU -EXTRA_CFLAGS = -I/usr/sfw/include +#GARCOMPILER = GNU +EXTRA_INC = /usr/sfw/include EXTRA_LDFLAGS = -L/usr/sfw/lib -R/usr/sfw/lib -lusb CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-threads CONFIGURE_ARGS += --enable-conduits CONFIGURE_ARGS += --enable-libusb -# CONFIGURE_ARGS += --with-perl=$(bindir)/perl +CONFIGURE_ARGS += --with-perl=$(bindir)/perl # #CONFIGURE_ARGS += --with-java=/usr/java -# CONFIGURE_ARGS += --with-tcl=$(libdir) -# CONFIGURE_ARGS += --with-tclinclude=$(includedir) -# CONFIGURE_ARGS += --with-python +CONFIGURE_ARGS += --with-tcl=$(libdir) +CONFIGURE_ARGS += --with-tclinclude=$(includedir) +CONFIGURE_ARGS += --with-python #LICENCE_CSWpilot-link = COPYING #LICENCE_CSWpilot-link-lib = COPYING.LIB include gar/category.mk +# kludge to ensure that /opt/csw/include come before /usr/sfw/include +# (needed to have USB capacity): +CPPFLAGS := $(sort $(CPPFLAGS)) + pre-configure-modulated: @echo "executing $@" cd $(WORKSRC) && libtoolize Added: csw/mgar/pkg/pilotlink/trunk/files/0003-Avoid-including-redundant-SFW.patch =================================================================== --- csw/mgar/pkg/pilotlink/trunk/files/0003-Avoid-including-redundant-SFW.patch (rev 0) +++ csw/mgar/pkg/pilotlink/trunk/files/0003-Avoid-including-redundant-SFW.patch 2012-06-22 08:41:45 UTC (rev 18497) @@ -0,0 +1,24 @@ +From bed9f247bdaa4bed8cd7dedc55a46adeaff22f34 Mon Sep 17 00:00:00 2001 +From: Peter Felecan +Date: Fri, 22 Jun 2012 10:24:07 +0200 +Subject: [PATCH] Avoid including redundant SFW + +--- + bindings/Makefile.am | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/bindings/Makefile.am b/bindings/Makefile.am +index 7e0422c..5fd086e 100644 +--- a/bindings/Makefile.am ++++ b/bindings/Makefile.am +@@ -1,3 +1,7 @@ ++# required to avoid mixing with the pi-* include supplied by ++# SunFreeware which is needed to have the USB capacity: ++CPPFLAGS := $(subst -I/usr/sfw/include,,$(CPPFLAGS)) ++ + if WITH_JAVA + JAVA_DIR=Java + else +-- +1.7.10.3 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Fri Jun 22 11:24:46 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Fri, 22 Jun 2012 09:24:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[18498] csw/mgar/pkg/pilotlink/trunk Message-ID: Revision: 18498 http://gar.svn.sourceforge.net/gar/?rev=18498&view=rev Author: pfelecan Date: 2012-06-22 09:24:46 +0000 (Fri, 22 Jun 2012) Log Message: ----------- all bindings; still not ready for release: monolithic package. Modified Paths: -------------- csw/mgar/pkg/pilotlink/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/pilotlink/trunk/files/0004-Include-Solaris-specifics-Java-binding.patch Modified: csw/mgar/pkg/pilotlink/trunk/Makefile =================================================================== --- csw/mgar/pkg/pilotlink/trunk/Makefile 2012-06-22 08:41:45 UTC (rev 18497) +++ csw/mgar/pkg/pilotlink/trunk/Makefile 2012-06-22 09:24:46 UTC (rev 18498) @@ -32,14 +32,14 @@ BUILD_DEP_PKGS += CSWtcl BUILD_DEP_PKGS += CSWpython-dev BUILD_DEP_PKGS += SUNWlibusb -#BUILD_DEP_PKGS += SUNWj6dev +BUILD_DEP_PKGS += SUNWj6dev BUILD_DEP_PKGS += CSWdoxygen RUNTIME_DEP_PKGS = CSWperl RUNTIME_DEP_PKGS += CSWtcl RUNTIME_DEP_PKGS += CSWpython RUNTIME_DEP_PKGS += SUNWlibusb -#RUNTIME_DEP_PKGS += SUNWj6rt +RUNTIME_DEP_PKGS += SUNWj6rt # This cannot be tracked with checkpkg # CHECKPKG_OVERRIDES_CSWpilot-link += surplus-dependency|CSWperl @@ -49,6 +49,7 @@ PATCHFILES = 0001-Fix-python-binding-configuration.patch PATCHFILES += 0002-Fix-ctime_r-prototype.patch PATCHFILES += 0003-Avoid-including-redundant-SFW.patch +PATCHFILES += 0004-Include-Solaris-specifics-Java-binding.patch #GARCOMPILER = GNU EXTRA_INC = /usr/sfw/include @@ -59,7 +60,7 @@ CONFIGURE_ARGS += --enable-conduits CONFIGURE_ARGS += --enable-libusb CONFIGURE_ARGS += --with-perl=$(bindir)/perl -# #CONFIGURE_ARGS += --with-java=/usr/java +CONFIGURE_ARGS += --with-java=/usr/java CONFIGURE_ARGS += --with-tcl=$(libdir) CONFIGURE_ARGS += --with-tclinclude=$(includedir) CONFIGURE_ARGS += --with-python Added: csw/mgar/pkg/pilotlink/trunk/files/0004-Include-Solaris-specifics-Java-binding.patch =================================================================== --- csw/mgar/pkg/pilotlink/trunk/files/0004-Include-Solaris-specifics-Java-binding.patch (rev 0) +++ csw/mgar/pkg/pilotlink/trunk/files/0004-Include-Solaris-specifics-Java-binding.patch 2012-06-22 09:24:46 UTC (rev 18498) @@ -0,0 +1,25 @@ +From 65c4910a8801f031652d2e7985062a20f9938e48 Mon Sep 17 00:00:00 2001 +From: Peter Felecan +Date: Fri, 22 Jun 2012 11:02:26 +0200 +Subject: [PATCH] Include Solaris specifics Java binding + +--- + bindings/Java/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/bindings/Java/Makefile.am b/bindings/Java/Makefile.am +index cdeb59d..30fc38f 100644 +--- a/bindings/Java/Makefile.am ++++ b/bindings/Java/Makefile.am +@@ -7,7 +7,7 @@ INCLUDES= \ + -I $(top_srcdir)/include \ + -I $(top_builddir)/include \ + -I $(JAVABASE)/include \ +- -I $(JAVABASE)/include/linux ++ -I $(JAVABASE)/include/solaris + + java_files= \ + $(srcdir)/MidiMgr.java \ +-- +1.7.10.3 + 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 22 12:08:39 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 22 Jun 2012 10:08:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[18499] csw/mgar/pkg/openldap/trunk Message-ID: Revision: 18499 http://gar.svn.sourceforge.net/gar/?rev=18499&view=rev Author: dmichelsen Date: 2012-06-22 10:08:39 +0000 (Fri, 22 Jun 2012) Log Message: ----------- openldap/trunk: Update to 2.4.30 last version with soname 2-4.so.2 and OpenSSL 1.0 Modified Paths: -------------- csw/mgar/pkg/openldap/trunk/Makefile csw/mgar/pkg/openldap/trunk/checksums Modified: csw/mgar/pkg/openldap/trunk/Makefile =================================================================== --- csw/mgar/pkg/openldap/trunk/Makefile 2012-06-22 09:24:46 UTC (rev 18498) +++ csw/mgar/pkg/openldap/trunk/Makefile 2012-06-22 10:08:39 UTC (rev 18499) @@ -1,7 +1,7 @@ # $Id$ NAME = openldap -VERSION = 2.4.28 +VERSION = 2.4.30 GARTYPE = v2 CATEGORIES = server @@ -27,6 +27,8 @@ PATCHFILES += patch-libtool-64bit.diff DISTFILES += patch-oldap-2.4.16-ntlm.diff +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + # Maybe in # /opt/csw/share/man/man5/ldap.conf.5 # the string @@ -61,7 +63,7 @@ RUNTIME_DEP_PKGS_CSWopenldap += CSWlibodbc2 RUNTIME_DEP_PKGS_CSWopenldap += CSWlibsasl2-2 RUNTIME_DEP_PKGS_CSWopenldap += CSWlibslp1 -RUNTIME_DEP_PKGS_CSWopenldap += CSWlibssl0-9-8 +RUNTIME_DEP_PKGS_CSWopenldap += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWopenldap += CSWlibwrap1 RUNTIME_DEP_PKGS_CSWopenldap += CSWperl OBSOLETED_BY_CSWopenldap += CSWoldap @@ -77,7 +79,7 @@ RUNTIME_DEP_PKGS_CSWopenldap-client += CSWliblber2-4-2 RUNTIME_DEP_PKGS_CSWopenldap-client += CSWlibldap2-4-2 RUNTIME_DEP_PKGS_CSWopenldap-client += CSWlibsasl2-2 -RUNTIME_DEP_PKGS_CSWopenldap-client += CSWlibssl0-9-8 +RUNTIME_DEP_PKGS_CSWopenldap-client += CSWlibssl1-0-0 OBSOLETED_BY_CSWopenldap-client += CSWoldapclient CATALOGNAME_CSWoldapclient = openldap_client_stub @@ -95,7 +97,7 @@ SPKG_DESC_CSWliblber2-4-2 = OpenLDAP ASN.1 BER library, liblber-2.4.so.2 PKGFILES_CSWliblber2-4-2 += $(call pkgfiles_lib,liblber-2.4.so.2) RUNTIME_DEP_PKGS_CSWlibldap2-4-2 += CSWlibsasl2-2 -RUNTIME_DEP_PKGS_CSWlibldap2-4-2 += CSWlibssl0-9-8 +RUNTIME_DEP_PKGS_CSWlibldap2-4-2 += CSWlibssl1-0-0 OBSOLETED_BY_CSWliblber2-4-2 += CSWoldaprt CATALOGNAME_CSWoldaprt = openldap_rt_stub @@ -115,7 +117,7 @@ PKGFILES_CSWlibldap-r2-4-2 += $(call pkgfiles_lib,libldap_r-2.4.so.2) RUNTIME_DEP_PKGS_CSWlibldap-r2-4-2 += CSWliblber2-4-2 RUNTIME_DEP_PKGS_CSWlibldap-r2-4-2 += CSWlibsasl2-2 -RUNTIME_DEP_PKGS_CSWlibldap-r2-4-2 += CSWlibssl0-9-8 +RUNTIME_DEP_PKGS_CSWlibldap-r2-4-2 += CSWlibssl1-0-0 OBSOLETED_BY_CSWlibldap-r2-4-2 += CSWoldaprt FOREIGN_PACKAGES += CSWliblber2-3-0 @@ -202,9 +204,6 @@ include gar/category.mk -CFLAGS := $(filter-out -I%,$(CFLAGS)) -DIRECTORY_EXPORTS := $(filter-out includedir,$(DIRECTORY_EXPORTS)) - post-merge-modulated: ginstall -D $(WORKDIR)/cswopenldap \ $(PKGROOT)/etc/opt/csw/init.d/cswopenldap Modified: csw/mgar/pkg/openldap/trunk/checksums =================================================================== --- csw/mgar/pkg/openldap/trunk/checksums 2012-06-22 09:24:46 UTC (rev 18498) +++ csw/mgar/pkg/openldap/trunk/checksums 2012-06-22 10:08:39 UTC (rev 18499) @@ -1 +1 @@ -196023e552eeb259e048edcd61a9645b openldap-2.4.28.tgz +4f210937cf87e3467a536dd3fed1b8b4 openldap-2.4.30.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 22 12:40:37 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 22 Jun 2012 10:40:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[18500] csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile Message-ID: Revision: 18500 http://gar.svn.sourceforge.net/gar/?rev=18500&view=rev Author: dmichelsen Date: 2012-06-22 10:40:36 +0000 (Fri, 22 Jun 2012) Log Message: ----------- mysql5/branches/mysql-5.5.x: Fixed issue with wrong pathes for 64 bit Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2012-06-22 10:08:39 UTC (rev 18499) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2012-06-22 10:40:36 UTC (rev 18500) @@ -190,11 +190,11 @@ CMAKE_ARGS += -DINSTALL_LAYOUT=RPM CMAKE_ARGS += -DMYSQL_DATADIR=$(localstatedir) CMAKE_ARGS += -DSYSCONFDIR=$(sysconfdir) -CMAKE_ARGS += -DINSTALL_BINDIR=$(subst $(prefix)/,,$(bindir_install)) -CMAKE_ARGS += -DINSTALL_SBINDIR=$(subst $(prefix)/,,$(libexecdir_install)) +CMAKE_ARGS += -DINSTALL_BINDIR=$(subst $(prefix)/,,$(bindir)) +CMAKE_ARGS += -DINSTALL_SBINDIR=$(subst $(prefix)/,,$(libexecdir)) # CMAKE_ARGS += -DINSTALL_MANDIR=$(subst $(prefix)/,,$(mandir)) -CMAKE_ARGS += -DINSTALL_LIBDIR=$(subst $(prefix)/,,$(libdir_install)) -CMAKE_ARGS += -DINSTALL_PLUGINDIR=$(subst $(prefix)/,,$(libdir_install))/$(NAME)/$(MM_LIBDIR)/plugin +CMAKE_ARGS += -DINSTALL_LIBDIR=$(subst $(prefix)/,,$(libdir)) +CMAKE_ARGS += -DINSTALL_PLUGINDIR=$(subst $(prefix)/,,$(libdir))/$(NAME)/plugin CMAKE_ARGS += -DWITH_READLINE=1 CMAKE_ARGS += -DWITH_LIBWRAP=1 CMAKE_ARGS += -DWITH_SSL=system @@ -209,8 +209,8 @@ # CMAKE_ARGS += -DCMAKE_LIBRARY_PATH="$(libdir)" # CMAKE_ARGS += -DCMAKE_PREFIX_PATH="$(prefix)" CMAKE_ARGS += -DOPENSSL_ROOT_DIR=$(prefix) -# CMAKE_ARGS += -DOPENSSL_SSL_LIBRARIES=$(libdir)/$(MM_LIBDIR)/libssl.so -# CMAKE_ARGS += -DOPENSSL_CRYPTO_LIBRARIES=$(libdir)/$(MM_LIBDIR)/libcrypto.so +# CMAKE_ARGS += -DOPENSSL_SSL_LIBRARIES=$(libdir)/libssl.so +# CMAKE_ARGS += -DOPENSSL_CRYPTO_LIBRARIES=$(libdir)/libcrypto.so CMAKE_ARGS += -DCMAKE_INCLUDE_PATH="$(includedir)" CMAKE_ARGS += -DCMAKE_LIBRARY_PATH="$(libdir)" CMAKE_ARGS += "-DCMAKE_C_FLAGS=$(CFLAGS)" 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 22 12:47:37 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 22 Jun 2012 10:47:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[18501] csw/mgar/pkg/cvs/trunk/Makefile Message-ID: Revision: 18501 http://gar.svn.sourceforge.net/gar/?rev=18501&view=rev Author: dmichelsen Date: 2012-06-22 10:47:37 +0000 (Fri, 22 Jun 2012) Log Message: ----------- cvs/trunk: Update to OpenSSL 1.0 and new deps, use proper obsoletion Modified Paths: -------------- csw/mgar/pkg/cvs/trunk/Makefile Modified: csw/mgar/pkg/cvs/trunk/Makefile =================================================================== --- csw/mgar/pkg/cvs/trunk/Makefile 2012-06-22 10:40:36 UTC (rev 18500) +++ csw/mgar/pkg/cvs/trunk/Makefile 2012-06-22 10:47:37 UTC (rev 18501) @@ -26,33 +26,31 @@ # http://lists.gnu.org/archive/html/bug-cvs/2008-01/msg00007.html PATCHFILES += cvs-1.12.13-extssh.diff +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + # The above is a functionality patch VERSION_FLAG_PATCH = 1 PACKAGES += CSWcvs CATALOGNAME_CSWcvs = cvs SPKG_DESC_CSWcvs = $(DESCRIPTION) -RUNTIME_DEP_PKGS_CSWcvs += CSWggettextrt -RUNTIME_DEP_PKGS_CSWcvs += CSWkrb5lib -RUNTIME_DEP_PKGS_CSWcvs += CSWosslrt -RUNTIME_DEP_PKGS_CSWcvs += CSWzlib +RUNTIME_DEP_PKGS_CSWcvs += CSWlibssl1-0-0 +RUNTIME_DEP_PKGS_CSWcvs += CSWlibz1 +RUNTIME_DEP_PKGS_CSWcvs += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWcvs += CSWlibcom-err3 +RUNTIME_DEP_PKGS_CSWcvs += CSWlibkrb5-3 +RUNTIME_DEP_PKGS_CSWcvs += CSWlibgssapi-krb5-2 +RUNTIME_DEP_PKGS_CSWcvs += CSWlibk5crypto3 +OBSOLETED_BY_CSWcvs += CSWcvs-feature -PACKAGES += CSWcvs-feature -CATALONGAME_CSWcvs-feature = cvs_feature -SPKG_DESC_CSWcvs-feature = Legacy package as CSWcvs now contains the feature CVS -PKGFILES_CSWcvs-feature = $(prefix)/cvs-feature -ARCHALL_CSWcvs-feature = 1 -RUNTIME_DEP_PKGS_CSWcvs-feature = CSWcvs -CHECKPKG_OVERRIDES_CSWcvs-feature += surplus-dependency|CSWcvs +# This is just the legacy link +PKGFILES_CSWcvs-feature += $(prefix)/cvs-feature CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-external-zlib=$(prefix) -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = (\d+(?:\.\d+)*) - # The testsuite runs for more than one hour! -# SKIPTEST ?= 1 +SKIPTEST ?= 1 # This is for GNATS. We don't have GNATS at OpenCSW CHECKPKG_OVERRIDES_CSWcvs += file-with-bad-content|/usr/local|root/opt/csw/bin/cvsbug @@ -70,6 +68,6 @@ PATH := /opt/csw/gnu:$(PATH) post-install-modulated: - @gln -sf ../share/cvs/contrib/rcs2log $(DESTDIR)$(bindir)/rcslog - @gln -s . $(DESTDIR)$(prefix)/cvs-feature + gln -sf ../share/cvs/contrib/rcs2log $(DESTDIR)$(bindir)/rcslog + gln -s . $(DESTDIR)$(prefix)/cvs-feature @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Fri Jun 22 13:16:14 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Fri, 22 Jun 2012 11:16:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[18502] csw/mgar/pkg/pilotlink/trunk/Makefile Message-ID: Revision: 18502 http://gar.svn.sourceforge.net/gar/?rev=18502&view=rev Author: pfelecan Date: 2012-06-22 11:16:14 +0000 (Fri, 22 Jun 2012) Log Message: ----------- force Sun Studio 12.3 as the default compiler Modified Paths: -------------- csw/mgar/pkg/pilotlink/trunk/Makefile Modified: csw/mgar/pkg/pilotlink/trunk/Makefile =================================================================== --- csw/mgar/pkg/pilotlink/trunk/Makefile 2012-06-22 10:47:37 UTC (rev 18501) +++ csw/mgar/pkg/pilotlink/trunk/Makefile 2012-06-22 11:16:14 UTC (rev 18502) @@ -51,7 +51,7 @@ PATCHFILES += 0003-Avoid-including-redundant-SFW.patch PATCHFILES += 0004-Include-Solaris-specifics-Java-binding.patch -#GARCOMPILER = GNU +GARCOMPILER = SOS12U3 EXTRA_INC = /usr/sfw/include EXTRA_LDFLAGS = -L/usr/sfw/lib -R/usr/sfw/lib -lusb 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 22 14:11:11 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 22 Jun 2012 12:11:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[18503] csw/mgar/pkg/lang-python/pycurl/trunk/Makefile Message-ID: Revision: 18503 http://gar.svn.sourceforge.net/gar/?rev=18503&view=rev Author: dmichelsen Date: 2012-06-22 12:11:11 +0000 (Fri, 22 Jun 2012) Log Message: ----------- lang-python/pycurl/trunk: Update to OpenSSL 1.0.0 Modified Paths: -------------- csw/mgar/pkg/lang-python/pycurl/trunk/Makefile Modified: csw/mgar/pkg/lang-python/pycurl/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pycurl/trunk/Makefile 2012-06-22 11:16:14 UTC (rev 18502) +++ csw/mgar/pkg/lang-python/pycurl/trunk/Makefile 2012-06-22 12:11:11 UTC (rev 18503) @@ -19,6 +19,8 @@ PATCHFILES += pycurl-mondo.patch PATCHDIRLEVEL = 0 +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + VENDOR_URL = http://pycurl.sourceforge.net/ PACKAGES += CSWpy-curl @@ -27,7 +29,7 @@ RUNTIME_DEP_PKGS_CSWpy-curl += CSWlibpython2-6-1-0 RUNTIME_DEP_PKGS_CSWpy-curl += CSWlibcurl4 RUNTIME_DEP_PKGS_CSWpy-curl += CSWlibz1 -RUNTIME_DEP_PKGS_CSWpy-curl += CSWosslrt +RUNTIME_DEP_PKGS_CSWpy-curl += CSWlibssl1-0-0 # These are docs only CHECKPKG_OVERRIDES_CSWpy-curl += file-with-bad-content|/usr/local|root/opt/csw/share/doc/pycurl/INSTALL 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 22 14:56:24 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 22 Jun 2012 12:56:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[18504] csw/mgar/pkg/icecast/trunk Message-ID: Revision: 18504 http://gar.svn.sourceforge.net/gar/?rev=18504&view=rev Author: dmichelsen Date: 2012-06-22 12:56:24 +0000 (Fri, 22 Jun 2012) Log Message: ----------- icecast/trunk: Update to 2.3.3, still open issues Modified Paths: -------------- csw/mgar/pkg/icecast/trunk/Makefile csw/mgar/pkg/icecast/trunk/checksums Added Paths: ----------- csw/mgar/pkg/icecast/trunk/files/cswicecast csw/mgar/pkg/icecast/trunk/files/icecast.xml Modified: csw/mgar/pkg/icecast/trunk/Makefile =================================================================== --- csw/mgar/pkg/icecast/trunk/Makefile 2012-06-22 12:11:11 UTC (rev 18503) +++ csw/mgar/pkg/icecast/trunk/Makefile 2012-06-22 12:56:24 UTC (rev 18504) @@ -1,31 +1,67 @@ +# TBD: +# - SMF manifest missing +# - user and group for icecast server, make config in icecast.xml + NAME = icecast -VERSION = 2.3.2 +VERSION = 2.3.3 CATEGORIES = apps -GARTYPE = v2 DESCRIPTION = A free server software for streaming multimedia define BLURB endef MASTER_SITES = http://downloads.xiph.org/releases/icecast/ -DISTFILES = $(NAME)-$(VERSION).tar.gz +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 +VENDOR_URL = http://www.icecast.org/ -SPKG_SOURCEURL = http://www.icecast.org/ +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 -RUNTIME_DEP_PKGS = CSWlibogg CSWosslrt CSWtheora CSWvorbis CSWzlib -RUNTIME_DEP_PKGS += CSWcurlrt CSWlibidn CSWoldaprt CSWspeex -RUNTIME_DEP_PKGS += CSWiconv CSWlibnet CSWlibxml2 CSWlibxslt CSWsasl +PACKAGES += CSWicecast +SPKG_DESC_CSWicecast = A free server software for streaming multimedia +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWicecast += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWicecast += CSWlibssl1-0-0 +RUNTIME_DEP_PKGS_CSWicecast += CSWlibz1 +RUNTIME_DEP_PKGS_CSWicecast += CSWlibogg0 +RUNTIME_DEP_PKGS_CSWicecast += CSWlibcurl4 +RUNTIME_DEP_PKGS_CSWicecast += CSWlibidn11 +RUNTIME_DEP_PKGS_CSWicecast += CSWlibvorbis0 +RUNTIME_DEP_PKGS_CSWicecast += CSWlibxslt1 +RUNTIME_DEP_PKGS_CSWicecast += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSWicecast += CSWliboggkate1 +RUNTIME_DEP_PKGS_CSWicecast += CSWlibtheora0 +RUNTIME_DEP_PKGS_CSWicecast += CSWlibspeex1 +RUNTIME_DEP_PKGS_CSWicecast += CSWlibkate1 -BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) -sysconfdir = /etc/opt/csw -localstatedir = /var/opt/csw +# These are just docs, override for now +CHECKPKG_OVERRIDES_CSWicecast += file-with-bad-content|/usr/local|root/opt/csw/share/doc/icecast/index.html +CHECKPKG_OVERRIDES_CSWicecast += file-with-bad-content|/usr/local|root/opt/csw/share/doc/icecast/README + +REINPLACEMENTS += cfglogs +REINPLACE_MATCH_cfglogs = /usr/local/icecast/logs +REINPLACE_WITH_cfglogs = $(localstatedir)/log/icecast +REINPLACE_FILES_cfglogs += src/cfgfile.c + +REINPLACEMENTS += cfgadmin +REINPLACE_MATCH_cfgadmin = /usr/local/icecast/admin +REINPLACE_WITH_cfgadmin = $(sharedstatedir)/icecast/admin +REINPLACE_FILES_cfgadmin += src/cfgfile.c + +REINPLACEMENTS += cfgweb +REINPLACE_MATCH_cfgweb = /usr/local/icecast/webroot +REINPLACE_WITH_cfgweb = $(sharedstatedir)/icecast/web +REINPLACE_FILES_cfgweb += src/cfgfile.c + +REINPLACEMENTS += cfg +REINPLACE_MATCH_cfg = /usr/local/icecast +REINPLACE_WITH_cfg = $(sharedstatedir)/icecast +REINPLACE_FILES_cfg += src/cfgfile.c + PRESERVECONF = $(sysconfdir)/icecast.xml -CONFIGURE_ARGS = $(DIRPATHS) +# CSWicecast_usergroup = icecast:icecast:Icecast Server:/var/opt/csw/log/icecast: include gar/category.mk Modified: csw/mgar/pkg/icecast/trunk/checksums =================================================================== --- csw/mgar/pkg/icecast/trunk/checksums 2012-06-22 12:11:11 UTC (rev 18503) +++ csw/mgar/pkg/icecast/trunk/checksums 2012-06-22 12:56:24 UTC (rev 18504) @@ -1 +1 @@ -ff516b3ccd2bcc31e68f460cd316093f icecast-2.3.2.tar.gz +2b5d1b40778922e5f6431b7758c359ad icecast-2.3.3.tar.gz Added: csw/mgar/pkg/icecast/trunk/files/cswicecast =================================================================== --- csw/mgar/pkg/icecast/trunk/files/cswicecast (rev 0) +++ csw/mgar/pkg/icecast/trunk/files/cswicecast 2012-06-22 12:56:24 UTC (rev 18504) @@ -0,0 +1,172 @@ +#!/bin/sh +# +# SMF Method file for icecast +# + +ICECAST=/opt/csw/bin/icecast +CFGFILE=/etc/opt/csw/icecast.xml +VARRUNX=/var/run +PIDFILE=${VARRUNX}/icecast.pid +PIDFILO=${VARRUNX}/icecast.pid.oldbin + +[ ! -f ${ICECAST} ] && exit 255 +[ ! -f ${CFGFILE} ] && exit 254 + +RETVAL=0 + +start() { + $ICECAST -c $CFGFILE -b + RETVAL=$? + return $RETVAL +} + +stop() { + killpidf -TERM $PIDFILO + killpidf -TERM +} + +check() { + MSG=`$ICECAST -t 2>&1` + RETVAL=$? + [ $RETVAL -ne 0 ] && echo $MSG + return $RETVAL +} + +killpidf() { + if [ "$2" != "" ]; then + PIDF=$2 + else + PIDF=$PIDFILE + fi + if [ -s "$PIDF" ]; then + /bin/kill $1 `/usr/bin/cat $PIDF` + RETVAL=$? + else + RETVAL=1 + fi + return $RETVAL +} + +reload() { + killpidf -HUP + return $RETVAL +} + +restart() { + stop + start + return $RETVAL +} + +rotate() { + killpidf -USR1 + return $RETVAL +} + +status() { + if [ -s "$PIDFILE" ]; then + FPID=`/bin/cat $PIDFILE` + else + echo "not running" + RETVAL=1 + return $RETVAL + fi + PIDP=`/bin/ps -o pid= -p $FPID` + if [ "$PIDP" = "" ]; then + echo "not running" + RETVAL=1 + return $RETVAL + fi + COMM=`/bin/ps -o comm= -p $FPID` + if [ "$ICECAST" = "$COMM" ]; then + echo "running" + RETVAL=0 + return $RETVAL + else + echo "running, but it is not a CSW package" + RETVAL=1 + return $RETVAL + fi +} + +upgrade() +{ + killpidf -USR2 + [ $RETVAL -ne 0 ] && return $RETVAL + OLDBINPID=0 + for i in 1 2 3 4 5; do + if [ -f $PIDFILO ]; then + OLDBINPID=1 + break + else + sleep 1 + fi + done + if [ $OLDBINPID -eq 1 ]; then + status >/dev/null + if [ $RETVAL -eq 0 ]; then + killpidf -WINCH $PIDFILO + fi + else + RETVAL=1 + fi + return $RETVAL +} + +upgrade_commit() +{ + killpidf -QUIT $PIDFILO + return $RETVAL +} + +upgrade_rollback() +{ + killpidf -HUP $PIDFILO + if [ $RETVAL -eq 0 ]; then + killpidf -QUIT $PIDFILE + fi + return $RETVAL +} + + +case "$1" in +start) + [ ! -d $VARRUNX ] && /bin/mkdir -p $VARRUNX ||: + check + [ $RETVAL -eq 0 ] && start ||: + ;; +stop) + stop + ;; +refresh|reload) + check + [ $RETVAL -eq 0 ] && reload ||: + ;; +restart) + check + [ $RETVAL -eq 0 ] && restart ||: + ;; +rotate) + rotate + ;; +status) + status + ;; +upgrade) + check + [ $RETVAL -eq 0 ] && upgrade ||: + ;; +upgrade-commit) + upgrade_commit + ;; +upgrade-rollback) + upgrade_rollback + ;; +*) + echo "Usage:" `basename $0` "{start|stop|refresh|reload|restart|rotate|status|upgrade|upgrade-commit|upgrade-rollback}" + exit 1 + ;; +esac + +exit $RETVAL + Added: csw/mgar/pkg/icecast/trunk/files/icecast.xml =================================================================== --- csw/mgar/pkg/icecast/trunk/files/icecast.xml (rev 0) +++ csw/mgar/pkg/icecast/trunk/files/icecast.xml 2012-06-22 12:56:24 UTC (rev 18504) @@ -0,0 +1,172 @@ + + + 100 + 2 + 5 + 524288 + 30 + 15 + 10 + + 1 + + 65535 + + + + + hackme + + hackme + + + admin + hackme + + + + + + + + + localhost + + + + 8000 + + + + + + + + + + + + + + + + + + 1 + + + + /opt/csw/share/icecast + + + /var/opt/csw/icecast/log + /opt/csw/share/icecast/web + /opt/csw/share/icecast/admin + /var/run/icecast.pid --> + + + + + + + + + access.log + error.log + + 3 + 10000 + + + + + + 0 + + nobody + nogroup + + + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Fri Jun 22 16:06:19 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Fri, 22 Jun 2012 14:06:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[18505] csw/mgar/pkg/pilotlink/trunk/Makefile Message-ID: Revision: 18505 http://gar.svn.sourceforge.net/gar/?rev=18505&view=rev Author: pfelecan Date: 2012-06-22 14:06:18 +0000 (Fri, 22 Jun 2012) Log Message: ----------- split packages and introduced some overrides where appropriate and obvious. Modified Paths: -------------- csw/mgar/pkg/pilotlink/trunk/Makefile Modified: csw/mgar/pkg/pilotlink/trunk/Makefile =================================================================== --- csw/mgar/pkg/pilotlink/trunk/Makefile 2012-06-22 12:56:24 UTC (rev 18504) +++ csw/mgar/pkg/pilotlink/trunk/Makefile 2012-06-22 14:06:18 UTC (rev 18505) @@ -31,15 +31,13 @@ BUILD_DEP_PKGS += CSWperl BUILD_DEP_PKGS += CSWtcl BUILD_DEP_PKGS += CSWpython-dev +BUILD_DEP_PKGS += CSWlibreadline-dev +BUILD_DEP_PKGS += CSWlibncurses-dev +BUILD_DEP_PKGS += CSWlibpng-dev BUILD_DEP_PKGS += SUNWlibusb -BUILD_DEP_PKGS += SUNWj6dev -BUILD_DEP_PKGS += CSWdoxygen +#BUILD_DEP_PKGS += SUNWj6dev -RUNTIME_DEP_PKGS = CSWperl -RUNTIME_DEP_PKGS += CSWtcl -RUNTIME_DEP_PKGS += CSWpython -RUNTIME_DEP_PKGS += SUNWlibusb -RUNTIME_DEP_PKGS += SUNWj6rt +#RUNTIME_DEP_PKGS += SUNWj6rt # This cannot be tracked with checkpkg # CHECKPKG_OVERRIDES_CSWpilot-link += surplus-dependency|CSWperl @@ -65,9 +63,166 @@ CONFIGURE_ARGS += --with-tclinclude=$(includedir) CONFIGURE_ARGS += --with-python -#LICENCE_CSWpilot-link = COPYING -#LICENCE_CSWpilot-link-lib = COPYING.LIB +PACKAGES = CSWpilot-link-doc +CATALOGNAME_CSWpilot-link-doc = pilot_link_doc +SPKG_DESC_CSWpilot-link-doc = $(DESCRIPTION), documentation +OBSOLETED_BY_CSWpilot-link-doc = CSWpilotlink +CATALOGNAME_CSWpilotlink = pilotlink_stub +LICENCE_CSWpilot-link-doc = COPYING +ARCHALL_CSWpilot-link-doc = 1 +CHECKPKG_OVERRIDES_CSWpilot-link-doc += file-with-bad-content|/usr/local|root/opt/csw/share/doc/pilot-link/README.usb +PACKAGES += CSWpilot-link +CATALOGNAME_CSWpilot-link = pilot_link +SPKG_DESC_CSWpilot-link = $(DESCRIPTION) +OBSOLETED_BY_CSWpilot-link = CSWpilotlink +PKGFILES_CSWpilot-link += /opt/csw/bin/pilot-addresses +PKGFILES_CSWpilot-link += /opt/csw/bin/pilot-clip +PKGFILES_CSWpilot-link += /opt/csw/bin/pilot-csd +PKGFILES_CSWpilot-link += /opt/csw/bin/pilot-debugsh +PKGFILES_CSWpilot-link += /opt/csw/bin/pilot-dedupe +PKGFILES_CSWpilot-link += /opt/csw/bin/pilot-dlpsh +PKGFILES_CSWpilot-link += /opt/csw/bin/pilot-file +PKGFILES_CSWpilot-link += /opt/csw/bin/pilot-foto +PKGFILES_CSWpilot-link += /opt/csw/bin/pilot-foto-treo600 +PKGFILES_CSWpilot-link += /opt/csw/bin/pilot-foto-treo650 +PKGFILES_CSWpilot-link += /opt/csw/bin/pilot-getram +PKGFILES_CSWpilot-link += /opt/csw/bin/pilot-getrom +PKGFILES_CSWpilot-link += /opt/csw/bin/pilot-getromtoken +PKGFILES_CSWpilot-link += /opt/csw/bin/pilot-hinotes +PKGFILES_CSWpilot-link += /opt/csw/bin/pilot-ietf2datebook +PKGFILES_CSWpilot-link += /opt/csw/bin/pilot-install-datebook +PKGFILES_CSWpilot-link += /opt/csw/bin/pilot-install-expenses +PKGFILES_CSWpilot-link += /opt/csw/bin/pilot-install-hinote +PKGFILES_CSWpilot-link += /opt/csw/bin/pilot-install-memo +PKGFILES_CSWpilot-link += /opt/csw/bin/pilot-install-netsync +PKGFILES_CSWpilot-link += /opt/csw/bin/pilot-install-todo +PKGFILES_CSWpilot-link += /opt/csw/bin/pilot-install-todos +PKGFILES_CSWpilot-link += /opt/csw/bin/pilot-install-user +PKGFILES_CSWpilot-link += /opt/csw/bin/pilot-memos +PKGFILES_CSWpilot-link += /opt/csw/bin/pilot-nredir +PKGFILES_CSWpilot-link += /opt/csw/bin/pilot-read-expenses +PKGFILES_CSWpilot-link += /opt/csw/bin/pilot-read-ical +PKGFILES_CSWpilot-link += /opt/csw/bin/pilot-read-notepad +PKGFILES_CSWpilot-link += /opt/csw/bin/pilot-read-palmpix +PKGFILES_CSWpilot-link += /opt/csw/bin/pilot-read-screenshot +PKGFILES_CSWpilot-link += /opt/csw/bin/pilot-read-todos +PKGFILES_CSWpilot-link += /opt/csw/bin/pilot-read-veo +PKGFILES_CSWpilot-link += /opt/csw/bin/pilot-reminders +PKGFILES_CSWpilot-link += /opt/csw/bin/pilot-schlep +PKGFILES_CSWpilot-link += /opt/csw/bin/pilot-sync-plan +PKGFILES_CSWpilot-link += /opt/csw/bin/pilot-undelete +PKGFILES_CSWpilot-link += /opt/csw/bin/pilot-wav +PKGFILES_CSWpilot-link += /opt/csw/bin/pilot-xfer +PKGFILES_CSWpilot-link += /opt/csw/bin/pitclsh +PKGFILES_CSWpilot-link += /opt/csw/share/pilot-link/pix/b1.gif +PKGFILES_CSWpilot-link += /opt/csw/share/pilot-link/pix/b2.gif +PKGFILES_CSWpilot-link += /opt/csw/share/pilot-link/pix/b3.gif +PKGFILES_CSWpilot-link += /opt/csw/share/pilot-link/pix/b4.gif +PKGFILES_CSWpilot-link += /opt/csw/share/pilot-link/pix/b5.gif +PKGFILES_CSWpilot-link += /opt/csw/share/pilot-link/pix/b6.gif +PKGFILES_CSWpilot-link += /opt/csw/share/pilot-link/pix/b7.gif +PKGFILES_CSWpilot-link += /opt/csw/share/pilot-link/pix/case.gif +PKGFILES_CSWpilot-link += /opt/csw/share/pilot-link/pix/case.xbm +PKGFILES_CSWpilot-link += /opt/csw/share/pilot-link/pix/casemask.xbm +PKGFILES_CSWpilot-link += /opt/csw/share/pilot-link/prc/getrom.prc +PKGFILES_CSWpilot-link += /opt/csw/share/pilot-link/prc/getrom2.prc +PKGFILES_CSWpilot-link += /opt/csw/share/pilot-link/udev/60-libpisock.rules +RUNTIME_DEP_PKGS_CSWpilot-link += CSWlibpisock9 +RUNTIME_DEP_PKGS_CSWpilot-link += CSWlibpisync1 +RUNTIME_DEP_PKGS_CSWpilot-link += CSWlibpitcl0 +RUNTIME_DEP_PKGS_CSWpilot-link += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWpilot-link += CSWlibncurses5 +RUNTIME_DEP_PKGS_CSWpilot-link += CSWlibpng12-0 +RUNTIME_DEP_PKGS_CSWpilot-link += CSWlibreadline6 +LICENCE_CSWpilot-link = COPYING + +PACKAGES += CSWlibpisock9 +CATALOGNAME_CSWlibpisock9 = libpisock9 +PKGFILES_CSWlibpisock9 += $(call baseisadirs,$(libdir),libpisock\.so\.9\.0\.2) +PKGFILES_CSWlibpisock9 += $(call baseisadirs,$(libdir),libpisock\.so\.9(\.\d+)*) +SPKG_DESC_CSWlibpisock9 += $(DESCRIPTION), libpisock.so.9 +OBSOLETED_BY_CSWlibpisock9 = CSWpilotlink +RUNTIME_DEP_PKGS_CSWlibpisock9 += SUNWlibusb +LICENCE_CSWlibpisock9 = COPYING.LIB + +PACKAGES += CSWlibpisync1 +CATALOGNAME_CSWlibpisync1 = libpisync1 +PKGFILES_CSWlibpisync1 += $(call baseisadirs,$(libdir),libpisync\.so\.1\.0\.3) +PKGFILES_CSWlibpisync1 += $(call baseisadirs,$(libdir),libpisync\.so\.1(\.\d+)*) +SPKG_DESC_CSWlibpisync1 += $(DESCRIPTION), libpisync.so.1 +OBSOLETED_BY_CSWlibpisync1 = CSWpilotlink +RUNTIME_DEP_PKGS_CSWlibpisync1 += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWlibpisync1 += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibpisync1 += CSWlibpisock9 +LICENCE_CSWlibpisync1 = COPYING.LIB + +PACKAGES += CSWlibpitcl0 +CATALOGNAME_CSWlibpitcl0 = libpitcl0 +PKGFILES_CSWlibpitcl0 += $(call baseisadirs,$(libdir),libpitcl\.so\.0\.0\.0) +PKGFILES_CSWlibpitcl0 += $(call baseisadirs,$(libdir),libpitcl\.so\.0(\.\d+)*) +SPKG_DESC_CSWlibpitcl0 += $(DESCRIPTION), TCL binding, libpitcl.so.0 +OBSOLETED_BY_CSWlibpitcl0 = CSWpilotlink +RUNTIME_DEP_PKGS_CSWlibpitcl0 += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWlibpitcl0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibpitcl0 += CSWlibpopt0 +RUNTIME_DEP_PKGS_CSWlibpitcl0 += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibpitcl0 += CSWlibpisock9 +RUNTIME_DEP_PKGS_CSWlibpitcl0 += CSWtcl +LICENCE_CSWlibpitcl0 = COPYING.LIB + +PACKAGES += CSWpilot-link-perl +CATALOGNAME_CSWpilot-link-perl = pilot_link_perl +SPKG_DESC_CSWpilot-link-perl = $(DESCRIPTION), Perl binding +OBSOLETED_BY_CSWpilot-link-perl = CSWpilotlink +PKGFILES_CSWpilot-link-perl += /opt/csw/lib/perl/5.10.1/perllocal.pod +PKGFILES_CSWpilot-link-perl += /opt/csw/lib/perl/csw/PDA/Pilot.pm +PKGFILES_CSWpilot-link-perl += /opt/csw/lib/perl/csw/PDA/dump.pl +PKGFILES_CSWpilot-link-perl += /opt/csw/lib/perl/csw/auto/PDA/Pilot/.packlist +PKGFILES_CSWpilot-link-perl += /opt/csw/lib/perl/csw/auto/PDA/Pilot/Pilot.bs +PKGFILES_CSWpilot-link-perl += /opt/csw/lib/perl/csw/auto/PDA/Pilot/Pilot.so +PKGFILES_CSWpilot-link-perl += /opt/csw/lib/perl/csw/auto/PDA/Pilot/autosplit.ix +RUNTIME_DEP_PKGS_CSWpilot-link-perl += CSWlibpisock9 +RUNTIME_DEP_PKGS_CSWpilot-link-perl += CSWperl +RUNTIME_DEP_PKGS_CSWpilot-link-perl += CSWlibz1 +ARCHALL_CSWpilot-link-perl = 1 + +PACKAGES += CSWpilot-link-python +CATALOGNAME_CSWpilot-link-python = pilot_link_python +SPKG_DESC_CSWpilot-link-python = $(DESCRIPTION), Python binding +OBSOLETED_BY_CSWpilot-link-python = CSWpilotlink +PKGFILES_CSWpilot-link-python += /opt/csw/lib/python/site-packages/_pisock.so +PKGFILES_CSWpilot-link-python += /opt/csw/lib/python/site-packages/pisock.py +PKGFILES_CSWpilot-link-python += /opt/csw/lib/python/site-packages/pisock.pyc +PKGFILES_CSWpilot-link-python += /opt/csw/lib/python/site-packages/pisockextras.py +PKGFILES_CSWpilot-link-python += /opt/csw/lib/python/site-packages/pisockextras.pyc +PKGFILES_CSWpilot-link-python += /opt/csw/lib/python/site-packages/python_libpisock-0.12.5-py2.6.egg-info +RUNTIME_DEP_PKGS_CSWpilot-link-python += CSWlibpisock9 +RUNTIME_DEP_PKGS_CSWpilot-link-python += CSWlibpython2-6-1-0 +RUNTIME_DEP_PKGS_CSWpilot-link-python += CSWlibz1 +ARCHALL_CSWpilot-link-python = 1 +CHECKPKG_OVERRIDES_CSWpilot-link-python += discouraged-path-in-pkgmap|/opt/csw/lib/python/site-packages/pisock.pyc +CHECKPKG_OVERRIDES_CSWpilot-link-python += discouraged-path-in-pkgmap|/opt/csw/lib/python/site-packages/pisockextras.pyc +CHECKPKG_OVERRIDES_CSWpilot-link-python += pkgname-does-not-start-with-CSWpy- +CHECKPKG_OVERRIDES_CSWpilot-link-python += catalogname-does-not-start-with-py_ + +PACKAGES += CSWpilot-link-dev +CATALOGNAME_CSWpilot-link-dev = pilot_link_dev +SPKG_DESC_CSWpilot-link-dev += $(DESCRIPTION), development files +PKGFILES_CSWpilot-link-dev += /opt/csw/lib/libpisock.so +PKGFILES_CSWpilot-link-dev += /opt/csw/lib/libpisync.so +PKGFILES_CSWpilot-link-dev += /opt/csw/lib/libpitcl.so +PKGFILES_CSWpilot-link-dev += $(PKGFILES_DEVEL) +OBSOLETED_BY_CSWpilot-link-dev = CSWpilotlink +RUNTIME_DEP_PKGS_CSWpilot-link-dev += CSWlibpisock9 +RUNTIME_DEP_PKGS_CSWpilot-link-dev += CSWlibpisync1 +RUNTIME_DEP_PKGS_CSWpilot-link-dev += CSWlibpitcl0 +RUNTIME_DEP_PKGS_CSWpilot-link-dev += CSWpilot-link-perl +RUNTIME_DEP_PKGS_CSWpilot-link-dev += CSWpilot-link-python +LICENCE_CSWpilot-link-dev = COPYING +ARCHALL_CSWpilot-link-dev = 1 +CHECKPKG_OVERRIDES_CSWpilot-link-dev += archall-devel-package + include gar/category.mk # kludge to ensure that /opt/csw/include come before /usr/sfw/include This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Jun 22 16:25:34 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 22 Jun 2012 14:25:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[18506] csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile Message-ID: Revision: 18506 http://gar.svn.sourceforge.net/gar/?rev=18506&view=rev Author: wahwah Date: 2012-06-22 14:25:34 +0000 (Fri, 22 Jun 2012) Log Message: ----------- mysql5/branches/mysql-5.5.x: $(libdir) is the directory to use, this is the latest version. let me try if it works. Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2012-06-22 14:06:18 UTC (rev 18505) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2012-06-22 14:25:34 UTC (rev 18506) @@ -322,9 +322,9 @@ # gmv -v "$(DESTDIR)$(bindir)/$${f}" \ # "$(DESTDIR)$(bindir)/$${f}"; \ # done - (cd $(DESTDIR)$(libdir_install); rm libmysqlclient_r.so.18; \ + (cd $(DESTDIR)$(libdir); rm libmysqlclient_r.so.18; \ ln -s libmysqlclient.so.18 libmysqlclient_r.so.18) - (cd $(DESTDIR)$(libdir_install); rm libmysqlclient_r.so.18.0.0; \ + (cd $(DESTDIR)$(libdir); rm libmysqlclient_r.so.18.0.0; \ ln -s libmysqlclient.so.18.0.0 libmysqlclient_r.so.18.0.0) # gmv -vf $(DESTDIR)$(mandir)/man1/mysql_config.1 @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Jun 22 22:47:01 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 22 Jun 2012 20:47:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[18507] csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile Message-ID: Revision: 18507 http://gar.svn.sourceforge.net/gar/?rev=18507&view=rev Author: wahwah Date: 2012-06-22 20:47:01 +0000 (Fri, 22 Jun 2012) Log Message: ----------- mysql5/branches/mysql-5.5.x: disable 64-bit for Solaris 9 x86 Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2012-06-22 14:25:34 UTC (rev 18506) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2012-06-22 20:47:01 UTC (rev 18507) @@ -141,10 +141,13 @@ EXTRA_MERGE_EXCLUDE_FILES += $(prefix)/sql-bench.* EXTRA_MERGE_EXCLUDE_FILES += $(datadir)/mysql-test.* +# Enable 64 bits, but not for Solaris 9 x86 +BUILD64_5.9_sparc = 1 +BUILD64_5.10_sparc = 1 +BUILD64_5.9_i386 = +BUILD64_5.10_i386 = 1 +BUILD64 = $(BUILD64_$(GAROSREL)_$(GARCH)) -# Enable 64 bits build -BUILD64 = 1 - MASTER_SITES = http://ftp.heanet.ie/mirrors/www.mysql.com/Downloads/MySQL-$(BASE_VERSION)/ MASTER_SITES += http://mysql.skynet.be/Downloads/MySQL-$(BASE_VERSION)/ DISTFILES = mysql-$(VERSION).tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Jun 23 01:16:34 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 22 Jun 2012 23:16:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[18508] csw/mgar/pkg/collectd/trunk Message-ID: Revision: 18508 http://gar.svn.sourceforge.net/gar/?rev=18508&view=rev Author: wahwah Date: 2012-06-22 23:16:34 +0000 (Fri, 22 Jun 2012) Log Message: ----------- collectd/trunk: disable what fails, add overrides and deps Modified Paths: -------------- csw/mgar/pkg/collectd/trunk/Makefile csw/mgar/pkg/collectd/trunk/checksums Added Paths: ----------- csw/mgar/pkg/collectd/trunk/files/0001-work-around-the-s_addr-macro.patch Modified: csw/mgar/pkg/collectd/trunk/Makefile =================================================================== --- csw/mgar/pkg/collectd/trunk/Makefile 2012-06-22 20:47:01 UTC (rev 18507) +++ csw/mgar/pkg/collectd/trunk/Makefile 2012-06-22 23:16:34 UTC (rev 18508) @@ -1,31 +1,66 @@ # $Id$ -# TODO (release-critical prefixed with !, non release-critical with *) # NAME = collectd -VERSION = 5.0.2 +VERSION = 5.1.0 GARTYPE = v2 CATEGORIES = server -DESCRIPTION = Brief description +DESCRIPTION = Collects sistema performance statistics periodically define BLURB - Long description endef MASTER_SITES = http://collectd.org/files/ DISTFILES = $(DISTNAME).tar.gz PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 +VENDOR_URL = http://collectd.org/ -# File name regex to get notifications about upstream software releases -# NOTE: Use this only if the automatic regex creation -# does not work for your package -# UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +PATCHFILES += 0001-work-around-the-s_addr-macro.patch -# If the url used to check for software update is different of MASTER_SITES, then -# uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES -# UPSTREAM_MASTER_SITES = +BUILD_DEP_PKGS += CSWlibgcrypt-dev +EXTRA_CPPFLAGS = -DSOLARIS2=10 -D__EXTENSIONS__ -CONFIGURE_ARGS = $(DIRPATHS) +GARCOMPILER = GNU +CONFIGURE_ARGS += $(DIRPATHS) +CONFIGURE_ARGS += --disable-dns +CONFIGURE_ARGS += --disable-nfs +CONFIGURE_ARGS += --disable-zfs_arc + +PACKAGES += CSWlibcollectdclient0 +PKGFILES_CSWlibcollectdclient0 += $(call baseisadirs,$(libdir),libcollectdclient\.so\.0(\.\d+)*) +SPKG_DESC_CSWlibcollectdclient0 += $(DESCRIPTION), libcollectdclient.so.0 +RUNTIME_DEP_PKGS_CSWcollectd += CSWlibcollectdclient0 +RUNTIME_DEP_PKGS_CSWlibcollectdclient0 += CSWlibgcc-s1 + +PACKAGES += CSWcollectd +SPKG_DESC_CSWcollectd += $(DESCRIPTION) + +RUNTIME_DEP_PKGS_CSWcollectd += CSWlibltdl7 +RUNTIME_DEP_PKGS_CSWcollectd += CSWlibdbi1 +RUNTIME_DEP_PKGS_CSWcollectd += CSWlibssl1-0-0 +RUNTIME_DEP_PKGS_CSWcollectd += CSWlibz1 +RUNTIME_DEP_PKGS_CSWcollectd += CSWlibrrd-th4 +RUNTIME_DEP_PKGS_CSWcollectd += CSWlibgpg-error0 +RUNTIME_DEP_PKGS_CSWcollectd += CSWlibcurl4 +RUNTIME_DEP_PKGS_CSWcollectd += CSWlibgcrypt11 +RUNTIME_DEP_PKGS_CSWcollectd += CSWlibstatgrab6 +RUNTIME_DEP_PKGS_CSWcollectd += CSWlibpython2-6-1-0 +RUNTIME_DEP_PKGS_CSWcollectd += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSWcollectd += CSWperl +RUNTIME_DEP_PKGS_CSWcollectd += CSWlibganglia0 +RUNTIME_DEP_PKGS_CSWcollectd += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWcollectd += CSWlibidn11 +RUNTIME_DEP_PKGS_CSWcollectd += CSWlibpq5 + +CHECKPKG_OVERRIDES_CSWcollectd += file-with-bad-content|/usr/share|root/opt/csw/share/man/man1/collectd.1 +CHECKPKG_OVERRIDES_CSWcollectd += file-with-bad-content|/usr/share|root/opt/csw/share/man/man5/collectd-unixsock.5 + include gar/category.mk +post-install-modulated: + ginstall -m 755 -d $(DESTDIR)/opt/csw/share/man/man3 + cd $(DESTDIR); gmv -v opt/csw/man/man3/* opt/csw/share/man/man3 + rmdir $(DESTDIR)/opt/csw/man/man3 + grm -v $(DESTDIR)/opt/csw/lib/perl/*/perllocal.pod + $(MAKECOOKIE) Modified: csw/mgar/pkg/collectd/trunk/checksums =================================================================== --- csw/mgar/pkg/collectd/trunk/checksums 2012-06-22 20:47:01 UTC (rev 18507) +++ csw/mgar/pkg/collectd/trunk/checksums 2012-06-22 23:16:34 UTC (rev 18508) @@ -1 +1 @@ -6612c9722552a603667caede17703073 collectd-5.0.2.tar.gz +adc58a0d448a359ecf737da9398898c6 collectd-5.1.0.tar.gz Added: csw/mgar/pkg/collectd/trunk/files/0001-work-around-the-s_addr-macro.patch =================================================================== --- csw/mgar/pkg/collectd/trunk/files/0001-work-around-the-s_addr-macro.patch (rev 0) +++ csw/mgar/pkg/collectd/trunk/files/0001-work-around-the-s_addr-macro.patch 2012-06-22 23:16:34 UTC (rev 18508) @@ -0,0 +1,57 @@ +From ccb4cb2d3a9b4ef7c8fbc4275f00acdc01abe02a Mon Sep 17 00:00:00 2001 +From: Maciej Blizinski +Date: Thu, 31 May 2012 16:21:57 +0200 +Subject: [PATCH] work around the s_addr macro + +--- + src/utils_dns.c | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/src/utils_dns.c b/src/utils_dns.c +index cfa4a5c..fcf7b43 100644 +--- a/src/utils_dns.c ++++ b/src/utils_dns.c +@@ -449,7 +449,7 @@ handle_ipv6 (struct ip6_hdr *ipv6, int len) + unsigned int offset; + int nexthdr; + +- struct in6_addr s_addr; ++ struct in6_addr fluffy_kitten; + uint16_t payload_len; + + if (0 > len) +@@ -457,10 +457,10 @@ handle_ipv6 (struct ip6_hdr *ipv6, int len) + + offset = sizeof (struct ip6_hdr); + nexthdr = ipv6->ip6_nxt; +- s_addr = ipv6->ip6_src; ++ fluffy_kitten = ipv6->ip6_src; + payload_len = ntohs (ipv6->ip6_plen); + +- if (ignore_list_match (&s_addr)) ++ if (ignore_list_match (&fluffy_kitten)) + return (0); + + /* Parse extension headers. This only handles the standard headers, as +@@ -527,15 +527,15 @@ handle_ip(const struct ip *ip, int len) + { + char buf[PCAP_SNAPLEN]; + int offset = ip->ip_hl << 2; +- struct in6_addr s_addr; ++ struct in6_addr fluffy_kitten; + struct in6_addr d_addr; + + if (ip->ip_v == 6) + return (handle_ipv6 ((void *) ip, len)); + +- in6_addr_from_buffer (&s_addr, &ip->ip_src.s_addr, sizeof (ip->ip_src.s_addr), AF_INET); ++ in6_addr_from_buffer (&fluffy_kitten, &ip->ip_src.s_addr, sizeof (ip->ip_src.s_addr), AF_INET); + in6_addr_from_buffer (&d_addr, &ip->ip_dst.s_addr, sizeof (ip->ip_dst.s_addr), AF_INET); +- if (ignore_list_match (&s_addr)) ++ if (ignore_list_match (&fluffy_kitten)) + return (0); + if (IPPROTO_UDP != ip->ip_p) + return 0; +-- +1.7.10 + 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 23 01:44:04 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 22 Jun 2012 23:44:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[18509] csw/mgar/pkg/collectd/trunk/Makefile Message-ID: Revision: 18509 http://gar.svn.sourceforge.net/gar/?rev=18509&view=rev Author: wahwah Date: 2012-06-22 23:44:04 +0000 (Fri, 22 Jun 2012) Log Message: ----------- collectd/trunk: enable the 64-bit build Modified Paths: -------------- csw/mgar/pkg/collectd/trunk/Makefile Modified: csw/mgar/pkg/collectd/trunk/Makefile =================================================================== --- csw/mgar/pkg/collectd/trunk/Makefile 2012-06-22 23:16:34 UTC (rev 18508) +++ csw/mgar/pkg/collectd/trunk/Makefile 2012-06-22 23:44:04 UTC (rev 18509) @@ -17,6 +17,8 @@ PATCHFILES += 0001-work-around-the-s_addr-macro.patch +BUILD64 = 1 + BUILD_DEP_PKGS += CSWlibgcrypt-dev EXTRA_CPPFLAGS = -DSOLARIS2=10 -D__EXTENSIONS__ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Sat Jun 23 11:04:16 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Sat, 23 Jun 2012 09:04:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[18510] csw/mgar/pkg/pilotlink/trunk/Makefile Message-ID: Revision: 18510 http://gar.svn.sourceforge.net/gar/?rev=18510&view=rev Author: pfelecan Date: 2012-06-23 09:04:16 +0000 (Sat, 23 Jun 2012) Log Message: ----------- removed Java binding and started overriding. Modified Paths: -------------- csw/mgar/pkg/pilotlink/trunk/Makefile Modified: csw/mgar/pkg/pilotlink/trunk/Makefile =================================================================== --- csw/mgar/pkg/pilotlink/trunk/Makefile 2012-06-22 23:44:04 UTC (rev 18509) +++ csw/mgar/pkg/pilotlink/trunk/Makefile 2012-06-23 09:04:16 UTC (rev 18510) @@ -58,7 +58,7 @@ CONFIGURE_ARGS += --enable-conduits CONFIGURE_ARGS += --enable-libusb CONFIGURE_ARGS += --with-perl=$(bindir)/perl -CONFIGURE_ARGS += --with-java=/usr/java +#CONFIGURE_ARGS += --with-java=/usr/java CONFIGURE_ARGS += --with-tcl=$(libdir) CONFIGURE_ARGS += --with-tclinclude=$(includedir) CONFIGURE_ARGS += --with-python This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Sat Jun 23 11:35:50 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Sat, 23 Jun 2012 09:35:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[18511] csw/mgar/pkg/pilotlink/trunk/Makefile Message-ID: Revision: 18511 http://gar.svn.sourceforge.net/gar/?rev=18511&view=rev Author: pfelecan Date: 2012-06-23 09:35:50 +0000 (Sat, 23 Jun 2012) Log Message: ----------- verification and validation of overrides Modified Paths: -------------- csw/mgar/pkg/pilotlink/trunk/Makefile Modified: csw/mgar/pkg/pilotlink/trunk/Makefile =================================================================== --- csw/mgar/pkg/pilotlink/trunk/Makefile 2012-06-23 09:04:16 UTC (rev 18510) +++ csw/mgar/pkg/pilotlink/trunk/Makefile 2012-06-23 09:35:50 UTC (rev 18511) @@ -136,6 +136,56 @@ RUNTIME_DEP_PKGS_CSWpilot-link += CSWlibpng12-0 RUNTIME_DEP_PKGS_CSWpilot-link += CSWlibreadline6 LICENCE_CSWpilot-link = COPYING +CHECKPKG_OVERRIDES_CSWpilot-link+= missing-dependency|CSWlibpopt0 +CHECKPKG_OVERRIDES_CSWpilot-link+= missing-dependency|CSWtcl +CHECKPKG_OVERRIDES_CSWpilot-link+= surplus-dependency|CSWlibncurses5 +CHECKPKG_OVERRIDES_CSWpilot-link+= surplus-dependency|CSWlibintl8 +CHECKPKG_OVERRIDES_CSWpilot-link+= surplus-dependency|CSWlibpisync1 +# these are here because we wish to suport USB which is provided in SFW: +CHECKPKG_OVERRIDES_CSWpilot-link+= bad-rpath-entry|/usr/sfw/lib|opt/csw/bin/pil +ot-addresses +CHECKPKG_OVERRIDES_CSWpilot-link+= bad-rpath-entry|/usr/sfw/lib|opt/csw/bin/pil +ot-clip +CHECKPKG_OVERRIDES_CSWpilot-link+= bad-rpath-entry|/usr/sfw/lib|opt/csw/bin/pil +ot-csd +CHECKPKG_OVERRIDES_CSWpilot-link+= bad-rpath-entry|/usr/sfw/lib|opt/csw/bin/pil +ot-debugsh +CHECKPKG_OVERRIDES_CSWpilot-link+= bad-rpath-entry|/usr/sfw/lib|opt/csw/bin/pil +ot-dedupe +CHECKPKG_OVERRIDES_CSWpilot-link+= bad-rpath-entry|/usr/sfw/lib|opt/csw/bin/pil +ot-dlpsh +CHECKPKG_OVERRIDES_CSWpilot-link+= bad-rpath-entry|/usr/sfw/lib|opt/csw/bin/pil +ot-file +CHECKPKG_OVERRIDES_CSWpilot-link+= bad-rpath-entry|/usr/sfw/lib|opt/csw/bin/pil +ot-foto +CHECKPKG_OVERRIDES_CSWpilot-link+= bad-rpath-entry|/usr/sfw/lib|opt/csw/bin/pilot-foto-treo600 +CHECKPKG_OVERRIDES_CSWpilot-link+= bad-rpath-entry|/usr/sfw/lib|opt/csw/bin/pilot-foto-treo650 +CHECKPKG_OVERRIDES_CSWpilot-link+= bad-rpath-entry|/usr/sfw/lib|opt/csw/bin/pilot-getram +CHECKPKG_OVERRIDES_CSWpilot-link+= bad-rpath-entry|/usr/sfw/lib|opt/csw/bin/pilot-getrom +CHECKPKG_OVERRIDES_CSWpilot-link+= bad-rpath-entry|/usr/sfw/lib|opt/csw/bin/pilot-getromtoken +CHECKPKG_OVERRIDES_CSWpilot-link+= bad-rpath-entry|/usr/sfw/lib|opt/csw/bin/pilot-hinotes +CHECKPKG_OVERRIDES_CSWpilot-link+= bad-rpath-entry|/usr/sfw/lib|opt/csw/bin/pilot-install-datebook +CHECKPKG_OVERRIDES_CSWpilot-link+= bad-rpath-entry|/usr/sfw/lib|opt/csw/bin/pilot-install-expenses +CHECKPKG_OVERRIDES_CSWpilot-link+= bad-rpath-entry|/usr/sfw/lib|opt/csw/bin/pilot-install-hinote +CHECKPKG_OVERRIDES_CSWpilot-link+= bad-rpath-entry|/usr/sfw/lib|opt/csw/bin/pilot-install-memo +CHECKPKG_OVERRIDES_CSWpilot-link+= bad-rpath-entry|/usr/sfw/lib|opt/csw/bin/pilot-install-netsync +CHECKPKG_OVERRIDES_CSWpilot-link+= bad-rpath-entry|/usr/sfw/lib|opt/csw/bin/pilot-install-todo +CHECKPKG_OVERRIDES_CSWpilot-link+= bad-rpath-entry|/usr/sfw/lib|opt/csw/bin/pilot-install-todos +CHECKPKG_OVERRIDES_CSWpilot-link+= bad-rpath-entry|/usr/sfw/lib|opt/csw/bin/pilot-install-user +CHECKPKG_OVERRIDES_CSWpilot-link+= bad-rpath-entry|/usr/sfw/lib|opt/csw/bin/pilot-memos +CHECKPKG_OVERRIDES_CSWpilot-link+= bad-rpath-entry|/usr/sfw/lib|opt/csw/bin/pilot-nredir +CHECKPKG_OVERRIDES_CSWpilot-link+= bad-rpath-entry|/usr/sfw/lib|opt/csw/bin/pilot-read-expenses +CHECKPKG_OVERRIDES_CSWpilot-link+= bad-rpath-entry|/usr/sfw/lib|opt/csw/bin/pilot-read-ical +CHECKPKG_OVERRIDES_CSWpilot-link+= bad-rpath-entry|/usr/sfw/lib|opt/csw/bin/pilot-read-notepad +CHECKPKG_OVERRIDES_CSWpilot-link+= bad-rpath-entry|/usr/sfw/lib|opt/csw/bin/pilot-read-palmpix +CHECKPKG_OVERRIDES_CSWpilot-link+= bad-rpath-entry|/usr/sfw/lib|opt/csw/bin/pilot-read-screenshot +CHECKPKG_OVERRIDES_CSWpilot-link+= bad-rpath-entry|/usr/sfw/lib|opt/csw/bin/pilot-read-todos +CHECKPKG_OVERRIDES_CSWpilot-link+= bad-rpath-entry|/usr/sfw/lib|opt/csw/bin/pilot-read-veo +CHECKPKG_OVERRIDES_CSWpilot-link+= bad-rpath-entry|/usr/sfw/lib|opt/csw/bin/pilot-reminders +CHECKPKG_OVERRIDES_CSWpilot-link+= bad-rpath-entry|/usr/sfw/lib|opt/csw/bin/pilot-schlep +CHECKPKG_OVERRIDES_CSWpilot-link+= bad-rpath-entry|/usr/sfw/lib|opt/csw/bin/pilot-wav +CHECKPKG_OVERRIDES_CSWpilot-link+= bad-rpath-entry|/usr/sfw/lib|opt/csw/bin/pilot-xfer +CHECKPKG_OVERRIDES_CSWpilot-link+= bad-rpath-entry|/usr/sfw/lib|opt/csw/bin/pitclsh PACKAGES += CSWlibpisock9 CATALOGNAME_CSWlibpisock9 = libpisock9 @@ -145,6 +195,8 @@ OBSOLETED_BY_CSWlibpisock9 = CSWpilotlink RUNTIME_DEP_PKGS_CSWlibpisock9 += SUNWlibusb LICENCE_CSWlibpisock9 = COPYING.LIB +# this is here because we wish to suport USB which is provided in SFW: +CHECKPKG_OVERRIDES_CSWlibpisock9+= bad-rpath-entry|/usr/sfw/lib|opt/csw/lib/libpisock.so.9.0.2 PACKAGES += CSWlibpisync1 CATALOGNAME_CSWlibpisync1 = libpisync1 @@ -156,6 +208,9 @@ RUNTIME_DEP_PKGS_CSWlibpisync1 += CSWlibz1 RUNTIME_DEP_PKGS_CSWlibpisync1 += CSWlibpisock9 LICENCE_CSWlibpisync1 = COPYING.LIB +CHECKPKG_OVERRIDES_CSWlibpisync1 += surplus-dependency|CSWlibz1 +# this is here because we wish to suport USB which is provided in SFW: +CHECKPKG_OVERRIDES_CSWlibpisync1 += bad-rpath-entry|/usr/sfw/lib|opt/csw/lib/libpisync.so.1.0.3 PACKAGES += CSWlibpitcl0 CATALOGNAME_CSWlibpitcl0 = libpitcl0 @@ -170,6 +225,10 @@ RUNTIME_DEP_PKGS_CSWlibpitcl0 += CSWlibpisock9 RUNTIME_DEP_PKGS_CSWlibpitcl0 += CSWtcl LICENCE_CSWlibpitcl0 = COPYING.LIB +CHECKPKG_OVERRIDES_CSWlibpitcl0 += bad-rpath-entry|/usr/sfw/lib|opt/csw/lib/libpitcl.so.0.0.0 +CHECKPKG_OVERRIDES_CSWlibpitcl0 += surplus-dependency|CSWlibz1 +CHECKPKG_OVERRIDES_CSWlibpitcl0 += surplus-dependency|CSWlibiconv2 +CHECKPKG_OVERRIDES_CSWlibpitcl0 += surplus-dependency|CSWlibintl8 PACKAGES += CSWpilot-link-perl CATALOGNAME_CSWpilot-link-perl = pilot_link_perl @@ -185,7 +244,6 @@ RUNTIME_DEP_PKGS_CSWpilot-link-perl += CSWlibpisock9 RUNTIME_DEP_PKGS_CSWpilot-link-perl += CSWperl RUNTIME_DEP_PKGS_CSWpilot-link-perl += CSWlibz1 -ARCHALL_CSWpilot-link-perl = 1 PACKAGES += CSWpilot-link-python CATALOGNAME_CSWpilot-link-python = pilot_link_python @@ -200,7 +258,6 @@ RUNTIME_DEP_PKGS_CSWpilot-link-python += CSWlibpisock9 RUNTIME_DEP_PKGS_CSWpilot-link-python += CSWlibpython2-6-1-0 RUNTIME_DEP_PKGS_CSWpilot-link-python += CSWlibz1 -ARCHALL_CSWpilot-link-python = 1 CHECKPKG_OVERRIDES_CSWpilot-link-python += discouraged-path-in-pkgmap|/opt/csw/lib/python/site-packages/pisock.pyc CHECKPKG_OVERRIDES_CSWpilot-link-python += discouraged-path-in-pkgmap|/opt/csw/lib/python/site-packages/pisockextras.pyc CHECKPKG_OVERRIDES_CSWpilot-link-python += pkgname-does-not-start-with-CSWpy- This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Sat Jun 23 11:37:54 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Sat, 23 Jun 2012 09:37:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[18512] csw/mgar/pkg/pilotlink/trunk/Makefile Message-ID: Revision: 18512 http://gar.svn.sourceforge.net/gar/?rev=18512&view=rev Author: pfelecan Date: 2012-06-23 09:37:54 +0000 (Sat, 23 Jun 2012) Log Message: ----------- corrected end of line issues after copy&paste... Modified Paths: -------------- csw/mgar/pkg/pilotlink/trunk/Makefile Modified: csw/mgar/pkg/pilotlink/trunk/Makefile =================================================================== --- csw/mgar/pkg/pilotlink/trunk/Makefile 2012-06-23 09:35:50 UTC (rev 18511) +++ csw/mgar/pkg/pilotlink/trunk/Makefile 2012-06-23 09:37:54 UTC (rev 18512) @@ -142,23 +142,15 @@ CHECKPKG_OVERRIDES_CSWpilot-link+= surplus-dependency|CSWlibintl8 CHECKPKG_OVERRIDES_CSWpilot-link+= surplus-dependency|CSWlibpisync1 # these are here because we wish to suport USB which is provided in SFW: -CHECKPKG_OVERRIDES_CSWpilot-link+= bad-rpath-entry|/usr/sfw/lib|opt/csw/bin/pil -ot-addresses -CHECKPKG_OVERRIDES_CSWpilot-link+= bad-rpath-entry|/usr/sfw/lib|opt/csw/bin/pil -ot-clip -CHECKPKG_OVERRIDES_CSWpilot-link+= bad-rpath-entry|/usr/sfw/lib|opt/csw/bin/pil -ot-csd -CHECKPKG_OVERRIDES_CSWpilot-link+= bad-rpath-entry|/usr/sfw/lib|opt/csw/bin/pil -ot-debugsh -CHECKPKG_OVERRIDES_CSWpilot-link+= bad-rpath-entry|/usr/sfw/lib|opt/csw/bin/pil -ot-dedupe -CHECKPKG_OVERRIDES_CSWpilot-link+= bad-rpath-entry|/usr/sfw/lib|opt/csw/bin/pil -ot-dlpsh -CHECKPKG_OVERRIDES_CSWpilot-link+= bad-rpath-entry|/usr/sfw/lib|opt/csw/bin/pil -ot-file -CHECKPKG_OVERRIDES_CSWpilot-link+= bad-rpath-entry|/usr/sfw/lib|opt/csw/bin/pil -ot-foto -CHECKPKG_OVERRIDES_CSWpilot-link+= bad-rpath-entry|/usr/sfw/lib|opt/csw/bin/pilot-foto-treo600 +CHECKPKG_OVERRIDES_CSWpilot-link+= bad-rpath-entry|/usr/sfw/lib|opt/csw/bin/pilot-addresses +CHECKPKG_OVERRIDES_CSWpilot-link+= bad-rpath-entry|/usr/sfw/lib|opt/csw/bin/pilot-clip +CHECKPKG_OVERRIDES_CSWpilot-link+= bad-rpath-entry|/usr/sfw/lib|opt/csw/bin/pilot-csd +CHECKPKG_OVERRIDES_CSWpilot-link+= bad-rpath-entry|/usr/sfw/lib|opt/csw/bin/pilot-debugsh +CHECKPKG_OVERRIDES_CSWpilot-link+= bad-rpath-entry|/usr/sfw/lib|opt/csw/bin/pilot-dedupe +CHECKPKG_OVERRIDES_CSWpilot-link+= bad-rpath-entry|/usr/sfw/lib|opt/csw/bin/pilot-dlpsh +CHECKPKG_OVERRIDES_CSWpilot-link+= bad-rpath-entry|/usr/sfw/lib|opt/csw/bin/pilot-file +CHECKPKG_OVERRIDES_CSWpilot-link+= bad-rpath-entry|/usr/sfw/lib|opt/csw/bin/pilot-foto +CHECKPKG_OVERRIDES_CSWpilot-link+= bad-rpath-entry|/usr/sfw/lib|opt/csw/bin/piot-foto-treo600 CHECKPKG_OVERRIDES_CSWpilot-link+= bad-rpath-entry|/usr/sfw/lib|opt/csw/bin/pilot-foto-treo650 CHECKPKG_OVERRIDES_CSWpilot-link+= bad-rpath-entry|/usr/sfw/lib|opt/csw/bin/pilot-getram CHECKPKG_OVERRIDES_CSWpilot-link+= bad-rpath-entry|/usr/sfw/lib|opt/csw/bin/pilot-getrom This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Sat Jun 23 11:59:22 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Sat, 23 Jun 2012 09:59:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[18513] csw/mgar/pkg/pilotlink/trunk/Makefile Message-ID: Revision: 18513 http://gar.svn.sourceforge.net/gar/?rev=18513&view=rev Author: pfelecan Date: 2012-06-23 09:59:22 +0000 (Sat, 23 Jun 2012) Log Message: ----------- some additional overrides Modified Paths: -------------- csw/mgar/pkg/pilotlink/trunk/Makefile Modified: csw/mgar/pkg/pilotlink/trunk/Makefile =================================================================== --- csw/mgar/pkg/pilotlink/trunk/Makefile 2012-06-23 09:37:54 UTC (rev 18512) +++ csw/mgar/pkg/pilotlink/trunk/Makefile 2012-06-23 09:59:22 UTC (rev 18513) @@ -150,7 +150,7 @@ CHECKPKG_OVERRIDES_CSWpilot-link+= bad-rpath-entry|/usr/sfw/lib|opt/csw/bin/pilot-dlpsh CHECKPKG_OVERRIDES_CSWpilot-link+= bad-rpath-entry|/usr/sfw/lib|opt/csw/bin/pilot-file CHECKPKG_OVERRIDES_CSWpilot-link+= bad-rpath-entry|/usr/sfw/lib|opt/csw/bin/pilot-foto -CHECKPKG_OVERRIDES_CSWpilot-link+= bad-rpath-entry|/usr/sfw/lib|opt/csw/bin/piot-foto-treo600 +CHECKPKG_OVERRIDES_CSWpilot-link+= bad-rpath-entry|/usr/sfw/lib|opt/csw/bin/pilot-foto-treo600 CHECKPKG_OVERRIDES_CSWpilot-link+= bad-rpath-entry|/usr/sfw/lib|opt/csw/bin/pilot-foto-treo650 CHECKPKG_OVERRIDES_CSWpilot-link+= bad-rpath-entry|/usr/sfw/lib|opt/csw/bin/pilot-getram CHECKPKG_OVERRIDES_CSWpilot-link+= bad-rpath-entry|/usr/sfw/lib|opt/csw/bin/pilot-getrom @@ -236,6 +236,8 @@ RUNTIME_DEP_PKGS_CSWpilot-link-perl += CSWlibpisock9 RUNTIME_DEP_PKGS_CSWpilot-link-perl += CSWperl RUNTIME_DEP_PKGS_CSWpilot-link-perl += CSWlibz1 +CHECKPKG_OVERRIDES_CSWpilot-link-perl+= perllocal-pod-in-pkgmap|/opt/csw/lib/perl/5.10.1/perllocal.pod +CHECKPKG_OVERRIDES_CSWpilot-link-perl+= surplus-dependency|CSWlibz1 PACKAGES += CSWpilot-link-python CATALOGNAME_CSWpilot-link-python = pilot_link_python @@ -249,11 +251,14 @@ PKGFILES_CSWpilot-link-python += /opt/csw/lib/python/site-packages/python_libpisock-0.12.5-py2.6.egg-info RUNTIME_DEP_PKGS_CSWpilot-link-python += CSWlibpisock9 RUNTIME_DEP_PKGS_CSWpilot-link-python += CSWlibpython2-6-1-0 +RUNTIME_DEP_PKGS_CSWpilot-link-python += CSWpython RUNTIME_DEP_PKGS_CSWpilot-link-python += CSWlibz1 CHECKPKG_OVERRIDES_CSWpilot-link-python += discouraged-path-in-pkgmap|/opt/csw/lib/python/site-packages/pisock.pyc CHECKPKG_OVERRIDES_CSWpilot-link-python += discouraged-path-in-pkgmap|/opt/csw/lib/python/site-packages/pisockextras.pyc CHECKPKG_OVERRIDES_CSWpilot-link-python += pkgname-does-not-start-with-CSWpy- CHECKPKG_OVERRIDES_CSWpilot-link-python += catalogname-does-not-start-with-py_ +CHECKPKG_OVERRIDES_CSWpilot-link-python += bad-rpath-entry|/usr/sfw/lib|opt/csw/lib/python/site-packages/_pisock.so +CHECKPKG_OVERRIDES_CSWpilot-link-python += surplus-dependency|CSWlibz1 PACKAGES += CSWpilot-link-dev CATALOGNAME_CSWpilot-link-dev = pilot_link_dev 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 23 22:24:07 2012 From: maciej at opencsw.org (Maciej =?utf-8?Q?Blizi=C5=84ski?=) Date: Sat, 23 Jun 2012 21:24:07 +0100 Subject: [csw-devel] SF.net SVN: gar:[16652] csw/mgar/pkg/subversion/trunk/Makefile In-Reply-To: References: Message-ID: <20120623202407.GA27730@quince.home.blizinski.pl> Hi Rupert, On Mon, Jan 02, 2012 at 08:17:25PM +0000, rthurner at users.sourceforge.net wrote: > +CHECKPKG_OVERRIDES_CSWpythonsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/svn/repos.pyc > +CHECKPKG_OVERRIDES_CSWpythonsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/svn/wc.pyc > +CHECKPKG_OVERRIDES_CSWpythonsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/libsvn/__init__.pyc > (...) We don't ship *.pyc files in Python packages. We use the pycompile class instead, and generate the *.pyc files locally. Instead of overriding the error tags, you can remove the files in a post-install-modulated step and set the pycompile class on them. Maciej From maciej at opencsw.org Sat Jun 23 22:35:11 2012 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_=28Matchek=29_Blizi=C5=84ski?=) Date: Sat, 23 Jun 2012 21:35:11 +0100 Subject: [csw-devel] SF.net SVN: gar:[16652] csw/mgar/pkg/subversion/trunk/Makefile In-Reply-To: References: Message-ID: Hi Rupert, On Mon, Jan 02, 2012 at 08:17:25PM +0000,?rthurner at users.sourceforge.net?wrote: > +CHECKPKG_OVERRIDES_CSWpythonsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/svn/repos.pyc > +CHECKPKG_OVERRIDES_CSWpythonsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/svn/wc.pyc > +CHECKPKG_OVERRIDES_CSWpythonsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/libsvn/__init__.pyc > (...) We don't ship *.pyc files in Python packages. We use the pycompile class instead, and generate the *.pyc files locally. Instead of overriding the error tags, you can remove the files in a post-install-modulated step and set the pycompile class on them. From pfelecan at opencsw.org Sun Jun 24 11:02:50 2012 From: pfelecan at opencsw.org (Peter FELECAN) Date: Sun, 24 Jun 2012 11:02:50 +0200 Subject: [csw-devel] SF.net SVN: gar:[16652] csw/mgar/pkg/subversion/trunk/Makefile In-Reply-To: <20120623202407.GA27730@quince.home.blizinski.pl> ("Maciej =?utf-8?Q?Blizi=C5=84ski=22's?= message of "Sat, 23 Jun 2012 21:24:07 +0100") References: <20120623202407.GA27730@quince.home.blizinski.pl> Message-ID: Maciej Blizi?ski writes: > On Mon, Jan 02, 2012 at 08:17:25PM +0000, rthurner at users.sourceforge.net wrote: >> +CHECKPKG_OVERRIDES_CSWpythonsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/svn/repos.pyc >> +CHECKPKG_OVERRIDES_CSWpythonsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/svn/wc.pyc >> +CHECKPKG_OVERRIDES_CSWpythonsvn += discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/libsvn/__init__.pyc >> (...) > > We don't ship *.pyc files in Python packages. We use the pycompile class > instead, and generate the *.pyc files locally. Instead of overriding the > error tags, you can remove the files in a post-install-modulated step > and set the pycompile class on them. Sincerely, I don't get the rationale of this: pyc as elc (e-lisp compiled) are architecture neutral. The only reason that I can imagine is that compiling on the target, i.e., on which the package containing the source is installed, uses environmental, i.e., specific, information, e.g. Python's current version. As our Python reference, can you enlighten us on this? TIA -- Peter From wahwah at users.sourceforge.net Sun Jun 24 14:18:08 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 24 Jun 2012 12:18:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[18514] csw/mgar/pkg/amanda/trunk Message-ID: Revision: 18514 http://gar.svn.sourceforge.net/gar/?rev=18514&view=rev Author: wahwah Date: 2012-06-24 12:18:08 +0000 (Sun, 24 Jun 2012) Log Message: ----------- amanda/trunk: upgrade Modified Paths: -------------- csw/mgar/pkg/amanda/trunk/Makefile csw/mgar/pkg/amanda/trunk/checksums Modified: csw/mgar/pkg/amanda/trunk/Makefile =================================================================== --- csw/mgar/pkg/amanda/trunk/Makefile 2012-06-23 09:59:22 UTC (rev 18513) +++ csw/mgar/pkg/amanda/trunk/Makefile 2012-06-24 12:18:08 UTC (rev 18514) @@ -1,6 +1,6 @@ -# : Makefile 9089 2010-03-11 08:34:46Z wahwah $ +# $Id$ NAME = amanda -VERSION = 3.2.0 +VERSION = 3.3.1 CATEGORIES = apps GARTYPE = v2 @@ -11,11 +11,12 @@ MASTER_SITES = $(SF_MIRROR) DISTFILES = $(NAME)-$(VERSION).tar.gz -# File name regex to get notifications about upstream software releases -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 -DEP_PKGS = CSWperl CSWreadline CSWlibidn CSWglib2 CSWsasl CSWlibcares CSWggettextrt CSWzlib CSWoldaprt -DEP_PKGS += CSWcurlrt CSWosslrt CSWlibnet +BUILD_DEP_PKGS = CSWlibcares-dev +# libcares? +# DEP_PKGS = CSWperl CSWreadline CSWlibidn CSWglib2 CSWsasl CSWggettextrt CSWzlib CSWoldaprt +# DEP_PKGS += CSWcurlrt CSWosslrt CSWlibnet VENDOR_URL = http://www.amanda.org @@ -62,4 +63,28 @@ CONFIGURE_ARGS += --disable-installperms CONFIGURE_ARGS += --with-amperldir=/opt/csw/lib/perl/csw +RUNTIME_DEP_PKGS_CSWamanda += CSWlibcurl4 +RUNTIME_DEP_PKGS_CSWamanda += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWamanda += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWamanda += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWamanda += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWamanda += CSWlibidn11 +RUNTIME_DEP_PKGS_CSWamanda += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWamanda += CSWlibreadline6 +RUNTIME_DEP_PKGS_CSWamanda += CSWlibssl1-0-0 +RUNTIME_DEP_PKGS_CSWamanda += CSWlibz1 +RUNTIME_DEP_PKGS_CSWamanda += CSWperl + +# for opt/csw/lib/charset.alias +RUNTIME_DEP_PKGS_CSWamanda += CSWlibcharset1 +CHECKPKG_OVERRIDES_CSWamanda += surplus-dependency|CSWlibcharset1 + +# man pages +CHECKPKG_OVERRIDES_CSWamanda += file-with-bad-content + include gar/category.mk + +post-install-modulated: + # It belongs to CSWlibcharset1 + rm $(DESTDIR)/opt/csw/lib/charset.alias + @$(MAKECOOKIE) Modified: csw/mgar/pkg/amanda/trunk/checksums =================================================================== --- csw/mgar/pkg/amanda/trunk/checksums 2012-06-23 09:59:22 UTC (rev 18513) +++ csw/mgar/pkg/amanda/trunk/checksums 2012-06-24 12:18:08 UTC (rev 18514) @@ -1 +1 @@ -df73a318af8f04e9ad2ecb4d59dc052c amanda-3.2.0.tar.gz +dae7631b4abcf7eac874df6e3740e75b amanda-3.3.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at opencsw.org Sun Jun 24 15:35:38 2012 From: pfelecan at opencsw.org (Peter FELECAN) Date: Sun, 24 Jun 2012 15:35:38 +0200 Subject: [csw-devel] SF.net SVN: gar:[18514] csw/mgar/pkg/amanda/trunk In-Reply-To: (wahwah@users.sourceforge.net's message of "Sun, 24 Jun 2012 12:18:08 +0000") References: Message-ID: wahwah at users.sourceforge.net writes: > +# DEP_PKGS += CSWcurlrt CSWosslrt CSWlibnet What's the role of DEP_PKGS (viz. RUNTIME_DEP_PKGS or BUILD_DEP_PKGS)? -- Peter From bonivart at opencsw.org Sun Jun 24 15:37:46 2012 From: bonivart at opencsw.org (Peter Bonivart) Date: Sun, 24 Jun 2012 15:37:46 +0200 Subject: [csw-devel] SF.net SVN: gar:[18514] csw/mgar/pkg/amanda/trunk In-Reply-To: References: Message-ID: On Sun, Jun 24, 2012 at 3:35 PM, Peter FELECAN wrote: > wahwah at users.sourceforge.net writes: > >> +# DEP_PKGS += CSWcurlrt CSWosslrt CSWlibnet > > What's the role of DEP_PKGS (viz. RUNTIME_DEP_PKGS or BUILD_DEP_PKGS)? It's been replaced by RUNTIME_DEP_PKGS. From wahwah at users.sourceforge.net Mon Jun 25 00:14:53 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 24 Jun 2012 22:14:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[18515] csw/mgar/pkg Message-ID: Revision: 18515 http://gar.svn.sourceforge.net/gar/?rev=18515&view=rev Author: wahwah Date: 2012-06-24 22:14:53 +0000 (Sun, 24 Jun 2012) Log Message: ----------- matplotlib/trunk: the setup script is stupid and tries to compile C++ sources with a C compiler Added Paths: ----------- csw/mgar/pkg/matplotlib/ csw/mgar/pkg/matplotlib/Makefile csw/mgar/pkg/matplotlib/branches/ csw/mgar/pkg/matplotlib/tags/ csw/mgar/pkg/matplotlib/trunk/ csw/mgar/pkg/matplotlib/trunk/Makefile csw/mgar/pkg/matplotlib/trunk/checksums csw/mgar/pkg/matplotlib/trunk/files/ Added: csw/mgar/pkg/matplotlib/Makefile =================================================================== --- csw/mgar/pkg/matplotlib/Makefile (rev 0) +++ csw/mgar/pkg/matplotlib/Makefile 2012-06-24 22:14:53 UTC (rev 18515) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/matplotlib/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/matplotlib/trunk/Makefile =================================================================== --- csw/mgar/pkg/matplotlib/trunk/Makefile (rev 0) +++ csw/mgar/pkg/matplotlib/trunk/Makefile 2012-06-24 22:14:53 UTC (rev 18515) @@ -0,0 +1,16 @@ +# Copyright 2009 OpenCSW +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +NAME = matplotlib +VERSION = 1.1.0 +CATEGORIES = python +DESCRIPTION = A pure python plotting library +define BLURB +endef +SPKG_SOURCEURL = http://matplotlib.sourceforge.net/ +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(DISTNAME).tar.gz +LICENSE = LICENSE.txt +CONFIGURE_ARGS = $(DIRPATHS) +include gar/category.mk Property changes on: csw/mgar/pkg/matplotlib/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/matplotlib/trunk/checksums =================================================================== --- csw/mgar/pkg/matplotlib/trunk/checksums (rev 0) +++ csw/mgar/pkg/matplotlib/trunk/checksums 2012-06-24 22:14:53 UTC (rev 18515) @@ -0,0 +1 @@ +57a627f30b3b27821f808659889514c2 matplotlib-1.1.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Jun 25 05:15:29 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 25 Jun 2012 03:15:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[18516] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 18516 http://gar.svn.sourceforge.net/gar/?rev=18516&view=rev Author: bdwalton Date: 2012-06-25 03:15:29 +0000 (Mon, 25 Jun 2012) Log Message: ----------- php5/trunk: update deps for mysqli and imap sub-packages (part of the ssl relinking effort) Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2012-06-24 22:14:53 UTC (rev 18515) +++ csw/mgar/pkg/php5/trunk/Makefile 2012-06-25 03:15:29 UTC (rev 18516) @@ -158,7 +158,7 @@ PKGFILES_CSWphp5-hash += .*/include/php/ext/hash.* $(eval $(call php5_subpackage,iconv,CSWlibiconv2 CSWlibz1)) PKGFILES_CSWphp5-iconv += .*/include/php/ext/iconv.* -$(eval $(call php5_subpackage,imap,CSWimaprt CSWlibk5crypto3 CSWlibgssapi-krb5-2 CSWlibcom-err3 CSWlibkrb5-3 CSWlibssl1-0-0 CSWlibz1)) +$(eval $(call php5_subpackage,imap,CSWlibc-client2007f CSWlibk5crypto3 CSWlibgssapi-krb5-2 CSWlibcom-err3 CSWlibkrb5-3 CSWlibssl1-0-0 CSWlibz1)) $(eval $(call php5_subpackage,json,CSWlibz1)) $(eval $(call php5_subpackage,ldap,CSWliblber2-4-2 CSWlibldap2-4-2 CSWlibsasl2-2 CSWlibz1)) $(eval $(call php5_subpackage,mbstring,CSWlibz1)) @@ -166,7 +166,7 @@ $(eval $(call php5_subpackage,mcrypt,CSWlibmcrypt4 CSWlibltdl7 CSWlibz1)) $(eval $(call php5_subpackage,mssql,CSWlibsybdb5 CSWlibz1)) $(eval $(call php5_subpackage,mysql,CSWlibmysqlclient18 CSWlibz1 CSWlibssl1-0-0)) -$(eval $(call php5_subpackage,mysqli,CSWlibmysqlclient18 CSWlibz1)) +$(eval $(call php5_subpackage,mysqli,CSWlibmysqlclient18 CSWlibz1 CSWlibssl1-0-0)) $(eval $(call php5_subpackage,odbc,CSWlibodbc2 CSWlibz1)) $(eval $(call php5_subpackage,openssl,CSWlibssl1-0-0 CSWlibgssapi-krb5-2 CSWlibkrb5-3 CSWlibk5crypto3 CSWlibcom-err3 CSWlibz1)) $(eval $(call php5_subpackage,pcntl,CSWlibz1)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Mon Jun 25 10:11:53 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Mon, 25 Jun 2012 08:11:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[18517] csw/mgar/pkg Message-ID: Revision: 18517 http://gar.svn.sourceforge.net/gar/?rev=18517&view=rev Author: pfelecan Date: 2012-06-25 08:11:53 +0000 (Mon, 25 Jun 2012) Log Message: ----------- migrated from a private recipe to a GAR based recipe. Added Paths: ----------- csw/mgar/pkg/pstoedit/ csw/mgar/pkg/pstoedit/Makefile csw/mgar/pkg/pstoedit/branches/ csw/mgar/pkg/pstoedit/tags/ csw/mgar/pkg/pstoedit/trunk/ csw/mgar/pkg/pstoedit/trunk/Makefile csw/mgar/pkg/pstoedit/trunk/checksums csw/mgar/pkg/pstoedit/trunk/files/ Added: csw/mgar/pkg/pstoedit/Makefile =================================================================== --- csw/mgar/pkg/pstoedit/Makefile (rev 0) +++ csw/mgar/pkg/pstoedit/Makefile 2012-06-25 08:11:53 UTC (rev 18517) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/pstoedit/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/pstoedit/trunk/Makefile =================================================================== --- csw/mgar/pkg/pstoedit/trunk/Makefile (rev 0) +++ csw/mgar/pkg/pstoedit/trunk/Makefile 2012-06-25 08:11:53 UTC (rev 18517) @@ -0,0 +1,31 @@ +# $Id$ + +NAME = pstoedit +VERSION = 3.60 +GARTYPE = v2 +CATEGORIES = lib + +DESCRIPTION = Translates PostScript and PDF files to editable vector graphics converter +define BLURB + translates PostScript and PDF graphics into other vector formats. +endef + +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(DISTNAME).tar.gz + +BUILD_DEP_PKGS += CSWimagemagick-dev +BUILD_DEP_PKGS += CSWlibgd-dev +BUILD_DEP_PKGS += CSWplotutils-dev + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-libplot +CONFIGURE_ARGS += --without-emf +CONFIGURE_ARGS += --without-swf + +LICENSE = copying + +include gar/category.mk + +# this is private and not available publicly +mydependencies: + $(HOME)/bin/ocswdeplist --package $(NAME) Property changes on: csw/mgar/pkg/pstoedit/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/pstoedit/trunk/checksums =================================================================== --- csw/mgar/pkg/pstoedit/trunk/checksums (rev 0) +++ csw/mgar/pkg/pstoedit/trunk/checksums 2012-06-25 08:11:53 UTC (rev 18517) @@ -0,0 +1 @@ +1bd14f33c1cf57bf6880e2f8f3f93080 pstoedit-3.60.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Mon Jun 25 11:55:11 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Mon, 25 Jun 2012 09:55:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[18518] csw/mgar/pkg/pstoedit/trunk/Makefile Message-ID: Revision: 18518 http://gar.svn.sourceforge.net/gar/?rev=18518&view=rev Author: pfelecan Date: 2012-06-25 09:55:11 +0000 (Mon, 25 Jun 2012) Log Message: ----------- availability limited to Solaris 10 Modified Paths: -------------- csw/mgar/pkg/pstoedit/trunk/Makefile Modified: csw/mgar/pkg/pstoedit/trunk/Makefile =================================================================== --- csw/mgar/pkg/pstoedit/trunk/Makefile 2012-06-25 08:11:53 UTC (rev 18517) +++ csw/mgar/pkg/pstoedit/trunk/Makefile 2012-06-25 09:55:11 UTC (rev 18518) @@ -24,6 +24,9 @@ LICENSE = copying +PACKAGING_PLATFORMS = solaris10-sparc +PACKAGING_PLATFORMS += solaris10-i386 + include gar/category.mk # this is private and not available publicly This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Mon Jun 25 11:56:12 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Mon, 25 Jun 2012 09:56:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[18519] csw/mgar/pkg/jpilot/trunk/Makefile Message-ID: Revision: 18519 http://gar.svn.sourceforge.net/gar/?rev=18519&view=rev Author: pfelecan Date: 2012-06-25 09:56:12 +0000 (Mon, 25 Jun 2012) Log Message: ----------- monolithic package complete Modified Paths: -------------- csw/mgar/pkg/jpilot/trunk/Makefile Modified: csw/mgar/pkg/jpilot/trunk/Makefile =================================================================== --- csw/mgar/pkg/jpilot/trunk/Makefile 2012-06-25 09:55:11 UTC (rev 18518) +++ csw/mgar/pkg/jpilot/trunk/Makefile 2012-06-25 09:56:12 UTC (rev 18519) @@ -17,9 +17,52 @@ GARCOMPILER = GNU +BUILD_DEP_PKGS += CSWfconfig-dev +BUILD_DEP_PKGS += CSWggettext-dev +BUILD_DEP_PKGS += CSWlibatk-dev +BUILD_DEP_PKGS += CSWlibbz2-dev +BUILD_DEP_PKGS += CSWlibcairo-dev +BUILD_DEP_PKGS += CSWlibexpat-dev +BUILD_DEP_PKGS += CSWlibfreetype-dev +BUILD_DEP_PKGS += CSWlibgcrypt-dev +BUILD_DEP_PKGS += CSWlibgdk-pixbuf-dev +BUILD_DEP_PKGS += CSWlibglib2-dev +BUILD_DEP_PKGS += CSWlibgpg-error-dev +BUILD_DEP_PKGS += CSWlibgtk2-dev +BUILD_DEP_PKGS += CSWlibiconv-dev +BUILD_DEP_PKGS += CSWlibpixman-dev +BUILD_DEP_PKGS += CSWlibpng-dev +BUILD_DEP_PKGS += CSWlibz-dev +BUILD_DEP_PKGS += CSWpangodevel +BUILD_DEP_PKGS += CSWpilot-link-dev BUILD_DEP_PKGS += CSWpmxmlparser -BUILD_DEP_PKGS += CSWpilotlink +RUNTIME_DEP_PKGS += CSWlibatk1-0-0 +RUNTIME_DEP_PKGS += CSWlibbz2-1-0 +RUNTIME_DEP_PKGS += CSWlibcairo2 +RUNTIME_DEP_PKGS += CSWlibexpat1 +RUNTIME_DEP_PKGS += CSWlibfontconfig1 +RUNTIME_DEP_PKGS += CSWlibfreetype6 +RUNTIME_DEP_PKGS += CSWlibgcc-s1 +RUNTIME_DEP_PKGS += CSWlibgcrypt11 +RUNTIME_DEP_PKGS += CSWlibgdk-pixbuf2-0-0 +RUNTIME_DEP_PKGS += CSWlibgdk-x11-2-0-0 +RUNTIME_DEP_PKGS += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS += CSWlibgpg-error0 +RUNTIME_DEP_PKGS += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS += CSWlibgtk-x11-2-0-0 +RUNTIME_DEP_PKGS += CSWlibiconv2 +RUNTIME_DEP_PKGS += CSWlibintl8 +RUNTIME_DEP_PKGS += CSWlibpisock9 +RUNTIME_DEP_PKGS += CSWlibpixman1-0 +RUNTIME_DEP_PKGS += CSWlibpng12-0 +RUNTIME_DEP_PKGS += CSWlibxrender +RUNTIME_DEP_PKGS += CSWlibz1 +RUNTIME_DEP_PKGS += CSWpango + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-pilot-prefix=$(prefix) CONFIGURE_ARGS += --with-libintl-prefix=$(prefix) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Mon Jun 25 12:40:10 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Mon, 25 Jun 2012 10:40:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[18520] csw/mgar/pkg/pstoedit/trunk/Makefile Message-ID: Revision: 18520 http://gar.svn.sourceforge.net/gar/?rev=18520&view=rev Author: pfelecan Date: 2012-06-25 10:40:10 +0000 (Mon, 25 Jun 2012) Log Message: ----------- force usage of Sun Studio 12.3 Modified Paths: -------------- csw/mgar/pkg/pstoedit/trunk/Makefile Modified: csw/mgar/pkg/pstoedit/trunk/Makefile =================================================================== --- csw/mgar/pkg/pstoedit/trunk/Makefile 2012-06-25 09:56:12 UTC (rev 18519) +++ csw/mgar/pkg/pstoedit/trunk/Makefile 2012-06-25 10:40:10 UTC (rev 18520) @@ -17,6 +17,8 @@ BUILD_DEP_PKGS += CSWlibgd-dev BUILD_DEP_PKGS += CSWplotutils-dev +GARCOMPILER = SOS12U3 + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-libplot CONFIGURE_ARGS += --without-emf 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 25 12:45:39 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 25 Jun 2012 10:45:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[18521] csw/mgar/pkg/phpldapadmin/trunk Message-ID: Revision: 18521 http://gar.svn.sourceforge.net/gar/?rev=18521&view=rev Author: dmichelsen Date: 2012-06-25 10:45:39 +0000 (Mon, 25 Jun 2012) Log Message: ----------- phpldapadmin/trunk: Update to 1.2.2 and new package dependency names Modified Paths: -------------- csw/mgar/pkg/phpldapadmin/trunk/Makefile csw/mgar/pkg/phpldapadmin/trunk/checksums Modified: csw/mgar/pkg/phpldapadmin/trunk/Makefile =================================================================== --- csw/mgar/pkg/phpldapadmin/trunk/Makefile 2012-06-25 10:40:10 UTC (rev 18520) +++ csw/mgar/pkg/phpldapadmin/trunk/Makefile 2012-06-25 10:45:39 UTC (rev 18521) @@ -1,5 +1,5 @@ NAME = phpldapadmin -VERSION = 1.2.0.5 +VERSION = 1.2.2 CATEGORIES = apps GARTYPE = v2 @@ -18,18 +18,37 @@ DISTFILES = $(NAME)-$(VERSION).tgz DISTFILES += CSWphpldapadmin.preinstall +# The .git directory is not needed and would need to be skipped on install +NOGITPATCH = 1 + +VENDOR_URL = http://phpldapadmin.sourceforge.net/ + +LICENSE = LICENSE + # We define upstream file regex so we can be notifed of new upstream software release UPSTREAM_MASTER_SITES = https://sourceforge.net/projects/phpldapadmin/files/ UFILES_REGEX = (\d+(?:\.\d+)*).tgz -RUNTIME_DEP_PKGS = CSWapache2 -RUNTIME_DEP_PKGS += CSWap2modphp5 -RUNTIME_DEP_PKGS += CSWphp5session -RUNTIME_DEP_PKGS += CSWphp5gettext -RUNTIME_DEP_PKGS += CSWphp5ldap +PACKAGES += CSWphpldapadmin +SPKG_DESC_CSWphpldapadmin = Web-based LDAP browser to manage your LDAP server +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWphpldapadmin += CSWapache2 +RUNTIME_DEP_PKGS_CSWphpldapadmin += CSWap2-modphp5 +RUNTIME_DEP_PKGS_CSWphpldapadmin += CSWphp5-session +RUNTIME_DEP_PKGS_CSWphpldapadmin += CSWphp5-gettext +RUNTIME_DEP_PKGS_CSWphpldapadmin += CSWphp5-ldap -SPKG_SOURCEURL = http://phpldapadmin.sourceforge.net/ +# These can not be tracked by checkpkg +CHECKPKG_OVERRIDES_CSWphpldapadmin += surplus-dependency|CSWphp5-session +CHECKPKG_OVERRIDES_CSWphpldapadmin += surplus-dependency|CSWphp5-ldap +CHECKPKG_OVERRIDES_CSWphpldapadmin += surplus-dependency|CSWap2-modphp5 +CHECKPKG_OVERRIDES_CSWphpldapadmin += surplus-dependency|CSWphp5-gettext +# This is just an example +CHECKPKG_OVERRIDES_CSWphpldapadmin += file-with-bad-content|/usr/local|root/opt/csw/share/www/phpldapadmin/config/config.php.CSW + +ARCHALL = 1 + CONFIGURE_SCRIPTS = BUILD_SCRIPTS = TEST_SCRIPTS = @@ -37,9 +56,6 @@ PRESERVECONF = $(sharedstatedir)/www/phpldapadmin/config/config.php -LICENSE = LICENSE -ARCHALL = 1 - include gar/category.mk install-custom: Modified: csw/mgar/pkg/phpldapadmin/trunk/checksums =================================================================== --- csw/mgar/pkg/phpldapadmin/trunk/checksums 2012-06-25 10:40:10 UTC (rev 18520) +++ csw/mgar/pkg/phpldapadmin/trunk/checksums 2012-06-25 10:45:39 UTC (rev 18521) @@ -1,2 +1 @@ -e0065aa1e6f36ccd29f73e691903d436 CSWphpldapadmin.preinstall -d75f043686da4c1e333ca160b0d26c01 phpldapadmin-1.2.0.5.tgz +78ca61eb5d7913963f8e42eb3b4f0e95 phpldapadmin-1.2.2.tgz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Jun 25 13:27:18 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 25 Jun 2012 11:27:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[18522] csw/mgar/pkg Message-ID: Revision: 18522 http://gar.svn.sourceforge.net/gar/?rev=18522&view=rev Author: dmichelsen Date: 2012-06-25 11:27:17 +0000 (Mon, 25 Jun 2012) Log Message: ----------- thttpd/trunk: Initial commit, install stil broken Added Paths: ----------- csw/mgar/pkg/thttpd/ csw/mgar/pkg/thttpd/Makefile csw/mgar/pkg/thttpd/branches/ csw/mgar/pkg/thttpd/tags/ csw/mgar/pkg/thttpd/trunk/ csw/mgar/pkg/thttpd/trunk/Makefile csw/mgar/pkg/thttpd/trunk/checksums csw/mgar/pkg/thttpd/trunk/files/ csw/mgar/pkg/thttpd/trunk/files/0001-Honour-DESTDIR.patch Added: csw/mgar/pkg/thttpd/Makefile =================================================================== --- csw/mgar/pkg/thttpd/Makefile (rev 0) +++ csw/mgar/pkg/thttpd/Makefile 2012-06-25 11:27:17 UTC (rev 18522) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/thttpd/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/thttpd/trunk/Makefile =================================================================== --- csw/mgar/pkg/thttpd/trunk/Makefile (rev 0) +++ csw/mgar/pkg/thttpd/trunk/Makefile 2012-06-25 11:27:17 UTC (rev 18522) @@ -0,0 +1,47 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = thttpd +VERSION = 2.25b +GARTYPE = v2 +CATEGORIES = server + +DESCRIPTION = The tiny/turbo/throttling HTTP server + +MASTER_SITES = http://www.acme.com/software/thttpd/ +DISTFILES = $(DISTNAME).tar.gz + +PATCHFILES += 0001-Honour-DESTDIR.patch + +PACKAGES += CSWmypkg +SPKG_DESC_CSWmypkg = My package +PKGFILES_CSWmypkg += $(call pkgfiles_lib,libabc.so.1) +PKGFILES_CSWmypkg += $(call baseisadirs,$(bindir),myexec) +PKGFILES_CSWmypkg += $(sysconfdir)/myconf + +REINPLACEMENTS += nochown +REINPLACE_MATCH_nochown = -o bin -g bin +REINPLACE_WITH_nochown = +REINPLACE_FILES_nochown += Makefile.in + +REINPLACEMENTS += nochgrp +REINPLACE_MATCH_nochgrp = chown.*|chgrp.* +REINPLACE_WITH_nochgrp = # +REINPLACE_FILES_nochgrp += extras/Makefile.in + +# There is no testsuite +TEST_SCRIPTS = + +INSTALL_OVERRIDE_VARS += prefix +INSTALL_OVERRIDE_VAR_prefix = $(DESTDIR)$(prefix) +INSTALL_OVERRIDE_VARS += MANDIR +INSTALL_OVERRIDE_VAR_MANDIR = $(DESTDIR)$(mandir) +INSTALL_OVERRIDE_VARS += DESTDIR +INSTALL_OVERRIDE_VAR_DESTDIR = + +include gar/category.mk + +pre-install-modulated: + ginstall -d $(DESTDIR)$(mandir)/man1 + ginstall -d $(DESTDIR)$(mandir)/man8 + @$(MAKECOOKIE) Property changes on: csw/mgar/pkg/thttpd/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/thttpd/trunk/checksums =================================================================== --- csw/mgar/pkg/thttpd/trunk/checksums (rev 0) +++ csw/mgar/pkg/thttpd/trunk/checksums 2012-06-25 11:27:17 UTC (rev 18522) @@ -0,0 +1 @@ +156b249b3b0bcd48b06badd2db0d56c5 thttpd-2.25b.tar.gz Added: csw/mgar/pkg/thttpd/trunk/files/0001-Honour-DESTDIR.patch =================================================================== --- csw/mgar/pkg/thttpd/trunk/files/0001-Honour-DESTDIR.patch (rev 0) +++ csw/mgar/pkg/thttpd/trunk/files/0001-Honour-DESTDIR.patch 2012-06-25 11:27:17 UTC (rev 18522) @@ -0,0 +1,70 @@ +From 952c968ae325f27c9ebb1309a6d2210f4e11b75c Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Mon, 25 Jun 2012 13:07:58 +0200 +Subject: [PATCH] Honour DESTDIR + +--- + cgi-src/Makefile.in | 22 +++++++++++----------- + extras/Makefile.in | 8 ++++---- + 2 files changed, 15 insertions(+), 15 deletions(-) + mode change 100644 => 100755 extras/Makefile.in + +diff --git a/cgi-src/Makefile.in b/cgi-src/Makefile.in +index 6e4e9ba..ac2f354 100644 +--- a/cgi-src/Makefile.in ++++ b/cgi-src/Makefile.in +@@ -67,17 +67,17 @@ strerror.o: + cd .. ; $(MAKE) $(MFLAGS) strerror.o + + install: all +- -mkdir -p $(CGIBINDIR) +- rm -f $(CGIBINDIR)/redirect +- cp redirect $(CGIBINDIR)/redirect +- rm -f $(MANDIR)/man8/redirect.8 +- cp redirect.8 $(MANDIR)/man8/redirect.8 +- rm -f $(CGIBINDIR)/ssi +- cp ssi $(CGIBINDIR)/ssi +- rm -f $(MANDIR)/man8/ssi.8 +- cp ssi.8 $(MANDIR)/man8/ssi.8 +- rm -f $(CGIBINDIR)/phf +- cp phf $(CGIBINDIR)/phf ++ -mkdir -p $(DESTDIR)$(CGIBINDIR) ++ rm -f $(DESTDIR)$(CGIBINDIR)/redirect ++ cp redirect $(DESTDIR)$(CGIBINDIR)/redirect ++ rm -f $(DESTDIR)$(MANDIR)/man8/redirect.8 ++ cp redirect.8 $(DESTDIR)$(MANDIR)/man8/redirect.8 ++ rm -f $(DESTDIR)$(CGIBINDIR)/ssi ++ cp ssi $(DESTDIR)$(CGIBINDIR)/ssi ++ rm -f $(DESTDIR)$(MANDIR)/man8/ssi.8 ++ cp ssi.8 $(DESTDIR)$(MANDIR)/man8/ssi.8 ++ rm -f $(DESTDIR)$(CGIBINDIR)/phf ++ cp phf $(DESTDIR)$(CGIBINDIR)/phf + + clean: + rm -f $(CLEANFILES) +diff --git a/extras/Makefile.in b/extras/Makefile.in +old mode 100644 +new mode 100755 +index a29780f..0759269 +--- a/extras/Makefile.in ++++ b/extras/Makefile.in +@@ -24,12 +24,12 @@ + # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + # SUCH DAMAGE. + +-prefix = @prefix@ +-exec_prefix = @exec_prefix@ +-BINDIR = @sbindir@ ++prefix = $(DESTDIR)@prefix@ ++exec_prefix = $(DESTDIR)@exec_prefix@ ++BINDIR = $(DESTDIR)@sbindir@ + WEBDIR = $(prefix)/www + CGIBINDIR = $(WEBDIR)/cgi-bin +-MANDIR = @mandir@ ++MANDIR = $(DESTDIR)@mandir@ + + CC = @CC@ + CCOPT = @V_CCOPT@ +-- +1.7.10.3 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Mon Jun 25 14:29:45 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Mon, 25 Jun 2012 12:29:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[18523] csw/mgar/pkg/pstoedit/trunk/Makefile Message-ID: Revision: 18523 http://gar.svn.sourceforge.net/gar/?rev=18523&view=rev Author: pfelecan Date: 2012-06-25 12:29:45 +0000 (Mon, 25 Jun 2012) Log Message: ----------- - try without .la - adjust build dependencies Modified Paths: -------------- csw/mgar/pkg/pstoedit/trunk/Makefile Modified: csw/mgar/pkg/pstoedit/trunk/Makefile =================================================================== --- csw/mgar/pkg/pstoedit/trunk/Makefile 2012-06-25 11:27:17 UTC (rev 18522) +++ csw/mgar/pkg/pstoedit/trunk/Makefile 2012-06-25 12:29:45 UTC (rev 18523) @@ -16,6 +16,7 @@ BUILD_DEP_PKGS += CSWimagemagick-dev BUILD_DEP_PKGS += CSWlibgd-dev BUILD_DEP_PKGS += CSWplotutils-dev +BUILD_DEP_PKGS += CSWbison GARCOMPILER = SOS12U3 @@ -26,6 +27,8 @@ LICENSE = copying +STRIP_LIBTOOL = 1 + PACKAGING_PLATFORMS = solaris10-sparc PACKAGING_PLATFORMS += solaris10-i386 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Mon Jun 25 15:09:29 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Mon, 25 Jun 2012 13:09:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[18524] csw/mgar/pkg/cswclassutils/trunk Message-ID: Revision: 18524 http://gar.svn.sourceforge.net/gar/?rev=18524&view=rev Author: pfelecan Date: 2012-06-25 13:09:29 +0000 (Mon, 25 Jun 2012) Log Message: ----------- new class action for TeX index update when installing TeX packages. Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/Makefile csw/mgar/pkg/cswclassutils/trunk/README.maintainers csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.README.CSW Added Paths: ----------- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswtexhash csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswtexhash Modified: csw/mgar/pkg/cswclassutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/Makefile 2012-06-25 12:29:45 UTC (rev 18523) +++ csw/mgar/pkg/cswclassutils/trunk/Makefile 2012-06-25 13:09:29 UTC (rev 18524) @@ -1,7 +1,7 @@ # $HeadURL$ NAME = cswclassutils -VERSION = 1.47 +VERSION = 1.48 CATEGORIES = utils GARTYPE = v2 Modified: csw/mgar/pkg/cswclassutils/trunk/README.maintainers =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/README.maintainers 2012-06-25 12:29:45 UTC (rev 18523) +++ csw/mgar/pkg/cswclassutils/trunk/README.maintainers 2012-06-25 13:09:29 UTC (rev 18524) @@ -11,8 +11,9 @@ 1. Update the script(s) appropriately. 2. Bump the version number in Makefile -3. Commit changes to svn. -4. gmake package-CSWcas-$name (eg: package-CSWcas-initsmf) +3. Update files/CSWcswclassutils.README.CSW to document the new CAS +4. Commit changes to svn. +5. gmake package-CSWcas-$name (eg: package-CSWcas-initsmf) All of the GAR stuff is dynamically generated. You can override these values if desired, but in most cases this won't be required. Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.README.CSW =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.README.CSW 2012-06-25 12:29:45 UTC (rev 18523) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.README.CSW 2012-06-25 13:09:29 UTC (rev 18524) @@ -66,6 +66,12 @@ package removal. If the entries have been changed manually they will not be preserved. +- cswtexhash + + This class takes care of keeping the Tex packages index in sync with + all TeX packages installed. It adds index entries on package + installation and removes them on package removal. + Read more on the wiki: http://wiki.opencsw.org/cswclassutils-package. -- Added: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswtexhash =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswtexhash (rev 0) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswtexhash 2012-06-25 13:09:29 UTC (rev 18524) @@ -0,0 +1,25 @@ +#!/bin/sh +# +# i.cswtexhash - Class action script +# for registration of TeX packages +# +# Written and maintained by Peter Felecan +# +# 2012-06-25 Initial release + +echo "Installing class ..." + +while read src dest; do + + /usr/bin/cp $src $dest || exit 2 +done + +if [ -x ${PKG_INSTALL_ROOT}/opt/csw/bin/mktexlsr ]; then + echo "Registering TeX entries. This may take some time..." + bash ${PKG_INSTALL_ROOT}/opt/csw/bin/mktexlsr || + echo "Registering Tex entries failed! You need to run mktexlsr again" +else + echo "$dest (TeX will be registered when CSWtetex is installed)" +fi + +exit 0 Property changes on: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswtexhash ___________________________________________________________________ Added: svn:keywords + Author Date HeadURL Id Revision Added: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswtexhash =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswtexhash (rev 0) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswtexhash 2012-06-25 13:09:29 UTC (rev 18524) @@ -0,0 +1,25 @@ +#!/bin/sh +# +# r.cswtexhash - Class action script +# for registration of TeX packages +# +# Written and maintained by Peter Felecan +# +# 2012-06-25 Initial release + +echo "Removing class ..." + +while read dest; do + + echo $dest + rm -f $dest + +done + +if [ -x ${PKG_INSTALL_ROOT}/opt/csw/bin/mktexlsr ]; then + echo "Unregistering TeX entries. This may take some time..." + bash ${PKG_INSTALL_ROOT}/opt/csw/bin/mktexlsr || + echo "Unregistering Tex entries failed! You need to run mktexlsr again" +fi + +exit 0 Property changes on: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswtexhash ___________________________________________________________________ Added: svn:keywords + Author Date HeadURL Id Revision This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Mon Jun 25 15:32:07 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Mon, 25 Jun 2012 13:32:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[18525] csw/mgar/pkg/cswclassutils/trunk/README.maintainers Message-ID: Revision: 18525 http://gar.svn.sourceforge.net/gar/?rev=18525&view=rev Author: pfelecan Date: 2012-06-25 13:32:07 +0000 (Mon, 25 Jun 2012) Log Message: ----------- corrected documentation for packaging step Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/README.maintainers Modified: csw/mgar/pkg/cswclassutils/trunk/README.maintainers =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/README.maintainers 2012-06-25 13:09:29 UTC (rev 18524) +++ csw/mgar/pkg/cswclassutils/trunk/README.maintainers 2012-06-25 13:32:07 UTC (rev 18525) @@ -13,7 +13,7 @@ 2. Bump the version number in Makefile 3. Update files/CSWcswclassutils.README.CSW to document the new CAS 4. Commit changes to svn. -5. gmake package-CSWcas-$name (eg: package-CSWcas-initsmf) +5. mgar package-CSWcas-$name (eg: package-CSWcas-initsmf) All of the GAR stuff is dynamically generated. You can override these values if desired, but in most cases this won't be required. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Mon Jun 25 15:47:09 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Mon, 25 Jun 2012 13:47:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[18526] csw/mgar/pkg/cswclassutils/trunk/files Message-ID: Revision: 18526 http://gar.svn.sourceforge.net/gar/?rev=18526&view=rev Author: pfelecan Date: 2012-06-25 13:47:09 +0000 (Mon, 25 Jun 2012) Log Message: ----------- avoid confusion when PKG_INSTALL_ROOT is not / (thanks Ben) Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswtexhash csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswtexhash Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswtexhash =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswtexhash 2012-06-25 13:32:07 UTC (rev 18525) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswtexhash 2012-06-25 13:47:09 UTC (rev 18526) @@ -16,7 +16,7 @@ if [ -x ${PKG_INSTALL_ROOT}/opt/csw/bin/mktexlsr ]; then echo "Registering TeX entries. This may take some time..." - bash ${PKG_INSTALL_ROOT}/opt/csw/bin/mktexlsr || + chroot ${PKG_INSTALL_ROOT:-/} bash /opt/csw/bin/mktexlsr || echo "Registering Tex entries failed! You need to run mktexlsr again" else echo "$dest (TeX will be registered when CSWtetex is installed)" Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswtexhash =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswtexhash 2012-06-25 13:32:07 UTC (rev 18525) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswtexhash 2012-06-25 13:47:09 UTC (rev 18526) @@ -18,7 +18,7 @@ if [ -x ${PKG_INSTALL_ROOT}/opt/csw/bin/mktexlsr ]; then echo "Unregistering TeX entries. This may take some time..." - bash ${PKG_INSTALL_ROOT}/opt/csw/bin/mktexlsr || + chroot ${PKG_INSTALL_ROOT:-/} bash /opt/csw/bin/mktexlsr || echo "Unregistering Tex entries failed! You need to run mktexlsr again" fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Mon Jun 25 16:25:53 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Mon, 25 Jun 2012 14:25:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[18527] csw/mgar/pkg/xpdf/trunk Message-ID: Revision: 18527 http://gar.svn.sourceforge.net/gar/?rev=18527&view=rev Author: cgrzemba Date: 2012-06-25 14:25:53 +0000 (Mon, 25 Jun 2012) Log Message: ----------- xpdf/trunk: remove tools which are contained in CSWpoppler Modified Paths: -------------- csw/mgar/pkg/xpdf/trunk/Makefile csw/mgar/pkg/xpdf/trunk/checksums Modified: csw/mgar/pkg/xpdf/trunk/Makefile =================================================================== --- csw/mgar/pkg/xpdf/trunk/Makefile 2012-06-25 13:47:09 UTC (rev 18526) +++ csw/mgar/pkg/xpdf/trunk/Makefile 2012-06-25 14:25:53 UTC (rev 18527) @@ -1,8 +1,8 @@ NAME = xpdf -VERSION = 3.02 +VERSION = 3.03 CATEGORIES = utils GARTYPE = v2 -RELEASE = p4 +RELEASE = DESCRIPTION = Open source viewer for Portable Document Format (PDF) files define BLURB @@ -21,26 +21,59 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +GARCOMPILER = SOS12U3 +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + PACKAGES = CSWxpdf CSWxpdfutils CATALOGNAME_CSWxpdf = xpdf -CATALOGNAME_CSWxpdfutils = xpdf_utils +CATALOGNAME_CSWxpdf-utils = xpdf_utils SPKG_DESC_CSWxpdf = $(DESCRIPTION) SPKG_DESC_CSWxpdfutils = $(DESCRIPTION) - utils # we require -RUNTIME_DEP_PKGS = CSWftype2 CSWt1lib CSWgsfonts +RUNTIME_DEP_PKGS = CSWgsfonts +RUNTIME_DEP_PKGS_CSWxpdf += CSWxpm +RUNTIME_DEP_PKGS_CSWxpdf += CSWlibfreetype6 + # poppler also has pdffonts, pdfimages et al. -INCOMPATIBLE_PKGS_CSWxpdfutils = CSWpoppler +# INCOMPATIBLE_PKGS_CSWxpdfutils = CSWpoppler PKGFILES_CSWxpdf += $(call baseisadirs,$(bindir),[^/]*xpdf) PKGFILES_CSWxpdf += $(sysconfdir)/.* PKGFILES_CSWxpdf += $(mandir)/man.*/xpdf.* +#content moved to package CSWpoppler +EXTRA_MERGE_EXCLUDE_FILES += $(call baseisadirs,$(bindir),[^/]*pdffonts) +EXTRA_MERGE_EXCLUDE_FILES += $(call baseisadirs,$(bindir),[^/]*pdfimages) +EXTRA_MERGE_EXCLUDE_FILES += $(call baseisadirs,$(bindir),[^/]*pdfinfo) +EXTRA_MERGE_EXCLUDE_FILES += $(call baseisadirs,$(bindir),[^/]*pdftoabw) +EXTRA_MERGE_EXCLUDE_FILES += $(call baseisadirs,$(bindir),[^/]*pdftohtml) +EXTRA_MERGE_EXCLUDE_FILES += $(call baseisadirs,$(bindir),[^/]*pdftoppm) +EXTRA_MERGE_EXCLUDE_FILES += $(call baseisadirs,$(bindir),[^/]*pdftops) +EXTRA_MERGE_EXCLUDE_FILES += $(call baseisadirs,$(bindir),[^/]*pdftotext) +EXTRA_MERGE_EXCLUDE_FILES += $(mandir)/.*/pdffonts.* +EXTRA_MERGE_EXCLUDE_FILES += $(mandir)/.*/pdfimages.1 +EXTRA_MERGE_EXCLUDE_FILES += $(mandir)/.*/pdfinfo.1 +EXTRA_MERGE_EXCLUDE_FILES += $(mandir)/.*/pdftoabw.1 +EXTRA_MERGE_EXCLUDE_FILES += $(mandir)/.*/pdftohtml.1 +EXTRA_MERGE_EXCLUDE_FILES += $(mandir)/.*/pdftoppm.1 +EXTRA_MERGE_EXCLUDE_FILES += $(mandir)/.*/pdftops.1 +EXTRA_MERGE_EXCLUDE_FILES += $(mandir)/.*/pdftotext.1 + # Yes, we need gsfonts CHECKPKG_OVERRIDES_CSWxpdfutils += surplus-dependency|CSWgsfonts CHECKPKG_OVERRIDES_CSWxpdf += surplus-dependency|CSWgsfonts +CHECKPKG_OVERRIDES_CSWxpdf += file-with-bad-content|/usr/local|root/opt/csw/bin/xpdf +CHECKPKG_OVERRIDES_CSWxpdf += file-with-bad-content|/usr/local|root/opt/csw/share/man/man5/xpdfrc.5 +CHECKPKG_OVERRIDES_CSWxpdf += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/xpdf.1 +CHECKPKG_OVERRIDES_CSWxpdf += file-with-bad-content|/usr/local|root/etc/opt/csw/xpdfrc +CHECKPKG_OVERRIDES_CSWxpdf += file-with-bad-content|/usr/share|root/opt/csw/bin/xpdf +CHECKPKG_OVERRIDES_CSWxpdfutils += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/pdfdetach.1 +CHECKPKG_OVERRIDES_CSWxpdfutils += file-with-bad-content|/usr/local|root/opt/csw/bin/pdfdetach +CHECKPKG_OVERRIDES_CSWxpdfutils += file-with-bad-content|/usr/share|root/opt/csw/bin/pdfdetach + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-t1-library=$(libdir) CONFIGURE_ARGS += --with-t1-includes=$(includedir) @@ -51,14 +84,16 @@ EXTRA_SOS_LD_FLAGS = -L/usr/openwin/lib EXTRA_SOS_LD_OPTIONS = -R/usr/openwin/lib +EXTRA_CXXFLAGS = -I/opt/csw/include +EXTRA_LINKER_FLAGS = -norunpath # apply patches -PATCHFILES = xpdf-3.02pl1.patch -PATCHFILES += xpdf-3.02pl2.patch -PATCHFILES += xpdf-3.02pl3.patch -PATCHFILES += xpdf-3.02pl4.patch -PATCHFILES += patch-GString.cc -PATCHFILES += patch-XPDFCore.cc +# PATCHFILES = xpdf-3.02pl1.patch +# PATCHFILES += xpdf-3.02pl2.patch +# PATCHFILES += xpdf-3.02pl3.patch +# PATCHFILES += xpdf-3.02pl4.patch +# PATCHFILES += patch-GString.cc +# PATCHFILES += patch-XPDFCore.cc # no test script TEST_SCRIPTS = Modified: csw/mgar/pkg/xpdf/trunk/checksums =================================================================== --- csw/mgar/pkg/xpdf/trunk/checksums 2012-06-25 13:47:09 UTC (rev 18526) +++ csw/mgar/pkg/xpdf/trunk/checksums 2012-06-25 14:25:53 UTC (rev 18527) @@ -1,7 +1 @@ -28cd772ed42159f2dbbe3a0e8e9e4dfa patch-GString.cc -4c23bc375fbb6096fb8b2266d0ef527d patch-XPDFCore.cc -599dc4cc65a07ee868cf92a667a913d2 xpdf-3.02.tar.gz -877118786dfe27d1b7aa5a6759cc6e45 xpdf-3.02pl1.patch -3a5cb165ae66781e0b21e6219ae06795 xpdf-3.02pl2.patch -581963ede0fb5715e1a69f01b5b8ce63 xpdf-3.02pl3.patch -70b752716798dd341a4bf890df5f6fdc xpdf-3.02pl4.patch +af75f772bee0e5ae4a811ff9d03eac5a xpdf-3.03.tar.gz 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 25 21:41:16 2012 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_=28Matchek=29_Blizi=C5=84ski?=) Date: Mon, 25 Jun 2012 20:41:16 +0100 Subject: [csw-devel] SF.net SVN: gar:[18514] csw/mgar/pkg/amanda/trunk In-Reply-To: References: Message-ID: 2012/6/24 Peter Bonivart : > On Sun, Jun 24, 2012 at 3:35 PM, Peter FELECAN wrote: >> wahwah at users.sourceforge.net writes: >> >>> +# DEP_PKGS += CSWcurlrt CSWosslrt CSWlibnet >> >> What's the role of DEP_PKGS (viz. RUNTIME_DEP_PKGS or BUILD_DEP_PKGS)? > > It's been replaced by RUNTIME_DEP_PKGS. I think that DEP_PKGS adds a package name to both runtime and build time deps. But in practice it's of little use, because with most libraries you want the *_dev package as the build dep, and lib* as the runtime dependency. From pfelecan at users.sourceforge.net Tue Jun 26 09:13:08 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Tue, 26 Jun 2012 07:13:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[18528] csw/mgar/pkg/cswclassutils/trunk/files Message-ID: Revision: 18528 http://gar.svn.sourceforge.net/gar/?rev=18528&view=rev Author: pfelecan Date: 2012-06-26 07:13:08 +0000 (Tue, 26 Jun 2012) Log Message: ----------- fully qualify chroot and bash Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswtexhash csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswtexhash Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswtexhash =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswtexhash 2012-06-25 14:25:53 UTC (rev 18527) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswtexhash 2012-06-26 07:13:08 UTC (rev 18528) @@ -16,7 +16,7 @@ if [ -x ${PKG_INSTALL_ROOT}/opt/csw/bin/mktexlsr ]; then echo "Registering TeX entries. This may take some time..." - chroot ${PKG_INSTALL_ROOT:-/} bash /opt/csw/bin/mktexlsr || + /usr/sbin/chroot ${PKG_INSTALL_ROOT:-/} /usr/bin/bash /opt/csw/bin/mktexlsr || echo "Registering Tex entries failed! You need to run mktexlsr again" else echo "$dest (TeX will be registered when CSWtetex is installed)" Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswtexhash =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswtexhash 2012-06-25 14:25:53 UTC (rev 18527) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswtexhash 2012-06-26 07:13:08 UTC (rev 18528) @@ -18,7 +18,7 @@ if [ -x ${PKG_INSTALL_ROOT}/opt/csw/bin/mktexlsr ]; then echo "Unregistering TeX entries. This may take some time..." - chroot ${PKG_INSTALL_ROOT:-/} bash /opt/csw/bin/mktexlsr || + /usr/sbin/chroot ${PKG_INSTALL_ROOT:-/} /usr/bin/bash /opt/csw/bin/mktexlsr || echo "Unregistering Tex entries failed! You need to run mktexlsr again" fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Tue Jun 26 09:40:28 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Tue, 26 Jun 2012 07:40:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[18529] csw/mgar/pkg/cswclassutils/trunk/files/ CSWcswclassutils.r.cswtexhash Message-ID: Revision: 18529 http://gar.svn.sourceforge.net/gar/?rev=18529&view=rev Author: pfelecan Date: 2012-06-26 07:40:28 +0000 (Tue, 26 Jun 2012) Log Message: ----------- discriminate files and directories on removal Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswtexhash Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswtexhash =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswtexhash 2012-06-26 07:13:08 UTC (rev 18528) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswtexhash 2012-06-26 07:40:28 UTC (rev 18529) @@ -12,7 +12,11 @@ while read dest; do echo $dest - rm -f $dest + if [ -d $dest ]; then + rmdir $dest + else + rm -f $dest + fi done This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Tue Jun 26 09:44:46 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Tue, 26 Jun 2012 07:44:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[18530] csw/mgar/gar/v2 Message-ID: Revision: 18530 http://gar.svn.sourceforge.net/gar/?rev=18530&view=rev Author: pfelecan Date: 2012-06-26 07:44:46 +0000 (Tue, 26 Jun 2012) Log Message: ----------- add support for TeX hash class Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.conf.mk =================================================================== --- csw/mgar/gar/v2/gar.conf.mk 2012-06-26 07:40:28 UTC (rev 18529) +++ csw/mgar/gar/v2/gar.conf.mk 2012-06-26 07:44:46 UTC (rev 18530) @@ -145,6 +145,11 @@ perllib ?= $(libdir)/perl perlcswlib ?= $(perllib)/csw perlpackroot ?= $(perlcswlib)/auto +texmfdir ?= $(sharedstatedir)/texmf +texmfconfigdir ?= $(texmfdir)-config +texmfdistdir ?= $(texmfdir)-dist +texmflocaldir ?= $(texmfdir)-local +texmfvardir ?= $(texmfdir)-var # This Variable is only used if you make your package relocatable # using ALLOW_RELOCATE, it will allow you to change your default Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2012-06-26 07:40:28 UTC (rev 18529) +++ csw/mgar/gar/v2/gar.pkg.mk 2012-06-26 07:44:46 UTC (rev 18530) @@ -232,6 +232,9 @@ # This is the default path for texinfo pages to be picked up. Extend or replace as necessary. TEXINFO ?= $(infodir)/.*\.info(?:-\d+)? $(EXTRA_TEXINFO) +# These are the default paths for TeX packages to be picked up. +TEXHASH ?= $(texmfdir)/.* $(texmfconfigdir)/.* $(texmfdistdir)/.* $(texmflocaldir)/.* $(texmfvardir)/.* + # if AP2_MODS is set, files matching this shell glob (passed to find) # will have 'build' set as their class AP2_MODFILES ?= opt/csw/apache2/libexec/*so $(EXTRA_AP2_MODFILES) @@ -250,6 +253,7 @@ $(foreach FILE,$(CRONTABS),$$F[1] = "cswcrontab" if( $$F[2] =~ m(^$(FILE)$$) );)\ $(if $(PYCOMPILE),$(foreach FILE,$(_PYCOMPILE_FILES),$$F[1] = "cswpycompile" if( $$F[2] =~ m(^$(FILE)$$) );))\ $(foreach FILE,$(TEXINFO),$$F[1] = "cswtexinfo" if( $$F[2] =~ m(^$(FILE)$$) );)\ + $(foreach FILE,$(TEXHASH),$$F[1] = "cswtexhash" if( $$F[2] =~ m(^$(FILE)$$) );)\ $(if $(AP2_MODS), at F = ("e", "build", $$F[2], "?", "?", "?") if ($$F[2] =~ m(^/opt/csw/apache2/ap2mod/.*));) \ $(if $(PHP5_EXT), at F = ("e", "build", $$F[2], "?", "?", "?") if ($$F[2] =~ m(^/opt/csw/php5/extensions/.*));) \ $$F[1] = "cswcptemplates" if( $$F[2] =~ m(^/opt/csw/etc/templates/.+$$) and $$F[0] eq "f" ); \ @@ -281,6 +285,7 @@ _CSWCLASSES += cswinitsmf _CSWCLASSES += cswtexinfo _CSWCLASSES += cswpostmsg +_CSWCLASSES += cswtexhash # Make sure the configuration files always have a .CSW suffix and rename the # configuration files to this if necessary during merge. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Tue Jun 26 09:45:52 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Tue, 26 Jun 2012 07:45:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[18531] csw/mgar/pkg/auctex/trunk Message-ID: Revision: 18531 http://gar.svn.sourceforge.net/gar/?rev=18531&view=rev Author: pfelecan Date: 2012-06-26 07:45:51 +0000 (Tue, 26 Jun 2012) Log Message: ----------- adapt for TeX hash class support Modified Paths: -------------- csw/mgar/pkg/auctex/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/auctex/trunk/files/CSWauctex.postinstall Modified: csw/mgar/pkg/auctex/trunk/Makefile =================================================================== --- csw/mgar/pkg/auctex/trunk/Makefile 2012-06-26 07:44:46 UTC (rev 18530) +++ csw/mgar/pkg/auctex/trunk/Makefile 2012-06-26 07:45:51 UTC (rev 18531) @@ -14,7 +14,6 @@ MASTER_SITES = http://ftp.gnu.org/pub/gnu/auctex/ DISTFILES = $(DISTNAME).tar.gz DISTFILES += README.CSW -DISTFILES += CSWauctex.postinstall CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-texmf-dir=/opt/csw/share/texmf-local Deleted: csw/mgar/pkg/auctex/trunk/files/CSWauctex.postinstall =================================================================== --- csw/mgar/pkg/auctex/trunk/files/CSWauctex.postinstall 2012-06-26 07:44:46 UTC (rev 18530) +++ csw/mgar/pkg/auctex/trunk/files/CSWauctex.postinstall 2012-06-26 07:45:51 UTC (rev 18531) @@ -1,32 +0,0 @@ -# $Id$ - -Error() -{ - echo "postinstall: anomaly : $1" >&2 - exit 1 -} - -Warning() -{ - echo "warning:" "$1" >&2 -} - -if [ -x /opt/csw/bin/mktexlsr ] -then -{ - echo "Running mktexlsr. This may take some time..." - bash /opt/csw/bin/mktexlsr || - Warning "mktexlsr failed! You need to run mktexlsr again" -} -else -{ - Warning "cannot update TeX hash: /opt/csw/bin/mktexlsr is not an executable!" -} -fi - -exit 0 - -# Local Variables: -# mode: shell-script -# mode: font-lock -# End: 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 26 09:47:48 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 26 Jun 2012 07:47:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[18532] csw/mgar/pkg/zabbix/trunk Message-ID: Revision: 18532 http://gar.svn.sourceforge.net/gar/?rev=18532&view=rev Author: dmichelsen Date: 2012-06-26 07:47:48 +0000 (Tue, 26 Jun 2012) Log Message: ----------- zabbix/trunk: Update to 2.0.0 Modified Paths: -------------- csw/mgar/pkg/zabbix/trunk/Makefile csw/mgar/pkg/zabbix/trunk/checksums Modified: csw/mgar/pkg/zabbix/trunk/Makefile =================================================================== --- csw/mgar/pkg/zabbix/trunk/Makefile 2012-06-26 07:45:51 UTC (rev 18531) +++ csw/mgar/pkg/zabbix/trunk/Makefile 2012-06-26 07:47:48 UTC (rev 18532) @@ -2,7 +2,7 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = zabbix -VERSION = 1.8.10 +VERSION = 2.0.0 GARTYPE = v2 CATEGORIES = server @@ -13,7 +13,7 @@ MASTER_SITES = $(SF_MIRROR) DISTFILES = $(DISTNAME).tar.gz -PACKAGING_PLATFORMS += solaris9-sparc solaris9-i386 +# PACKAGING_PLATFORMS += solaris9-sparc solaris9-i386 PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 # This is just for the server which is in 64 bit only on Solars 10 @@ -26,20 +26,30 @@ SPKG_DESC_CSWzabbix-agent = Zabbix monitoring system agent # PKGFILES is catchall RUNTIME_DEP_PKGS_CSWzabbix-agent += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWzabbix-agent += CSWlibidn11 +RUNTIME_DEP_PKGS_CSWzabbix-agent += CSWlibz1 +RUNTIME_DEP_PKGS_CSWzabbix-agent += CSWlibssl1-0-0 +RUNTIME_DEP_PKGS_CSWzabbix-agent += CSWlibcurl4 +# These are just examples +CHECKPKG_OVERRIDES_CSWzabbix-agent += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/zabbix_agentd.8 +CHECKPKG_OVERRIDES_CSWzabbix-agent += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/zabbix_sender.1 +CHECKPKG_OVERRIDES_CSWzabbix-agent += file-with-bad-content|/usr/local|root/etc/opt/csw/zabbix_agentd.conf.CSW +CHECKPKG_OVERRIDES_CSWzabbix-agent += file-with-bad-content|/usr/local|root/etc/opt/csw/zabbix_agent.conf.CSW + PACKAGES-5.10 += CSWzabbix-server PACKAGES += $(PACKAGES-$(GAROSREL)) SPKG_DESC_CSWzabbix-server = Zabbix monitoring system server PKGFILES_CSWzabbix-server += $(call baseisadirs,$(sbindir),zabbix_server) -RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibmysqlclient15 +RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibmysqlclient18 RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibiconv2 RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibz1 -RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibssl0-9-8 +RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibcurl4 RUNTIME_DEP_PKGS_CSWzabbix-server += CSWlibidn11 CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-mysql +CONFIGURE_ARGS += --with-mysql=$(bindir)/mysql_config CONFIGURE_ARGS += --with-libcurl CONFIGURE_ARGS += --enable-agent CONFIGURE_ARGS += --enable-ipv6 @@ -50,5 +60,8 @@ CONFIGURE_ARGS-5.10-64 += --enable-server CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(GAROSREL)-$(MEMORYMODEL)) +PRESERVECONF += $(sysconfdir)/zabbix_agent.conf +PRESERVECONF += $(sysconfdir)/zabbix_agentd.conf + include gar/category.mk Modified: csw/mgar/pkg/zabbix/trunk/checksums =================================================================== --- csw/mgar/pkg/zabbix/trunk/checksums 2012-06-26 07:45:51 UTC (rev 18531) +++ csw/mgar/pkg/zabbix/trunk/checksums 2012-06-26 07:47:48 UTC (rev 18532) @@ -1 +1 @@ -7e89f80c1822787c0831f7c0dbefcd7b zabbix-1.8.10.tar.gz +d34d398beddee0eaa999789100cf74e3 zabbix-2.0.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Tue Jun 26 09:59:59 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Tue, 26 Jun 2012 07:59:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[18533] csw/mgar/pkg/hevea/trunk Message-ID: Revision: 18533 http://gar.svn.sourceforge.net/gar/?rev=18533&view=rev Author: pfelecan Date: 2012-06-26 07:59:59 +0000 (Tue, 26 Jun 2012) Log Message: ----------- adapt for TeX hash class support Modified Paths: -------------- csw/mgar/pkg/hevea/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/hevea/trunk/files/CSWhevea.postinstall Modified: csw/mgar/pkg/hevea/trunk/Makefile =================================================================== --- csw/mgar/pkg/hevea/trunk/Makefile 2012-06-26 07:47:48 UTC (rev 18532) +++ csw/mgar/pkg/hevea/trunk/Makefile 2012-06-26 07:59:59 UTC (rev 18533) @@ -29,7 +29,6 @@ MASTER_SITES = http://hevea.inria.fr/distri/ DISTFILES = $(DISTNAME).tar.gz -DISTFILES += CSWhevea.postinstall LICENSE = LICENSE Deleted: csw/mgar/pkg/hevea/trunk/files/CSWhevea.postinstall =================================================================== --- csw/mgar/pkg/hevea/trunk/files/CSWhevea.postinstall 2012-06-26 07:47:48 UTC (rev 18532) +++ csw/mgar/pkg/hevea/trunk/files/CSWhevea.postinstall 2012-06-26 07:59:59 UTC (rev 18533) @@ -1,32 +0,0 @@ -# $Id$ - -Error() -{ - echo "postinstall: anomaly : $1" >&2 - exit 1 -} - -Warning() -{ - echo "warning:" "$1" >&2 -} - -if [ -x /opt/csw/bin/mktexlsr ] -then -{ - echo "Running mktexlsr. This may take some time..." - bash /opt/csw/bin/mktexlsr || - Warning "mktexlsr failed! You need to run mktexlsr again" -} -else -{ - Warning "cannot update TeX hash: /opt/csw/bin/mktexlsr is not an executable!" -} -fi - -exit 0 - -# Local Variables: -# mode: shell-script -# mode: font-lock -# End: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Tue Jun 26 10:23:56 2012 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_=28Matchek=29_Blizi=C5=84ski?=) Date: Tue, 26 Jun 2012 09:23:56 +0100 Subject: [csw-devel] SF.net SVN: gar:[18518] csw/mgar/pkg/pstoedit/trunk/Makefile In-Reply-To: References: Message-ID: 2012/6/25 : > Revision: 18518 > ? ? ? ? ?http://gar.svn.sourceforge.net/gar/?rev=18518&view=rev > Author: ? pfelecan > Date: ? ? 2012-06-25 09:55:11 +0000 (Mon, 25 Jun 2012) > Log Message: > ----------- > availability limited to Solaris 10 When committing code, please add the package name as the first word of the commit message. It makes it easier to read the timeline and commit logs. You can use mgar to do it for you: mgar ci -m "short message" If you do this, mgar will automatically prepend the commit message with the package name (and branch), and call svn. From maciej at opencsw.org Tue Jun 26 10:28:02 2012 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_=28Matchek=29_Blizi=C5=84ski?=) Date: Tue, 26 Jun 2012 09:28:02 +0100 Subject: [csw-devel] SF.net SVN: gar:[18513] csw/mgar/pkg/pilotlink/trunk/Makefile In-Reply-To: References: Message-ID: 2012/6/23 : > Revision: 18513 > ? ? ? ? ?http://gar.svn.sourceforge.net/gar/?rev=18513&view=rev > Author: ? pfelecan > Date: ? ? 2012-06-23 09:59:22 +0000 (Sat, 23 Jun 2012) > Log Message: > ----------- > some additional overrides > > Modified Paths: > -------------- > ? ?csw/mgar/pkg/pilotlink/trunk/Makefile > > Modified: csw/mgar/pkg/pilotlink/trunk/Makefile > =================================================================== > --- csw/mgar/pkg/pilotlink/trunk/Makefile ? ? ? 2012-06-23 09:37:54 UTC (rev 18512) > +++ csw/mgar/pkg/pilotlink/trunk/Makefile ? ? ? 2012-06-23 09:59:22 UTC (rev 18513) > @@ -150,7 +150,7 @@ > ?CHECKPKG_OVERRIDES_CSWpilot-link+= ? ? bad-rpath-entry|/usr/sfw/lib|opt/csw/bin/pilot-dlpsh > ?CHECKPKG_OVERRIDES_CSWpilot-link+= ? ? bad-rpath-entry|/usr/sfw/lib|opt/csw/bin/pilot-file > ?CHECKPKG_OVERRIDES_CSWpilot-link+= ? ? bad-rpath-entry|/usr/sfw/lib|opt/csw/bin/pilot-foto > -CHECKPKG_OVERRIDES_CSWpilot-link+= ? ? bad-rpath-entry|/usr/sfw/lib|opt/csw/bin/piot-foto-treo600 > +CHECKPKG_OVERRIDES_CSWpilot-link+= ? ? bad-rpath-entry|/usr/sfw/lib|opt/csw/bin/pilot-foto-treo600 > ?CHECKPKG_OVERRIDES_CSWpilot-link+= ? ? bad-rpath-entry|/usr/sfw/lib|opt/csw/bin/pilot-foto-treo650 > ?CHECKPKG_OVERRIDES_CSWpilot-link+= ? ? bad-rpath-entry|/usr/sfw/lib|opt/csw/bin/pilot-getram > ?CHECKPKG_OVERRIDES_CSWpilot-link+= ? ? bad-rpath-entry|/usr/sfw/lib|opt/csw/bin/pilot-getrom > @@ -236,6 +236,8 @@ > ?RUNTIME_DEP_PKGS_CSWpilot-link-perl ? ?+= ? ? ?CSWlibpisock9 > ?RUNTIME_DEP_PKGS_CSWpilot-link-perl ? ?+= ? ? ?CSWperl > ?RUNTIME_DEP_PKGS_CSWpilot-link-perl ? ?+= ? ? ?CSWlibz1 > +CHECKPKG_OVERRIDES_CSWpilot-link-perl+= perllocal-pod-in-pkgmap|/opt/csw/lib/perl/5.10.1/perllocal.pod Why override this and not remove the file? I don't know what was the original motivation, but AFAIK, we shouldn't and don't ship the perllocal.pod file. > +CHECKPKG_OVERRIDES_CSWpilot-link-perl+= surplus-dependency|CSWlibz1 Why this override? Is libz.so.1 loaded dynamically? From maciej at opencsw.org Tue Jun 26 10:30:16 2012 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_=28Matchek=29_Blizi=C5=84ski?=) Date: Tue, 26 Jun 2012 09:30:16 +0100 Subject: [csw-devel] SF.net SVN: gar:[18512] csw/mgar/pkg/pilotlink/trunk/Makefile In-Reply-To: References: Message-ID: 2012/6/23 : > Revision: 18512 > ? ? ? ? ?http://gar.svn.sourceforge.net/gar/?rev=18512&view=rev > Author: ? pfelecan > Date: ? ? 2012-06-23 09:37:54 +0000 (Sat, 23 Jun 2012) > Log Message: > ----------- > corrected end of line issues after copy&paste... I would suggest only committing after you've verified that the change actually works. It's less code and better quality code to review for others. Maciej From maciej at opencsw.org Tue Jun 26 10:31:35 2012 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_=28Matchek=29_Blizi=C5=84ski?=) Date: Tue, 26 Jun 2012 09:31:35 +0100 Subject: [csw-devel] SF.net SVN: gar:[18511] csw/mgar/pkg/pilotlink/trunk/Makefile In-Reply-To: References: Message-ID: 2012/6/23 : > ?PACKAGES ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? += ? ? ?CSWlibpitcl0 > ?CATALOGNAME_CSWlibpitcl0 ? ? ? ? ? ? ? = ? ? ? libpitcl0 > @@ -170,6 +225,10 @@ > ?RUNTIME_DEP_PKGS_CSWlibpitcl0 ?+= ? ? ?CSWlibpisock9 > ?RUNTIME_DEP_PKGS_CSWlibpitcl0 ?+= ? ? ?CSWtcl > ?LICENCE_CSWlibpitcl0 ? ? ? ? ? ? ? ? ? = ? ? ? COPYING.LIB > +CHECKPKG_OVERRIDES_CSWlibpitcl0 ? ? ? ?+= ? ? ?bad-rpath-entry|/usr/sfw/lib|opt/csw/lib/libpitcl.so.0.0.0 > +CHECKPKG_OVERRIDES_CSWlibpitcl0 ? ? ? ?+= ? ? ?surplus-dependency|CSWlibz1 > +CHECKPKG_OVERRIDES_CSWlibpitcl0 ? ? ? ?+= ? ? ?surplus-dependency|CSWlibiconv2 > +CHECKPKG_OVERRIDES_CSWlibpitcl0 ? ? ? ?+= ? ? ?surplus-dependency|CSWlibintl8 How do you know that these dependencies are actually required? In most packages, you can rely of the NEEDED field, and there's no need for additional dependencies. Maciej From maciej at opencsw.org Tue Jun 26 10:40:46 2012 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_=28Matchek=29_Blizi=C5=84ski?=) Date: Tue, 26 Jun 2012 09:40:46 +0100 Subject: [csw-devel] SF.net SVN: gar:[18463] csw/mgar/pkg/plotutils/trunk/Makefile In-Reply-To: References: Message-ID: 2012/6/19 : > ?RUNTIME_DEP_PKGS_CSWplotutils ?+= ? ? ?CSWlibplotter2 > ?RUNTIME_DEP_PKGS_CSWplotutils ?+= ? ? ?CSWlibxmi0 > ?OBSOLETED_BY_CSWplotutils ? ? ? ? ? ? ?= ? ? ? CSWplotutil > +CHECKPKG_OVERRIDES_CSWplotutils ? ? ? ?+= ? ? ?missing-dependency|CSWlibgcc-s1 > +CHECKPKG_OVERRIDES_CSWplotutils ? ? ? ?+= ? ? ?missing-dependency|CSWlibstdc++6 > +CHECKPKG_OVERRIDES_CSWplotutils ? ? ? ?+= ? ? ?missing-dependency|CSWlibpng12-0 > +CHECKPKG_OVERRIDES_CSWplotutils ? ? ? ?+= ? ? ?missing-dependency|CSWlibz1 > +CHECKPKG_OVERRIDES_CSWplotutils ? ? ? ?+= ? ? ?surplus-dependency|CSWlibxmi0 > +CHECKPKG_OVERRIDES_CSWplotutils ? ? ? ?+= ? ? ?surplus-dependency|CSWlibplotter2 This is suspicious, why do you not add dependencies to a package containing binaries with specific SONAMEs in NEEDED? If CSWplotutils contains a binary foo, and foo requires the "libz.so.1" string in NEEDED, it does make sense to make CSWplotutils depend on CSWlibz1, no? Maciej From maciej at opencsw.org Tue Jun 26 10:46:20 2012 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_=28Matchek=29_Blizi=C5=84ski?=) Date: Tue, 26 Jun 2012 09:46:20 +0100 Subject: [csw-devel] SF.net SVN: gar:[18440] csw/mgar/pkg/libgnet/trunk/Makefile In-Reply-To: References: Message-ID: 2012/6/16 : > ?RUNTIME_DEP_PKGS_CSWlibgnet2-0-0 ? ? ? += ? ? ?CSWlibintl8 > +CHECKPKG_OVERRIDES_CSWlibgnet2-0-0 += surplus-dependency|CSWlibiconv2 A similar issue as in other packages - CSWlibiconv2 only adds a single library, usually when a library is used, it's in the NEEDED of its dependent binaries, and checkpkg detects that. The only case when checkpkg doesn't detect that, is dynamic loading. Is it the case here? Maciej From maciej at opencsw.org Tue Jun 26 10:47:21 2012 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_=28Matchek=29_Blizi=C5=84ski?=) Date: Tue, 26 Jun 2012 09:47:21 +0100 Subject: [csw-devel] SF.net SVN: gar:[18439] csw/mgar/pkg/mule/trunk/Makefile In-Reply-To: References: Message-ID: 2012/6/16 : > +CHECKPKG_OVERRIDES_CSWmule += binary-architecture-does-not-match-placement|file=opt/csw/mule/lib/boot/libwrapper-solaris-sparc-64.so|arch_id=43|arch_name=sparcv9 > +CHECKPKG_OVERRIDES_CSWmule += binary-architecture-does-not-match-placement|file=opt/csw/mule/lib/boot/exec/wrapper-solaris-sparc-64|arch_id=43|arch_name=sparcv9 > +CHECKPKG_OVERRIDES_CSWmule += archall-with-binaries|opt/csw/mule/lib/boot/exec/wrapper-solaris-sparc-32 > +CHECKPKG_OVERRIDES_CSWmule += archall-with-binaries|opt/csw/mule/lib/boot/exec/wrapper-solaris-sparc-64 > +CHECKPKG_OVERRIDES_CSWmule += archall-with-binaries|opt/csw/mule/lib/boot/exec/wrapper-solaris-x86-32 > +CHECKPKG_OVERRIDES_CSWmule += archall-with-binaries|opt/csw/mule/lib/boot/libwrapper-solaris-sparc-32.so > +CHECKPKG_OVERRIDES_CSWmule += archall-with-binaries|opt/csw/mule/lib/boot/libwrapper-solaris-sparc-64.so > +CHECKPKG_OVERRIDES_CSWmule += archall-with-binaries|opt/csw/mule/lib/boot/libwrapper-solaris-x86-32.so > +CHECKPKG_OVERRIDES_CSWmule += file-with-bad-content|/usr/share|root/var/opt/csw/svc/manifest/application/cswmule.xml > +CHECKPKG_OVERRIDES_CSWmule += binary-wrong-architecture|file=opt/csw/mule/lib/boot/libwrapper-solaris-sparc-32.so|pkginfo-says=all|actual-binary=sparc > +CHECKPKG_OVERRIDES_CSWmule += binary-wrong-architecture|file=opt/csw/mule/lib/boot/libwrapper-solaris-sparc-64.so|pkginfo-says=all|actual-binary=sparc > +CHECKPKG_OVERRIDES_CSWmule += binary-wrong-architecture|file=opt/csw/mule/lib/boot/libwrapper-solaris-x86-32.so|pkginfo-says=all|actual-binary=i386 > +CHECKPKG_OVERRIDES_CSWmule += binary-wrong-architecture|file=opt/csw/mule/lib/boot/exec/wrapper-solaris-sparc-32|pkginfo-says=all|actual-binary=sparc > +CHECKPKG_OVERRIDES_CSWmule += binary-wrong-architecture|file=opt/csw/mule/lib/boot/exec/wrapper-solaris-sparc-64|pkginfo-says=all|actual-binary=sparc > +CHECKPKG_OVERRIDES_CSWmule += binary-wrong-architecture|file=opt/csw/mule/lib/boot/exec/wrapper-solaris-x86-32|pkginfo-says=all|actual-binary=i386 Binaries in an arch=all package, why? From maciej at opencsw.org Tue Jun 26 10:49:05 2012 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_=28Matchek=29_Blizi=C5=84ski?=) Date: Tue, 26 Jun 2012 09:49:05 +0100 Subject: [csw-devel] SF.net SVN: gar:[18436] csw/mgar/pkg/tokyocabinet/trunk/Makefile In-Reply-To: References: Message-ID: 2012/6/16 : > ?CHECKPKG_OVERRIDES_CSWlibtokyocabinet9 += file-with-bad-content|/usr/local|root/opt/csw/lib/libtokyocabinet.so.9.10.0 > ?CHECKPKG_OVERRIDES_CSWlibtokyocabinet9 += file-with-bad-content|/usr/local|root/opt/csw/lib/sparcv9/libtokyocabinet.so.9.10.0 > +CHECKPKG_OVERRIDES_CSWlibtokyocabinet9 += file-with-bad-content|/usr/local|root/opt/csw/lib/amd64/libtokyocabinet.so.9.10.0 You can compact the above 3 lines into: CHECKPKG_OVERRIDES_CSWlibtokyocabinet9 += file-with-bad-content ...because you probably mean to override all the file-with-bad-content errors for the CSWlibtokyocabinet9 package. From dmichelsen at users.sourceforge.net Tue Jun 26 10:56:26 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 26 Jun 2012 08:56:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[18534] csw/mgar/pkg/lua/trunk Message-ID: Revision: 18534 http://gar.svn.sourceforge.net/gar/?rev=18534&view=rev Author: dmichelsen Date: 2012-06-26 08:56:26 +0000 (Tue, 26 Jun 2012) Log Message: ----------- lua/trunk: Update to 5.2.1 Modified Paths: -------------- csw/mgar/pkg/lua/trunk/Makefile csw/mgar/pkg/lua/trunk/checksums csw/mgar/pkg/lua/trunk/files/0001-Make-shared-lib.patch Modified: csw/mgar/pkg/lua/trunk/Makefile =================================================================== --- csw/mgar/pkg/lua/trunk/Makefile 2012-06-26 07:59:59 UTC (rev 18533) +++ csw/mgar/pkg/lua/trunk/Makefile 2012-06-26 08:56:26 UTC (rev 18534) @@ -6,7 +6,7 @@ # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=560139 NAME = lua -VERSION = 5.2.0 +VERSION = 5.2.1 CATEGORIES = lang GARTYPE = v2 @@ -22,6 +22,8 @@ PATCHFILES += 0001-Make-shared-lib.patch +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + VENDOR_URL = http://www.lua.org LICENSE = doc/readme.html @@ -44,6 +46,9 @@ REINPLACE_WITH_luaroot = $$1"$(prefix)" REINPLACE_FILES_luaroot += src/luaconf.h +BUILD64 = 1 +ISAEXEC = 1 + # No configure CONFIGURE_SCRIPTS = @@ -60,5 +65,7 @@ INSTALL_ARGS += INSTALL=ginstall INSTALL_ARGS += INSTALL_TOP=$(DESTDIR)$(prefix) INSTALL_ARGS += INSTALL_MAN=$(DESTDIR)$(mandir)/man1 +INSTALL_ARGS += INSTALL_BIN=$(DESTDIR)$(bindir) +INSTALL_ARGS += INSTALL_LIB=$(DESTDIR)$(libdir) include gar/category.mk Modified: csw/mgar/pkg/lua/trunk/checksums =================================================================== --- csw/mgar/pkg/lua/trunk/checksums 2012-06-26 07:59:59 UTC (rev 18533) +++ csw/mgar/pkg/lua/trunk/checksums 2012-06-26 08:56:26 UTC (rev 18534) @@ -1 +1 @@ -f1ea831f397214bae8a265995ab1a93e lua-5.2.0.tar.gz +ae08f641b45d737d12d30291a5e5f6e3 lua-5.2.1.tar.gz Modified: csw/mgar/pkg/lua/trunk/files/0001-Make-shared-lib.patch =================================================================== --- csw/mgar/pkg/lua/trunk/files/0001-Make-shared-lib.patch 2012-06-26 07:59:59 UTC (rev 18533) +++ csw/mgar/pkg/lua/trunk/files/0001-Make-shared-lib.patch 2012-06-26 08:56:26 UTC (rev 18534) @@ -1,6 +1,6 @@ -From 65faf5dfa74ed9349a3b73156e271620ff227d12 Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Thu, 19 Jan 2012 20:34:38 +0100 +From 4acc4fe1ee5ef0370dfdb4198f65709db9b95046 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Tue, 26 Jun 2012 10:17:46 +0200 Subject: [PATCH] Make shared lib --- @@ -9,7 +9,7 @@ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile -index ec53e1a..e553643 100644 +index bd9515f..bb38500 100644 --- a/Makefile +++ b/Makefile @@ -42,6 +42,9 @@ PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris @@ -22,7 +22,7 @@ TO_MAN= lua.1 luac.1 # Lua version and release. -@@ -52,7 +55,7 @@ R= $V.0 +@@ -52,7 +55,7 @@ R= $V.1 all: $(PLAT) $(PLATS) clean: @@ -50,7 +50,7 @@ @echo "INSTALL_TOP= $(INSTALL_TOP)" @echo "INSTALL_BIN= $(INSTALL_BIN)" diff --git a/src/Makefile b/src/Makefile -index bba1693..fdd68b1 100644 +index 8c9ee67..2cc26e1 100644 --- a/src/Makefile +++ b/src/Makefile @@ -29,6 +29,7 @@ MYOBJS= @@ -79,17 +79,17 @@ +so: $(ALL_SO) + $(LUA_A): $(BASE_O) - $(AR) $@ $? + $(AR) $@ $(BASE_O) $(RANLIB) $@ +$(LUA_SO): $(LUA_A) + -rm -f $(LUA_SO) -+ $(CC) -h $(LUA_SO).$(V) -G -o $(LUA_SO).$(R) $(CORE_O) $(LIB_O) ++ $(CC) $(LDFLAGS) -h $(LUA_SO).$(V) -G -o $(LUA_SO).$(R) $(CORE_O) $(LIB_O) + ln -s $(LUA_SO).$(R) $(LUA_SO) + $(LUA_T): $(LUA_O) $(LUA_A) $(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS) -- -1.7.8.3 +1.7.10.3 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Tue Jun 26 11:40:15 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Tue, 26 Jun 2012 09:40:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[18535] csw/mgar/pkg/pilotlink/trunk/Makefile Message-ID: Revision: 18535 http://gar.svn.sourceforge.net/gar/?rev=18535&view=rev Author: pfelecan Date: 2012-06-26 09:40:15 +0000 (Tue, 26 Jun 2012) Log Message: ----------- pilotlink/trunk: - removed unnecessary dependencies and their afferent overrides - do not supply Perl pod file Modified Paths: -------------- csw/mgar/pkg/pilotlink/trunk/Makefile Modified: csw/mgar/pkg/pilotlink/trunk/Makefile =================================================================== --- csw/mgar/pkg/pilotlink/trunk/Makefile 2012-06-26 08:56:26 UTC (rev 18534) +++ csw/mgar/pkg/pilotlink/trunk/Makefile 2012-06-26 09:40:15 UTC (rev 18535) @@ -213,12 +213,10 @@ RUNTIME_DEP_PKGS_CSWlibpitcl0 += CSWlibiconv2 RUNTIME_DEP_PKGS_CSWlibpitcl0 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibpitcl0 += CSWlibpopt0 -RUNTIME_DEP_PKGS_CSWlibpitcl0 += CSWlibz1 RUNTIME_DEP_PKGS_CSWlibpitcl0 += CSWlibpisock9 RUNTIME_DEP_PKGS_CSWlibpitcl0 += CSWtcl LICENCE_CSWlibpitcl0 = COPYING.LIB CHECKPKG_OVERRIDES_CSWlibpitcl0 += bad-rpath-entry|/usr/sfw/lib|opt/csw/lib/libpitcl.so.0.0.0 -CHECKPKG_OVERRIDES_CSWlibpitcl0 += surplus-dependency|CSWlibz1 CHECKPKG_OVERRIDES_CSWlibpitcl0 += surplus-dependency|CSWlibiconv2 CHECKPKG_OVERRIDES_CSWlibpitcl0 += surplus-dependency|CSWlibintl8 @@ -226,7 +224,6 @@ CATALOGNAME_CSWpilot-link-perl = pilot_link_perl SPKG_DESC_CSWpilot-link-perl = $(DESCRIPTION), Perl binding OBSOLETED_BY_CSWpilot-link-perl = CSWpilotlink -PKGFILES_CSWpilot-link-perl += /opt/csw/lib/perl/5.10.1/perllocal.pod PKGFILES_CSWpilot-link-perl += /opt/csw/lib/perl/csw/PDA/Pilot.pm PKGFILES_CSWpilot-link-perl += /opt/csw/lib/perl/csw/PDA/dump.pl PKGFILES_CSWpilot-link-perl += /opt/csw/lib/perl/csw/auto/PDA/Pilot/.packlist @@ -235,9 +232,6 @@ PKGFILES_CSWpilot-link-perl += /opt/csw/lib/perl/csw/auto/PDA/Pilot/autosplit.ix RUNTIME_DEP_PKGS_CSWpilot-link-perl += CSWlibpisock9 RUNTIME_DEP_PKGS_CSWpilot-link-perl += CSWperl -RUNTIME_DEP_PKGS_CSWpilot-link-perl += CSWlibz1 -CHECKPKG_OVERRIDES_CSWpilot-link-perl+= perllocal-pod-in-pkgmap|/opt/csw/lib/perl/5.10.1/perllocal.pod -CHECKPKG_OVERRIDES_CSWpilot-link-perl+= surplus-dependency|CSWlibz1 PACKAGES += CSWpilot-link-python CATALOGNAME_CSWpilot-link-python = pilot_link_python @@ -303,6 +297,8 @@ ginstall --directory --mode=u=rwx,go=rx $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man7 cd $(WORKSRC) && ginstall --preserve-timestamps --mode=u=rw,go=r doc/man/*.1 $(DESTDIR)$(mandir)/man1 cd $(WORKSRC) && ginstall --preserve-timestamps --mode=u=rw,go=r doc/man/*.7 $(DESTDIR)$(mandir)/man7 + rm -rf $(DESTDIR)$(perllib)/5* + $(MAKECOOKIE) # this is private and not available publicly mydependencies: 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 26 12:07:37 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 26 Jun 2012 10:07:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[18536] csw/mgar/pkg/libldns/trunk/Makefile Message-ID: Revision: 18536 http://gar.svn.sourceforge.net/gar/?rev=18536&view=rev Author: dmichelsen Date: 2012-06-26 10:07:37 +0000 (Tue, 26 Jun 2012) Log Message: ----------- libldns/trunk: Remove specific additions of ISAs which are now the default Modified Paths: -------------- csw/mgar/pkg/libldns/trunk/Makefile Modified: csw/mgar/pkg/libldns/trunk/Makefile =================================================================== --- csw/mgar/pkg/libldns/trunk/Makefile 2012-06-26 09:40:15 UTC (rev 18535) +++ csw/mgar/pkg/libldns/trunk/Makefile 2012-06-26 10:07:37 UTC (rev 18536) @@ -37,8 +37,6 @@ LICENSE = LICENSE BUILD64 = 1 -EXTRA_BUILD_ISAS_i386 = pentium_pro -EXTRA_BUILD_ISAS_sparc = sparcv8plus EXTRA_BUILD_ISAS_sparc += sparcv8plus+vis RUNTIME_DEP_PKGS_CSWlibldns1 += CSWlibssl1-0-0 @@ -54,9 +52,7 @@ CONFIGURE_ARGS += --enable-sha2 MERGE_DIRS_isa-sparcv9 = $(libdir) -MERGE_DIRS_isa-sparcv8plus = $(libdir) MERGE_DIRS_isa-amd64 = $(libdir) -MERGE_DIRS_isa-pentium_pro = $(libdir) TEST_TARGET = This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Tue Jun 26 13:25:04 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Tue, 26 Jun 2012 11:25:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[18537] csw/mgar/pkg Message-ID: Revision: 18537 http://gar.svn.sourceforge.net/gar/?rev=18537&view=rev Author: pfelecan Date: 2012-06-26 11:25:04 +0000 (Tue, 26 Jun 2012) Log Message: ----------- tex_dirtree/trunk: migrated from a private recipe to a GAR based recipe. Added Paths: ----------- csw/mgar/pkg/tex_dirtree/ csw/mgar/pkg/tex_dirtree/Makefile csw/mgar/pkg/tex_dirtree/branches/ csw/mgar/pkg/tex_dirtree/tags/ csw/mgar/pkg/tex_dirtree/trunk/ csw/mgar/pkg/tex_dirtree/trunk/Makefile csw/mgar/pkg/tex_dirtree/trunk/checksums csw/mgar/pkg/tex_dirtree/trunk/files/ Added: csw/mgar/pkg/tex_dirtree/Makefile =================================================================== --- csw/mgar/pkg/tex_dirtree/Makefile (rev 0) +++ csw/mgar/pkg/tex_dirtree/Makefile 2012-06-26 11:25:04 UTC (rev 18537) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/tex_dirtree/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/tex_dirtree/trunk/Makefile =================================================================== --- csw/mgar/pkg/tex_dirtree/trunk/Makefile (rev 0) +++ csw/mgar/pkg/tex_dirtree/trunk/Makefile 2012-06-26 11:25:04 UTC (rev 18537) @@ -0,0 +1,79 @@ +# $Id$ + +NAME = tex_dirtree +VERSION = 0.2 +GARTYPE = v2 +CATEGORIES = xtra + +DESCRIPTION = Draws Windows Explorer style trees for Plain TeX and LaTeX +define BLURB + The dirtree package provide a TeX macro to typeset directory trees like + in windows explorator. +endef + +DISTNAME = dirtree +MASTER_SITES = http://mirror.ctan.org/macros/generic/ +DISTFILES = $(DISTNAME).zip + +RUNTIME_DEP_PKGS += CSWtetex + +PACKAGES = CSWtex-dirtree +SPKG_DESC_CSWtex-dirtree = $(DESCRIPTION) +CATALOGNAME_CSWtex-dirtree = tex_dirtree +OBSOLETED_BY_CSWtex-dirtree = CSWtexdirtree +CATALOGNAME_CSWtexdirtree = tex_dirtree_stub +ARCHALL_CSWtex-dirtree = 1 + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = custom +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +include gar/category.mk + +texdir = $(texmflocaldir)/tex/latex/dirtree +texmf = \ + $(WORKSRC)/dirtree.sty \ + $(WORKSRC)/dirtree.tex + +build-custom: \ + $(texmf) \ + doc + $(MAKECOOKIE) + +$(texmf): \ + $(WORKSRC)/dirtree.ins \ + $(WORKSRC)/dirtree.dtx + cd $(WORKSRC) && latex dirtree.ins + +doc: \ + $(WORKSRC)/dirtree.dvi \ + $(WORKSRC)/dirtree.ps \ + $(WORKSRC)/dirtree.pdf + : $@ done + +$(WORKSRC)/dirtree.dvi: \ + $(texmf) + cd $(WORKSRC) && latex dirtree.dtx + cd $(WORKSRC) && makeindex -s gind.ist dirtree + cd $(WORKSRC) && makeindex -s gglo.ist -o dirtree.gls dirtree.glo + cd $(WORKSRC) && latex dirtree.dtx + +$(WORKSRC)/dirtree.ps: \ + $(WORKSRC)/dirtree.dvi + cd $(WORKSRC) && dvips dirtree + +$(WORKSRC)/dirtree.pdf: \ + $(WORKSRC)/dirtree.ps + cd $(WORKSRC) && ps2pdf dirtree.ps dirtree.pdf + +install-custom: pkgdocdir = $(docdir)$(NAME) +install-custom: + ginstall --directory --mode=u=rwx,go=rx $(DESTDIR)/$(texdir) + ginstall --preserve-timestamps --mode=u=rwx,go=r $(WORKSRC)/dirtree.sty $(DESTDIR)/$(texdir) + ginstall --preserve-timestamps --mode=u=rwx,go=r $(WORKSRC)/dirtree.tex $(DESTDIR)/$(texdir) + ginstall --directory --mode=u=rwx,go=rx $(DESTDIR)/$(pkgdocdir) + ginstall --preserve-timestamps --mode=u=rwx,go=r $(WORKSRC)/dirtree.dvi $(DESTDIR)/$(pkgdocdir) + ginstall --preserve-timestamps --mode=u=rwx,go=r $(WORKSRC)/dirtree.ps $(DESTDIR)/$(pkgdocdir) + ginstall --preserve-timestamps --mode=u=rwx,go=r $(WORKSRC)/dirtree.pdf $(DESTDIR)/$(pkgdocdir) + $(MAKECOOKIE) Property changes on: csw/mgar/pkg/tex_dirtree/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/tex_dirtree/trunk/checksums =================================================================== --- csw/mgar/pkg/tex_dirtree/trunk/checksums (rev 0) +++ csw/mgar/pkg/tex_dirtree/trunk/checksums 2012-06-26 11:25:04 UTC (rev 18537) @@ -0,0 +1 @@ +2b7dcb51abbd515d5a9a2032e04f1853 dirtree.zip This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Tue Jun 26 13:31:14 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Tue, 26 Jun 2012 11:31:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[18538] csw/mgar/pkg/tex_dirtree/trunk/Makefile Message-ID: Revision: 18538 http://gar.svn.sourceforge.net/gar/?rev=18538&view=rev Author: pfelecan Date: 2012-06-26 11:31:13 +0000 (Tue, 26 Jun 2012) Log Message: ----------- tex_dirtree/trunk: corrected the documentation directory name Modified Paths: -------------- csw/mgar/pkg/tex_dirtree/trunk/Makefile Modified: csw/mgar/pkg/tex_dirtree/trunk/Makefile =================================================================== --- csw/mgar/pkg/tex_dirtree/trunk/Makefile 2012-06-26 11:25:04 UTC (rev 18537) +++ csw/mgar/pkg/tex_dirtree/trunk/Makefile 2012-06-26 11:31:13 UTC (rev 18538) @@ -67,7 +67,7 @@ $(WORKSRC)/dirtree.ps cd $(WORKSRC) && ps2pdf dirtree.ps dirtree.pdf -install-custom: pkgdocdir = $(docdir)$(NAME) +install-custom: pkgdocdir = $(docdir)/$(NAME) install-custom: ginstall --directory --mode=u=rwx,go=rx $(DESTDIR)/$(texdir) ginstall --preserve-timestamps --mode=u=rwx,go=r $(WORKSRC)/dirtree.sty $(DESTDIR)/$(texdir) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Tue Jun 26 13:36:47 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Tue, 26 Jun 2012 11:36:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[18539] csw/mgar/pkg/cswclassutils/trunk/files/ CSWcswclassutils.i.cswtexhash Message-ID: Revision: 18539 http://gar.svn.sourceforge.net/gar/?rev=18539&view=rev Author: pfelecan Date: 2012-06-26 11:36:46 +0000 (Tue, 26 Jun 2012) Log Message: ----------- cswclassutils/trunk: echo components when installed in texhash installation script Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswtexhash Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswtexhash =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswtexhash 2012-06-26 11:31:13 UTC (rev 18538) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswtexhash 2012-06-26 11:36:46 UTC (rev 18539) @@ -10,7 +10,7 @@ echo "Installing class ..." while read src dest; do - + echo $dest /usr/bin/cp $src $dest || exit 2 done This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Tue Jun 26 13:57:42 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Tue, 26 Jun 2012 11:57:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[18540] csw/mgar/pkg/tex_dirtree/trunk/Makefile Message-ID: Revision: 18540 http://gar.svn.sourceforge.net/gar/?rev=18540&view=rev Author: pfelecan Date: 2012-06-26 11:57:42 +0000 (Tue, 26 Jun 2012) Log Message: ----------- tex_dirtree/trunk: - verified and validated overrides - added the corresponding licence (LPPL) Modified Paths: -------------- csw/mgar/pkg/tex_dirtree/trunk/Makefile Modified: csw/mgar/pkg/tex_dirtree/trunk/Makefile =================================================================== --- csw/mgar/pkg/tex_dirtree/trunk/Makefile 2012-06-26 11:36:46 UTC (rev 18539) +++ csw/mgar/pkg/tex_dirtree/trunk/Makefile 2012-06-26 11:57:42 UTC (rev 18540) @@ -14,6 +14,9 @@ DISTNAME = dirtree MASTER_SITES = http://mirror.ctan.org/macros/generic/ DISTFILES = $(DISTNAME).zip +# taken from http://www.latex-project.org/lppl.txt +LICENCE = lppl.txt +DISTFILES += $(LICENCE) RUNTIME_DEP_PKGS += CSWtetex @@ -23,6 +26,7 @@ OBSOLETED_BY_CSWtex-dirtree = CSWtexdirtree CATALOGNAME_CSWtexdirtree = tex_dirtree_stub ARCHALL_CSWtex-dirtree = 1 +CHECKPKG_OVERRIDES_CSWtex-dirtree += surplus-dependency|CSWtetex CONFIGURE_SCRIPTS = BUILD_SCRIPTS = custom @@ -76,4 +80,5 @@ ginstall --preserve-timestamps --mode=u=rwx,go=r $(WORKSRC)/dirtree.dvi $(DESTDIR)/$(pkgdocdir) ginstall --preserve-timestamps --mode=u=rwx,go=r $(WORKSRC)/dirtree.ps $(DESTDIR)/$(pkgdocdir) ginstall --preserve-timestamps --mode=u=rwx,go=r $(WORKSRC)/dirtree.pdf $(DESTDIR)/$(pkgdocdir) + ginstall --preserve-timestamps --mode=u=rwx,go=r $(WORKDIR)/$(LICENCE) $(DESTDIR)/$(pkgdocdir) $(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Tue Jun 26 14:13:31 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Tue, 26 Jun 2012 12:13:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[18541] csw/mgar/pkg Message-ID: Revision: 18541 http://gar.svn.sourceforge.net/gar/?rev=18541&view=rev Author: cgrzemba Date: 2012-06-26 12:13:30 +0000 (Tue, 26 Jun 2012) Log Message: ----------- clutter/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/clutter/ csw/mgar/pkg/clutter/Makefile csw/mgar/pkg/clutter/branches/ csw/mgar/pkg/clutter/tags/ csw/mgar/pkg/clutter/trunk/ csw/mgar/pkg/clutter/trunk/Makefile csw/mgar/pkg/clutter/trunk/checksums csw/mgar/pkg/clutter/trunk/files/ Added: csw/mgar/pkg/clutter/Makefile =================================================================== --- csw/mgar/pkg/clutter/Makefile (rev 0) +++ csw/mgar/pkg/clutter/Makefile 2012-06-26 12:13:30 UTC (rev 18541) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/clutter/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/clutter/trunk/Makefile =================================================================== --- csw/mgar/pkg/clutter/trunk/Makefile (rev 0) +++ csw/mgar/pkg/clutter/trunk/Makefile 2012-06-26 12:13:30 UTC (rev 18541) @@ -0,0 +1,30 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = clutter +VERSION = 1.11.4 +SUBDIR=$(basename $(VERSION)) +GARTYPE = v2 +CATEGORIES = gnome + +DESCRIPTION = Brief description +define BLURB + Long description +endef + +MASTER_SITES = http://source.clutter-project.org/sources/clutter/$(SUBDIR) +DISTFILES = $(DISTNAME).tar.bz2 + +# File name regex to get notifications about upstream software releases +# NOTE: Use this only if the automatic regex creation +# does not work for your package +# 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/clutter/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/clutter/trunk/checksums =================================================================== --- csw/mgar/pkg/clutter/trunk/checksums (rev 0) +++ csw/mgar/pkg/clutter/trunk/checksums 2012-06-26 12:13:30 UTC (rev 18541) @@ -0,0 +1 @@ +65ef744c6bdec1a54ae42147bf16927c clutter-1.11.4.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Tue Jun 26 14:20:00 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Tue, 26 Jun 2012 12:20:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[18542] csw/mgar/pkg/tex_dirtree/trunk/files/lppl.txt Message-ID: Revision: 18542 http://gar.svn.sourceforge.net/gar/?rev=18542&view=rev Author: pfelecan Date: 2012-06-26 12:20:00 +0000 (Tue, 26 Jun 2012) Log Message: ----------- tex_dirtree/trunk: really added the corresponding licence (LPPL) Added Paths: ----------- csw/mgar/pkg/tex_dirtree/trunk/files/lppl.txt Added: csw/mgar/pkg/tex_dirtree/trunk/files/lppl.txt =================================================================== --- csw/mgar/pkg/tex_dirtree/trunk/files/lppl.txt (rev 0) +++ csw/mgar/pkg/tex_dirtree/trunk/files/lppl.txt 2012-06-26 12:20:00 UTC (rev 18542) @@ -0,0 +1,416 @@ +The LaTeX Project Public License +=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- + +LPPL Version 1.3c 2008-05-04 + +Copyright 1999 2002-2008 LaTeX3 Project + Everyone is allowed to distribute verbatim copies of this + license document, but modification of it is not allowed. + + +PREAMBLE +======== + +The LaTeX Project Public License (LPPL) is the primary license under +which the LaTeX kernel and the base LaTeX packages are distributed. + +You may use this license for any work of which you hold the copyright +and which you wish to distribute. This license may be particularly +suitable if your work is TeX-related (such as a LaTeX package), but +it is written in such a way that you can use it even if your work is +unrelated to TeX. + +The section `WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE', +below, gives instructions, examples, and recommendations for authors +who are considering distributing their works under this license. + +This license gives conditions under which a work may be distributed +and modified, as well as conditions under which modified versions of +that work may be distributed. + +We, the LaTeX3 Project, believe that the conditions below give you +the freedom to make and distribute modified versions of your work +that conform with whatever technical specifications you wish while +maintaining the availability, integrity, and reliability of +that work. If you do not see how to achieve your goal while +meeting these conditions, then read the document `cfgguide.tex' +and `modguide.tex' in the base LaTeX distribution for suggestions. + + +DEFINITIONS +=========== + +In this license document the following terms are used: + + `Work' + Any work being distributed under this License. + + `Derived Work' + Any work that under any applicable law is derived from the Work. + + `Modification' + Any procedure that produces a Derived Work under any applicable + law -- for example, the production of a file containing an + original file associated with the Work or a significant portion of + such a file, either verbatim or with modifications and/or + translated into another language. + + `Modify' + To apply any procedure that produces a Derived Work under any + applicable law. + + `Distribution' + Making copies of the Work available from one person to another, in + whole or in part. Distribution includes (but is not limited to) + making any electronic components of the Work accessible by + file transfer protocols such as FTP or HTTP or by shared file + systems such as Sun's Network File System (NFS). + + `Compiled Work' + A version of the Work that has been processed into a form where it + is directly usable on a computer system. This processing may + include using installation facilities provided by the Work, + transformations of the Work, copying of components of the Work, or + other activities. Note that modification of any installation + facilities provided by the Work constitutes modification of the Work. + + `Current Maintainer' + A person or persons nominated as such within the Work. If there is + no such explicit nomination then it is the `Copyright Holder' under + any applicable law. + + `Base Interpreter' + A program or process that is normally needed for running or + interpreting a part or the whole of the Work. + + A Base Interpreter may depend on external components but these + are not considered part of the Base Interpreter provided that each + external component clearly identifies itself whenever it is used + interactively. Unless explicitly specified when applying the + license to the Work, the only applicable Base Interpreter is a + `LaTeX-Format' or in the case of files belonging to the + `LaTeX-format' a program implementing the `TeX language'. + + + +CONDITIONS ON DISTRIBUTION AND MODIFICATION +=========================================== + +1. Activities other than distribution and/or modification of the Work +are not covered by this license; they are outside its scope. In +particular, the act of running the Work is not restricted and no +requirements are made concerning any offers of support for the Work. + +2. You may distribute a complete, unmodified copy of the Work as you +received it. Distribution of only part of the Work is considered +modification of the Work, and no right to distribute such a Derived +Work may be assumed under the terms of this clause. + +3. You may distribute a Compiled Work that has been generated from a +complete, unmodified copy of the Work as distributed under Clause 2 +above, as long as that Compiled Work is distributed in such a way that +the recipients may install the Compiled Work on their system exactly +as it would have been installed if they generated a Compiled Work +directly from the Work. + +4. If you are the Current Maintainer of the Work, you may, without +restriction, modify the Work, thus creating a Derived Work. You may +also distribute the Derived Work without restriction, including +Compiled Works generated from the Derived Work. Derived Works +distributed in this manner by the Current Maintainer are considered to +be updated versions of the Work. + +5. If you are not the Current Maintainer of the Work, you may modify +your copy of the Work, thus creating a Derived Work based on the Work, +and compile this Derived Work, thus creating a Compiled Work based on +the Derived Work. + +6. If you are not the Current Maintainer of the Work, you may +distribute a Derived Work provided the following conditions are met +for every component of the Work unless that component clearly states +in the copyright notice that it is exempt from that condition. Only +the Current Maintainer is allowed to add such statements of exemption +to a component of the Work. + + a. If a component of this Derived Work can be a direct replacement + for a component of the Work when that component is used with the + Base Interpreter, then, wherever this component of the Work + identifies itself to the user when used interactively with that + Base Interpreter, the replacement component of this Derived Work + clearly and unambiguously identifies itself as a modified version + of this component to the user when used interactively with that + Base Interpreter. + + b. Every component of the Derived Work contains prominent notices + detailing the nature of the changes to that component, or a + prominent reference to another file that is distributed as part + of the Derived Work and that contains a complete and accurate log + of the changes. + + c. No information in the Derived Work implies that any persons, + including (but not limited to) the authors of the original version + of the Work, provide any support, including (but not limited to) + the reporting and handling of errors, to recipients of the + Derived Work unless those persons have stated explicitly that + they do provide such support for the Derived Work. + + d. You distribute at least one of the following with the Derived Work: + + 1. A complete, unmodified copy of the Work; + if your distribution of a modified component is made by + offering access to copy the modified component from a + designated place, then offering equivalent access to copy + the Work from the same or some similar place meets this + condition, even though third parties are not compelled to + copy the Work along with the modified component; + + 2. Information that is sufficient to obtain a complete, + unmodified copy of the Work. + +7. If you are not the Current Maintainer of the Work, you may +distribute a Compiled Work generated from a Derived Work, as long as +the Derived Work is distributed to all recipients of the Compiled +Work, and as long as the conditions of Clause 6, above, are met with +regard to the Derived Work. + +8. The conditions above are not intended to prohibit, and hence do not +apply to, the modification, by any method, of any component so that it +becomes identical to an updated version of that component of the Work as +it is distributed by the Current Maintainer under Clause 4, above. + +9. Distribution of the Work or any Derived Work in an alternative +format, where the Work or that Derived Work (in whole or in part) is +then produced by applying some process to that format, does not relax or +nullify any sections of this license as they pertain to the results of +applying that process. + +10. a. A Derived Work may be distributed under a different license + provided that license itself honors the conditions listed in + Clause 6 above, in regard to the Work, though it does not have + to honor the rest of the conditions in this license. + + b. If a Derived Work is distributed under a different license, that + Derived Work must provide sufficient documentation as part of + itself to allow each recipient of that Derived Work to honor the + restrictions in Clause 6 above, concerning changes from the Work. + +11. This license places no restrictions on works that are unrelated to +the Work, nor does this license place any restrictions on aggregating +such works with the Work by any means. + +12. Nothing in this license is intended to, or may be used to, prevent +complete compliance by all parties with all applicable laws. + + +NO WARRANTY +=========== + +There is no warranty for the Work. Except when otherwise stated in +writing, the Copyright Holder provides the Work `as is', without +warranty of any kind, either expressed or implied, including, but not +limited to, the implied warranties of merchantability and fitness for a +particular purpose. The entire risk as to the quality and performance +of the Work is with you. Should the Work prove defective, you assume +the cost of all necessary servicing, repair, or correction. + +In no event unless required by applicable law or agreed to in writing +will The Copyright Holder, or any author named in the components of the +Work, or any other party who may distribute and/or modify the Work as +permitted above, be liable to you for damages, including any general, +special, incidental or consequential damages arising out of any use of +the Work or out of inability to use the Work (including, but not limited +to, loss of data, data being rendered inaccurate, or losses sustained by +anyone as a result of any failure of the Work to operate with any other +programs), even if the Copyright Holder or said author or said other +party has been advised of the possibility of such damages. + + +MAINTENANCE OF THE WORK +======================= + +The Work has the status `author-maintained' if the Copyright Holder +explicitly and prominently states near the primary copyright notice in +the Work that the Work can only be maintained by the Copyright Holder +or simply that it is `author-maintained'. + +The Work has the status `maintained' if there is a Current Maintainer +who has indicated in the Work that they are willing to receive error +reports for the Work (for example, by supplying a valid e-mail +address). It is not required for the Current Maintainer to acknowledge +or act upon these error reports. + +The Work changes from status `maintained' to `unmaintained' if there +is no Current Maintainer, or the person stated to be Current +Maintainer of the work cannot be reached through the indicated means +of communication for a period of six months, and there are no other +significant signs of active maintenance. + +You can become the Current Maintainer of the Work by agreement with +any existing Current Maintainer to take over this role. + +If the Work is unmaintained, you can become the Current Maintainer of +the Work through the following steps: + + 1. Make a reasonable attempt to trace the Current Maintainer (and + the Copyright Holder, if the two differ) through the means of + an Internet or similar search. + + 2. If this search is successful, then enquire whether the Work + is still maintained. + + a. If it is being maintained, then ask the Current Maintainer + to update their communication data within one month. + + b. If the search is unsuccessful or no action to resume active + maintenance is taken by the Current Maintainer, then announce + within the pertinent community your intention to take over + maintenance. (If the Work is a LaTeX work, this could be + done, for example, by posting to comp.text.tex.) + + 3a. If the Current Maintainer is reachable and agrees to pass + maintenance of the Work to you, then this takes effect + immediately upon announcement. + + b. If the Current Maintainer is not reachable and the Copyright + Holder agrees that maintenance of the Work be passed to you, + then this takes effect immediately upon announcement. + + 4. If you make an `intention announcement' as described in 2b. above + and after three months your intention is challenged neither by + the Current Maintainer nor by the Copyright Holder nor by other + people, then you may arrange for the Work to be changed so as + to name you as the (new) Current Maintainer. + + 5. If the previously unreachable Current Maintainer becomes + reachable once more within three months of a change completed + under the terms of 3b) or 4), then that Current Maintainer must + become or remain the Current Maintainer upon request provided + they then update their communication data within one month. + +A change in the Current Maintainer does not, of itself, alter the fact +that the Work is distributed under the LPPL license. + +If you become the Current Maintainer of the Work, you should +immediately provide, within the Work, a prominent and unambiguous +statement of your status as Current Maintainer. You should also +announce your new status to the same pertinent community as +in 2b) above. + + +WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE +====================================================== + +This section contains important instructions, examples, and +recommendations for authors who are considering distributing their +works under this license. These authors are addressed as `you' in +this section. + +Choosing This License or Another License +---------------------------------------- + +If for any part of your work you want or need to use *distribution* +conditions that differ significantly from those in this license, then +do not refer to this license anywhere in your work but, instead, +distribute your work under a different license. You may use the text +of this license as a model for your own license, but your license +should not refer to the LPPL or otherwise give the impression that +your work is distributed under the LPPL. + +The document `modguide.tex' in the base LaTeX distribution explains +the motivation behind the conditions of this license. It explains, +for example, why distributing LaTeX under the GNU General Public +License (GPL) was considered inappropriate. Even if your work is +unrelated to LaTeX, the discussion in `modguide.tex' may still be +relevant, and authors intending to distribute their works under any +license are encouraged to read it. + +A Recommendation on Modification Without Distribution +----------------------------------------------------- + +It is wise never to modify a component of the Work, even for your own +personal use, without also meeting the above conditions for +distributing the modified component. While you might intend that such +modifications will never be distributed, often this will happen by +accident -- you may forget that you have modified that component; or +it may not occur to you when allowing others to access the modified +version that you are thus distributing it and violating the conditions +of this license in ways that could have legal implications and, worse, +cause problems for the community. It is therefore usually in your +best interest to keep your copy of the Work identical with the public +one. Many works provide ways to control the behavior of that work +without altering any of its licensed components. + +How to Use This License +----------------------- + +To use this license, place in each of the components of your work both +an explicit copyright notice including your name and the year the work +was authored and/or last substantially modified. Include also a +statement that the distribution and/or modification of that +component is constrained by the conditions in this license. + +Here is an example of such a notice and statement: + + %% pig.dtx + %% Copyright 2005 M. Y. Name + % + % This work may be distributed and/or modified under the + % conditions of the LaTeX Project Public License, either version 1.3 + % of this license or (at your option) any later version. + % The latest version of this license is in + % http://www.latex-project.org/lppl.txt + % and version 1.3 or later is part of all distributions of LaTeX + % version 2005/12/01 or later. + % + % This work has the LPPL maintenance status `maintained'. + % + % The Current Maintainer of this work is M. Y. Name. + % + % This work consists of the files pig.dtx and pig.ins + % and the derived file pig.sty. + +Given such a notice and statement in a file, the conditions +given in this license document would apply, with the `Work' referring +to the three files `pig.dtx', `pig.ins', and `pig.sty' (the last being +generated from `pig.dtx' using `pig.ins'), the `Base Interpreter' +referring to any `LaTeX-Format', and both `Copyright Holder' and +`Current Maintainer' referring to the person `M. Y. Name'. + +If you do not want the Maintenance section of LPPL to apply to your +Work, change `maintained' above into `author-maintained'. +However, we recommend that you use `maintained', as the Maintenance +section was added in order to ensure that your Work remains useful to +the community even when you can no longer maintain and support it +yourself. + +Derived Works That Are Not Replacements +--------------------------------------- + +Several clauses of the LPPL specify means to provide reliability and +stability for the user community. They therefore concern themselves +with the case that a Derived Work is intended to be used as a +(compatible or incompatible) replacement of the original Work. If +this is not the case (e.g., if a few lines of code are reused for a +completely different task), then clauses 6b and 6d shall not apply. + + +Important Recommendations +------------------------- + + Defining What Constitutes the Work + + The LPPL requires that distributions of the Work contain all the + files of the Work. It is therefore important that you provide a + way for the licensee to determine which files constitute the Work. + This could, for example, be achieved by explicitly listing all the + files of the Work near the copyright notice of each file or by + using a line such as: + + % This work consists of all files listed in manifest.txt. + + in that place. In the absence of an unequivocal list it might be + impossible for the licensee to determine what is considered by you + to comprise the Work and, in such a case, the licensee would be + entitled to make reasonable conjectures as to which files comprise + the Work. + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Tue Jun 26 14:30:20 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Tue, 26 Jun 2012 12:30:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[18543] csw/mgar/pkg/tex_dirtree/trunk Message-ID: Revision: 18543 http://gar.svn.sourceforge.net/gar/?rev=18543&view=rev Author: pfelecan Date: 2012-06-26 12:30:20 +0000 (Tue, 26 Jun 2012) Log Message: ----------- tex_dirtree/trunk: manage the licence in the recommended way... Modified Paths: -------------- csw/mgar/pkg/tex_dirtree/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/tex_dirtree/trunk/files/COPYING Removed Paths: ------------- csw/mgar/pkg/tex_dirtree/trunk/files/lppl.txt Modified: csw/mgar/pkg/tex_dirtree/trunk/Makefile =================================================================== --- csw/mgar/pkg/tex_dirtree/trunk/Makefile 2012-06-26 12:20:00 UTC (rev 18542) +++ csw/mgar/pkg/tex_dirtree/trunk/Makefile 2012-06-26 12:30:20 UTC (rev 18543) @@ -15,8 +15,7 @@ MASTER_SITES = http://mirror.ctan.org/macros/generic/ DISTFILES = $(DISTNAME).zip # taken from http://www.latex-project.org/lppl.txt -LICENCE = lppl.txt -DISTFILES += $(LICENCE) +DISTFILES += COPYING RUNTIME_DEP_PKGS += CSWtetex @@ -80,5 +79,4 @@ ginstall --preserve-timestamps --mode=u=rwx,go=r $(WORKSRC)/dirtree.dvi $(DESTDIR)/$(pkgdocdir) ginstall --preserve-timestamps --mode=u=rwx,go=r $(WORKSRC)/dirtree.ps $(DESTDIR)/$(pkgdocdir) ginstall --preserve-timestamps --mode=u=rwx,go=r $(WORKSRC)/dirtree.pdf $(DESTDIR)/$(pkgdocdir) - ginstall --preserve-timestamps --mode=u=rwx,go=r $(WORKDIR)/$(LICENCE) $(DESTDIR)/$(pkgdocdir) $(MAKECOOKIE) Copied: csw/mgar/pkg/tex_dirtree/trunk/files/COPYING (from rev 18542, csw/mgar/pkg/tex_dirtree/trunk/files/lppl.txt) =================================================================== --- csw/mgar/pkg/tex_dirtree/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/tex_dirtree/trunk/files/COPYING 2012-06-26 12:30:20 UTC (rev 18543) @@ -0,0 +1,416 @@ +The LaTeX Project Public License +=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- + +LPPL Version 1.3c 2008-05-04 + +Copyright 1999 2002-2008 LaTeX3 Project + Everyone is allowed to distribute verbatim copies of this + license document, but modification of it is not allowed. + + +PREAMBLE +======== + +The LaTeX Project Public License (LPPL) is the primary license under +which the LaTeX kernel and the base LaTeX packages are distributed. + +You may use this license for any work of which you hold the copyright +and which you wish to distribute. This license may be particularly +suitable if your work is TeX-related (such as a LaTeX package), but +it is written in such a way that you can use it even if your work is +unrelated to TeX. + +The section `WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE', +below, gives instructions, examples, and recommendations for authors +who are considering distributing their works under this license. + +This license gives conditions under which a work may be distributed +and modified, as well as conditions under which modified versions of +that work may be distributed. + +We, the LaTeX3 Project, believe that the conditions below give you +the freedom to make and distribute modified versions of your work +that conform with whatever technical specifications you wish while +maintaining the availability, integrity, and reliability of +that work. If you do not see how to achieve your goal while +meeting these conditions, then read the document `cfgguide.tex' +and `modguide.tex' in the base LaTeX distribution for suggestions. + + +DEFINITIONS +=========== + +In this license document the following terms are used: + + `Work' + Any work being distributed under this License. + + `Derived Work' + Any work that under any applicable law is derived from the Work. + + `Modification' + Any procedure that produces a Derived Work under any applicable + law -- for example, the production of a file containing an + original file associated with the Work or a significant portion of + such a file, either verbatim or with modifications and/or + translated into another language. + + `Modify' + To apply any procedure that produces a Derived Work under any + applicable law. + + `Distribution' + Making copies of the Work available from one person to another, in + whole or in part. Distribution includes (but is not limited to) + making any electronic components of the Work accessible by + file transfer protocols such as FTP or HTTP or by shared file + systems such as Sun's Network File System (NFS). + + `Compiled Work' + A version of the Work that has been processed into a form where it + is directly usable on a computer system. This processing may + include using installation facilities provided by the Work, + transformations of the Work, copying of components of the Work, or + other activities. Note that modification of any installation + facilities provided by the Work constitutes modification of the Work. + + `Current Maintainer' + A person or persons nominated as such within the Work. If there is + no such explicit nomination then it is the `Copyright Holder' under + any applicable law. + + `Base Interpreter' + A program or process that is normally needed for running or + interpreting a part or the whole of the Work. + + A Base Interpreter may depend on external components but these + are not considered part of the Base Interpreter provided that each + external component clearly identifies itself whenever it is used + interactively. Unless explicitly specified when applying the + license to the Work, the only applicable Base Interpreter is a + `LaTeX-Format' or in the case of files belonging to the + `LaTeX-format' a program implementing the `TeX language'. + + + +CONDITIONS ON DISTRIBUTION AND MODIFICATION +=========================================== + +1. Activities other than distribution and/or modification of the Work +are not covered by this license; they are outside its scope. In +particular, the act of running the Work is not restricted and no +requirements are made concerning any offers of support for the Work. + +2. You may distribute a complete, unmodified copy of the Work as you +received it. Distribution of only part of the Work is considered +modification of the Work, and no right to distribute such a Derived +Work may be assumed under the terms of this clause. + +3. You may distribute a Compiled Work that has been generated from a +complete, unmodified copy of the Work as distributed under Clause 2 +above, as long as that Compiled Work is distributed in such a way that +the recipients may install the Compiled Work on their system exactly +as it would have been installed if they generated a Compiled Work +directly from the Work. + +4. If you are the Current Maintainer of the Work, you may, without +restriction, modify the Work, thus creating a Derived Work. You may +also distribute the Derived Work without restriction, including +Compiled Works generated from the Derived Work. Derived Works +distributed in this manner by the Current Maintainer are considered to +be updated versions of the Work. + +5. If you are not the Current Maintainer of the Work, you may modify +your copy of the Work, thus creating a Derived Work based on the Work, +and compile this Derived Work, thus creating a Compiled Work based on +the Derived Work. + +6. If you are not the Current Maintainer of the Work, you may +distribute a Derived Work provided the following conditions are met +for every component of the Work unless that component clearly states +in the copyright notice that it is exempt from that condition. Only +the Current Maintainer is allowed to add such statements of exemption +to a component of the Work. + + a. If a component of this Derived Work can be a direct replacement + for a component of the Work when that component is used with the + Base Interpreter, then, wherever this component of the Work + identifies itself to the user when used interactively with that + Base Interpreter, the replacement component of this Derived Work + clearly and unambiguously identifies itself as a modified version + of this component to the user when used interactively with that + Base Interpreter. + + b. Every component of the Derived Work contains prominent notices + detailing the nature of the changes to that component, or a + prominent reference to another file that is distributed as part + of the Derived Work and that contains a complete and accurate log + of the changes. + + c. No information in the Derived Work implies that any persons, + including (but not limited to) the authors of the original version + of the Work, provide any support, including (but not limited to) + the reporting and handling of errors, to recipients of the + Derived Work unless those persons have stated explicitly that + they do provide such support for the Derived Work. + + d. You distribute at least one of the following with the Derived Work: + + 1. A complete, unmodified copy of the Work; + if your distribution of a modified component is made by + offering access to copy the modified component from a + designated place, then offering equivalent access to copy + the Work from the same or some similar place meets this + condition, even though third parties are not compelled to + copy the Work along with the modified component; + + 2. Information that is sufficient to obtain a complete, + unmodified copy of the Work. + +7. If you are not the Current Maintainer of the Work, you may +distribute a Compiled Work generated from a Derived Work, as long as +the Derived Work is distributed to all recipients of the Compiled +Work, and as long as the conditions of Clause 6, above, are met with +regard to the Derived Work. + +8. The conditions above are not intended to prohibit, and hence do not +apply to, the modification, by any method, of any component so that it +becomes identical to an updated version of that component of the Work as +it is distributed by the Current Maintainer under Clause 4, above. + +9. Distribution of the Work or any Derived Work in an alternative +format, where the Work or that Derived Work (in whole or in part) is +then produced by applying some process to that format, does not relax or +nullify any sections of this license as they pertain to the results of +applying that process. + +10. a. A Derived Work may be distributed under a different license + provided that license itself honors the conditions listed in + Clause 6 above, in regard to the Work, though it does not have + to honor the rest of the conditions in this license. + + b. If a Derived Work is distributed under a different license, that + Derived Work must provide sufficient documentation as part of + itself to allow each recipient of that Derived Work to honor the + restrictions in Clause 6 above, concerning changes from the Work. + +11. This license places no restrictions on works that are unrelated to +the Work, nor does this license place any restrictions on aggregating +such works with the Work by any means. + +12. Nothing in this license is intended to, or may be used to, prevent +complete compliance by all parties with all applicable laws. + + +NO WARRANTY +=========== + +There is no warranty for the Work. Except when otherwise stated in +writing, the Copyright Holder provides the Work `as is', without +warranty of any kind, either expressed or implied, including, but not +limited to, the implied warranties of merchantability and fitness for a +particular purpose. The entire risk as to the quality and performance +of the Work is with you. Should the Work prove defective, you assume +the cost of all necessary servicing, repair, or correction. + +In no event unless required by applicable law or agreed to in writing +will The Copyright Holder, or any author named in the components of the +Work, or any other party who may distribute and/or modify the Work as +permitted above, be liable to you for damages, including any general, +special, incidental or consequential damages arising out of any use of +the Work or out of inability to use the Work (including, but not limited +to, loss of data, data being rendered inaccurate, or losses sustained by +anyone as a result of any failure of the Work to operate with any other +programs), even if the Copyright Holder or said author or said other +party has been advised of the possibility of such damages. + + +MAINTENANCE OF THE WORK +======================= + +The Work has the status `author-maintained' if the Copyright Holder +explicitly and prominently states near the primary copyright notice in +the Work that the Work can only be maintained by the Copyright Holder +or simply that it is `author-maintained'. + +The Work has the status `maintained' if there is a Current Maintainer +who has indicated in the Work that they are willing to receive error +reports for the Work (for example, by supplying a valid e-mail +address). It is not required for the Current Maintainer to acknowledge +or act upon these error reports. + +The Work changes from status `maintained' to `unmaintained' if there +is no Current Maintainer, or the person stated to be Current +Maintainer of the work cannot be reached through the indicated means +of communication for a period of six months, and there are no other +significant signs of active maintenance. + +You can become the Current Maintainer of the Work by agreement with +any existing Current Maintainer to take over this role. + +If the Work is unmaintained, you can become the Current Maintainer of +the Work through the following steps: + + 1. Make a reasonable attempt to trace the Current Maintainer (and + the Copyright Holder, if the two differ) through the means of + an Internet or similar search. + + 2. If this search is successful, then enquire whether the Work + is still maintained. + + a. If it is being maintained, then ask the Current Maintainer + to update their communication data within one month. + + b. If the search is unsuccessful or no action to resume active + maintenance is taken by the Current Maintainer, then announce + within the pertinent community your intention to take over + maintenance. (If the Work is a LaTeX work, this could be + done, for example, by posting to comp.text.tex.) + + 3a. If the Current Maintainer is reachable and agrees to pass + maintenance of the Work to you, then this takes effect + immediately upon announcement. + + b. If the Current Maintainer is not reachable and the Copyright + Holder agrees that maintenance of the Work be passed to you, + then this takes effect immediately upon announcement. + + 4. If you make an `intention announcement' as described in 2b. above + and after three months your intention is challenged neither by + the Current Maintainer nor by the Copyright Holder nor by other + people, then you may arrange for the Work to be changed so as + to name you as the (new) Current Maintainer. + + 5. If the previously unreachable Current Maintainer becomes + reachable once more within three months of a change completed + under the terms of 3b) or 4), then that Current Maintainer must + become or remain the Current Maintainer upon request provided + they then update their communication data within one month. + +A change in the Current Maintainer does not, of itself, alter the fact +that the Work is distributed under the LPPL license. + +If you become the Current Maintainer of the Work, you should +immediately provide, within the Work, a prominent and unambiguous +statement of your status as Current Maintainer. You should also +announce your new status to the same pertinent community as +in 2b) above. + + +WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE +====================================================== + +This section contains important instructions, examples, and +recommendations for authors who are considering distributing their +works under this license. These authors are addressed as `you' in +this section. + +Choosing This License or Another License +---------------------------------------- + +If for any part of your work you want or need to use *distribution* +conditions that differ significantly from those in this license, then +do not refer to this license anywhere in your work but, instead, +distribute your work under a different license. You may use the text +of this license as a model for your own license, but your license +should not refer to the LPPL or otherwise give the impression that +your work is distributed under the LPPL. + +The document `modguide.tex' in the base LaTeX distribution explains +the motivation behind the conditions of this license. It explains, +for example, why distributing LaTeX under the GNU General Public +License (GPL) was considered inappropriate. Even if your work is +unrelated to LaTeX, the discussion in `modguide.tex' may still be +relevant, and authors intending to distribute their works under any +license are encouraged to read it. + +A Recommendation on Modification Without Distribution +----------------------------------------------------- + +It is wise never to modify a component of the Work, even for your own +personal use, without also meeting the above conditions for +distributing the modified component. While you might intend that such +modifications will never be distributed, often this will happen by +accident -- you may forget that you have modified that component; or +it may not occur to you when allowing others to access the modified +version that you are thus distributing it and violating the conditions +of this license in ways that could have legal implications and, worse, +cause problems for the community. It is therefore usually in your +best interest to keep your copy of the Work identical with the public +one. Many works provide ways to control the behavior of that work +without altering any of its licensed components. + +How to Use This License +----------------------- + +To use this license, place in each of the components of your work both +an explicit copyright notice including your name and the year the work +was authored and/or last substantially modified. Include also a +statement that the distribution and/or modification of that +component is constrained by the conditions in this license. + +Here is an example of such a notice and statement: + + %% pig.dtx + %% Copyright 2005 M. Y. Name + % + % This work may be distributed and/or modified under the + % conditions of the LaTeX Project Public License, either version 1.3 + % of this license or (at your option) any later version. + % The latest version of this license is in + % http://www.latex-project.org/lppl.txt + % and version 1.3 or later is part of all distributions of LaTeX + % version 2005/12/01 or later. + % + % This work has the LPPL maintenance status `maintained'. + % + % The Current Maintainer of this work is M. Y. Name. + % + % This work consists of the files pig.dtx and pig.ins + % and the derived file pig.sty. + +Given such a notice and statement in a file, the conditions +given in this license document would apply, with the `Work' referring +to the three files `pig.dtx', `pig.ins', and `pig.sty' (the last being +generated from `pig.dtx' using `pig.ins'), the `Base Interpreter' +referring to any `LaTeX-Format', and both `Copyright Holder' and +`Current Maintainer' referring to the person `M. Y. Name'. + +If you do not want the Maintenance section of LPPL to apply to your +Work, change `maintained' above into `author-maintained'. +However, we recommend that you use `maintained', as the Maintenance +section was added in order to ensure that your Work remains useful to +the community even when you can no longer maintain and support it +yourself. + +Derived Works That Are Not Replacements +--------------------------------------- + +Several clauses of the LPPL specify means to provide reliability and +stability for the user community. They therefore concern themselves +with the case that a Derived Work is intended to be used as a +(compatible or incompatible) replacement of the original Work. If +this is not the case (e.g., if a few lines of code are reused for a +completely different task), then clauses 6b and 6d shall not apply. + + +Important Recommendations +------------------------- + + Defining What Constitutes the Work + + The LPPL requires that distributions of the Work contain all the + files of the Work. It is therefore important that you provide a + way for the licensee to determine which files constitute the Work. + This could, for example, be achieved by explicitly listing all the + files of the Work near the copyright notice of each file or by + using a line such as: + + % This work consists of all files listed in manifest.txt. + + in that place. In the absence of an unequivocal list it might be + impossible for the licensee to determine what is considered by you + to comprise the Work and, in such a case, the licensee would be + entitled to make reasonable conjectures as to which files comprise + the Work. + Deleted: csw/mgar/pkg/tex_dirtree/trunk/files/lppl.txt =================================================================== --- csw/mgar/pkg/tex_dirtree/trunk/files/lppl.txt 2012-06-26 12:20:00 UTC (rev 18542) +++ csw/mgar/pkg/tex_dirtree/trunk/files/lppl.txt 2012-06-26 12:30:20 UTC (rev 18543) @@ -1,416 +0,0 @@ -The LaTeX Project Public License -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- - -LPPL Version 1.3c 2008-05-04 - -Copyright 1999 2002-2008 LaTeX3 Project - Everyone is allowed to distribute verbatim copies of this - license document, but modification of it is not allowed. - - -PREAMBLE -======== - -The LaTeX Project Public License (LPPL) is the primary license under -which the LaTeX kernel and the base LaTeX packages are distributed. - -You may use this license for any work of which you hold the copyright -and which you wish to distribute. This license may be particularly -suitable if your work is TeX-related (such as a LaTeX package), but -it is written in such a way that you can use it even if your work is -unrelated to TeX. - -The section `WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE', -below, gives instructions, examples, and recommendations for authors -who are considering distributing their works under this license. - -This license gives conditions under which a work may be distributed -and modified, as well as conditions under which modified versions of -that work may be distributed. - -We, the LaTeX3 Project, believe that the conditions below give you -the freedom to make and distribute modified versions of your work -that conform with whatever technical specifications you wish while -maintaining the availability, integrity, and reliability of -that work. If you do not see how to achieve your goal while -meeting these conditions, then read the document `cfgguide.tex' -and `modguide.tex' in the base LaTeX distribution for suggestions. - - -DEFINITIONS -=========== - -In this license document the following terms are used: - - `Work' - Any work being distributed under this License. - - `Derived Work' - Any work that under any applicable law is derived from the Work. - - `Modification' - Any procedure that produces a Derived Work under any applicable - law -- for example, the production of a file containing an - original file associated with the Work or a significant portion of - such a file, either verbatim or with modifications and/or - translated into another language. - - `Modify' - To apply any procedure that produces a Derived Work under any - applicable law. - - `Distribution' - Making copies of the Work available from one person to another, in - whole or in part. Distribution includes (but is not limited to) - making any electronic components of the Work accessible by - file transfer protocols such as FTP or HTTP or by shared file - systems such as Sun's Network File System (NFS). - - `Compiled Work' - A version of the Work that has been processed into a form where it - is directly usable on a computer system. This processing may - include using installation facilities provided by the Work, - transformations of the Work, copying of components of the Work, or - other activities. Note that modification of any installation - facilities provided by the Work constitutes modification of the Work. - - `Current Maintainer' - A person or persons nominated as such within the Work. If there is - no such explicit nomination then it is the `Copyright Holder' under - any applicable law. - - `Base Interpreter' - A program or process that is normally needed for running or - interpreting a part or the whole of the Work. - - A Base Interpreter may depend on external components but these - are not considered part of the Base Interpreter provided that each - external component clearly identifies itself whenever it is used - interactively. Unless explicitly specified when applying the - license to the Work, the only applicable Base Interpreter is a - `LaTeX-Format' or in the case of files belonging to the - `LaTeX-format' a program implementing the `TeX language'. - - - -CONDITIONS ON DISTRIBUTION AND MODIFICATION -=========================================== - -1. Activities other than distribution and/or modification of the Work -are not covered by this license; they are outside its scope. In -particular, the act of running the Work is not restricted and no -requirements are made concerning any offers of support for the Work. - -2. You may distribute a complete, unmodified copy of the Work as you -received it. Distribution of only part of the Work is considered -modification of the Work, and no right to distribute such a Derived -Work may be assumed under the terms of this clause. - -3. You may distribute a Compiled Work that has been generated from a -complete, unmodified copy of the Work as distributed under Clause 2 -above, as long as that Compiled Work is distributed in such a way that -the recipients may install the Compiled Work on their system exactly -as it would have been installed if they generated a Compiled Work -directly from the Work. - -4. If you are the Current Maintainer of the Work, you may, without -restriction, modify the Work, thus creating a Derived Work. You may -also distribute the Derived Work without restriction, including -Compiled Works generated from the Derived Work. Derived Works -distributed in this manner by the Current Maintainer are considered to -be updated versions of the Work. - -5. If you are not the Current Maintainer of the Work, you may modify -your copy of the Work, thus creating a Derived Work based on the Work, -and compile this Derived Work, thus creating a Compiled Work based on -the Derived Work. - -6. If you are not the Current Maintainer of the Work, you may -distribute a Derived Work provided the following conditions are met -for every component of the Work unless that component clearly states -in the copyright notice that it is exempt from that condition. Only -the Current Maintainer is allowed to add such statements of exemption -to a component of the Work. - - a. If a component of this Derived Work can be a direct replacement - for a component of the Work when that component is used with the - Base Interpreter, then, wherever this component of the Work - identifies itself to the user when used interactively with that - Base Interpreter, the replacement component of this Derived Work - clearly and unambiguously identifies itself as a modified version - of this component to the user when used interactively with that - Base Interpreter. - - b. Every component of the Derived Work contains prominent notices - detailing the nature of the changes to that component, or a - prominent reference to another file that is distributed as part - of the Derived Work and that contains a complete and accurate log - of the changes. - - c. No information in the Derived Work implies that any persons, - including (but not limited to) the authors of the original version - of the Work, provide any support, including (but not limited to) - the reporting and handling of errors, to recipients of the - Derived Work unless those persons have stated explicitly that - they do provide such support for the Derived Work. - - d. You distribute at least one of the following with the Derived Work: - - 1. A complete, unmodified copy of the Work; - if your distribution of a modified component is made by - offering access to copy the modified component from a - designated place, then offering equivalent access to copy - the Work from the same or some similar place meets this - condition, even though third parties are not compelled to - copy the Work along with the modified component; - - 2. Information that is sufficient to obtain a complete, - unmodified copy of the Work. - -7. If you are not the Current Maintainer of the Work, you may -distribute a Compiled Work generated from a Derived Work, as long as -the Derived Work is distributed to all recipients of the Compiled -Work, and as long as the conditions of Clause 6, above, are met with -regard to the Derived Work. - -8. The conditions above are not intended to prohibit, and hence do not -apply to, the modification, by any method, of any component so that it -becomes identical to an updated version of that component of the Work as -it is distributed by the Current Maintainer under Clause 4, above. - -9. Distribution of the Work or any Derived Work in an alternative -format, where the Work or that Derived Work (in whole or in part) is -then produced by applying some process to that format, does not relax or -nullify any sections of this license as they pertain to the results of -applying that process. - -10. a. A Derived Work may be distributed under a different license - provided that license itself honors the conditions listed in - Clause 6 above, in regard to the Work, though it does not have - to honor the rest of the conditions in this license. - - b. If a Derived Work is distributed under a different license, that - Derived Work must provide sufficient documentation as part of - itself to allow each recipient of that Derived Work to honor the - restrictions in Clause 6 above, concerning changes from the Work. - -11. This license places no restrictions on works that are unrelated to -the Work, nor does this license place any restrictions on aggregating -such works with the Work by any means. - -12. Nothing in this license is intended to, or may be used to, prevent -complete compliance by all parties with all applicable laws. - - -NO WARRANTY -=========== - -There is no warranty for the Work. Except when otherwise stated in -writing, the Copyright Holder provides the Work `as is', without -warranty of any kind, either expressed or implied, including, but not -limited to, the implied warranties of merchantability and fitness for a -particular purpose. The entire risk as to the quality and performance -of the Work is with you. Should the Work prove defective, you assume -the cost of all necessary servicing, repair, or correction. - -In no event unless required by applicable law or agreed to in writing -will The Copyright Holder, or any author named in the components of the -Work, or any other party who may distribute and/or modify the Work as -permitted above, be liable to you for damages, including any general, -special, incidental or consequential damages arising out of any use of -the Work or out of inability to use the Work (including, but not limited -to, loss of data, data being rendered inaccurate, or losses sustained by -anyone as a result of any failure of the Work to operate with any other -programs), even if the Copyright Holder or said author or said other -party has been advised of the possibility of such damages. - - -MAINTENANCE OF THE WORK -======================= - -The Work has the status `author-maintained' if the Copyright Holder -explicitly and prominently states near the primary copyright notice in -the Work that the Work can only be maintained by the Copyright Holder -or simply that it is `author-maintained'. - -The Work has the status `maintained' if there is a Current Maintainer -who has indicated in the Work that they are willing to receive error -reports for the Work (for example, by supplying a valid e-mail -address). It is not required for the Current Maintainer to acknowledge -or act upon these error reports. - -The Work changes from status `maintained' to `unmaintained' if there -is no Current Maintainer, or the person stated to be Current -Maintainer of the work cannot be reached through the indicated means -of communication for a period of six months, and there are no other -significant signs of active maintenance. - -You can become the Current Maintainer of the Work by agreement with -any existing Current Maintainer to take over this role. - -If the Work is unmaintained, you can become the Current Maintainer of -the Work through the following steps: - - 1. Make a reasonable attempt to trace the Current Maintainer (and - the Copyright Holder, if the two differ) through the means of - an Internet or similar search. - - 2. If this search is successful, then enquire whether the Work - is still maintained. - - a. If it is being maintained, then ask the Current Maintainer - to update their communication data within one month. - - b. If the search is unsuccessful or no action to resume active - maintenance is taken by the Current Maintainer, then announce - within the pertinent community your intention to take over - maintenance. (If the Work is a LaTeX work, this could be - done, for example, by posting to comp.text.tex.) - - 3a. If the Current Maintainer is reachable and agrees to pass - maintenance of the Work to you, then this takes effect - immediately upon announcement. - - b. If the Current Maintainer is not reachable and the Copyright - Holder agrees that maintenance of the Work be passed to you, - then this takes effect immediately upon announcement. - - 4. If you make an `intention announcement' as described in 2b. above - and after three months your intention is challenged neither by - the Current Maintainer nor by the Copyright Holder nor by other - people, then you may arrange for the Work to be changed so as - to name you as the (new) Current Maintainer. - - 5. If the previously unreachable Current Maintainer becomes - reachable once more within three months of a change completed - under the terms of 3b) or 4), then that Current Maintainer must - become or remain the Current Maintainer upon request provided - they then update their communication data within one month. - -A change in the Current Maintainer does not, of itself, alter the fact -that the Work is distributed under the LPPL license. - -If you become the Current Maintainer of the Work, you should -immediately provide, within the Work, a prominent and unambiguous -statement of your status as Current Maintainer. You should also -announce your new status to the same pertinent community as -in 2b) above. - - -WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE -====================================================== - -This section contains important instructions, examples, and -recommendations for authors who are considering distributing their -works under this license. These authors are addressed as `you' in -this section. - -Choosing This License or Another License ----------------------------------------- - -If for any part of your work you want or need to use *distribution* -conditions that differ significantly from those in this license, then -do not refer to this license anywhere in your work but, instead, -distribute your work under a different license. You may use the text -of this license as a model for your own license, but your license -should not refer to the LPPL or otherwise give the impression that -your work is distributed under the LPPL. - -The document `modguide.tex' in the base LaTeX distribution explains -the motivation behind the conditions of this license. It explains, -for example, why distributing LaTeX under the GNU General Public -License (GPL) was considered inappropriate. Even if your work is -unrelated to LaTeX, the discussion in `modguide.tex' may still be -relevant, and authors intending to distribute their works under any -license are encouraged to read it. - -A Recommendation on Modification Without Distribution ------------------------------------------------------ - -It is wise never to modify a component of the Work, even for your own -personal use, without also meeting the above conditions for -distributing the modified component. While you might intend that such -modifications will never be distributed, often this will happen by -accident -- you may forget that you have modified that component; or -it may not occur to you when allowing others to access the modified -version that you are thus distributing it and violating the conditions -of this license in ways that could have legal implications and, worse, -cause problems for the community. It is therefore usually in your -best interest to keep your copy of the Work identical with the public -one. Many works provide ways to control the behavior of that work -without altering any of its licensed components. - -How to Use This License ------------------------ - -To use this license, place in each of the components of your work both -an explicit copyright notice including your name and the year the work -was authored and/or last substantially modified. Include also a -statement that the distribution and/or modification of that -component is constrained by the conditions in this license. - -Here is an example of such a notice and statement: - - %% pig.dtx - %% Copyright 2005 M. Y. Name - % - % This work may be distributed and/or modified under the - % conditions of the LaTeX Project Public License, either version 1.3 - % of this license or (at your option) any later version. - % The latest version of this license is in - % http://www.latex-project.org/lppl.txt - % and version 1.3 or later is part of all distributions of LaTeX - % version 2005/12/01 or later. - % - % This work has the LPPL maintenance status `maintained'. - % - % The Current Maintainer of this work is M. Y. Name. - % - % This work consists of the files pig.dtx and pig.ins - % and the derived file pig.sty. - -Given such a notice and statement in a file, the conditions -given in this license document would apply, with the `Work' referring -to the three files `pig.dtx', `pig.ins', and `pig.sty' (the last being -generated from `pig.dtx' using `pig.ins'), the `Base Interpreter' -referring to any `LaTeX-Format', and both `Copyright Holder' and -`Current Maintainer' referring to the person `M. Y. Name'. - -If you do not want the Maintenance section of LPPL to apply to your -Work, change `maintained' above into `author-maintained'. -However, we recommend that you use `maintained', as the Maintenance -section was added in order to ensure that your Work remains useful to -the community even when you can no longer maintain and support it -yourself. - -Derived Works That Are Not Replacements ---------------------------------------- - -Several clauses of the LPPL specify means to provide reliability and -stability for the user community. They therefore concern themselves -with the case that a Derived Work is intended to be used as a -(compatible or incompatible) replacement of the original Work. If -this is not the case (e.g., if a few lines of code are reused for a -completely different task), then clauses 6b and 6d shall not apply. - - -Important Recommendations -------------------------- - - Defining What Constitutes the Work - - The LPPL requires that distributions of the Work contain all the - files of the Work. It is therefore important that you provide a - way for the licensee to determine which files constitute the Work. - This could, for example, be achieved by explicitly listing all the - files of the Work near the copyright notice of each file or by - using a line such as: - - % This work consists of all files listed in manifest.txt. - - in that place. In the absence of an unequivocal list it might be - impossible for the licensee to determine what is considered by you - to comprise the Work and, in such a case, the licensee would be - entitled to make reasonable conjectures as to which files comprise - the Work. - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Tue Jun 26 15:01:57 2012 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Tue, 26 Jun 2012 13:01:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[18544] csw/mgar/pkg/samba/trunk Message-ID: Revision: 18544 http://gar.svn.sourceforge.net/gar/?rev=18544&view=rev Author: janholzh Date: 2012-06-26 13:01:57 +0000 (Tue, 26 Jun 2012) Log Message: ----------- samba/trunk: update to 3.6.6 Modified Paths: -------------- csw/mgar/pkg/samba/trunk/Makefile csw/mgar/pkg/samba/trunk/checksums Modified: csw/mgar/pkg/samba/trunk/Makefile =================================================================== --- csw/mgar/pkg/samba/trunk/Makefile 2012-06-26 12:30:20 UTC (rev 18543) +++ csw/mgar/pkg/samba/trunk/Makefile 2012-06-26 13:01:57 UTC (rev 18544) @@ -4,7 +4,7 @@ # - Check http://src.opensolaris.org/source/xref/userland/src/components/samba/samba/ from time to time NAME = samba -VERSION = 3.6.5 +VERSION = 3.6.6 CATEGORIES = apps GARTYPE = v2 Modified: csw/mgar/pkg/samba/trunk/checksums =================================================================== --- csw/mgar/pkg/samba/trunk/checksums 2012-06-26 12:30:20 UTC (rev 18543) +++ csw/mgar/pkg/samba/trunk/checksums 2012-06-26 13:01:57 UTC (rev 18544) @@ -1 +1 @@ -2f0c14547333c1b48fd4728b031e7040 samba-3.6.5.tar.gz +0bea52842d172231c0c0e23ee570d7af samba-3.6.6.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Jun 26 15:08:11 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 26 Jun 2012 13:08:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[18545] csw/mgar/pkg/gnuplot/trunk Message-ID: Revision: 18545 http://gar.svn.sourceforge.net/gar/?rev=18545&view=rev Author: dmichelsen Date: 2012-06-26 13:08:11 +0000 (Tue, 26 Jun 2012) Log Message: ----------- gnuplot/trunk: Update to 4.6.0 Modified Paths: -------------- csw/mgar/pkg/gnuplot/trunk/Makefile csw/mgar/pkg/gnuplot/trunk/checksums Modified: csw/mgar/pkg/gnuplot/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnuplot/trunk/Makefile 2012-06-26 13:01:57 UTC (rev 18544) +++ csw/mgar/pkg/gnuplot/trunk/Makefile 2012-06-26 13:08:11 UTC (rev 18545) @@ -1,5 +1,5 @@ NAME = gnuplot -VERSION = 4.4.3 +VERSION = 4.6.0 CATEGORIES = utils GARTYPE = v2 @@ -13,6 +13,8 @@ PATCHFILES = 0001-Remove-definition-unclear-why-leaving-it-in-causes-e.patch +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + VENDOR_URL = http://www.gnuplot.info/ LICENSE = Copyright @@ -20,43 +22,50 @@ PACKAGES += CSWgnuplot CATALOGNAME_CSWgnuplot = gnuplot SPKG_DESC_CSWgnuplot = $(DESCRIPTION) -RUNTIME_DEP_PKGS_CSWgnuplot += CSWpng +RUNTIME_DEP_PKGS_CSWgnuplot += CSWlibpng12-0 RUNTIME_DEP_PKGS_CSWgnuplot += CSWemacscommon -RUNTIME_DEP_PKGS_CSWgnuplot += CSWfconfig -RUNTIME_DEP_PKGS_CSWgnuplot += CSWiconv -RUNTIME_DEP_PKGS_CSWgnuplot += CSWreadline +RUNTIME_DEP_PKGS_CSWgnuplot += CSWlibfontconfig1 +RUNTIME_DEP_PKGS_CSWgnuplot += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWgnuplot += CSWlibreadline6 RUNTIME_DEP_PKGS_CSWgnuplot += CSWlibgd2 RUNTIME_DEP_PKGS_CSWgnuplot += CSWxpm -RUNTIME_DEP_PKGS_CSWgnuplot += CSWncurses -RUNTIME_DEP_PKGS_CSWgnuplot += CSWlua -RUNTIME_DEP_PKGS_CSWgnuplot += CSWftype2 -RUNTIME_DEP_PKGS_CSWgnuplot += CSWzlib -RUNTIME_DEP_PKGS_CSWgnuplot += CSWjpeg +RUNTIME_DEP_PKGS_CSWgnuplot += CSWlibncurses5 +RUNTIME_DEP_PKGS_CSWgnuplot += CSWliblua5-2 +RUNTIME_DEP_PKGS_CSWgnuplot += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWgnuplot += CSWlibz1 +RUNTIME_DEP_PKGS_CSWgnuplot += CSWlibjpeg7 PACKAGES += CSWgnuplot-wx CATALOGNAME_CSWgnuplot-wx = gnuplot_wx SPKG_DESC_CSWgnuplot-wx = $(DESCRIPTION) (with WX-Widgets and Pango) RUNTIME_DEP_PKGS_CSWgnuplot-wx = CSWgnuplot RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWwxwidgetscommon -RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibatk +RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibatk1-0-0 RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWpango RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWpng -RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWfconfig -RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibcairo -RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWiconv +RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibpng12-0 +RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibfontconfig1 +RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibiconv2 RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWwxwidgetsgtk2 -RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWreadline -RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWgtk2 +RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibreadline6 RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibgd2 RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWxpm -RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWncurses -RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlua +RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibncurses5 +RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibncursesw5 +RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWliblua5-2 RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWsunmath -RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWftype2 -RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWglib2 -RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWzlib -RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWjpeg +RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibz1 +RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibjpeg7 +RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibgdk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibgtk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibgdk-pixbuf2-0-0 +RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibgio2-0-0 BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS_CSWgnuplot-wx) @@ -73,7 +82,8 @@ CONFIGURE_ARGS += $(CONFIGURE_ARGS_wxwidgets-$(WXWIDGETS)) # Preset value until this is fixed: -# https://sourceforge.net/tracker/?func=detail&aid=3129839&group_id=2055&atid=102055 +# https://sourceforge.net/tracker/?func=detail&aid=3129839&group_id=2055&atid=102055 (closed) +# https://sourceforge.net/tracker/?func=detail&atid=102055&aid=3538084&group_id=2055 (heads up) CONFIGURE_ARGS += ac_cv_type__Bool=no # Make sure we don't run the interactive displays from demo/ @@ -85,10 +95,10 @@ # These are exactly the differing files between the install-directories ALTERNATIVE_FILES += /opt/csw/bin/gnuplot -ALTERNATIVE_FILES += /opt/csw/libexec/gnuplot/4.4/gnuplot_x11 +ALTERNATIVE_FILES += /opt/csw/libexec/gnuplot/4.6/gnuplot_x11 ALTERNATIVE_FILES += /opt/csw/share/emacs/site-lisp/gnuplot-gui.elc ALTERNATIVE_FILES += /opt/csw/share/emacs/site-lisp/gnuplot.elc -ALTERNATIVE_FILES += /opt/csw/share/gnuplot/4.4/gnuplot.gih +ALTERNATIVE_FILES += /opt/csw/share/gnuplot/4.6/gnuplot.gih WXSUFFIX-yes = wx WXSUFFIX-no = nowx @@ -109,8 +119,8 @@ CHECKPKG_OVERRIDES_CSWgnuplot-wx += surplus-dependency|CSWalternatives # These are just examples -CHECKPKG_OVERRIDES_CSWgnuplot += file-with-bad-content|/usr/local|root/opt/csw/share/gnuplot/4.4/gnuplot.gih-nowx -CHECKPKG_OVERRIDES_CSWgnuplot-wx += file-with-bad-content|/usr/local|root/opt/csw/share/gnuplot/4.4/gnuplot.gih-wx +CHECKPKG_OVERRIDES_CSWgnuplot += file-with-bad-content|/usr/local|root/opt/csw/share/gnuplot/4.6/gnuplot.gih-nowx +CHECKPKG_OVERRIDES_CSWgnuplot-wx += file-with-bad-content|/usr/local|root/opt/csw/share/gnuplot/4.6/gnuplot.gih-wx CHECKPKG_OVERRIDES_CSWgnuplot += file-with-bad-content|/usr/local|root/opt/csw/share/info/gnuplot.info # Is this GDFONTPATH related? That would be bad... CHECK!!! Modified: csw/mgar/pkg/gnuplot/trunk/checksums =================================================================== --- csw/mgar/pkg/gnuplot/trunk/checksums 2012-06-26 13:01:57 UTC (rev 18544) +++ csw/mgar/pkg/gnuplot/trunk/checksums 2012-06-26 13:08:11 UTC (rev 18545) @@ -1 +1 @@ -639603752996f4923bc02c895fa03b45 gnuplot-4.4.3.tar.gz +8e6e92b4596ea0eb75e16a57fc79efec gnuplot-4.6.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Jun 26 15:30:10 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 26 Jun 2012 13:30:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[18546] csw/mgar/pkg/lighttpd/trunk Message-ID: Revision: 18546 http://gar.svn.sourceforge.net/gar/?rev=18546&view=rev Author: dmichelsen Date: 2012-06-26 13:30:10 +0000 (Tue, 26 Jun 2012) Log Message: ----------- lighttpd/trunk: Update to 1.4.31, enable more features, split bloat-mods Modified Paths: -------------- csw/mgar/pkg/lighttpd/trunk/Makefile csw/mgar/pkg/lighttpd/trunk/checksums Modified: csw/mgar/pkg/lighttpd/trunk/Makefile =================================================================== --- csw/mgar/pkg/lighttpd/trunk/Makefile 2012-06-26 13:08:11 UTC (rev 18545) +++ csw/mgar/pkg/lighttpd/trunk/Makefile 2012-06-26 13:30:10 UTC (rev 18546) @@ -1,6 +1,6 @@ # $Id$ NAME = lighttpd -VERSION = 1.4.30 +VERSION = 1.4.31 CATEGORIES = server GARTYPE = v2 @@ -20,6 +20,8 @@ DISTFILES += $(NAME)-$(VERSION).tar.gz DISTFILES += cswlighttpd +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + PATCHFILES += 0001-Work-around-linking-problem-buffer.c.patch # When mkdir is issued on an automounted directory like /home/ errno is @@ -37,11 +39,35 @@ PACKAGES += CSWlighttpd CATALOGNAME_CSWlighttpd = lighttpd SPKG_DESC_CSWlighttpd = HTTP server built for security, speed, compliance, and flexibility +# PKGFILES is catchall RUNTIME_DEP_PKGS_CSWlighttpd += CSWlibbz2-1-0 RUNTIME_DEP_PKGS_CSWlighttpd += CSWlibpcre1 -RUNTIME_DEP_PKGS_CSWlighttpd += CSWlibssl0-9-8 +RUNTIME_DEP_PKGS_CSWlighttpd += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWlighttpd += CSWlibz1 +PACKAGES += CSWlighttpd-mod-auth +SPKG_DESC_CSWlighttpd-mod-auth = Lighttpd module for authentication +PKGFILES_CSWlighttpd-mod-auth += $(call baseisadirs,$(libdir_install),mod_auth.so) +RUNTIME_DEP_PKGS_CSWlighttpd-mod-auth += CSWlighttpd +RUNTIME_DEP_PKGS_CSWlighttpd-mod-auth += CSWliblber2-4-2 +RUNTIME_DEP_PKGS_CSWlighttpd-mod-auth += CSWlibldap2-4-2 + +PACKAGES += CSWlighttpd-mod-webdav +SPKG_DESC_CSWlighttpd-mod-webdav = Lighttpd module for WebDAV access +PKGFILES_CSWlighttpd-mod-webdav += $(call baseisadirs,$(libdir_install),mod_webdav.so) +RUNTIME_DEP_PKGS_CSWlighttpd-mod-webdav += CSWlighttpd +RUNTIME_DEP_PKGS_CSWlighttpd-mod-webdav += CSWlibsqlite3-0 +RUNTIME_DEP_PKGS_CSWlighttpd-mod-webdav += CSWlibxml2-2 + +PACKAGES += CSWlighttpd-mod-mysql-vhost +SPKG_DESC_CSWlighttpd-mod-mysql-vhost = Lighttpd module for MySQL-driven VHOSTs +PKGFILES_CSWlighttpd-mod-mysql-vhost += $(call baseisadirs,$(libdir_install),mod_mysql_vhost.so) +RUNTIME_DEP_PKGS_CSWlighttpd-mod-mysql-vhost += CSWlighttpd +RUNTIME_DEP_PKGS_CSWlighttpd-mod-mysql-vhost += CSWlibmysqlclient18 +RUNTIME_DEP_PKGS_CSWlighttpd-mod-mysql-vhost += CSWlibssl1-0-0 +RUNTIME_DEP_PKGS_CSWlighttpd-mod-mysql-vhost += CSWlibz1 + +# Add library needed for sendfilev64 referenced from .libs/liblightcomp_la-network_solaris_sendfilev.o EXTRA_LINKER_FLAGS += -lsendfile # To fix undefined symbol 'dlopen' on Solaris 9 @@ -54,20 +80,51 @@ CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-openssl=$(prefix) -EXTRA_LINKER_FLAGS += -lcrypto +CONFIGURE_ARGS += --with-openssl=yes +CONFIGURE_ARGS += --with-openssl-includes=$(includedir) +CONFIGURE_ARGS += --with-openssl-libs=$(libpath) +# EXTRA_LINKER_FLAGS += -lcrypto # Solaris 9 does not have IPV6_V6ONLY. # IPv6 support only works on Solaris 10. CONFIGURE_ARGS_5.9 = --disable-ipv6 CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GAROSREL)) +# Plugins: +# disabled: +# mod_cml +# mod_magnet +# mod_mysql_vhost +# +# Features: +# disabled: +# auth-ldap +# stat-cache-fam +# storage-gdbm +# storage-memcache +# webdav-locks +# webdav-properties + +CONFIGURE_ARGS += --with-webdav-props +CONFIGURE_ARGS += --with-webdav-locks +CONFIGURE_ARGS += --with-memcache +CONFIGURE_ARGS += --with-ldap +CONFIGURE_ARGS += --with-mysql + +# -- LUA support +# Disable LUA for now until this is fixed: +# http://redmine.lighttpd.net/issues/2421 +# CONFIGURE_ARGS += --with-lua +#EXTRA_CONFIGURE_EXPORTS += LUA_CFLAGS LUA_LIBS +CONFIGURE_ENV_LUA_CFLAGS = $(CPPFLAGS) +CONFIGURE_ENV_LUA_LIBS = -L$(libdir) -llua + INITSMF = $(sysconfdir)/init\.d/cswlighttpd PRESERVECONF = $(sysconfdir)/lighttpd\.conf USERGROUP = $(sysconfdir)/pkg/$(NAME)/cswusergroup # Migrating the configuration file from /opt/csw/etc to /etc/opt/csw -MIGRATE_FILES = lighttpd.conf +MIGRATE_FILES_CSWlighttpd = lighttpd.conf # To allow lighttpd to write logs PROTOTYPE_MODIFIERS = user @@ -95,6 +152,6 @@ ginstall -d -m 755 $(DESTDIR)$(sysconfdir)/pkg/$(NAME) echo "lighttpd:lighttpd:lighttpd web server::::" \ > $(DESTDIR)$(sysconfdir)/pkg/$(NAME)/cswusergroup - (cd $(DESTDIR)$(libdir_install); ln -s $(ISA_DEFAULT) 32) + (cd $(DESTDIR)$(libdir_install); ln -s . 32) (cd $(DESTDIR)$(libdir_install); ln -s $(ISA_DEFAULT64) 64) @$(MAKECOOKIE) Modified: csw/mgar/pkg/lighttpd/trunk/checksums =================================================================== --- csw/mgar/pkg/lighttpd/trunk/checksums 2012-06-26 13:08:11 UTC (rev 18545) +++ csw/mgar/pkg/lighttpd/trunk/checksums 2012-06-26 13:30:10 UTC (rev 18546) @@ -1 +1 @@ -7f0bbb66a05099f634ea8f63af99cfed lighttpd-1.4.30.tar.gz +7907b7167d639b8a8daab97e223249d5 lighttpd-1.4.31.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 26 15:40:37 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 26 Jun 2012 13:40:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[18547] csw/mgar/pkg Message-ID: Revision: 18547 http://gar.svn.sourceforge.net/gar/?rev=18547&view=rev Author: dmichelsen Date: 2012-06-26 13:40:37 +0000 (Tue, 26 Jun 2012) Log Message: ----------- WHOLE TREE: Delete svn:externals Property Changed: ---------------- csw/mgar/pkg/matplotlib/trunk/ csw/mgar/pkg/thttpd/trunk/ Property changes on: csw/mgar/pkg/matplotlib/trunk ___________________________________________________________________ Deleted: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Property changes on: csw/mgar/pkg/thttpd/trunk ___________________________________________________________________ Deleted: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Jun 26 15:42:22 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 26 Jun 2012 13:42:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[18548] csw/mgar/pkg/lighttpd/trunk/Makefile Message-ID: Revision: 18548 http://gar.svn.sourceforge.net/gar/?rev=18548&view=rev Author: dmichelsen Date: 2012-06-26 13:42:22 +0000 (Tue, 26 Jun 2012) Log Message: ----------- lighttpd/trunk: Build only on Solaris 10 Modified Paths: -------------- csw/mgar/pkg/lighttpd/trunk/Makefile Modified: csw/mgar/pkg/lighttpd/trunk/Makefile =================================================================== --- csw/mgar/pkg/lighttpd/trunk/Makefile 2012-06-26 13:40:37 UTC (rev 18547) +++ csw/mgar/pkg/lighttpd/trunk/Makefile 2012-06-26 13:42:22 UTC (rev 18548) @@ -20,8 +20,6 @@ DISTFILES += $(NAME)-$(VERSION).tar.gz DISTFILES += cswlighttpd -PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 - PATCHFILES += 0001-Work-around-linking-problem-buffer.c.patch # When mkdir is issued on an automounted directory like /home/ errno is @@ -33,7 +31,7 @@ # http://redmine.lighttpd.net/boards/2/topics/4163 PATCHFILES += 0003-Ignore-ENOSYS-on-mkdir-which-happens-on-automounted-.patch -PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 +# PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 PACKAGES += CSWlighttpd This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Tue Jun 26 16:02:52 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Tue, 26 Jun 2012 14:02:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[18549] csw/mgar/pkg/tex_dirtree/trunk Message-ID: Revision: 18549 http://gar.svn.sourceforge.net/gar/?rev=18549&view=rev Author: pfelecan Date: 2012-06-26 14:02:52 +0000 (Tue, 26 Jun 2012) Log Message: ----------- tex_dirtree/trunk: addition of a specific README to direct the user toward the documentation. Modified Paths: -------------- csw/mgar/pkg/tex_dirtree/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/tex_dirtree/trunk/files/README.CSW Modified: csw/mgar/pkg/tex_dirtree/trunk/Makefile =================================================================== --- csw/mgar/pkg/tex_dirtree/trunk/Makefile 2012-06-26 13:42:22 UTC (rev 18548) +++ csw/mgar/pkg/tex_dirtree/trunk/Makefile 2012-06-26 14:02:52 UTC (rev 18549) @@ -17,6 +17,8 @@ # taken from http://www.latex-project.org/lppl.txt DISTFILES += COPYING +BUILD_DEP_PKGS += CSWtetex + RUNTIME_DEP_PKGS += CSWtetex PACKAGES = CSWtex-dirtree Added: csw/mgar/pkg/tex_dirtree/trunk/files/README.CSW =================================================================== --- csw/mgar/pkg/tex_dirtree/trunk/files/README.CSW (rev 0) +++ csw/mgar/pkg/tex_dirtree/trunk/files/README.CSW 2012-06-26 14:02:52 UTC (rev 18549) @@ -0,0 +1,11 @@ +$Id$ + +The documentation is installed in the standard TeX tree, i.e., +/opt/csw/share/texmf-local. + +CSW Team + +# Local Variables: +# mode: text +# mode: font-lock +# End: Property changes on: csw/mgar/pkg/tex_dirtree/trunk/files/README.CSW ___________________________________________________________________ Added: svn:keywords + Author Date HeadURL Id Revision This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Tue Jun 26 16:04:08 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Tue, 26 Jun 2012 14:04:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[18550] csw/mgar/pkg Message-ID: Revision: 18550 http://gar.svn.sourceforge.net/gar/?rev=18550&view=rev Author: pfelecan Date: 2012-06-26 14:04:08 +0000 (Tue, 26 Jun 2012) Log Message: ----------- tex_rcsinfo/trunk: migrated from a private recipe to a GAR based recipe Added Paths: ----------- csw/mgar/pkg/tex_rcsinfo/ csw/mgar/pkg/tex_rcsinfo/Makefile csw/mgar/pkg/tex_rcsinfo/branches/ csw/mgar/pkg/tex_rcsinfo/tags/ csw/mgar/pkg/tex_rcsinfo/trunk/ csw/mgar/pkg/tex_rcsinfo/trunk/Makefile csw/mgar/pkg/tex_rcsinfo/trunk/checksums csw/mgar/pkg/tex_rcsinfo/trunk/files/ csw/mgar/pkg/tex_rcsinfo/trunk/files/0001-Adapt-build.patch csw/mgar/pkg/tex_rcsinfo/trunk/files/COPYING csw/mgar/pkg/tex_rcsinfo/trunk/files/README.CSW Added: csw/mgar/pkg/tex_rcsinfo/Makefile =================================================================== --- csw/mgar/pkg/tex_rcsinfo/Makefile (rev 0) +++ csw/mgar/pkg/tex_rcsinfo/Makefile 2012-06-26 14:04:08 UTC (rev 18550) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/tex_rcsinfo/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/tex_rcsinfo/trunk/Makefile =================================================================== --- csw/mgar/pkg/tex_rcsinfo/trunk/Makefile (rev 0) +++ csw/mgar/pkg/tex_rcsinfo/trunk/Makefile 2012-06-26 14:04:08 UTC (rev 18550) @@ -0,0 +1,59 @@ +# $Id$ + +NAME = tex_rcsinfo +VERSION = 1.11 +GARTYPE = v2 +CATEGORIES = xtra + +DESCRIPTION = Extract the information provided by the RCS revision control system from TeX documents +define BLURB + This package is used to extract the revision and file information provided + by the RCS revision control system. + A PERL-package supporting rcsinfo and LaTeX2HTML is provided too. +endef + +DISTNAME = rcsinfo +MASTER_SITES = http://mirror.ctan.org/macros/latex/contrib/ +DISTFILES = $(DISTNAME).zip +# taken from http://www.latex-project.org/lppl.txt +DISTFILES += README.CSW +DISTFILES += COPYING +PATCHFILES += 0001-Adapt-build.patch + +BUILD_DEP_PKGS += CSWtetex +BUILD_DEP_PKGS += CSWlatex2html + +RUNTIME_DEP_PKGS += CSWtetex + +PACKAGES = CSWtex-rcsinfo +SPKG_DESC_CSWtex-rcsinfo = $(DESCRIPTION) +CATALOGNAME_CSWtex-rcsinfo = tex_rcsinfo +OBSOLETED_BY_CSWtex-rcsinfo = CSWtexrcsinfo +CATALOGNAME_CSWtexrcsinfo = tex_rcsinfo_stub +ARCHALL_CSWtex-rcsinfo = 1 +CHECKPKG_OVERRIDES_CSWtex-rcsinfo += surplus-dependency|CSWtetex + +CONFIGURE_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +include gar/category.mk + +pre-build-modulated: + cd $(WORKSRC) && gmake realclean + $(MAKECOOKIE) + +install-custom: pkgdocdir = $(docdir)/$(NAME) +install-custom: GNUinstall = ginstall +install-custom: TEXDIR = $(texmflocaldir) +install-custom: CONTRIB = $(TEXDIR)/tex/latex/$(BASE) +install-custom: DOCDIR = $(TEXDIR)/doc/latex/styles +install-custom: + $(GNUinstall) --directory $(DESTDIR)/$(CONTRIB) + $(GNUinstall) $(WORKSRC)/rcsinfo.cfg $(WORKSRC)/rcsinfo.sty $(WORKSRC)/rcsinfo.perl $(DESTDIR)/$(CONTRIB) + $(GNUinstall) --directory $(DESTDIR)/$(DOCDIR) + $(GNUinstall) $(WORKSRC)/rcsinfo.dvi $(WORKSRC)/rcsinfo.ps $(WORKSRC)/rcsinfo.pdf $(DESTDIR)/$(DOCDIR) + $(GNUinstall) $(WORKSRC)/rcsinfo2html.dvi $(WORKSRC)/rcsinfo2html.ps $(WORKSRC)/rcsinfo2html.pdf $(DESTDIR)/$(DOCDIR) + $(GNUinstall) --directory $(DESTDIR)/$(DOCDIR)/html + $(GNUinstall) $(WORKSRC)/html/*.html $(WORKSRC)/html/*.css $(DESTDIR)/$(DOCDIR)/html + $(MAKECOOKIE) Property changes on: csw/mgar/pkg/tex_rcsinfo/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/tex_rcsinfo/trunk/checksums =================================================================== --- csw/mgar/pkg/tex_rcsinfo/trunk/checksums (rev 0) +++ csw/mgar/pkg/tex_rcsinfo/trunk/checksums 2012-06-26 14:04:08 UTC (rev 18550) @@ -0,0 +1 @@ +b9bf663c556c7a198f83f124fab37efc rcsinfo.zip Added: csw/mgar/pkg/tex_rcsinfo/trunk/files/0001-Adapt-build.patch =================================================================== --- csw/mgar/pkg/tex_rcsinfo/trunk/files/0001-Adapt-build.patch (rev 0) +++ csw/mgar/pkg/tex_rcsinfo/trunk/files/0001-Adapt-build.patch 2012-06-26 14:04:08 UTC (rev 18550) @@ -0,0 +1,36 @@ +From 404064c0cee11652c52fd41d5b60502c05856c86 Mon Sep 17 00:00:00 2001 +From: Peter Felecan +Date: Tue, 26 Jun 2012 15:18:39 +0200 +Subject: [PATCH] Adapt build + +--- + Makefile | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/Makefile b/Makefile +index bcac06a..e35dba5 100644 +--- a/Makefile ++++ b/Makefile +@@ -12,9 +12,9 @@ + + BASE = rcsinfo + +-TEXDIR = +-CONTRIB = $(TEXDIR)/lib/texmf/tex/latex2e/contrib/$(BASE) +-DOCDIR = $(TEXDIR)/doc/latex2e ++TEXDIR = $(texmflocaldir) ++CONTRIB = $(TEXDIR)/tex/latex/$(BASE) ++DOCDIR = $(TEXDIR)/doc/latex/styles + + DVIPS = dvips + LATEX = latex +@@ -119,4 +119,4 @@ realclean: clean + rm -fr $(HTML_DIR) *.dvi *.ps $(GEN) *.pdf + + distclean: realclean +- rm -fr README-* +\ No newline at end of file ++ rm -fr README-* +-- +1.7.10.3 + Added: csw/mgar/pkg/tex_rcsinfo/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/tex_rcsinfo/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/tex_rcsinfo/trunk/files/COPYING 2012-06-26 14:04:08 UTC (rev 18550) @@ -0,0 +1,416 @@ +The LaTeX Project Public License +=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- + +LPPL Version 1.3c 2008-05-04 + +Copyright 1999 2002-2008 LaTeX3 Project + Everyone is allowed to distribute verbatim copies of this + license document, but modification of it is not allowed. + + +PREAMBLE +======== + +The LaTeX Project Public License (LPPL) is the primary license under +which the LaTeX kernel and the base LaTeX packages are distributed. + +You may use this license for any work of which you hold the copyright +and which you wish to distribute. This license may be particularly +suitable if your work is TeX-related (such as a LaTeX package), but +it is written in such a way that you can use it even if your work is +unrelated to TeX. + +The section `WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE', +below, gives instructions, examples, and recommendations for authors +who are considering distributing their works under this license. + +This license gives conditions under which a work may be distributed +and modified, as well as conditions under which modified versions of +that work may be distributed. + +We, the LaTeX3 Project, believe that the conditions below give you +the freedom to make and distribute modified versions of your work +that conform with whatever technical specifications you wish while +maintaining the availability, integrity, and reliability of +that work. If you do not see how to achieve your goal while +meeting these conditions, then read the document `cfgguide.tex' +and `modguide.tex' in the base LaTeX distribution for suggestions. + + +DEFINITIONS +=========== + +In this license document the following terms are used: + + `Work' + Any work being distributed under this License. + + `Derived Work' + Any work that under any applicable law is derived from the Work. + + `Modification' + Any procedure that produces a Derived Work under any applicable + law -- for example, the production of a file containing an + original file associated with the Work or a significant portion of + such a file, either verbatim or with modifications and/or + translated into another language. + + `Modify' + To apply any procedure that produces a Derived Work under any + applicable law. + + `Distribution' + Making copies of the Work available from one person to another, in + whole or in part. Distribution includes (but is not limited to) + making any electronic components of the Work accessible by + file transfer protocols such as FTP or HTTP or by shared file + systems such as Sun's Network File System (NFS). + + `Compiled Work' + A version of the Work that has been processed into a form where it + is directly usable on a computer system. This processing may + include using installation facilities provided by the Work, + transformations of the Work, copying of components of the Work, or + other activities. Note that modification of any installation + facilities provided by the Work constitutes modification of the Work. + + `Current Maintainer' + A person or persons nominated as such within the Work. If there is + no such explicit nomination then it is the `Copyright Holder' under + any applicable law. + + `Base Interpreter' + A program or process that is normally needed for running or + interpreting a part or the whole of the Work. + + A Base Interpreter may depend on external components but these + are not considered part of the Base Interpreter provided that each + external component clearly identifies itself whenever it is used + interactively. Unless explicitly specified when applying the + license to the Work, the only applicable Base Interpreter is a + `LaTeX-Format' or in the case of files belonging to the + `LaTeX-format' a program implementing the `TeX language'. + + + +CONDITIONS ON DISTRIBUTION AND MODIFICATION +=========================================== + +1. Activities other than distribution and/or modification of the Work +are not covered by this license; they are outside its scope. In +particular, the act of running the Work is not restricted and no +requirements are made concerning any offers of support for the Work. + +2. You may distribute a complete, unmodified copy of the Work as you +received it. Distribution of only part of the Work is considered +modification of the Work, and no right to distribute such a Derived +Work may be assumed under the terms of this clause. + +3. You may distribute a Compiled Work that has been generated from a +complete, unmodified copy of the Work as distributed under Clause 2 +above, as long as that Compiled Work is distributed in such a way that +the recipients may install the Compiled Work on their system exactly +as it would have been installed if they generated a Compiled Work +directly from the Work. + +4. If you are the Current Maintainer of the Work, you may, without +restriction, modify the Work, thus creating a Derived Work. You may +also distribute the Derived Work without restriction, including +Compiled Works generated from the Derived Work. Derived Works +distributed in this manner by the Current Maintainer are considered to +be updated versions of the Work. + +5. If you are not the Current Maintainer of the Work, you may modify +your copy of the Work, thus creating a Derived Work based on the Work, +and compile this Derived Work, thus creating a Compiled Work based on +the Derived Work. + +6. If you are not the Current Maintainer of the Work, you may +distribute a Derived Work provided the following conditions are met +for every component of the Work unless that component clearly states +in the copyright notice that it is exempt from that condition. Only +the Current Maintainer is allowed to add such statements of exemption +to a component of the Work. + + a. If a component of this Derived Work can be a direct replacement + for a component of the Work when that component is used with the + Base Interpreter, then, wherever this component of the Work + identifies itself to the user when used interactively with that + Base Interpreter, the replacement component of this Derived Work + clearly and unambiguously identifies itself as a modified version + of this component to the user when used interactively with that + Base Interpreter. + + b. Every component of the Derived Work contains prominent notices + detailing the nature of the changes to that component, or a + prominent reference to another file that is distributed as part + of the Derived Work and that contains a complete and accurate log + of the changes. + + c. No information in the Derived Work implies that any persons, + including (but not limited to) the authors of the original version + of the Work, provide any support, including (but not limited to) + the reporting and handling of errors, to recipients of the + Derived Work unless those persons have stated explicitly that + they do provide such support for the Derived Work. + + d. You distribute at least one of the following with the Derived Work: + + 1. A complete, unmodified copy of the Work; + if your distribution of a modified component is made by + offering access to copy the modified component from a + designated place, then offering equivalent access to copy + the Work from the same or some similar place meets this + condition, even though third parties are not compelled to + copy the Work along with the modified component; + + 2. Information that is sufficient to obtain a complete, + unmodified copy of the Work. + +7. If you are not the Current Maintainer of the Work, you may +distribute a Compiled Work generated from a Derived Work, as long as +the Derived Work is distributed to all recipients of the Compiled +Work, and as long as the conditions of Clause 6, above, are met with +regard to the Derived Work. + +8. The conditions above are not intended to prohibit, and hence do not +apply to, the modification, by any method, of any component so that it +becomes identical to an updated version of that component of the Work as +it is distributed by the Current Maintainer under Clause 4, above. + +9. Distribution of the Work or any Derived Work in an alternative +format, where the Work or that Derived Work (in whole or in part) is +then produced by applying some process to that format, does not relax or +nullify any sections of this license as they pertain to the results of +applying that process. + +10. a. A Derived Work may be distributed under a different license + provided that license itself honors the conditions listed in + Clause 6 above, in regard to the Work, though it does not have + to honor the rest of the conditions in this license. + + b. If a Derived Work is distributed under a different license, that + Derived Work must provide sufficient documentation as part of + itself to allow each recipient of that Derived Work to honor the + restrictions in Clause 6 above, concerning changes from the Work. + +11. This license places no restrictions on works that are unrelated to +the Work, nor does this license place any restrictions on aggregating +such works with the Work by any means. + +12. Nothing in this license is intended to, or may be used to, prevent +complete compliance by all parties with all applicable laws. + + +NO WARRANTY +=========== + +There is no warranty for the Work. Except when otherwise stated in +writing, the Copyright Holder provides the Work `as is', without +warranty of any kind, either expressed or implied, including, but not +limited to, the implied warranties of merchantability and fitness for a +particular purpose. The entire risk as to the quality and performance +of the Work is with you. Should the Work prove defective, you assume +the cost of all necessary servicing, repair, or correction. + +In no event unless required by applicable law or agreed to in writing +will The Copyright Holder, or any author named in the components of the +Work, or any other party who may distribute and/or modify the Work as +permitted above, be liable to you for damages, including any general, +special, incidental or consequential damages arising out of any use of +the Work or out of inability to use the Work (including, but not limited +to, loss of data, data being rendered inaccurate, or losses sustained by +anyone as a result of any failure of the Work to operate with any other +programs), even if the Copyright Holder or said author or said other +party has been advised of the possibility of such damages. + + +MAINTENANCE OF THE WORK +======================= + +The Work has the status `author-maintained' if the Copyright Holder +explicitly and prominently states near the primary copyright notice in +the Work that the Work can only be maintained by the Copyright Holder +or simply that it is `author-maintained'. + +The Work has the status `maintained' if there is a Current Maintainer +who has indicated in the Work that they are willing to receive error +reports for the Work (for example, by supplying a valid e-mail +address). It is not required for the Current Maintainer to acknowledge +or act upon these error reports. + +The Work changes from status `maintained' to `unmaintained' if there +is no Current Maintainer, or the person stated to be Current +Maintainer of the work cannot be reached through the indicated means +of communication for a period of six months, and there are no other +significant signs of active maintenance. + +You can become the Current Maintainer of the Work by agreement with +any existing Current Maintainer to take over this role. + +If the Work is unmaintained, you can become the Current Maintainer of +the Work through the following steps: + + 1. Make a reasonable attempt to trace the Current Maintainer (and + the Copyright Holder, if the two differ) through the means of + an Internet or similar search. + + 2. If this search is successful, then enquire whether the Work + is still maintained. + + a. If it is being maintained, then ask the Current Maintainer + to update their communication data within one month. + + b. If the search is unsuccessful or no action to resume active + maintenance is taken by the Current Maintainer, then announce + within the pertinent community your intention to take over + maintenance. (If the Work is a LaTeX work, this could be + done, for example, by posting to comp.text.tex.) + + 3a. If the Current Maintainer is reachable and agrees to pass + maintenance of the Work to you, then this takes effect + immediately upon announcement. + + b. If the Current Maintainer is not reachable and the Copyright + Holder agrees that maintenance of the Work be passed to you, + then this takes effect immediately upon announcement. + + 4. If you make an `intention announcement' as described in 2b. above + and after three months your intention is challenged neither by + the Current Maintainer nor by the Copyright Holder nor by other + people, then you may arrange for the Work to be changed so as + to name you as the (new) Current Maintainer. + + 5. If the previously unreachable Current Maintainer becomes + reachable once more within three months of a change completed + under the terms of 3b) or 4), then that Current Maintainer must + become or remain the Current Maintainer upon request provided + they then update their communication data within one month. + +A change in the Current Maintainer does not, of itself, alter the fact +that the Work is distributed under the LPPL license. + +If you become the Current Maintainer of the Work, you should +immediately provide, within the Work, a prominent and unambiguous +statement of your status as Current Maintainer. You should also +announce your new status to the same pertinent community as +in 2b) above. + + +WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE +====================================================== + +This section contains important instructions, examples, and +recommendations for authors who are considering distributing their +works under this license. These authors are addressed as `you' in +this section. + +Choosing This License or Another License +---------------------------------------- + +If for any part of your work you want or need to use *distribution* +conditions that differ significantly from those in this license, then +do not refer to this license anywhere in your work but, instead, +distribute your work under a different license. You may use the text +of this license as a model for your own license, but your license +should not refer to the LPPL or otherwise give the impression that +your work is distributed under the LPPL. + +The document `modguide.tex' in the base LaTeX distribution explains +the motivation behind the conditions of this license. It explains, +for example, why distributing LaTeX under the GNU General Public +License (GPL) was considered inappropriate. Even if your work is +unrelated to LaTeX, the discussion in `modguide.tex' may still be +relevant, and authors intending to distribute their works under any +license are encouraged to read it. + +A Recommendation on Modification Without Distribution +----------------------------------------------------- + +It is wise never to modify a component of the Work, even for your own +personal use, without also meeting the above conditions for +distributing the modified component. While you might intend that such +modifications will never be distributed, often this will happen by +accident -- you may forget that you have modified that component; or +it may not occur to you when allowing others to access the modified +version that you are thus distributing it and violating the conditions +of this license in ways that could have legal implications and, worse, +cause problems for the community. It is therefore usually in your +best interest to keep your copy of the Work identical with the public +one. Many works provide ways to control the behavior of that work +without altering any of its licensed components. + +How to Use This License +----------------------- + +To use this license, place in each of the components of your work both +an explicit copyright notice including your name and the year the work +was authored and/or last substantially modified. Include also a +statement that the distribution and/or modification of that +component is constrained by the conditions in this license. + +Here is an example of such a notice and statement: + + %% pig.dtx + %% Copyright 2005 M. Y. Name + % + % This work may be distributed and/or modified under the + % conditions of the LaTeX Project Public License, either version 1.3 + % of this license or (at your option) any later version. + % The latest version of this license is in + % http://www.latex-project.org/lppl.txt + % and version 1.3 or later is part of all distributions of LaTeX + % version 2005/12/01 or later. + % + % This work has the LPPL maintenance status `maintained'. + % + % The Current Maintainer of this work is M. Y. Name. + % + % This work consists of the files pig.dtx and pig.ins + % and the derived file pig.sty. + +Given such a notice and statement in a file, the conditions +given in this license document would apply, with the `Work' referring +to the three files `pig.dtx', `pig.ins', and `pig.sty' (the last being +generated from `pig.dtx' using `pig.ins'), the `Base Interpreter' +referring to any `LaTeX-Format', and both `Copyright Holder' and +`Current Maintainer' referring to the person `M. Y. Name'. + +If you do not want the Maintenance section of LPPL to apply to your +Work, change `maintained' above into `author-maintained'. +However, we recommend that you use `maintained', as the Maintenance +section was added in order to ensure that your Work remains useful to +the community even when you can no longer maintain and support it +yourself. + +Derived Works That Are Not Replacements +--------------------------------------- + +Several clauses of the LPPL specify means to provide reliability and +stability for the user community. They therefore concern themselves +with the case that a Derived Work is intended to be used as a +(compatible or incompatible) replacement of the original Work. If +this is not the case (e.g., if a few lines of code are reused for a +completely different task), then clauses 6b and 6d shall not apply. + + +Important Recommendations +------------------------- + + Defining What Constitutes the Work + + The LPPL requires that distributions of the Work contain all the + files of the Work. It is therefore important that you provide a + way for the licensee to determine which files constitute the Work. + This could, for example, be achieved by explicitly listing all the + files of the Work near the copyright notice of each file or by + using a line such as: + + % This work consists of all files listed in manifest.txt. + + in that place. In the absence of an unequivocal list it might be + impossible for the licensee to determine what is considered by you + to comprise the Work and, in such a case, the licensee would be + entitled to make reasonable conjectures as to which files comprise + the Work. + Added: csw/mgar/pkg/tex_rcsinfo/trunk/files/README.CSW =================================================================== --- csw/mgar/pkg/tex_rcsinfo/trunk/files/README.CSW (rev 0) +++ csw/mgar/pkg/tex_rcsinfo/trunk/files/README.CSW 2012-06-26 14:04:08 UTC (rev 18550) @@ -0,0 +1,11 @@ +$Id$ + +The documentation is installed in the standard TeX tree, i.e., +/opt/csw/share/texmf-local. + +CSW Team + +# Local Variables: +# mode: text +# mode: font-lock +# End: Property changes on: csw/mgar/pkg/tex_rcsinfo/trunk/files/README.CSW ___________________________________________________________________ Added: svn:keywords + Author Date HeadURL Id Revision This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Tue Jun 26 16:14:35 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Tue, 26 Jun 2012 14:14:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[18551] csw/mgar/pkg/tex_dirtree/trunk/Makefile Message-ID: Revision: 18551 http://gar.svn.sourceforge.net/gar/?rev=18551&view=rev Author: pfelecan Date: 2012-06-26 14:14:34 +0000 (Tue, 26 Jun 2012) Log Message: ----------- tex_dirtree/trunk: addition of the readme to the distributed files. Modified Paths: -------------- csw/mgar/pkg/tex_dirtree/trunk/Makefile Modified: csw/mgar/pkg/tex_dirtree/trunk/Makefile =================================================================== --- csw/mgar/pkg/tex_dirtree/trunk/Makefile 2012-06-26 14:04:08 UTC (rev 18550) +++ csw/mgar/pkg/tex_dirtree/trunk/Makefile 2012-06-26 14:14:34 UTC (rev 18551) @@ -15,6 +15,7 @@ MASTER_SITES = http://mirror.ctan.org/macros/generic/ DISTFILES = $(DISTNAME).zip # taken from http://www.latex-project.org/lppl.txt +DISTFILES += README.CSW DISTFILES += COPYING BUILD_DEP_PKGS += CSWtetex 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 26 16:33:13 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 26 Jun 2012 14:33:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[18552] csw/mgar/pkg/imapfilter/trunk/Makefile Message-ID: Revision: 18552 http://gar.svn.sourceforge.net/gar/?rev=18552&view=rev Author: bdwalton Date: 2012-06-26 14:33:12 +0000 (Tue, 26 Jun 2012) Log Message: ----------- imapfilter/trunk: solaris 10 build only Modified Paths: -------------- csw/mgar/pkg/imapfilter/trunk/Makefile Modified: csw/mgar/pkg/imapfilter/trunk/Makefile =================================================================== --- csw/mgar/pkg/imapfilter/trunk/Makefile 2012-06-26 14:14:34 UTC (rev 18551) +++ csw/mgar/pkg/imapfilter/trunk/Makefile 2012-06-26 14:33:12 UTC (rev 18552) @@ -3,6 +3,8 @@ GARTYPE = v2 CATEGORIES = net +PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 + DESCRIPTION = IMAP mail filtering utility define BLURB IMAPFilter is a mail filtering utility. It connects to remote mail servers 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 27 02:39:57 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 27 Jun 2012 00:39:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[18553] csw/mgar/pkg/gdal/trunk/Makefile Message-ID: Revision: 18553 http://gar.svn.sourceforge.net/gar/?rev=18553&view=rev Author: bdwalton Date: 2012-06-27 00:39:56 +0000 (Wed, 27 Jun 2012) Log Message: ----------- gdal/trunk: switch back to g++, add iconv2 dep, move back to gxx paths Modified Paths: -------------- csw/mgar/pkg/gdal/trunk/Makefile Modified: csw/mgar/pkg/gdal/trunk/Makefile =================================================================== --- csw/mgar/pkg/gdal/trunk/Makefile 2012-06-26 14:33:12 UTC (rev 18552) +++ csw/mgar/pkg/gdal/trunk/Makefile 2012-06-27 00:39:56 UTC (rev 18553) @@ -11,6 +11,8 @@ PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 +GARCOMPILER = GNU + MASTER_SITES = http://download.osgeo.org/$(NAME)/ DISTFILES = $(DISTNAME).tar.gz PATCHFILES += 0001-Force-use-of-double-data-type-before-checking-for-is.patch @@ -42,6 +44,7 @@ RUNTIME_DEP_PKGS_CSWgdal += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWgdal += CSWlibpq5 RUNTIME_DEP_PKGS_CSWgdal += CSWlibmysqlclient18 +RUNTIME_DEP_PKGS_CSWgdal += CSWlibiconv2 PACKAGES += CSWlibgdal1 CATALOGNAME_CSWlibgdal1 = libgdal1 @@ -63,6 +66,7 @@ RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibpq5 RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibgif4 +RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibiconv2 PKGFILES_CSWlibgdal1 += $(call baseisadirs,$(libdir),libgdal\.so\.1\.15\.0) PKGFILES_CSWlibgdal1 += $(call baseisadirs,$(libdir),libgdal\.so\.1(\.\d+)*) @@ -72,8 +76,13 @@ RUNTIME_DEP_PKGS_CSWgdal-dev += CSWlibgdal1 PKGFILES_CSWgdal-dev += $(PKGFILES_DEVEL) /opt/csw/bin/gdal-config +libdir = $(abspath /opt/csw/gxx/lib/$(MM_LIBDIR)) +includedir = /opt/csw/gxx/include + # enable use of __func__ as required by patch 0004 +ifneq ($(GARCOMPILER),GNU) EXTRA_CXXFLAGS += -features=extensions +endif CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-libz=$(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 Wed Jun 27 03:18:58 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 27 Jun 2012 01:18:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[18554] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 18554 http://gar.svn.sourceforge.net/gar/?rev=18554&view=rev Author: bdwalton Date: 2012-06-27 01:18:58 +0000 (Wed, 27 Jun 2012) Log Message: ----------- php5/trunk: override ssl dep issue for mysql extension (hopefully temporary) Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2012-06-27 00:39:56 UTC (rev 18553) +++ csw/mgar/pkg/php5/trunk/Makefile 2012-06-27 01:18:58 UTC (rev 18554) @@ -166,6 +166,8 @@ $(eval $(call php5_subpackage,mcrypt,CSWlibmcrypt4 CSWlibltdl7 CSWlibz1)) $(eval $(call php5_subpackage,mssql,CSWlibsybdb5 CSWlibz1)) $(eval $(call php5_subpackage,mysql,CSWlibmysqlclient18 CSWlibz1 CSWlibssl1-0-0)) +# likely a checkpkg glitch (uses sparcv8plus+vis path for the library) +CHECKPKG_OVERRIDES_CSWphp5-mysql += surplus-dependency|CSWlibssl1-0-0 $(eval $(call php5_subpackage,mysqli,CSWlibmysqlclient18 CSWlibz1 CSWlibssl1-0-0)) $(eval $(call php5_subpackage,odbc,CSWlibodbc2 CSWlibz1)) $(eval $(call php5_subpackage,openssl,CSWlibssl1-0-0 CSWlibgssapi-krb5-2 CSWlibkrb5-3 CSWlibk5crypto3 CSWlibcom-err3 CSWlibz1)) 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 27 04:20:10 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 27 Jun 2012 02:20:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[18555] csw/mgar/pkg/gdal/trunk/Makefile Message-ID: Revision: 18555 http://gar.svn.sourceforge.net/gar/?rev=18555&view=rev Author: bdwalton Date: 2012-06-27 02:20:10 +0000 (Wed, 27 Jun 2012) Log Message: ----------- gdal/trunk: more gxx renaming changes Modified Paths: -------------- csw/mgar/pkg/gdal/trunk/Makefile Modified: csw/mgar/pkg/gdal/trunk/Makefile =================================================================== --- csw/mgar/pkg/gdal/trunk/Makefile 2012-06-27 01:18:58 UTC (rev 18554) +++ csw/mgar/pkg/gdal/trunk/Makefile 2012-06-27 02:20:10 UTC (rev 18555) @@ -27,7 +27,7 @@ SPKG_DESC_CSWgdal = $(DESCRIPTION) RUNTIME_DEP_PKGS_CSWgdal += CSWlibgif4 RUNTIME_DEP_PKGS_CSWgdal += CSWlibgeos-c1 -RUNTIME_DEP_PKGS_CSWgdal += CSWlibgdal1 +RUNTIME_DEP_PKGS_CSWgdal += CSWlibgdal1-gxx RUNTIME_DEP_PKGS_CSWgdal += CSWlibcurl4 RUNTIME_DEP_PKGS_CSWgdal += CSWlibexpat1 RUNTIME_DEP_PKGS_CSWgdal += CSWlibstdc++6 @@ -46,34 +46,35 @@ RUNTIME_DEP_PKGS_CSWgdal += CSWlibmysqlclient18 RUNTIME_DEP_PKGS_CSWgdal += CSWlibiconv2 -PACKAGES += CSWlibgdal1 -CATALOGNAME_CSWlibgdal1 = libgdal1 -SPKG_DESC_CSWlibgdal1 += Geospatial Data Abstraction Library, libgdal.so.1 -RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibcurl4 -RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibexpat1 -RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibstdc++6 -RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibhdf5-7 -RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWjasper -RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibjpeg7 -RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibidn11 -RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibsqlite3-0 -RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibssl1-0-0 -RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibpng12-0 -RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibtiff3 -RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibz1 -RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibnetcdf7 -RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibmysqlclient18 -RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibpq5 -RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibgif4 -RUNTIME_DEP_PKGS_CSWlibgdal1 += CSWlibiconv2 -PKGFILES_CSWlibgdal1 += $(call baseisadirs,$(libdir),libgdal\.so\.1\.15\.0) -PKGFILES_CSWlibgdal1 += $(call baseisadirs,$(libdir),libgdal\.so\.1(\.\d+)*) +PACKAGES += CSWlibgdal1-gxx +OBSOLETED_BY_CSWlibgdal1-gxx = CSWlibgdal1 +CATALOGNAME_CSWlibgdal1-gxx = libgdal1_gxx +SPKG_DESC_CSWlibgdal1-gxx += Geospatial Data Abstraction Library, libgdal.so.1 +RUNTIME_DEP_PKGS_CSWlibgdal1-gxx += CSWlibcurl4 +RUNTIME_DEP_PKGS_CSWlibgdal1-gxx += CSWlibexpat1 +RUNTIME_DEP_PKGS_CSWlibgdal1-gxx += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWlibgdal1-gxx += CSWlibhdf5-7 +RUNTIME_DEP_PKGS_CSWlibgdal1-gxx += CSWjasper +RUNTIME_DEP_PKGS_CSWlibgdal1-gxx += CSWlibjpeg7 +RUNTIME_DEP_PKGS_CSWlibgdal1-gxx += CSWlibidn11 +RUNTIME_DEP_PKGS_CSWlibgdal1-gxx += CSWlibsqlite3-0 +RUNTIME_DEP_PKGS_CSWlibgdal1-gxx += CSWlibssl1-0-0 +RUNTIME_DEP_PKGS_CSWlibgdal1-gxx += CSWlibpng12-0 +RUNTIME_DEP_PKGS_CSWlibgdal1-gxx += CSWlibtiff3 +RUNTIME_DEP_PKGS_CSWlibgdal1-gxx += CSWlibz1 +RUNTIME_DEP_PKGS_CSWlibgdal1-gxx += CSWlibnetcdf7 +RUNTIME_DEP_PKGS_CSWlibgdal1-gxx += CSWlibmysqlclient18 +RUNTIME_DEP_PKGS_CSWlibgdal1-gxx += CSWlibpq5 +RUNTIME_DEP_PKGS_CSWlibgdal1-gxx += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibgdal1-gxx += CSWlibgif4 +RUNTIME_DEP_PKGS_CSWlibgdal1-gxx += CSWlibiconv2 +PKGFILES_CSWlibgdal1-gxx += $(call baseisadirs,$(libdir),libgdal\.so\.1\.15\.0) +PKGFILES_CSWlibgdal1-gxx += $(call baseisadirs,$(libdir),libgdal\.so\.1(\.\d+)*) PACKAGES += CSWgdal-dev CATALOGNAME_CSWgdal-dev = gdal_dev SPKG_DESC_CSWgdal-dev += Geospatial Data Abstraction Library, development files -RUNTIME_DEP_PKGS_CSWgdal-dev += CSWlibgdal1 +RUNTIME_DEP_PKGS_CSWgdal-dev += CSWlibgdal1-gxx PKGFILES_CSWgdal-dev += $(PKGFILES_DEVEL) /opt/csw/bin/gdal-config libdir = $(abspath /opt/csw/gxx/lib/$(MM_LIBDIR)) 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 27 04:34:39 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 27 Jun 2012 02:34:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[18556] csw/mgar/pkg/imapfilter/trunk/Makefile Message-ID: Revision: 18556 http://gar.svn.sourceforge.net/gar/?rev=18556&view=rev Author: bdwalton Date: 2012-06-27 02:34:38 +0000 (Wed, 27 Jun 2012) Log Message: ----------- imapfilter/trunk: update lua dev dependency after lua package split/update Modified Paths: -------------- csw/mgar/pkg/imapfilter/trunk/Makefile Modified: csw/mgar/pkg/imapfilter/trunk/Makefile =================================================================== --- csw/mgar/pkg/imapfilter/trunk/Makefile 2012-06-27 02:20:10 UTC (rev 18555) +++ csw/mgar/pkg/imapfilter/trunk/Makefile 2012-06-27 02:34:38 UTC (rev 18556) @@ -21,7 +21,7 @@ LICENSE = LICENSE BUILD_DEP_PKGS += CSWlibssl-dev -BUILD_DEP_PKGS += CSWlua +BUILD_DEP_PKGS += CSWlua-dev BUILD_DEP_PKGS += CSWlibpcre-dev RUNTIME_DEP_PKGS_CSWimapfilter += CSWlua 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 27 08:06:56 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 27 Jun 2012 06:06:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[18557] csw/mgar/pkg/cpan/GD/trunk Message-ID: Revision: 18557 http://gar.svn.sourceforge.net/gar/?rev=18557&view=rev Author: dmichelsen Date: 2012-06-27 06:06:56 +0000 (Wed, 27 Jun 2012) Log Message: ----------- cpan/GD/trunk: Update dependency names Modified Paths: -------------- csw/mgar/pkg/cpan/GD/trunk/Makefile csw/mgar/pkg/cpan/GD/trunk/checksums Modified: csw/mgar/pkg/cpan/GD/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/GD/trunk/Makefile 2012-06-27 02:34:38 UTC (rev 18556) +++ csw/mgar/pkg/cpan/GD/trunk/Makefile 2012-06-27 06:06:56 UTC (rev 18557) @@ -16,16 +16,27 @@ # https://rt.cpan.org/Ticket/Display.html?id=49053 PATCHFILES = diff-GD.t -PACKAGES = CSWpmgd -CATALOGNAME = pm_gd - LICENSE = LICENSE -RUNTIME_DEP_PKGS = CSWftype2 CSWgd CSWiconv CSWjpeg CSWpng -RUNTIME_DEP_PKGS += CSWzlib CSWfconfig CSWxpm +PACKAGES += CSWpm-gd +SPKG_DESC_CSWpm-gd = Interface to GD graphics library +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWpm-gd += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWpm-gd += CSWlibpng12-0 +RUNTIME_DEP_PKGS_CSWpm-gd += CSWlibz1 +RUNTIME_DEP_PKGS_CSWpm-gd += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWpm-gd += CSWlibgd2 +RUNTIME_DEP_PKGS_CSWpm-gd += CSWxpm +RUNTIME_DEP_PKGS_CSWpm-gd += CSWlibfontconfig1 +RUNTIME_DEP_PKGS_CSWpm-gd += CSWlibjpeg7 +OBSOLETED_BY_CSWpm-gd += CSWpmgd +CATALOGNAME_CSWpmgd = pm_gd_stub -BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) CSWlibxpmdevel +# These are just docs and examples +CHECKPKG_OVERRIDES_CSWpm-gd += file-with-bad-content|/usr/local|root/opt/csw/lib/perl/csw/qd.pl +REINPLACE_USRLOCAL += GD.pm + # These don't actually do anything as the pathes are already confgured CONFIGURE_ARGS = lib_gd_path $(libdir) CONFIGURE_ARGS += lib_ft_path $(libdir) @@ -36,8 +47,6 @@ CONFIGURE_ARGS += lib_xpm_path $(libdir) CONFIGURE_ARGS += lib_zlib_path $(libdir) -NOISALIST = 1 - # BUILD_OVERRIDE_VARS = CCFLAGS LD BUILD_OVERRIDE_VARS = CCFLAGS # Don't use hardcoded -Wformat=0 Modified: csw/mgar/pkg/cpan/GD/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/GD/trunk/checksums 2012-06-27 02:34:38 UTC (rev 18556) +++ csw/mgar/pkg/cpan/GD/trunk/checksums 2012-06-27 06:06:56 UTC (rev 18557) @@ -1,2 +1 @@ 430b15e74eb6287519c403c4772dc1e3 GD-2.45.tar.gz -ef1e469ea526f7a58fe986fdc0b67a4f diff-GD.t This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Wed Jun 27 08:14:39 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Wed, 27 Jun 2012 06:14:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[18558] csw/mgar/pkg/exiv2/trunk Message-ID: Revision: 18558 http://gar.svn.sourceforge.net/gar/?rev=18558&view=rev Author: cgrzemba Date: 2012-06-27 06:14:39 +0000 (Wed, 27 Jun 2012) Log Message: ----------- exiv2/trunk: add studio compiler patches Modified Paths: -------------- csw/mgar/pkg/exiv2/trunk/Makefile csw/mgar/pkg/exiv2/trunk/checksums Added Paths: ----------- csw/mgar/pkg/exiv2/trunk/files/0002-fix-depend-flag-config.mk.in.patch csw/mgar/pkg/exiv2/trunk/files/0003-type-cast-basicio.cpp.patch csw/mgar/pkg/exiv2/trunk/files/0004-rsc-remove-error.cpp.patch Modified: csw/mgar/pkg/exiv2/trunk/Makefile =================================================================== --- csw/mgar/pkg/exiv2/trunk/Makefile 2012-06-27 06:06:56 UTC (rev 18557) +++ csw/mgar/pkg/exiv2/trunk/Makefile 2012-06-27 06:14:39 UTC (rev 18558) @@ -1,7 +1,7 @@ NAME = exiv2 -VERSION = 0.19 +VERSION = 0.23 +GARTYPE = v2 CATEGORIES = lib -GARTYPE = v2 DESCRIPTION = Image metadata library and tools define BLURB @@ -13,12 +13,21 @@ MASTER_SITES = http://www.exiv2.org/ DISTFILES = $(NAME)-$(VERSION).tar.gz -PATCHFILES = 0001-Remove-unknown-flag-to-Sun-Studio.patch +PATCHFILES += 0001-Remove-unknown-flag-to-Sun-Studio.patch +PATCHFILES += 0002-fix-depend-flag-config.mk.in.patch +PATCHFILES += 0003-type-cast-basicio.cpp.patch +PATCHFILES += 0004-rsc-remove-error.cpp.patch +GARCOMPILER = SOS12U3 + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz BUILD64_LIBS_ONLY = 1 + +# see: http://solaris.bionicmutton.org/hg/kde4-specs-460/file/26c2cab27bbe/specs/patches/exiv2/0.14/README.STUDIO12 +EXTRA_CXXFLAGS = -features=anachronisms,except,rtti,export,extensions,nestedaccess,tmplife,tmplrefstatic + CONFIGURE_ARGS = $(DIRPATHS) # Sun Studio doesn't unerstand g++ features Modified: csw/mgar/pkg/exiv2/trunk/checksums =================================================================== --- csw/mgar/pkg/exiv2/trunk/checksums 2012-06-27 06:06:56 UTC (rev 18557) +++ csw/mgar/pkg/exiv2/trunk/checksums 2012-06-27 06:14:39 UTC (rev 18558) @@ -1,2 +1 @@ -ac2024c172a70a811b9972cd8b46f3f3 0001-Remove-unknown-flag-to-Sun-Studio.patch -f52fb75a2cb7512f1484deab76473e13 exiv2-0.19.tar.gz +dab67c07bb63a4386d4ea607a8e06eaf exiv2-0.23.tar.gz Added: csw/mgar/pkg/exiv2/trunk/files/0002-fix-depend-flag-config.mk.in.patch =================================================================== --- csw/mgar/pkg/exiv2/trunk/files/0002-fix-depend-flag-config.mk.in.patch (rev 0) +++ csw/mgar/pkg/exiv2/trunk/files/0002-fix-depend-flag-config.mk.in.patch 2012-06-27 06:14:39 UTC (rev 18558) @@ -0,0 +1,20 @@ +--- a/config/config.mk.in ++++ b/config/config.mk.in +@@ -129,14 +129,14 @@ ifdef DEP_TRACKING + # dependencies. If you're not using gcc, you may need to change + # this to something suitable for your compiler or simply unset + # the variable. See the link above for suggestions. +- MAKEDEPEND = $(CXX) -MM $(CPPFLAGS) -o $*.d $< ++ MAKEDEPEND = $(CXX) -xM1 $(CPPFLAGS) -o $*.d $< + + # Dependency files post-process commands +- POSTDEPEND = if test ! -d $(DEPDIR); then mkdir $(DEPDIR); fi; \ ++ POSTDEPEND = $(shell if test ! -d $(DEPDIR); then mkdir $(DEPDIR); fi; \ + if test -e $*.d; then cp $*.d $(DEPDIR)/$*.d; \ + sed -e 's/^\#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \ + -e '/^$$/ d' -e 's/$$/ :/' < $*.d >> $(DEPDIR)/$*.d; \ +- $(RM) $*.d; fi ++ $(RM) $*.d; fi) + + # Compiler flags to generate dependency files at the same time + # as object files (for gcc) Added: csw/mgar/pkg/exiv2/trunk/files/0003-type-cast-basicio.cpp.patch =================================================================== --- csw/mgar/pkg/exiv2/trunk/files/0003-type-cast-basicio.cpp.patch (rev 0) +++ csw/mgar/pkg/exiv2/trunk/files/0003-type-cast-basicio.cpp.patch 2012-06-27 06:14:39 UTC (rev 18558) @@ -0,0 +1,13 @@ +diff --git a/src/basicio.cpp b/src/basicio.cpp +index 0343dff..174e8a7 100644 +--- a/src/basicio.cpp ++++ b/src/basicio.cpp +@@ -312,7 +312,7 @@ namespace Exiv2 { + int rc = 0; + if (p_->pMappedArea_ != 0) { + #if defined EXV_HAVE_MMAP && defined EXV_HAVE_MUNMAP +- if (::munmap(p_->pMappedArea_, p_->mappedLength_) != 0) { ++ if (::munmap((char*)p_->pMappedArea_, p_->mappedLength_) != 0) { + rc = 1; + } + #elif defined WIN32 && !defined __CYGWIN__ Added: csw/mgar/pkg/exiv2/trunk/files/0004-rsc-remove-error.cpp.patch =================================================================== --- csw/mgar/pkg/exiv2/trunk/files/0004-rsc-remove-error.cpp.patch (rev 0) +++ csw/mgar/pkg/exiv2/trunk/files/0004-rsc-remove-error.cpp.patch 2012-06-27 06:14:39 UTC (rev 18558) @@ -0,0 +1,13 @@ +diff --git a/src/error.cpp b/src/error.cpp +index af588d0..efe2ebf 100644 +--- a/src/error.cpp ++++ b/src/error.cpp +@@ -26,7 +26,7 @@ + */ + // ***************************************************************************** + #include "rcsid_int.hpp" +-EXIV2_RCSID("@(#) $Id: error.cpp 2681 2012-03-22 15:19:35Z ahuggel $") ++// EXIV2_RCSID("@(#) $Id: error.cpp 2681 2012-03-22 15:19:35Z ahuggel $") + + // ***************************************************************************** + // included header files 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 27 09:21:22 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 27 Jun 2012 07:21:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[18559] csw/mgar/pkg/xpm Message-ID: Revision: 18559 http://gar.svn.sourceforge.net/gar/?rev=18559&view=rev Author: dmichelsen Date: 2012-06-27 07:21:21 +0000 (Wed, 27 Jun 2012) Log Message: ----------- xpm: Move old crud aside Added Paths: ----------- csw/mgar/pkg/xpm/branches/ csw/mgar/pkg/xpm/tags/ csw/mgar/pkg/xpm/tags/legacy/ csw/mgar/pkg/xpm/trunk/ Removed Paths: ------------- csw/mgar/pkg/xpm/trunk/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Jun 27 09:46:32 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 27 Jun 2012 07:46:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[18560] csw/mgar/pkg/matplotlib/trunk/Makefile Message-ID: Revision: 18560 http://gar.svn.sourceforge.net/gar/?rev=18560&view=rev Author: wahwah Date: 2012-06-27 07:46:32 +0000 (Wed, 27 Jun 2012) Log Message: ----------- matplotlib/trunk: more information about the bug Modified Paths: -------------- csw/mgar/pkg/matplotlib/trunk/Makefile Modified: csw/mgar/pkg/matplotlib/trunk/Makefile =================================================================== --- csw/mgar/pkg/matplotlib/trunk/Makefile 2012-06-27 07:21:21 UTC (rev 18559) +++ csw/mgar/pkg/matplotlib/trunk/Makefile 2012-06-27 07:46:32 UTC (rev 18560) @@ -1,6 +1,12 @@ # Copyright 2009 OpenCSW # Distributed under the terms of the GNU General Public License v2 # $Id$ +# +# This recipe does not build, because the code is in C++, and Python's setup +# script insists on calling the 'cc' binary instead of 'CC'. I don't know how +# to change it. +# +# upstream bug: http://bugs.python.org/issue1250 NAME = matplotlib VERSION = 1.1.0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Wed Jun 27 11:38:38 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Wed, 27 Jun 2012 09:38:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[18561] csw/mgar/pkg Message-ID: Revision: 18561 http://gar.svn.sourceforge.net/gar/?rev=18561&view=rev Author: pfelecan Date: 2012-06-27 09:38:38 +0000 (Wed, 27 Jun 2012) Log Message: ----------- tex_svninfo/trunk: migrated from a private recipe to a GAR based recipe Added Paths: ----------- csw/mgar/pkg/tex_svninfo/ csw/mgar/pkg/tex_svninfo/Makefile csw/mgar/pkg/tex_svninfo/branches/ csw/mgar/pkg/tex_svninfo/tags/ csw/mgar/pkg/tex_svninfo/trunk/ csw/mgar/pkg/tex_svninfo/trunk/Makefile csw/mgar/pkg/tex_svninfo/trunk/checksums csw/mgar/pkg/tex_svninfo/trunk/files/ csw/mgar/pkg/tex_svninfo/trunk/files/0001-Adapt-build.patch csw/mgar/pkg/tex_svninfo/trunk/files/COPYING csw/mgar/pkg/tex_svninfo/trunk/files/README.CSW Added: csw/mgar/pkg/tex_svninfo/Makefile =================================================================== --- csw/mgar/pkg/tex_svninfo/Makefile (rev 0) +++ csw/mgar/pkg/tex_svninfo/Makefile 2012-06-27 09:38:38 UTC (rev 18561) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/tex_svninfo/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/tex_svninfo/trunk/Makefile =================================================================== --- csw/mgar/pkg/tex_svninfo/trunk/Makefile (rev 0) +++ csw/mgar/pkg/tex_svninfo/trunk/Makefile 2012-06-27 09:38:38 UTC (rev 18561) @@ -0,0 +1,50 @@ +# $Id$ + +NAME = tex_svninfo +VERSION = 0.7.4 +GARTYPE = v2 +CATEGORIES = xtra + +DESCRIPTION = Extract the information provided by the SVN revision control system from TeX documents +define BLURB + This package is used to extract the revision and file information provided + by the subversion revision control system. +endef + +DISTNAME = svninfo +MASTER_SITES = http://mirror.ctan.org/macros/latex/contrib/ +DISTFILES = $(DISTNAME).zip +# taken from http://www.latex-project.org/lppl.txt +DISTFILES += README.CSW +DISTFILES += COPYING +PATCHFILES += 0001-Adapt-build.patch + +BUILD_DEP_PKGS += CSWtetex + +RUNTIME_DEP_PKGS += CSWtetex + +PACKAGES = CSWtex-svninfo +SPKG_DESC_CSWtex-svninfo = $(DESCRIPTION) +CATALOGNAME_CSWtex-svninfo = tex_svninfo +OBSOLETED_BY_CSWtex-svninfo = CSWtexsvninfo +CATALOGNAME_CSWtexsvninfo = tex_svninfo_stub +ARCHALL_CSWtex-svninfo = 1 +CHECKPKG_OVERRIDES_CSWtex-svninfo += surplus-dependency|CSWtetex + +CONFIGURE_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +include gar/category.mk + +install-custom: pkgdocdir = $(docdir)/$(NAME) +install-custom: GNUinstall = ginstall +install-custom: TEXDIR = $(texmflocaldir) +install-custom: CONTRIB = $(TEXDIR)/tex/latex/$(BASE) +install-custom: DOCDIR = $(TEXDIR)/doc/latex/styles +install-custom: + $(GNUinstall) --directory $(DESTDIR)/$(CONTRIB) + $(GNUinstall) $(WORKSRC)/svninfo.cfg $(WORKSRC)/svninfo.sty $(DESTDIR)/$(CONTRIB) + $(GNUinstall) --directory $(DESTDIR)/$(DOCDIR) + $(GNUinstall) $(WORKSRC)/svninfo.dvi $(WORKSRC)/svninfo.ps $(WORKSRC)/svninfo.pdf $(DESTDIR)/$(DOCDIR) + $(MAKECOOKIE) Property changes on: csw/mgar/pkg/tex_svninfo/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/tex_svninfo/trunk/checksums =================================================================== --- csw/mgar/pkg/tex_svninfo/trunk/checksums (rev 0) +++ csw/mgar/pkg/tex_svninfo/trunk/checksums 2012-06-27 09:38:38 UTC (rev 18561) @@ -0,0 +1 @@ +f5aae2926ec18069b0002026cd52b596 svninfo.zip Added: csw/mgar/pkg/tex_svninfo/trunk/files/0001-Adapt-build.patch =================================================================== --- csw/mgar/pkg/tex_svninfo/trunk/files/0001-Adapt-build.patch (rev 0) +++ csw/mgar/pkg/tex_svninfo/trunk/files/0001-Adapt-build.patch 2012-06-27 09:38:38 UTC (rev 18561) @@ -0,0 +1,37 @@ +From 766cd3a3ecccd65fdc445c561c70da190633d507 Mon Sep 17 00:00:00 2001 +From: Peter Felecan +Date: Wed, 27 Jun 2012 10:03:15 +0200 +Subject: [PATCH] Adapt build + +--- + Makefile | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/Makefile b/Makefile +index 822d6e3..016aecc 100644 +--- a/Makefile ++++ b/Makefile +@@ -11,16 +11,16 @@ + + BASE = svninfo + +-TEXDIR = +-CONTRIB = $(TEXDIR)/lib/texmf/tex/latex2e/contrib/$(BASE) +-DOCDIR = $(TEXDIR)/doc/latex2e ++TEXDIR = $(texmflocaldir) ++CONTRIB = $(TEXDIR)/tex/latex/$(BASE) ++DOCDIR = $(TEXDIR)/doc/latex + + DVIPS = dvips + LATEX = latex + MAKEINDEX = makeindex + PDFLATEX = pdflatex + +-TAR = tar ++TAR = gtar + + ######################################################################## + +-- +1.7.10.3 + Added: csw/mgar/pkg/tex_svninfo/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/tex_svninfo/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/tex_svninfo/trunk/files/COPYING 2012-06-27 09:38:38 UTC (rev 18561) @@ -0,0 +1,416 @@ +The LaTeX Project Public License +=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- + +LPPL Version 1.3c 2008-05-04 + +Copyright 1999 2002-2008 LaTeX3 Project + Everyone is allowed to distribute verbatim copies of this + license document, but modification of it is not allowed. + + +PREAMBLE +======== + +The LaTeX Project Public License (LPPL) is the primary license under +which the LaTeX kernel and the base LaTeX packages are distributed. + +You may use this license for any work of which you hold the copyright +and which you wish to distribute. This license may be particularly +suitable if your work is TeX-related (such as a LaTeX package), but +it is written in such a way that you can use it even if your work is +unrelated to TeX. + +The section `WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE', +below, gives instructions, examples, and recommendations for authors +who are considering distributing their works under this license. + +This license gives conditions under which a work may be distributed +and modified, as well as conditions under which modified versions of +that work may be distributed. + +We, the LaTeX3 Project, believe that the conditions below give you +the freedom to make and distribute modified versions of your work +that conform with whatever technical specifications you wish while +maintaining the availability, integrity, and reliability of +that work. If you do not see how to achieve your goal while +meeting these conditions, then read the document `cfgguide.tex' +and `modguide.tex' in the base LaTeX distribution for suggestions. + + +DEFINITIONS +=========== + +In this license document the following terms are used: + + `Work' + Any work being distributed under this License. + + `Derived Work' + Any work that under any applicable law is derived from the Work. + + `Modification' + Any procedure that produces a Derived Work under any applicable + law -- for example, the production of a file containing an + original file associated with the Work or a significant portion of + such a file, either verbatim or with modifications and/or + translated into another language. + + `Modify' + To apply any procedure that produces a Derived Work under any + applicable law. + + `Distribution' + Making copies of the Work available from one person to another, in + whole or in part. Distribution includes (but is not limited to) + making any electronic components of the Work accessible by + file transfer protocols such as FTP or HTTP or by shared file + systems such as Sun's Network File System (NFS). + + `Compiled Work' + A version of the Work that has been processed into a form where it + is directly usable on a computer system. This processing may + include using installation facilities provided by the Work, + transformations of the Work, copying of components of the Work, or + other activities. Note that modification of any installation + facilities provided by the Work constitutes modification of the Work. + + `Current Maintainer' + A person or persons nominated as such within the Work. If there is + no such explicit nomination then it is the `Copyright Holder' under + any applicable law. + + `Base Interpreter' + A program or process that is normally needed for running or + interpreting a part or the whole of the Work. + + A Base Interpreter may depend on external components but these + are not considered part of the Base Interpreter provided that each + external component clearly identifies itself whenever it is used + interactively. Unless explicitly specified when applying the + license to the Work, the only applicable Base Interpreter is a + `LaTeX-Format' or in the case of files belonging to the + `LaTeX-format' a program implementing the `TeX language'. + + + +CONDITIONS ON DISTRIBUTION AND MODIFICATION +=========================================== + +1. Activities other than distribution and/or modification of the Work +are not covered by this license; they are outside its scope. In +particular, the act of running the Work is not restricted and no +requirements are made concerning any offers of support for the Work. + +2. You may distribute a complete, unmodified copy of the Work as you +received it. Distribution of only part of the Work is considered +modification of the Work, and no right to distribute such a Derived +Work may be assumed under the terms of this clause. + +3. You may distribute a Compiled Work that has been generated from a +complete, unmodified copy of the Work as distributed under Clause 2 +above, as long as that Compiled Work is distributed in such a way that +the recipients may install the Compiled Work on their system exactly +as it would have been installed if they generated a Compiled Work +directly from the Work. + +4. If you are the Current Maintainer of the Work, you may, without +restriction, modify the Work, thus creating a Derived Work. You may +also distribute the Derived Work without restriction, including +Compiled Works generated from the Derived Work. Derived Works +distributed in this manner by the Current Maintainer are considered to +be updated versions of the Work. + +5. If you are not the Current Maintainer of the Work, you may modify +your copy of the Work, thus creating a Derived Work based on the Work, +and compile this Derived Work, thus creating a Compiled Work based on +the Derived Work. + +6. If you are not the Current Maintainer of the Work, you may +distribute a Derived Work provided the following conditions are met +for every component of the Work unless that component clearly states +in the copyright notice that it is exempt from that condition. Only +the Current Maintainer is allowed to add such statements of exemption +to a component of the Work. + + a. If a component of this Derived Work can be a direct replacement + for a component of the Work when that component is used with the + Base Interpreter, then, wherever this component of the Work + identifies itself to the user when used interactively with that + Base Interpreter, the replacement component of this Derived Work + clearly and unambiguously identifies itself as a modified version + of this component to the user when used interactively with that + Base Interpreter. + + b. Every component of the Derived Work contains prominent notices + detailing the nature of the changes to that component, or a + prominent reference to another file that is distributed as part + of the Derived Work and that contains a complete and accurate log + of the changes. + + c. No information in the Derived Work implies that any persons, + including (but not limited to) the authors of the original version + of the Work, provide any support, including (but not limited to) + the reporting and handling of errors, to recipients of the + Derived Work unless those persons have stated explicitly that + they do provide such support for the Derived Work. + + d. You distribute at least one of the following with the Derived Work: + + 1. A complete, unmodified copy of the Work; + if your distribution of a modified component is made by + offering access to copy the modified component from a + designated place, then offering equivalent access to copy + the Work from the same or some similar place meets this + condition, even though third parties are not compelled to + copy the Work along with the modified component; + + 2. Information that is sufficient to obtain a complete, + unmodified copy of the Work. + +7. If you are not the Current Maintainer of the Work, you may +distribute a Compiled Work generated from a Derived Work, as long as +the Derived Work is distributed to all recipients of the Compiled +Work, and as long as the conditions of Clause 6, above, are met with +regard to the Derived Work. + +8. The conditions above are not intended to prohibit, and hence do not +apply to, the modification, by any method, of any component so that it +becomes identical to an updated version of that component of the Work as +it is distributed by the Current Maintainer under Clause 4, above. + +9. Distribution of the Work or any Derived Work in an alternative +format, where the Work or that Derived Work (in whole or in part) is +then produced by applying some process to that format, does not relax or +nullify any sections of this license as they pertain to the results of +applying that process. + +10. a. A Derived Work may be distributed under a different license + provided that license itself honors the conditions listed in + Clause 6 above, in regard to the Work, though it does not have + to honor the rest of the conditions in this license. + + b. If a Derived Work is distributed under a different license, that + Derived Work must provide sufficient documentation as part of + itself to allow each recipient of that Derived Work to honor the + restrictions in Clause 6 above, concerning changes from the Work. + +11. This license places no restrictions on works that are unrelated to +the Work, nor does this license place any restrictions on aggregating +such works with the Work by any means. + +12. Nothing in this license is intended to, or may be used to, prevent +complete compliance by all parties with all applicable laws. + + +NO WARRANTY +=========== + +There is no warranty for the Work. Except when otherwise stated in +writing, the Copyright Holder provides the Work `as is', without +warranty of any kind, either expressed or implied, including, but not +limited to, the implied warranties of merchantability and fitness for a +particular purpose. The entire risk as to the quality and performance +of the Work is with you. Should the Work prove defective, you assume +the cost of all necessary servicing, repair, or correction. + +In no event unless required by applicable law or agreed to in writing +will The Copyright Holder, or any author named in the components of the +Work, or any other party who may distribute and/or modify the Work as +permitted above, be liable to you for damages, including any general, +special, incidental or consequential damages arising out of any use of +the Work or out of inability to use the Work (including, but not limited +to, loss of data, data being rendered inaccurate, or losses sustained by +anyone as a result of any failure of the Work to operate with any other +programs), even if the Copyright Holder or said author or said other +party has been advised of the possibility of such damages. + + +MAINTENANCE OF THE WORK +======================= + +The Work has the status `author-maintained' if the Copyright Holder +explicitly and prominently states near the primary copyright notice in +the Work that the Work can only be maintained by the Copyright Holder +or simply that it is `author-maintained'. + +The Work has the status `maintained' if there is a Current Maintainer +who has indicated in the Work that they are willing to receive error +reports for the Work (for example, by supplying a valid e-mail +address). It is not required for the Current Maintainer to acknowledge +or act upon these error reports. + +The Work changes from status `maintained' to `unmaintained' if there +is no Current Maintainer, or the person stated to be Current +Maintainer of the work cannot be reached through the indicated means +of communication for a period of six months, and there are no other +significant signs of active maintenance. + +You can become the Current Maintainer of the Work by agreement with +any existing Current Maintainer to take over this role. + +If the Work is unmaintained, you can become the Current Maintainer of +the Work through the following steps: + + 1. Make a reasonable attempt to trace the Current Maintainer (and + the Copyright Holder, if the two differ) through the means of + an Internet or similar search. + + 2. If this search is successful, then enquire whether the Work + is still maintained. + + a. If it is being maintained, then ask the Current Maintainer + to update their communication data within one month. + + b. If the search is unsuccessful or no action to resume active + maintenance is taken by the Current Maintainer, then announce + within the pertinent community your intention to take over + maintenance. (If the Work is a LaTeX work, this could be + done, for example, by posting to comp.text.tex.) + + 3a. If the Current Maintainer is reachable and agrees to pass + maintenance of the Work to you, then this takes effect + immediately upon announcement. + + b. If the Current Maintainer is not reachable and the Copyright + Holder agrees that maintenance of the Work be passed to you, + then this takes effect immediately upon announcement. + + 4. If you make an `intention announcement' as described in 2b. above + and after three months your intention is challenged neither by + the Current Maintainer nor by the Copyright Holder nor by other + people, then you may arrange for the Work to be changed so as + to name you as the (new) Current Maintainer. + + 5. If the previously unreachable Current Maintainer becomes + reachable once more within three months of a change completed + under the terms of 3b) or 4), then that Current Maintainer must + become or remain the Current Maintainer upon request provided + they then update their communication data within one month. + +A change in the Current Maintainer does not, of itself, alter the fact +that the Work is distributed under the LPPL license. + +If you become the Current Maintainer of the Work, you should +immediately provide, within the Work, a prominent and unambiguous +statement of your status as Current Maintainer. You should also +announce your new status to the same pertinent community as +in 2b) above. + + +WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE +====================================================== + +This section contains important instructions, examples, and +recommendations for authors who are considering distributing their +works under this license. These authors are addressed as `you' in +this section. + +Choosing This License or Another License +---------------------------------------- + +If for any part of your work you want or need to use *distribution* +conditions that differ significantly from those in this license, then +do not refer to this license anywhere in your work but, instead, +distribute your work under a different license. You may use the text +of this license as a model for your own license, but your license +should not refer to the LPPL or otherwise give the impression that +your work is distributed under the LPPL. + +The document `modguide.tex' in the base LaTeX distribution explains +the motivation behind the conditions of this license. It explains, +for example, why distributing LaTeX under the GNU General Public +License (GPL) was considered inappropriate. Even if your work is +unrelated to LaTeX, the discussion in `modguide.tex' may still be +relevant, and authors intending to distribute their works under any +license are encouraged to read it. + +A Recommendation on Modification Without Distribution +----------------------------------------------------- + +It is wise never to modify a component of the Work, even for your own +personal use, without also meeting the above conditions for +distributing the modified component. While you might intend that such +modifications will never be distributed, often this will happen by +accident -- you may forget that you have modified that component; or +it may not occur to you when allowing others to access the modified +version that you are thus distributing it and violating the conditions +of this license in ways that could have legal implications and, worse, +cause problems for the community. It is therefore usually in your +best interest to keep your copy of the Work identical with the public +one. Many works provide ways to control the behavior of that work +without altering any of its licensed components. + +How to Use This License +----------------------- + +To use this license, place in each of the components of your work both +an explicit copyright notice including your name and the year the work +was authored and/or last substantially modified. Include also a +statement that the distribution and/or modification of that +component is constrained by the conditions in this license. + +Here is an example of such a notice and statement: + + %% pig.dtx + %% Copyright 2005 M. Y. Name + % + % This work may be distributed and/or modified under the + % conditions of the LaTeX Project Public License, either version 1.3 + % of this license or (at your option) any later version. + % The latest version of this license is in + % http://www.latex-project.org/lppl.txt + % and version 1.3 or later is part of all distributions of LaTeX + % version 2005/12/01 or later. + % + % This work has the LPPL maintenance status `maintained'. + % + % The Current Maintainer of this work is M. Y. Name. + % + % This work consists of the files pig.dtx and pig.ins + % and the derived file pig.sty. + +Given such a notice and statement in a file, the conditions +given in this license document would apply, with the `Work' referring +to the three files `pig.dtx', `pig.ins', and `pig.sty' (the last being +generated from `pig.dtx' using `pig.ins'), the `Base Interpreter' +referring to any `LaTeX-Format', and both `Copyright Holder' and +`Current Maintainer' referring to the person `M. Y. Name'. + +If you do not want the Maintenance section of LPPL to apply to your +Work, change `maintained' above into `author-maintained'. +However, we recommend that you use `maintained', as the Maintenance +section was added in order to ensure that your Work remains useful to +the community even when you can no longer maintain and support it +yourself. + +Derived Works That Are Not Replacements +--------------------------------------- + +Several clauses of the LPPL specify means to provide reliability and +stability for the user community. They therefore concern themselves +with the case that a Derived Work is intended to be used as a +(compatible or incompatible) replacement of the original Work. If +this is not the case (e.g., if a few lines of code are reused for a +completely different task), then clauses 6b and 6d shall not apply. + + +Important Recommendations +------------------------- + + Defining What Constitutes the Work + + The LPPL requires that distributions of the Work contain all the + files of the Work. It is therefore important that you provide a + way for the licensee to determine which files constitute the Work. + This could, for example, be achieved by explicitly listing all the + files of the Work near the copyright notice of each file or by + using a line such as: + + % This work consists of all files listed in manifest.txt. + + in that place. In the absence of an unequivocal list it might be + impossible for the licensee to determine what is considered by you + to comprise the Work and, in such a case, the licensee would be + entitled to make reasonable conjectures as to which files comprise + the Work. + Added: csw/mgar/pkg/tex_svninfo/trunk/files/README.CSW =================================================================== --- csw/mgar/pkg/tex_svninfo/trunk/files/README.CSW (rev 0) +++ csw/mgar/pkg/tex_svninfo/trunk/files/README.CSW 2012-06-27 09:38:38 UTC (rev 18561) @@ -0,0 +1,11 @@ +$Id$ + +The documentation is installed in the standard TeX tree, i.e., +/opt/csw/share/texmf-local. + +CSW Team + +# Local Variables: +# mode: text +# mode: font-lock +# End: Property changes on: csw/mgar/pkg/tex_svninfo/trunk/files/README.CSW ___________________________________________________________________ Added: svn:keywords + Author Date HeadURL Id Revision 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 27 13:10:50 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 27 Jun 2012 11:10:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[18562] csw/mgar/pkg/xpm/trunk Message-ID: Revision: 18562 http://gar.svn.sourceforge.net/gar/?rev=18562&view=rev Author: dmichelsen Date: 2012-06-27 11:10:49 +0000 (Wed, 27 Jun 2012) Log Message: ----------- xpm/trunk: Initial commit of garified version Added Paths: ----------- csw/mgar/pkg/xpm/trunk/Makefile csw/mgar/pkg/xpm/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/xpm/trunk/ Property changes on: csw/mgar/pkg/xpm/trunk ___________________________________________________________________ Added: svn:ignore + work Copied: csw/mgar/pkg/xpm/trunk/Makefile (from rev 18556, csw/mgar/pkg/libpng/trunk/Makefile) =================================================================== --- csw/mgar/pkg/xpm/trunk/Makefile (rev 0) +++ csw/mgar/pkg/xpm/trunk/Makefile 2012-06-27 11:10:49 UTC (rev 18562) @@ -0,0 +1,38 @@ +# Copyright 2009 OpenCSW +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +NAME = libXpm +VERSION = 3.5.10 +CATEGORIES = lib +GARTYPE = v2 + +DESCRIPTION = X11 pixmap library +define BLURB +endef + +MASTER_SITES += http://xorg.freedesktop.org/archive/individual/lib/ +DISTFILES += $(NAME)-$(VERSION).tar.bz2 + +PACKAGES += CSWxpm +SPKG_DESC_CSWxpm = X11 XPM pixmap utilities +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWxpm += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWxpm += CSWlibxpm4 + +PACKAGES += CSWlibxpm4 +SPKG_DESC_CSWlibxpm4 += X11 pixmap library, libXpm.so.4 +PKGFILES_CSWlibxpm4 += $(call pkgfiles_lib,libXpm.so.4) +RUNTIME_DEP_PKGS_CSWlibxpm4 += CSWlibintl8 + +PACKAGES += CSWlibxpm-dev +SPKG_DESC_CSWlibxpm-dev = Devlopment files for libXpm.so.4 +PKGFILES_CSWlibxpm-dev += $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWlibxpm-dev += CSWlibxpm4 + +BUILD64_LIBS_ONLY = 1 + +CONFIGURE_ARGS += $(DIRPATHS) +CONFIGURE_ARGS += ac_cv_search_gettext=-lintl + +include gar/category.mk Added: csw/mgar/pkg/xpm/trunk/checksums =================================================================== --- csw/mgar/pkg/xpm/trunk/checksums (rev 0) +++ csw/mgar/pkg/xpm/trunk/checksums 2012-06-27 11:10:49 UTC (rev 18562) @@ -0,0 +1 @@ +7ae7eff7a14d411e84a67bd166bcec1a libXpm-3.5.10.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 27 14:44:42 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 27 Jun 2012 12:44:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[18563] csw/mgar/pkg/bzflag/trunk Message-ID: Revision: 18563 http://gar.svn.sourceforge.net/gar/?rev=18563&view=rev Author: dmichelsen Date: 2012-06-27 12:44:42 +0000 (Wed, 27 Jun 2012) Log Message: ----------- bzflag/trunk: Update to 2.4.0 Modified Paths: -------------- csw/mgar/pkg/bzflag/trunk/Makefile csw/mgar/pkg/bzflag/trunk/checksums Added Paths: ----------- csw/mgar/pkg/bzflag/trunk/files/0001-Keep-norunpath.patch Removed Paths: ------------- csw/mgar/pkg/bzflag/trunk/files/0001-Fix-ambiguity-between-double-and-long-double.patch csw/mgar/pkg/bzflag/trunk/files/0002-Make-function-location-explicit.patch csw/mgar/pkg/bzflag/trunk/files/0003-Force-inclusion-of-glew.h-before-gl.h.patch csw/mgar/pkg/bzflag/trunk/files/0004-Do-not-use-const-as-non-const-is-required-at-some-pl.patch csw/mgar/pkg/bzflag/trunk/files/0005-Make-arguments-constant-as-required.patch Modified: csw/mgar/pkg/bzflag/trunk/Makefile =================================================================== --- csw/mgar/pkg/bzflag/trunk/Makefile 2012-06-27 11:10:49 UTC (rev 18562) +++ csw/mgar/pkg/bzflag/trunk/Makefile 2012-06-27 12:44:42 UTC (rev 18563) @@ -1,6 +1,6 @@ # $Id$ NAME = bzflag -VERSION = 2.0.16 +VERSION = 2.4.0 CATEGORIES = apps GARTYPE = v2 @@ -11,26 +11,22 @@ MASTER_SITES = $(SF_MIRROR) DISTFILES = $(DISTNAME).tar.bz2 -PATCHFILES += 0001-Fix-ambiguity-between-double-and-long-double.patch -PATCHFILES += 0002-Make-function-location-explicit.patch -PATCHFILES += 0003-Force-inclusion-of-glew.h-before-gl.h.patch -PATCHFILES += 0004-Do-not-use-const-as-non-const-is-required-at-some-pl.patch -PATCHFILES += 0005-Make-arguments-constant-as-required.patch +PATCHFILES += 0001-Keep-norunpath.patch -# File name regex to get notifications about upstream software releases -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2 +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 -CONFIGURE_ARGS = $(DIRPATHS) +libdir_install = $(prefix)/lib/bzflag -RUNTIME_DEP_PKGS_CSWbzflag += CSWglew -RUNTIME_DEP_PKGS_CSWbzflag += CSWlibsdl -RUNTIME_DEP_PKGS_CSWbzflag += CSWcurlrt -RUNTIME_DEP_PKGS_CSWbzflag += CSWlibidn -RUNTIME_DEP_PKGS_CSWbzflag += CSWzlib +RUNTIME_DEP_PKGS_CSWbzflag += CSWlibssl1-0-0 +RUNTIME_DEP_PKGS_CSWbzflag += CSWlibz1 +RUNTIME_DEP_PKGS_CSWbzflag += CSWlibcurl4 +RUNTIME_DEP_PKGS_CSWbzflag += CSWlibglew1-7 +RUNTIME_DEP_PKGS_CSWbzflag += CSWlibsdl1-2-0 +RUNTIME_DEP_PKGS_CSWbzflag += CSWlibcares2 +RUNTIME_DEP_PKGS_CSWbzflag += CSWlibidn11 +# Old-style deps RUNTIME_DEP_PKGS_CSWbzflag += CSWmesa -RUNTIME_DEP_PKGS_CSWbzflag += CSWlibcares -RUNTIME_DEP_PKGS_CSWbzflag += CSWnas -RUNTIME_DEP_PKGS_CSWbzflag += CSWosslrt -RUNTIME_DEP_PKGS_CSWbzflag += CSWoldaprt +EXTRA_LINKER_FLAGS += -norunpath + include gar/category.mk Modified: csw/mgar/pkg/bzflag/trunk/checksums =================================================================== --- csw/mgar/pkg/bzflag/trunk/checksums 2012-06-27 11:10:49 UTC (rev 18562) +++ csw/mgar/pkg/bzflag/trunk/checksums 2012-06-27 12:44:42 UTC (rev 18563) @@ -1 +1 @@ -161b973bee586d43ebff4695dfb8c359 bzflag-2.0.16.tar.bz2 +5b38894b7a7f883ffbe8f5e4c580ee25 bzflag-2.4.0.tar.bz2 Deleted: csw/mgar/pkg/bzflag/trunk/files/0001-Fix-ambiguity-between-double-and-long-double.patch =================================================================== --- csw/mgar/pkg/bzflag/trunk/files/0001-Fix-ambiguity-between-double-and-long-double.patch 2012-06-27 11:10:49 UTC (rev 18562) +++ csw/mgar/pkg/bzflag/trunk/files/0001-Fix-ambiguity-between-double-and-long-double.patch 2012-06-27 12:44:42 UTC (rev 18563) @@ -1,25 +0,0 @@ -From 87ea1e52b98d43252aecc3911ff96d3a6444dbe3 Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Fri, 7 Jan 2011 13:43:07 +0100 -Subject: [PATCH 1/5] Fix ambiguity between double and long double - ---- - src/bzflag/ServerMenu.cxx | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/src/bzflag/ServerMenu.cxx b/src/bzflag/ServerMenu.cxx -index ebd00f2..f5db381 100644 ---- a/src/bzflag/ServerMenu.cxx -+++ b/src/bzflag/ServerMenu.cxx -@@ -354,7 +354,7 @@ void ServerMenu::setSelected(int index, bool forcerefresh) - } - else { - // colorize servers: many shots->red, jumping->green, CTF->blue -- const float rf = std::min(1.0f, logf(server.ping.maxShots) / logf(20.0f)); -+ const float rf = std::min(1.0f, logf( (double) server.ping.maxShots) / logf( (double) 20.0f)); - const float gf = gameStyle & JumpingGameStyle ? 1.0f : 0.0f; - const float bf = gameStyle & TeamFlagGameStyle ? 1.0f : 0.0f; - label->setColor(0.5f + rf * 0.5f, 0.5f + gf * 0.5f, 0.5f + bf * 0.5f); --- -1.7.3.2 - Added: csw/mgar/pkg/bzflag/trunk/files/0001-Keep-norunpath.patch =================================================================== --- csw/mgar/pkg/bzflag/trunk/files/0001-Keep-norunpath.patch (rev 0) +++ csw/mgar/pkg/bzflag/trunk/files/0001-Keep-norunpath.patch 2012-06-27 12:44:42 UTC (rev 18563) @@ -0,0 +1,25 @@ +From 24f77d89889796113fd16899559117914040afe2 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Wed, 27 Jun 2012 14:10:16 +0200 +Subject: [PATCH] Keep -norunpath + +--- + misc/ltmain.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/misc/ltmain.sh b/misc/ltmain.sh +index d8efb57..819d4a2 100755 +--- a/misc/ltmain.sh ++++ b/misc/ltmain.sh +@@ -5091,7 +5091,7 @@ func_mode_link () + # @file GCC response files + # -tp=* Portland pgcc target processor selection + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ +- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*) ++ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|-norunpath) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" +-- +1.7.10.3 + Deleted: csw/mgar/pkg/bzflag/trunk/files/0002-Make-function-location-explicit.patch =================================================================== --- csw/mgar/pkg/bzflag/trunk/files/0002-Make-function-location-explicit.patch 2012-06-27 11:10:49 UTC (rev 18562) +++ csw/mgar/pkg/bzflag/trunk/files/0002-Make-function-location-explicit.patch 2012-06-27 12:44:42 UTC (rev 18563) @@ -1,43 +0,0 @@ -From d116c7dabfe30093c09b151f9344fbc296716a05 Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Fri, 7 Jan 2011 13:47:21 +0100 -Subject: [PATCH 2/5] Make function location explicit - ---- - src/common/WordFilter.cxx | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/common/WordFilter.cxx b/src/common/WordFilter.cxx -index 2d65dc2..fe62f4d 100644 ---- a/src/common/WordFilter.cxx -+++ b/src/common/WordFilter.cxx -@@ -49,7 +49,7 @@ bool WordFilter::simpleFilter(char *input) const - - word = line.substr(startPosition, endPosition-startPosition); - // transform to lowercase -- transform (word.begin(), word.end(), word.begin(), tolower); -+ std::transform (word.begin(), word.end(), word.begin(), tolower); - - findWord.word = word; - firstchar = (unsigned char)word[0]; -@@ -778,7 +778,7 @@ unsigned int WordFilter::loadFromFile(const std::string &fileName, bool verbose) - } - - // convert the word to lowercase -- transform (filterWord.begin(),filterWord.end(), filterWord.begin(), tolower); -+ std::transform (filterWord.begin(),filterWord.end(), filterWord.begin(), tolower); - - bool added = addToFilter(filterWord, std::string("")); - if ((!added) && (verbose)) { -@@ -800,7 +800,7 @@ unsigned int WordFilter::loadFromFile(const std::string &fileName, bool verbose) - * pattern match (default) catching hundreds of variations per filter - * word or using a simple exact word match technique (original). - */ --bool WordFilter::filter(char *input, bool simple) const -+bool WordFilter::filter(char *input, const bool simple) const - { - #ifdef DEBUG - TimeKeeper before = TimeKeeper::getCurrent(); --- -1.7.3.2 - Deleted: csw/mgar/pkg/bzflag/trunk/files/0003-Force-inclusion-of-glew.h-before-gl.h.patch =================================================================== --- csw/mgar/pkg/bzflag/trunk/files/0003-Force-inclusion-of-glew.h-before-gl.h.patch 2012-06-27 11:10:49 UTC (rev 18562) +++ csw/mgar/pkg/bzflag/trunk/files/0003-Force-inclusion-of-glew.h-before-gl.h.patch 2012-06-27 12:44:42 UTC (rev 18563) @@ -1,24 +0,0 @@ -From 0d728c7a76f0a0e37e88262059fce9d850963242 Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Fri, 7 Jan 2011 13:47:41 +0100 -Subject: [PATCH 3/5] Force inclusion of glew.h before gl.h - ---- - src/platform/XWindow.cxx | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -diff --git a/src/platform/XWindow.cxx b/src/platform/XWindow.cxx -index 3c56476..c802bf8 100644 ---- a/src/platform/XWindow.cxx -+++ b/src/platform/XWindow.cxx -@@ -10,6 +10,7 @@ - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. - */ - -+#include "GL/glew.h" - #include "XWindow.h" - #include "XVisual.h" - #include "OpenGLGState.h" --- -1.7.3.2 - Deleted: csw/mgar/pkg/bzflag/trunk/files/0004-Do-not-use-const-as-non-const-is-required-at-some-pl.patch =================================================================== --- csw/mgar/pkg/bzflag/trunk/files/0004-Do-not-use-const-as-non-const-is-required-at-some-pl.patch 2012-06-27 11:10:49 UTC (rev 18562) +++ csw/mgar/pkg/bzflag/trunk/files/0004-Do-not-use-const-as-non-const-is-required-at-some-pl.patch 2012-06-27 12:44:42 UTC (rev 18563) @@ -1,25 +0,0 @@ -From 8516009f9e7d257c396a7e9729be468089bd3da0 Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Fri, 7 Jan 2011 13:48:16 +0100 -Subject: [PATCH 4/5] Do not use const as non-const is required at some place - ---- - src/bzflag/HUDuiList.cxx | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/src/bzflag/HUDuiList.cxx b/src/bzflag/HUDuiList.cxx -index 201a711..77afc01 100644 ---- a/src/bzflag/HUDuiList.cxx -+++ b/src/bzflag/HUDuiList.cxx -@@ -57,7 +57,7 @@ void HUDuiList::update() - setIndex(index); - } - --void HUDuiList::createSlider(const int numValues) -+void HUDuiList::createSlider(int numValues) - { - // create a slider with numValues options - /* createSlider(4) does the equivalent of --- -1.7.3.2 - Deleted: csw/mgar/pkg/bzflag/trunk/files/0005-Make-arguments-constant-as-required.patch =================================================================== --- csw/mgar/pkg/bzflag/trunk/files/0005-Make-arguments-constant-as-required.patch 2012-06-27 11:10:49 UTC (rev 18562) +++ csw/mgar/pkg/bzflag/trunk/files/0005-Make-arguments-constant-as-required.patch 2012-06-27 12:44:42 UTC (rev 18563) @@ -1,25 +0,0 @@ -From 6b65d1feeec8c055edafb80172beff75e617abac Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Fri, 7 Jan 2011 13:48:46 +0100 -Subject: [PATCH 5/5] Make arguments constant as required - ---- - src/common/VotingBooth.cxx | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/src/common/VotingBooth.cxx b/src/common/VotingBooth.cxx -index e36f446..29f9238 100644 ---- a/src/common/VotingBooth.cxx -+++ b/src/common/VotingBooth.cxx -@@ -85,7 +85,7 @@ bool VotingBooth::hasVoted(const std::string voterName) const - } - - --bool VotingBooth::vote(std::string voterName, std::string response) -+bool VotingBooth::vote(const std::string voterName, const std::string response) - { - if (this->hasVoted(voterName)) { - /* voters are not allowed to vote multiple times */ --- -1.7.3.2 - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Wed Jun 27 15:11:46 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Wed, 27 Jun 2012 13:11:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[18564] csw/mgar/pkg Message-ID: Revision: 18564 http://gar.svn.sourceforge.net/gar/?rev=18564&view=rev Author: pfelecan Date: 2012-06-27 13:11:46 +0000 (Wed, 27 Jun 2012) Log Message: ----------- tex_devnag/trunk: migrated from a private recipe to a GAR based recipe Added Paths: ----------- csw/mgar/pkg/tex_devnag/ csw/mgar/pkg/tex_devnag/Makefile csw/mgar/pkg/tex_devnag/branches/ csw/mgar/pkg/tex_devnag/tags/ csw/mgar/pkg/tex_devnag/trunk/ csw/mgar/pkg/tex_devnag/trunk/Makefile csw/mgar/pkg/tex_devnag/trunk/checksums csw/mgar/pkg/tex_devnag/trunk/files/ csw/mgar/pkg/tex_devnag/trunk/files/COPYING csw/mgar/pkg/tex_devnag/trunk/files/README.CSW Added: csw/mgar/pkg/tex_devnag/Makefile =================================================================== --- csw/mgar/pkg/tex_devnag/Makefile (rev 0) +++ csw/mgar/pkg/tex_devnag/Makefile 2012-06-27 13:11:46 UTC (rev 18564) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/tex_devnag/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/tex_devnag/trunk/Makefile =================================================================== --- csw/mgar/pkg/tex_devnag/trunk/Makefile (rev 0) +++ csw/mgar/pkg/tex_devnag/trunk/Makefile 2012-06-27 13:11:46 UTC (rev 18564) @@ -0,0 +1,73 @@ +# $Id$ + +NAME = tex_devnag +VERSION = 2.15.1 +GARTYPE = v2 +CATEGORIES = xtra + +DESCRIPTION = Support for typesetting texts in Devanagari script TeX and LaTeX +define BLURB + The Devan?gar? for TEX (devnag) package provides a way to typeset + high-quality Devan?gar? text with TEX. The devnag package provides + features that support Sanskrit, Hindi, Marathi, Nepali, and other + languages typically printed in the Devan?gar? script. The devnag + package was released in May 1991 by Frans Velthuis for the University + of Groningen, The Netherlands. The devnag package consists of a + preprocessor, font files, and macros for Plain TEX and LATEX. +endef + +DISTNAME = velthuis +# I don't like this but this is what we get... +MASTER_SITES = http://sarovar.org/frs/download.php/1334/ +VENDOR_URL = http://devnag.sarovar.org/ +DISTFILES = $(DISTNAME).zip +# taken from http://www.latex-project.org/lppl.txt +DISTFILES += README.CSW +DISTFILES += COPYING + +PACKAGES = CSWtex-devnag-common +SPKG_DESC_CSWtex-devnag-common = $(DESCRIPTION), fonts, documentation and macros +CATALOGNAME_CSWtex-devnag-common = tex_devnag_common +OBSOLETED_BY_CSWtex-devnag-common = CSWtexvdevnagcommon +CATALOGNAME_CSWtexvdevnagcommon = tex_vdevnag_common_stub +ARCHALL_CSWtex-devnag = 1 +RUNTIME_DEP_PKGS_CSWtex-devnag-common += CSWtetex + +CHECKPKG_OVERRIDES_CSWtex-devnag_common += surplus-dependency|CSWtetex + +PACKAGES += CSWtex-devnag +SPKG_DESC_CSWtex-devnag = $(DESCRIPTION) +CATALOGNAME_CSWtex-devnag = tex_devnag +OBSOLETED_BY_CSWtex-devnag = CSWtexvdevnag +CATALOGNAME_CSWtexvdevnag = tex_vdevnag_stub +PKGFILES_CSWtex-devnag = /opt/csw/bin/devnag +RUNTIME_DEP_PKGS_CSWtex-devnag = CSWtex-devnag-common +CHECKPKG_OVERRIDES_CSWtex-devnag += surplus-dependency|CSWtex_devnag_common + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = custom +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +GARCOMPILER = GNU + +include gar/category.mk + +binsrc = $(WORKSRC)/bin + +build-custom: \ + $(binsrc)/devnag + $(MAKECOOKIE) + +$(binsrc)/devnag: \ + $(binsrc)/devnag.o + +$(binsrc)/devnag.o: \ + $(binsrc)/devnag.c + +install-custom: + ginstall --directory --mode=u=rwx,go=rx $(DESTDIR)/$(bindir) + ginstall --preserve-timestamps --mode=u=rwx,go=rx $(binsrc)/devnag $(DESTDIR)/$(bindir) + ginstall --directory --mode=u=rwx,go=rx $(DESTDIR)/$(texmflocaldir) + gtar --directory=$(WORKSRC) --create --file=- doc fonts tex | gtar --directory=$(DESTDIR)/$(texmflocaldir) --extract --file=- + $(MAKECOOKIE) Property changes on: csw/mgar/pkg/tex_devnag/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/tex_devnag/trunk/checksums =================================================================== --- csw/mgar/pkg/tex_devnag/trunk/checksums (rev 0) +++ csw/mgar/pkg/tex_devnag/trunk/checksums 2012-06-27 13:11:46 UTC (rev 18564) @@ -0,0 +1 @@ +13e31b5d3db8cc9ca0e99add1440b7a7 velthuis.zip Added: csw/mgar/pkg/tex_devnag/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/tex_devnag/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/tex_devnag/trunk/files/COPYING 2012-06-27 13:11:46 UTC (rev 18564) @@ -0,0 +1,416 @@ +The LaTeX Project Public License +=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- + +LPPL Version 1.3c 2008-05-04 + +Copyright 1999 2002-2008 LaTeX3 Project + Everyone is allowed to distribute verbatim copies of this + license document, but modification of it is not allowed. + + +PREAMBLE +======== + +The LaTeX Project Public License (LPPL) is the primary license under +which the LaTeX kernel and the base LaTeX packages are distributed. + +You may use this license for any work of which you hold the copyright +and which you wish to distribute. This license may be particularly +suitable if your work is TeX-related (such as a LaTeX package), but +it is written in such a way that you can use it even if your work is +unrelated to TeX. + +The section `WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE', +below, gives instructions, examples, and recommendations for authors +who are considering distributing their works under this license. + +This license gives conditions under which a work may be distributed +and modified, as well as conditions under which modified versions of +that work may be distributed. + +We, the LaTeX3 Project, believe that the conditions below give you +the freedom to make and distribute modified versions of your work +that conform with whatever technical specifications you wish while +maintaining the availability, integrity, and reliability of +that work. If you do not see how to achieve your goal while +meeting these conditions, then read the document `cfgguide.tex' +and `modguide.tex' in the base LaTeX distribution for suggestions. + + +DEFINITIONS +=========== + +In this license document the following terms are used: + + `Work' + Any work being distributed under this License. + + `Derived Work' + Any work that under any applicable law is derived from the Work. + + `Modification' + Any procedure that produces a Derived Work under any applicable + law -- for example, the production of a file containing an + original file associated with the Work or a significant portion of + such a file, either verbatim or with modifications and/or + translated into another language. + + `Modify' + To apply any procedure that produces a Derived Work under any + applicable law. + + `Distribution' + Making copies of the Work available from one person to another, in + whole or in part. Distribution includes (but is not limited to) + making any electronic components of the Work accessible by + file transfer protocols such as FTP or HTTP or by shared file + systems such as Sun's Network File System (NFS). + + `Compiled Work' + A version of the Work that has been processed into a form where it + is directly usable on a computer system. This processing may + include using installation facilities provided by the Work, + transformations of the Work, copying of components of the Work, or + other activities. Note that modification of any installation + facilities provided by the Work constitutes modification of the Work. + + `Current Maintainer' + A person or persons nominated as such within the Work. If there is + no such explicit nomination then it is the `Copyright Holder' under + any applicable law. + + `Base Interpreter' + A program or process that is normally needed for running or + interpreting a part or the whole of the Work. + + A Base Interpreter may depend on external components but these + are not considered part of the Base Interpreter provided that each + external component clearly identifies itself whenever it is used + interactively. Unless explicitly specified when applying the + license to the Work, the only applicable Base Interpreter is a + `LaTeX-Format' or in the case of files belonging to the + `LaTeX-format' a program implementing the `TeX language'. + + + +CONDITIONS ON DISTRIBUTION AND MODIFICATION +=========================================== + +1. Activities other than distribution and/or modification of the Work +are not covered by this license; they are outside its scope. In +particular, the act of running the Work is not restricted and no +requirements are made concerning any offers of support for the Work. + +2. You may distribute a complete, unmodified copy of the Work as you +received it. Distribution of only part of the Work is considered +modification of the Work, and no right to distribute such a Derived +Work may be assumed under the terms of this clause. + +3. You may distribute a Compiled Work that has been generated from a +complete, unmodified copy of the Work as distributed under Clause 2 +above, as long as that Compiled Work is distributed in such a way that +the recipients may install the Compiled Work on their system exactly +as it would have been installed if they generated a Compiled Work +directly from the Work. + +4. If you are the Current Maintainer of the Work, you may, without +restriction, modify the Work, thus creating a Derived Work. You may +also distribute the Derived Work without restriction, including +Compiled Works generated from the Derived Work. Derived Works +distributed in this manner by the Current Maintainer are considered to +be updated versions of the Work. + +5. If you are not the Current Maintainer of the Work, you may modify +your copy of the Work, thus creating a Derived Work based on the Work, +and compile this Derived Work, thus creating a Compiled Work based on +the Derived Work. + +6. If you are not the Current Maintainer of the Work, you may +distribute a Derived Work provided the following conditions are met +for every component of the Work unless that component clearly states +in the copyright notice that it is exempt from that condition. Only +the Current Maintainer is allowed to add such statements of exemption +to a component of the Work. + + a. If a component of this Derived Work can be a direct replacement + for a component of the Work when that component is used with the + Base Interpreter, then, wherever this component of the Work + identifies itself to the user when used interactively with that + Base Interpreter, the replacement component of this Derived Work + clearly and unambiguously identifies itself as a modified version + of this component to the user when used interactively with that + Base Interpreter. + + b. Every component of the Derived Work contains prominent notices + detailing the nature of the changes to that component, or a + prominent reference to another file that is distributed as part + of the Derived Work and that contains a complete and accurate log + of the changes. + + c. No information in the Derived Work implies that any persons, + including (but not limited to) the authors of the original version + of the Work, provide any support, including (but not limited to) + the reporting and handling of errors, to recipients of the + Derived Work unless those persons have stated explicitly that + they do provide such support for the Derived Work. + + d. You distribute at least one of the following with the Derived Work: + + 1. A complete, unmodified copy of the Work; + if your distribution of a modified component is made by + offering access to copy the modified component from a + designated place, then offering equivalent access to copy + the Work from the same or some similar place meets this + condition, even though third parties are not compelled to + copy the Work along with the modified component; + + 2. Information that is sufficient to obtain a complete, + unmodified copy of the Work. + +7. If you are not the Current Maintainer of the Work, you may +distribute a Compiled Work generated from a Derived Work, as long as +the Derived Work is distributed to all recipients of the Compiled +Work, and as long as the conditions of Clause 6, above, are met with +regard to the Derived Work. + +8. The conditions above are not intended to prohibit, and hence do not +apply to, the modification, by any method, of any component so that it +becomes identical to an updated version of that component of the Work as +it is distributed by the Current Maintainer under Clause 4, above. + +9. Distribution of the Work or any Derived Work in an alternative +format, where the Work or that Derived Work (in whole or in part) is +then produced by applying some process to that format, does not relax or +nullify any sections of this license as they pertain to the results of +applying that process. + +10. a. A Derived Work may be distributed under a different license + provided that license itself honors the conditions listed in + Clause 6 above, in regard to the Work, though it does not have + to honor the rest of the conditions in this license. + + b. If a Derived Work is distributed under a different license, that + Derived Work must provide sufficient documentation as part of + itself to allow each recipient of that Derived Work to honor the + restrictions in Clause 6 above, concerning changes from the Work. + +11. This license places no restrictions on works that are unrelated to +the Work, nor does this license place any restrictions on aggregating +such works with the Work by any means. + +12. Nothing in this license is intended to, or may be used to, prevent +complete compliance by all parties with all applicable laws. + + +NO WARRANTY +=========== + +There is no warranty for the Work. Except when otherwise stated in +writing, the Copyright Holder provides the Work `as is', without +warranty of any kind, either expressed or implied, including, but not +limited to, the implied warranties of merchantability and fitness for a +particular purpose. The entire risk as to the quality and performance +of the Work is with you. Should the Work prove defective, you assume +the cost of all necessary servicing, repair, or correction. + +In no event unless required by applicable law or agreed to in writing +will The Copyright Holder, or any author named in the components of the +Work, or any other party who may distribute and/or modify the Work as +permitted above, be liable to you for damages, including any general, +special, incidental or consequential damages arising out of any use of +the Work or out of inability to use the Work (including, but not limited +to, loss of data, data being rendered inaccurate, or losses sustained by +anyone as a result of any failure of the Work to operate with any other +programs), even if the Copyright Holder or said author or said other +party has been advised of the possibility of such damages. + + +MAINTENANCE OF THE WORK +======================= + +The Work has the status `author-maintained' if the Copyright Holder +explicitly and prominently states near the primary copyright notice in +the Work that the Work can only be maintained by the Copyright Holder +or simply that it is `author-maintained'. + +The Work has the status `maintained' if there is a Current Maintainer +who has indicated in the Work that they are willing to receive error +reports for the Work (for example, by supplying a valid e-mail +address). It is not required for the Current Maintainer to acknowledge +or act upon these error reports. + +The Work changes from status `maintained' to `unmaintained' if there +is no Current Maintainer, or the person stated to be Current +Maintainer of the work cannot be reached through the indicated means +of communication for a period of six months, and there are no other +significant signs of active maintenance. + +You can become the Current Maintainer of the Work by agreement with +any existing Current Maintainer to take over this role. + +If the Work is unmaintained, you can become the Current Maintainer of +the Work through the following steps: + + 1. Make a reasonable attempt to trace the Current Maintainer (and + the Copyright Holder, if the two differ) through the means of + an Internet or similar search. + + 2. If this search is successful, then enquire whether the Work + is still maintained. + + a. If it is being maintained, then ask the Current Maintainer + to update their communication data within one month. + + b. If the search is unsuccessful or no action to resume active + maintenance is taken by the Current Maintainer, then announce + within the pertinent community your intention to take over + maintenance. (If the Work is a LaTeX work, this could be + done, for example, by posting to comp.text.tex.) + + 3a. If the Current Maintainer is reachable and agrees to pass + maintenance of the Work to you, then this takes effect + immediately upon announcement. + + b. If the Current Maintainer is not reachable and the Copyright + Holder agrees that maintenance of the Work be passed to you, + then this takes effect immediately upon announcement. + + 4. If you make an `intention announcement' as described in 2b. above + and after three months your intention is challenged neither by + the Current Maintainer nor by the Copyright Holder nor by other + people, then you may arrange for the Work to be changed so as + to name you as the (new) Current Maintainer. + + 5. If the previously unreachable Current Maintainer becomes + reachable once more within three months of a change completed + under the terms of 3b) or 4), then that Current Maintainer must + become or remain the Current Maintainer upon request provided + they then update their communication data within one month. + +A change in the Current Maintainer does not, of itself, alter the fact +that the Work is distributed under the LPPL license. + +If you become the Current Maintainer of the Work, you should +immediately provide, within the Work, a prominent and unambiguous +statement of your status as Current Maintainer. You should also +announce your new status to the same pertinent community as +in 2b) above. + + +WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE +====================================================== + +This section contains important instructions, examples, and +recommendations for authors who are considering distributing their +works under this license. These authors are addressed as `you' in +this section. + +Choosing This License or Another License +---------------------------------------- + +If for any part of your work you want or need to use *distribution* +conditions that differ significantly from those in this license, then +do not refer to this license anywhere in your work but, instead, +distribute your work under a different license. You may use the text +of this license as a model for your own license, but your license +should not refer to the LPPL or otherwise give the impression that +your work is distributed under the LPPL. + +The document `modguide.tex' in the base LaTeX distribution explains +the motivation behind the conditions of this license. It explains, +for example, why distributing LaTeX under the GNU General Public +License (GPL) was considered inappropriate. Even if your work is +unrelated to LaTeX, the discussion in `modguide.tex' may still be +relevant, and authors intending to distribute their works under any +license are encouraged to read it. + +A Recommendation on Modification Without Distribution +----------------------------------------------------- + +It is wise never to modify a component of the Work, even for your own +personal use, without also meeting the above conditions for +distributing the modified component. While you might intend that such +modifications will never be distributed, often this will happen by +accident -- you may forget that you have modified that component; or +it may not occur to you when allowing others to access the modified +version that you are thus distributing it and violating the conditions +of this license in ways that could have legal implications and, worse, +cause problems for the community. It is therefore usually in your +best interest to keep your copy of the Work identical with the public +one. Many works provide ways to control the behavior of that work +without altering any of its licensed components. + +How to Use This License +----------------------- + +To use this license, place in each of the components of your work both +an explicit copyright notice including your name and the year the work +was authored and/or last substantially modified. Include also a +statement that the distribution and/or modification of that +component is constrained by the conditions in this license. + +Here is an example of such a notice and statement: + + %% pig.dtx + %% Copyright 2005 M. Y. Name + % + % This work may be distributed and/or modified under the + % conditions of the LaTeX Project Public License, either version 1.3 + % of this license or (at your option) any later version. + % The latest version of this license is in + % http://www.latex-project.org/lppl.txt + % and version 1.3 or later is part of all distributions of LaTeX + % version 2005/12/01 or later. + % + % This work has the LPPL maintenance status `maintained'. + % + % The Current Maintainer of this work is M. Y. Name. + % + % This work consists of the files pig.dtx and pig.ins + % and the derived file pig.sty. + +Given such a notice and statement in a file, the conditions +given in this license document would apply, with the `Work' referring +to the three files `pig.dtx', `pig.ins', and `pig.sty' (the last being +generated from `pig.dtx' using `pig.ins'), the `Base Interpreter' +referring to any `LaTeX-Format', and both `Copyright Holder' and +`Current Maintainer' referring to the person `M. Y. Name'. + +If you do not want the Maintenance section of LPPL to apply to your +Work, change `maintained' above into `author-maintained'. +However, we recommend that you use `maintained', as the Maintenance +section was added in order to ensure that your Work remains useful to +the community even when you can no longer maintain and support it +yourself. + +Derived Works That Are Not Replacements +--------------------------------------- + +Several clauses of the LPPL specify means to provide reliability and +stability for the user community. They therefore concern themselves +with the case that a Derived Work is intended to be used as a +(compatible or incompatible) replacement of the original Work. If +this is not the case (e.g., if a few lines of code are reused for a +completely different task), then clauses 6b and 6d shall not apply. + + +Important Recommendations +------------------------- + + Defining What Constitutes the Work + + The LPPL requires that distributions of the Work contain all the + files of the Work. It is therefore important that you provide a + way for the licensee to determine which files constitute the Work. + This could, for example, be achieved by explicitly listing all the + files of the Work near the copyright notice of each file or by + using a line such as: + + % This work consists of all files listed in manifest.txt. + + in that place. In the absence of an unequivocal list it might be + impossible for the licensee to determine what is considered by you + to comprise the Work and, in such a case, the licensee would be + entitled to make reasonable conjectures as to which files comprise + the Work. + Added: csw/mgar/pkg/tex_devnag/trunk/files/README.CSW =================================================================== --- csw/mgar/pkg/tex_devnag/trunk/files/README.CSW (rev 0) +++ csw/mgar/pkg/tex_devnag/trunk/files/README.CSW 2012-06-27 13:11:46 UTC (rev 18564) @@ -0,0 +1,11 @@ +$Id$ + +The documentation is installed in the standard TeX tree, i.e., +/opt/csw/share/texmf-local. + +CSW Team + +# Local Variables: +# mode: text +# mode: font-lock +# End: Property changes on: csw/mgar/pkg/tex_devnag/trunk/files/README.CSW ___________________________________________________________________ Added: svn:keywords + Author Date HeadURL Id Revision This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Wed Jun 27 15:21:44 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Wed, 27 Jun 2012 13:21:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[18565] csw/mgar/pkg/tex_devnag/trunk/Makefile Message-ID: Revision: 18565 http://gar.svn.sourceforge.net/gar/?rev=18565&view=rev Author: pfelecan Date: 2012-06-27 13:21:44 +0000 (Wed, 27 Jun 2012) Log Message: ----------- tex_devnag/trunk: fixed the wront architecture neutral declaration Modified Paths: -------------- csw/mgar/pkg/tex_devnag/trunk/Makefile Modified: csw/mgar/pkg/tex_devnag/trunk/Makefile =================================================================== --- csw/mgar/pkg/tex_devnag/trunk/Makefile 2012-06-27 13:11:46 UTC (rev 18564) +++ csw/mgar/pkg/tex_devnag/trunk/Makefile 2012-06-27 13:21:44 UTC (rev 18565) @@ -30,7 +30,7 @@ CATALOGNAME_CSWtex-devnag-common = tex_devnag_common OBSOLETED_BY_CSWtex-devnag-common = CSWtexvdevnagcommon CATALOGNAME_CSWtexvdevnagcommon = tex_vdevnag_common_stub -ARCHALL_CSWtex-devnag = 1 +ARCHALL_CSWtex-devnag-common = 1 RUNTIME_DEP_PKGS_CSWtex-devnag-common += CSWtetex CHECKPKG_OVERRIDES_CSWtex-devnag_common += surplus-dependency|CSWtetex This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Wed Jun 27 16:50:51 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Wed, 27 Jun 2012 14:50:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[18566] csw/mgar/pkg Message-ID: Revision: 18566 http://gar.svn.sourceforge.net/gar/?rev=18566&view=rev Author: pfelecan Date: 2012-06-27 14:50:51 +0000 (Wed, 27 Jun 2012) Log Message: ----------- tex_pdftricks/trunk: migrated from a private recipe to a GAR based recipe Added Paths: ----------- csw/mgar/pkg/tex_pdftricks/ csw/mgar/pkg/tex_pdftricks/Makefile csw/mgar/pkg/tex_pdftricks/branches/ csw/mgar/pkg/tex_pdftricks/tags/ csw/mgar/pkg/tex_pdftricks/trunk/ csw/mgar/pkg/tex_pdftricks/trunk/Makefile csw/mgar/pkg/tex_pdftricks/trunk/checksums csw/mgar/pkg/tex_pdftricks/trunk/files/ csw/mgar/pkg/tex_pdftricks/trunk/files/0001-Fix-shebang-bash.patch csw/mgar/pkg/tex_pdftricks/trunk/files/COPYING csw/mgar/pkg/tex_pdftricks/trunk/files/README.CSW Added: csw/mgar/pkg/tex_pdftricks/Makefile =================================================================== --- csw/mgar/pkg/tex_pdftricks/Makefile (rev 0) +++ csw/mgar/pkg/tex_pdftricks/Makefile 2012-06-27 14:50:51 UTC (rev 18566) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/tex_pdftricks/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/tex_pdftricks/trunk/Makefile =================================================================== --- csw/mgar/pkg/tex_pdftricks/trunk/Makefile (rev 0) +++ csw/mgar/pkg/tex_pdftricks/trunk/Makefile 2012-06-27 14:50:51 UTC (rev 18566) @@ -0,0 +1,54 @@ +# $Id$ + +NAME = tex_pdftricks +VERSION = 1.16 +GARTYPE = v2 +CATEGORIES = xtra + +DESCRIPTION = A pstricks encapsulation for PDF +define BLURB + PDFtricks -- a LaTeX package that helps to allow PSTricks code in + a pdfTeX document. +endef + +DISTNAME = pdftricks +# I don't like this but this is what we get... +MASTER_SITES = http://sarovar.org/frs/download.php/98/ +VENDOR_URL = http://devnag.sarovar.org/ +DISTFILES = $(DISTNAME).tar.gz +# taken from http://www.latex-project.org/lppl.txt +DISTFILES += README.CSW +DISTFILES += COPYING + +WORKSRC = $(WORKDIR)/$(DISTNAME)-$(VERSION) +PATCHDIR = $(WORKSRC) +PATCHFILES = 0001-Fix-shebang-bash.patch + +BUILD_DEP_PKGS += CSWtetex +RUNTIME_DEP_PKGS += CSWtetex + +PACKAGES = CSWtex-pdftricks +SPKG_DESC_CSWtex-pdftricks = $(DESCRIPTION) +CATALOGNAME_CSWtex-pdftricks = tex_pdftricks +OBSOLETED_BY_CSWtex-pdftricks = CSWtexpdftricks +CATALOGNAME_CSWtexpdftricks = tex_pdftricks_stub +ARCHALL_CSWtex-pdftricks = 1 +CHECKPKG_OVERRIDES_CSWtex-pdftricks += surplus-dependency|CSWtetex + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +include gar/category.mk + +install-custom: styles = $(texmflocaldir)/tex/latex/pdftricks +install-custom: documentation = $(texmflocaldir)/doc/generic/pdftricks +install-custom: + ginstall --directory --mode=u=rwx,go=rx $(DESTDIR)/$(bindir) + ginstall --preserve-timestamps --mode=u=rwx,go=rx $(WORKSRC)/pst2pdf $(DESTDIR)/$(bindir) + ginstall --directory --mode=u=rwx,go=rx $(DESTDIR)/$(styles) + ginstall --preserve-timestamps --mode=u=rw,go=r $(WORKSRC)/pdftricks.sty $(DESTDIR)/$(styles) + ginstall --directory --mode=u=rwx,go=rx $(DESTDIR)/$(documentation) + ginstall --preserve-timestamps --mode=u=rw,go=r $(WORKSRC)/manual.pdf $(DESTDIR)/$(documentation) + $(MAKECOOKIE) Property changes on: csw/mgar/pkg/tex_pdftricks/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/tex_pdftricks/trunk/checksums =================================================================== --- csw/mgar/pkg/tex_pdftricks/trunk/checksums (rev 0) +++ csw/mgar/pkg/tex_pdftricks/trunk/checksums 2012-06-27 14:50:51 UTC (rev 18566) @@ -0,0 +1 @@ +b02ddd88cc9f8982477334f99ff69d4b pdftricks.tar.gz Added: csw/mgar/pkg/tex_pdftricks/trunk/files/0001-Fix-shebang-bash.patch =================================================================== --- csw/mgar/pkg/tex_pdftricks/trunk/files/0001-Fix-shebang-bash.patch (rev 0) +++ csw/mgar/pkg/tex_pdftricks/trunk/files/0001-Fix-shebang-bash.patch 2012-06-27 14:50:51 UTC (rev 18566) @@ -0,0 +1,22 @@ +From 1471a2d0926a462d06455db65d85f548263a1cf7 Mon Sep 17 00:00:00 2001 +From: Peter Felecan +Date: Wed, 27 Jun 2012 16:17:14 +0200 +Subject: [PATCH] Fix shebang bash + +--- + pst2pdf | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pst2pdf b/pst2pdf +index e58bfe7..ec500a5 100755 +--- a/pst2pdf ++++ b/pst2pdf +@@ -1,4 +1,4 @@ +-#! /bin/bash ++#! /usr/bin/env bash + # pst2pdf + # PSTricks 2 PDF converter : + # Usage: "pst2pdf" produces PDF files for all files of the form *-fig*.tex +-- +1.7.10.3 + Added: csw/mgar/pkg/tex_pdftricks/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/tex_pdftricks/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/tex_pdftricks/trunk/files/COPYING 2012-06-27 14:50:51 UTC (rev 18566) @@ -0,0 +1,416 @@ +The LaTeX Project Public License +=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- + +LPPL Version 1.3c 2008-05-04 + +Copyright 1999 2002-2008 LaTeX3 Project + Everyone is allowed to distribute verbatim copies of this + license document, but modification of it is not allowed. + + +PREAMBLE +======== + +The LaTeX Project Public License (LPPL) is the primary license under +which the LaTeX kernel and the base LaTeX packages are distributed. + +You may use this license for any work of which you hold the copyright +and which you wish to distribute. This license may be particularly +suitable if your work is TeX-related (such as a LaTeX package), but +it is written in such a way that you can use it even if your work is +unrelated to TeX. + +The section `WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE', +below, gives instructions, examples, and recommendations for authors +who are considering distributing their works under this license. + +This license gives conditions under which a work may be distributed +and modified, as well as conditions under which modified versions of +that work may be distributed. + +We, the LaTeX3 Project, believe that the conditions below give you +the freedom to make and distribute modified versions of your work +that conform with whatever technical specifications you wish while +maintaining the availability, integrity, and reliability of +that work. If you do not see how to achieve your goal while +meeting these conditions, then read the document `cfgguide.tex' +and `modguide.tex' in the base LaTeX distribution for suggestions. + + +DEFINITIONS +=========== + +In this license document the following terms are used: + + `Work' + Any work being distributed under this License. + + `Derived Work' + Any work that under any applicable law is derived from the Work. + + `Modification' + Any procedure that produces a Derived Work under any applicable + law -- for example, the production of a file containing an + original file associated with the Work or a significant portion of + such a file, either verbatim or with modifications and/or + translated into another language. + + `Modify' + To apply any procedure that produces a Derived Work under any + applicable law. + + `Distribution' + Making copies of the Work available from one person to another, in + whole or in part. Distribution includes (but is not limited to) + making any electronic components of the Work accessible by + file transfer protocols such as FTP or HTTP or by shared file + systems such as Sun's Network File System (NFS). + + `Compiled Work' + A version of the Work that has been processed into a form where it + is directly usable on a computer system. This processing may + include using installation facilities provided by the Work, + transformations of the Work, copying of components of the Work, or + other activities. Note that modification of any installation + facilities provided by the Work constitutes modification of the Work. + + `Current Maintainer' + A person or persons nominated as such within the Work. If there is + no such explicit nomination then it is the `Copyright Holder' under + any applicable law. + + `Base Interpreter' + A program or process that is normally needed for running or + interpreting a part or the whole of the Work. + + A Base Interpreter may depend on external components but these + are not considered part of the Base Interpreter provided that each + external component clearly identifies itself whenever it is used + interactively. Unless explicitly specified when applying the + license to the Work, the only applicable Base Interpreter is a + `LaTeX-Format' or in the case of files belonging to the + `LaTeX-format' a program implementing the `TeX language'. + + + +CONDITIONS ON DISTRIBUTION AND MODIFICATION +=========================================== + +1. Activities other than distribution and/or modification of the Work +are not covered by this license; they are outside its scope. In +particular, the act of running the Work is not restricted and no +requirements are made concerning any offers of support for the Work. + +2. You may distribute a complete, unmodified copy of the Work as you +received it. Distribution of only part of the Work is considered +modification of the Work, and no right to distribute such a Derived +Work may be assumed under the terms of this clause. + +3. You may distribute a Compiled Work that has been generated from a +complete, unmodified copy of the Work as distributed under Clause 2 +above, as long as that Compiled Work is distributed in such a way that +the recipients may install the Compiled Work on their system exactly +as it would have been installed if they generated a Compiled Work +directly from the Work. + +4. If you are the Current Maintainer of the Work, you may, without +restriction, modify the Work, thus creating a Derived Work. You may +also distribute the Derived Work without restriction, including +Compiled Works generated from the Derived Work. Derived Works +distributed in this manner by the Current Maintainer are considered to +be updated versions of the Work. + +5. If you are not the Current Maintainer of the Work, you may modify +your copy of the Work, thus creating a Derived Work based on the Work, +and compile this Derived Work, thus creating a Compiled Work based on +the Derived Work. + +6. If you are not the Current Maintainer of the Work, you may +distribute a Derived Work provided the following conditions are met +for every component of the Work unless that component clearly states +in the copyright notice that it is exempt from that condition. Only +the Current Maintainer is allowed to add such statements of exemption +to a component of the Work. + + a. If a component of this Derived Work can be a direct replacement + for a component of the Work when that component is used with the + Base Interpreter, then, wherever this component of the Work + identifies itself to the user when used interactively with that + Base Interpreter, the replacement component of this Derived Work + clearly and unambiguously identifies itself as a modified version + of this component to the user when used interactively with that + Base Interpreter. + + b. Every component of the Derived Work contains prominent notices + detailing the nature of the changes to that component, or a + prominent reference to another file that is distributed as part + of the Derived Work and that contains a complete and accurate log + of the changes. + + c. No information in the Derived Work implies that any persons, + including (but not limited to) the authors of the original version + of the Work, provide any support, including (but not limited to) + the reporting and handling of errors, to recipients of the + Derived Work unless those persons have stated explicitly that + they do provide such support for the Derived Work. + + d. You distribute at least one of the following with the Derived Work: + + 1. A complete, unmodified copy of the Work; + if your distribution of a modified component is made by + offering access to copy the modified component from a + designated place, then offering equivalent access to copy + the Work from the same or some similar place meets this + condition, even though third parties are not compelled to + copy the Work along with the modified component; + + 2. Information that is sufficient to obtain a complete, + unmodified copy of the Work. + +7. If you are not the Current Maintainer of the Work, you may +distribute a Compiled Work generated from a Derived Work, as long as +the Derived Work is distributed to all recipients of the Compiled +Work, and as long as the conditions of Clause 6, above, are met with +regard to the Derived Work. + +8. The conditions above are not intended to prohibit, and hence do not +apply to, the modification, by any method, of any component so that it +becomes identical to an updated version of that component of the Work as +it is distributed by the Current Maintainer under Clause 4, above. + +9. Distribution of the Work or any Derived Work in an alternative +format, where the Work or that Derived Work (in whole or in part) is +then produced by applying some process to that format, does not relax or +nullify any sections of this license as they pertain to the results of +applying that process. + +10. a. A Derived Work may be distributed under a different license + provided that license itself honors the conditions listed in + Clause 6 above, in regard to the Work, though it does not have + to honor the rest of the conditions in this license. + + b. If a Derived Work is distributed under a different license, that + Derived Work must provide sufficient documentation as part of + itself to allow each recipient of that Derived Work to honor the + restrictions in Clause 6 above, concerning changes from the Work. + +11. This license places no restrictions on works that are unrelated to +the Work, nor does this license place any restrictions on aggregating +such works with the Work by any means. + +12. Nothing in this license is intended to, or may be used to, prevent +complete compliance by all parties with all applicable laws. + + +NO WARRANTY +=========== + +There is no warranty for the Work. Except when otherwise stated in +writing, the Copyright Holder provides the Work `as is', without +warranty of any kind, either expressed or implied, including, but not +limited to, the implied warranties of merchantability and fitness for a +particular purpose. The entire risk as to the quality and performance +of the Work is with you. Should the Work prove defective, you assume +the cost of all necessary servicing, repair, or correction. + +In no event unless required by applicable law or agreed to in writing +will The Copyright Holder, or any author named in the components of the +Work, or any other party who may distribute and/or modify the Work as +permitted above, be liable to you for damages, including any general, +special, incidental or consequential damages arising out of any use of +the Work or out of inability to use the Work (including, but not limited +to, loss of data, data being rendered inaccurate, or losses sustained by +anyone as a result of any failure of the Work to operate with any other +programs), even if the Copyright Holder or said author or said other +party has been advised of the possibility of such damages. + + +MAINTENANCE OF THE WORK +======================= + +The Work has the status `author-maintained' if the Copyright Holder +explicitly and prominently states near the primary copyright notice in +the Work that the Work can only be maintained by the Copyright Holder +or simply that it is `author-maintained'. + +The Work has the status `maintained' if there is a Current Maintainer +who has indicated in the Work that they are willing to receive error +reports for the Work (for example, by supplying a valid e-mail +address). It is not required for the Current Maintainer to acknowledge +or act upon these error reports. + +The Work changes from status `maintained' to `unmaintained' if there +is no Current Maintainer, or the person stated to be Current +Maintainer of the work cannot be reached through the indicated means +of communication for a period of six months, and there are no other +significant signs of active maintenance. + +You can become the Current Maintainer of the Work by agreement with +any existing Current Maintainer to take over this role. + +If the Work is unmaintained, you can become the Current Maintainer of +the Work through the following steps: + + 1. Make a reasonable attempt to trace the Current Maintainer (and + the Copyright Holder, if the two differ) through the means of + an Internet or similar search. + + 2. If this search is successful, then enquire whether the Work + is still maintained. + + a. If it is being maintained, then ask the Current Maintainer + to update their communication data within one month. + + b. If the search is unsuccessful or no action to resume active + maintenance is taken by the Current Maintainer, then announce + within the pertinent community your intention to take over + maintenance. (If the Work is a LaTeX work, this could be + done, for example, by posting to comp.text.tex.) + + 3a. If the Current Maintainer is reachable and agrees to pass + maintenance of the Work to you, then this takes effect + immediately upon announcement. + + b. If the Current Maintainer is not reachable and the Copyright + Holder agrees that maintenance of the Work be passed to you, + then this takes effect immediately upon announcement. + + 4. If you make an `intention announcement' as described in 2b. above + and after three months your intention is challenged neither by + the Current Maintainer nor by the Copyright Holder nor by other + people, then you may arrange for the Work to be changed so as + to name you as the (new) Current Maintainer. + + 5. If the previously unreachable Current Maintainer becomes + reachable once more within three months of a change completed + under the terms of 3b) or 4), then that Current Maintainer must + become or remain the Current Maintainer upon request provided + they then update their communication data within one month. + +A change in the Current Maintainer does not, of itself, alter the fact +that the Work is distributed under the LPPL license. + +If you become the Current Maintainer of the Work, you should +immediately provide, within the Work, a prominent and unambiguous +statement of your status as Current Maintainer. You should also +announce your new status to the same pertinent community as +in 2b) above. + + +WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE +====================================================== + +This section contains important instructions, examples, and +recommendations for authors who are considering distributing their +works under this license. These authors are addressed as `you' in +this section. + +Choosing This License or Another License +---------------------------------------- + +If for any part of your work you want or need to use *distribution* +conditions that differ significantly from those in this license, then +do not refer to this license anywhere in your work but, instead, +distribute your work under a different license. You may use the text +of this license as a model for your own license, but your license +should not refer to the LPPL or otherwise give the impression that +your work is distributed under the LPPL. + +The document `modguide.tex' in the base LaTeX distribution explains +the motivation behind the conditions of this license. It explains, +for example, why distributing LaTeX under the GNU General Public +License (GPL) was considered inappropriate. Even if your work is +unrelated to LaTeX, the discussion in `modguide.tex' may still be +relevant, and authors intending to distribute their works under any +license are encouraged to read it. + +A Recommendation on Modification Without Distribution +----------------------------------------------------- + +It is wise never to modify a component of the Work, even for your own +personal use, without also meeting the above conditions for +distributing the modified component. While you might intend that such +modifications will never be distributed, often this will happen by +accident -- you may forget that you have modified that component; or +it may not occur to you when allowing others to access the modified +version that you are thus distributing it and violating the conditions +of this license in ways that could have legal implications and, worse, +cause problems for the community. It is therefore usually in your +best interest to keep your copy of the Work identical with the public +one. Many works provide ways to control the behavior of that work +without altering any of its licensed components. + +How to Use This License +----------------------- + +To use this license, place in each of the components of your work both +an explicit copyright notice including your name and the year the work +was authored and/or last substantially modified. Include also a +statement that the distribution and/or modification of that +component is constrained by the conditions in this license. + +Here is an example of such a notice and statement: + + %% pig.dtx + %% Copyright 2005 M. Y. Name + % + % This work may be distributed and/or modified under the + % conditions of the LaTeX Project Public License, either version 1.3 + % of this license or (at your option) any later version. + % The latest version of this license is in + % http://www.latex-project.org/lppl.txt + % and version 1.3 or later is part of all distributions of LaTeX + % version 2005/12/01 or later. + % + % This work has the LPPL maintenance status `maintained'. + % + % The Current Maintainer of this work is M. Y. Name. + % + % This work consists of the files pig.dtx and pig.ins + % and the derived file pig.sty. + +Given such a notice and statement in a file, the conditions +given in this license document would apply, with the `Work' referring +to the three files `pig.dtx', `pig.ins', and `pig.sty' (the last being +generated from `pig.dtx' using `pig.ins'), the `Base Interpreter' +referring to any `LaTeX-Format', and both `Copyright Holder' and +`Current Maintainer' referring to the person `M. Y. Name'. + +If you do not want the Maintenance section of LPPL to apply to your +Work, change `maintained' above into `author-maintained'. +However, we recommend that you use `maintained', as the Maintenance +section was added in order to ensure that your Work remains useful to +the community even when you can no longer maintain and support it +yourself. + +Derived Works That Are Not Replacements +--------------------------------------- + +Several clauses of the LPPL specify means to provide reliability and +stability for the user community. They therefore concern themselves +with the case that a Derived Work is intended to be used as a +(compatible or incompatible) replacement of the original Work. If +this is not the case (e.g., if a few lines of code are reused for a +completely different task), then clauses 6b and 6d shall not apply. + + +Important Recommendations +------------------------- + + Defining What Constitutes the Work + + The LPPL requires that distributions of the Work contain all the + files of the Work. It is therefore important that you provide a + way for the licensee to determine which files constitute the Work. + This could, for example, be achieved by explicitly listing all the + files of the Work near the copyright notice of each file or by + using a line such as: + + % This work consists of all files listed in manifest.txt. + + in that place. In the absence of an unequivocal list it might be + impossible for the licensee to determine what is considered by you + to comprise the Work and, in such a case, the licensee would be + entitled to make reasonable conjectures as to which files comprise + the Work. + Added: csw/mgar/pkg/tex_pdftricks/trunk/files/README.CSW =================================================================== --- csw/mgar/pkg/tex_pdftricks/trunk/files/README.CSW (rev 0) +++ csw/mgar/pkg/tex_pdftricks/trunk/files/README.CSW 2012-06-27 14:50:51 UTC (rev 18566) @@ -0,0 +1,11 @@ +$Id$ + +The documentation is installed in the standard TeX tree, i.e., +/opt/csw/share/texmf-local. + +CSW Team + +# Local Variables: +# mode: text +# mode: font-lock +# End: Property changes on: csw/mgar/pkg/tex_pdftricks/trunk/files/README.CSW ___________________________________________________________________ Added: svn:keywords + Author Date HeadURL Id Revision This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at opencsw.org Wed Jun 27 20:03:23 2012 From: pfelecan at opencsw.org (Peter FELECAN) Date: Wed, 27 Jun 2012 20:03:23 +0200 Subject: [csw-devel] SF.net SVN: gar:[18518] csw/mgar/pkg/pstoedit/trunk/Makefile In-Reply-To: ("Maciej (Matchek) =?utf-8?Q?Blizi=C5=84ski=22's?= message of "Tue, 26 Jun 2012 09:23:56 +0100") References: Message-ID: "Maciej (Matchek) Blizi?ski" writes: > 2012/6/25 : >> Revision: 18518 >> ? ? ? ? ?http://gar.svn.sourceforge.net/gar/?rev=18518&view=rev >> Author: ? pfelecan >> Date: ? ? 2012-06-25 09:55:11 +0000 (Mon, 25 Jun 2012) >> Log Message: >> ----------- >> availability limited to Solaris 10 > > When committing code, please add the package name as the first word > of the commit message. It makes it easier to read the timeline and > commit logs. I'll do but I don't see the difference when browsing the repository; maybe I'm not looking at the relevant place. BTW, I wasn't aware about this convention; is this published somewhere? -- Peter From pfelecan at opencsw.org Wed Jun 27 20:04:41 2012 From: pfelecan at opencsw.org (Peter FELECAN) Date: Wed, 27 Jun 2012 20:04:41 +0200 Subject: [csw-devel] SF.net SVN: gar:[18513] csw/mgar/pkg/pilotlink/trunk/Makefile In-Reply-To: ("Maciej (Matchek) =?utf-8?Q?Blizi=C5=84ski=22's?= message of "Tue, 26 Jun 2012 09:28:02 +0100") References: Message-ID: "Maciej (Matchek) Blizi?ski" writes: >> +CHECKPKG_OVERRIDES_CSWpilot-link-perl+= perllocal-pod-in-pkgmap|/opt/csw/lib/perl/5.10.1/perllocal.pod > > Why override this and not remove the file? I don't know what was the > original motivation, but AFAIK, we shouldn't and don't ship the > perllocal.pod file. I didn't kenw that. Corrected. >> +CHECKPKG_OVERRIDES_CSWpilot-link-perl+= surplus-dependency|CSWlibz1 > > Why this override? Is libz.so.1 loaded dynamically? My mistake. -- Peter From pfelecan at opencsw.org Wed Jun 27 20:06:34 2012 From: pfelecan at opencsw.org (Peter FELECAN) Date: Wed, 27 Jun 2012 20:06:34 +0200 Subject: [csw-devel] SF.net SVN: gar:[18512] csw/mgar/pkg/pilotlink/trunk/Makefile In-Reply-To: ("Maciej (Matchek) =?utf-8?Q?Blizi=C5=84ski=22's?= message of "Tue, 26 Jun 2012 09:30:16 +0100") References: Message-ID: "Maciej (Matchek) Blizi?ski" writes: > 2012/6/23 : >> Revision: 18512 >> ? ? ? ? ?http://gar.svn.sourceforge.net/gar/?rev=18512&view=rev >> Author: ? pfelecan >> Date: ? ? 2012-06-23 09:37:54 +0000 (Sat, 23 Jun 2012) >> Log Message: >> ----------- >> corrected end of line issues after copy&paste... > > I would suggest only committing after you've verified that the change > actually works. It's less code and better quality code to review for > others. Sure, but I can run checkpkg only on the build farm but my modification takes place on my local system, on which I test but this wasn't detected without checkpkg. Remember that I asked to run this beast also outside the build farm? -- Peter From pfelecan at opencsw.org Wed Jun 27 20:10:13 2012 From: pfelecan at opencsw.org (Peter FELECAN) Date: Wed, 27 Jun 2012 20:10:13 +0200 Subject: [csw-devel] SF.net SVN: gar:[18511] csw/mgar/pkg/pilotlink/trunk/Makefile In-Reply-To: ("Maciej (Matchek) =?utf-8?Q?Blizi=C5=84ski=22's?= message of "Tue, 26 Jun 2012 09:31:35 +0100") References: Message-ID: "Maciej (Matchek) Blizi?ski" writes: > 2012/6/23 : >> ?PACKAGES ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? += ? ? ?CSWlibpitcl0 >> ?CATALOGNAME_CSWlibpitcl0 ? ? ? ? ? ? ? = ? ? ? libpitcl0 >> @@ -170,6 +225,10 @@ >> ?RUNTIME_DEP_PKGS_CSWlibpitcl0 ?+= ? ? ?CSWlibpisock9 >> ?RUNTIME_DEP_PKGS_CSWlibpitcl0 ?+= ? ? ?CSWtcl >> ?LICENCE_CSWlibpitcl0 ? ? ? ? ? ? ? ? ? = ? ? ? COPYING.LIB >> +CHECKPKG_OVERRIDES_CSWlibpitcl0 ? ? ? ?+= ? ? ?bad-rpath-entry|/usr/sfw/lib|opt/csw/lib/libpitcl.so.0.0.0 >> +CHECKPKG_OVERRIDES_CSWlibpitcl0 ? ? ? ?+= ? ? ?surplus-dependency|CSWlibz1 >> +CHECKPKG_OVERRIDES_CSWlibpitcl0 ? ? ? ?+= ? ? ?surplus-dependency|CSWlibiconv2 >> +CHECKPKG_OVERRIDES_CSWlibpitcl0 ? ? ? ?+= ? ? ?surplus-dependency|CSWlibintl8 > > How do you know that these dependencies are actually required? In most > packages, you can rely of the NEEDED field, and there's no need for > additional dependencies. libz1 is my mistake but: ldd opencsw/pilotlink/trunk/work/solaris10-sparc/pkgroot/opt/csw/lib/libpitcl.so.0.0.0 libtcl8.4.so => /opt/csw/lib/sparcv8/libtcl8.4.so libpopt.so.0 => /opt/csw/lib/sparcv8/libpopt.so.0 libpisock.so.9 => /opt/csw/lib/sparcv8/libpisock.so.9 libusb.so.1 => /usr/sfw/lib/libusb.so.1 libpthread.so.1 => /lib/libpthread.so.1 libm.so.2 => /lib/libm.so.2 libsocket.so.1 => /lib/libsocket.so.1 libnsl.so.1 => /lib/libnsl.so.1 libc.so.1 => /lib/libc.so.1 libdl.so.1 => /lib/libdl.so.1 libm.so.1 => /lib/libm.so.1 *here* libintl.so.8 => /opt/csw/lib/libintl.so.8 *here* libiconv.so.2 => /opt/csw/lib/libiconv.so.2 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 /platform/SUNW,SPARC-Enterprise-T5220/lib/libc_psr.so.1 /platform/SUNW,SPARC-Enterprise-T5220/lib/libmd_psr.so.1 -- Peter From pfelecan at opencsw.org Wed Jun 27 20:12:09 2012 From: pfelecan at opencsw.org (Peter FELECAN) Date: Wed, 27 Jun 2012 20:12:09 +0200 Subject: [csw-devel] SF.net SVN: gar:[18463] csw/mgar/pkg/plotutils/trunk/Makefile In-Reply-To: ("Maciej (Matchek) =?utf-8?Q?Blizi=C5=84ski=22's?= message of "Tue, 26 Jun 2012 09:40:46 +0100") References: Message-ID: "Maciej (Matchek) Blizi?ski" writes: > 2012/6/19 : >> ?RUNTIME_DEP_PKGS_CSWplotutils ?+= ? ? ?CSWlibplotter2 >> ?RUNTIME_DEP_PKGS_CSWplotutils ?+= ? ? ?CSWlibxmi0 >> ?OBSOLETED_BY_CSWplotutils ? ? ? ? ? ? ?= ? ? ? CSWplotutil >> +CHECKPKG_OVERRIDES_CSWplotutils ? ? ? ?+= ? ? ?missing-dependency|CSWlibgcc-s1 >> +CHECKPKG_OVERRIDES_CSWplotutils ? ? ? ?+= ? ? ?missing-dependency|CSWlibstdc++6 >> +CHECKPKG_OVERRIDES_CSWplotutils ? ? ? ?+= ? ? ?missing-dependency|CSWlibpng12-0 >> +CHECKPKG_OVERRIDES_CSWplotutils ? ? ? ?+= ? ? ?missing-dependency|CSWlibz1 >> +CHECKPKG_OVERRIDES_CSWplotutils ? ? ? ?+= ? ? ?surplus-dependency|CSWlibxmi0 >> +CHECKPKG_OVERRIDES_CSWplotutils ? ? ? ?+= ? ? ?surplus-dependency|CSWlibplotter2 > > This is suspicious, why do you not add dependencies to a package > containing binaries with specific SONAMEs in NEEDED? If CSWplotutils > contains a binary foo, and foo requires the "libz.so.1" string in > NEEDED, it does make sense to make CSWplotutils depend on CSWlibz1, > no? No because the binary in plotutil depends also on libplotter2 and I apply transitive dependency. -- Peter From pfelecan at opencsw.org Wed Jun 27 20:14:09 2012 From: pfelecan at opencsw.org (Peter FELECAN) Date: Wed, 27 Jun 2012 20:14:09 +0200 Subject: [csw-devel] SF.net SVN: gar:[18440] csw/mgar/pkg/libgnet/trunk/Makefile In-Reply-To: ("Maciej (Matchek) =?utf-8?Q?Blizi=C5=84ski=22's?= message of "Tue, 26 Jun 2012 09:46:20 +0100") References: Message-ID: "Maciej (Matchek) Blizi?ski" writes: > 2012/6/16 : >> ?RUNTIME_DEP_PKGS_CSWlibgnet2-0-0 ? ? ? += ? ? ?CSWlibintl8 >> +CHECKPKG_OVERRIDES_CSWlibgnet2-0-0 += surplus-dependency|CSWlibiconv2 > > A similar issue as in other packages - CSWlibiconv2 only adds a single > library, usually when a library is used, it's in the NEEDED of its > dependent binaries, and checkpkg detects that. The only case when > checkpkg doesn't detect that, is dynamic loading. Is it the case here? No, but: ldd opencsw/libgnet2/trunk/work/solaris10-sparc/pkgroot/opt/csw/lib/libgnet-2.0.so libgthread-2.0.so.0 => /opt/csw/lib/sparcv8/libgthread-2.0.so.0 libpthread.so.1 => /lib/libpthread.so.1 libthread.so.1 => /lib/libthread.so.1 librt.so.1 => /lib/librt.so.1 libglib-2.0.so.0 => /opt/csw/lib/sparcv8/libglib-2.0.so.0 libintl.so.8 => /opt/csw/lib/sparcv8/libintl.so.8 libresolv.so.2 => /lib/libresolv.so.2 libnsl.so.1 => /lib/libnsl.so.1 libsocket.so.1 => /lib/libsocket.so.1 libgcc_s.so.1 => /opt/csw/lib/sparcv8/libgcc_s.so.1 libc.so.1 => /lib/libc.so.1 *here* libiconv.so.2 => /opt/csw/lib/libiconv.so.2 libaio.so.1 => /lib/libaio.so.1 libmd.so.1 => /lib/libmd.so.1 libmp.so.2 => /lib/libmp.so.2 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 /platform/SUNW,SPARC-Enterprise-T5220/lib/libc_psr.so.1 /platform/SUNW,SPARC-Enterprise-T5220/lib/libmd_psr.so.1 -- Peter From bdwalton at users.sourceforge.net Thu Jun 28 01:54:07 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 27 Jun 2012 23:54:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[18567] csw/mgar/pkg/php5/trunk/Makefile Message-ID: Revision: 18567 http://gar.svn.sourceforge.net/gar/?rev=18567&view=rev Author: bdwalton Date: 2012-06-27 23:54:06 +0000 (Wed, 27 Jun 2012) Log Message: ----------- php5/trunk: update the xpm dependencies due to package split Modified Paths: -------------- csw/mgar/pkg/php5/trunk/Makefile Modified: csw/mgar/pkg/php5/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5/trunk/Makefile 2012-06-27 14:50:51 UTC (rev 18566) +++ csw/mgar/pkg/php5/trunk/Makefile 2012-06-27 23:54:06 UTC (rev 18567) @@ -53,7 +53,7 @@ BUILD_DEP_PKGS += CSWlibgdbm-dev CSWlibidn-dev CSWlibgd-dev CSWcoreutils BUILD_DEP_PKGS += CSWlibxml2-dev CSWlibexpat1 CSWlibz-dev CSWlibcurl-dev CSWjpeg -BUILD_DEP_PKGS += CSWlibpng-dev CSWt1lib CSWxpm CSWlibgdbm-dev CSWlibgmp10 +BUILD_DEP_PKGS += CSWlibpng-dev CSWt1lib CSWlibgdbm-dev CSWlibgmp10 BUILD_DEP_PKGS += CSWggettext-dev CSWlibssl-dev CSWlibgd2 CSWbdb42devel BUILD_DEP_PKGS += CSWlibcares-dev CSWftype2 CSWlibiconv-dev CSWlibc-client-dev BUILD_DEP_PKGS += CSWoldapdevel CSWlibkrb5-dev CSWsasl CSWlibltdl7 @@ -61,6 +61,7 @@ BUILD_DEP_PKGS += CSWlibreadline-dev CSWlibncurses-dev CSWnetsnmp-dev BUILD_DEP_PKGS += CSWlibsqlite3-dev CSWaspell CSWtidy-dev CSWpostgresql BUILD_DEP_PKGS += CSWlibfreetype-dev +BUILD_DEP_PKGS += CSWlibxpm-dev # NOTE: I think this is a leftover bug. we shouldn't depend on two versions # of sqlite... BUILD_DEP_PKGS += CSWlibsqlite3-0 @@ -150,7 +151,7 @@ PKGFILES_CSWphp5-dom += .*include/php/ext/dom.* $(eval $(call php5_subpackage,exif,CSWlibz1)) $(eval $(call php5_subpackage,ftp,CSWlibssl1-0-0 CSWlibz1)) -$(eval $(call php5_subpackage,gd,CSWlibfreetype6 CSWlibgd2 CSWlibjpeg7 CSWlibpng12-0 CSWlibt1-5 CSWxpm CSWlibz1)) +$(eval $(call php5_subpackage,gd,CSWlibfreetype6 CSWlibgd2 CSWlibjpeg7 CSWlibpng12-0 CSWlibt1-5 CSWlibxpm4 CSWlibz1)) PKGFILES_CSWphp5-gd += .*/include/php/ext/gd.* $(eval $(call php5_subpackage,gettext,CSWlibintl8 CSWlibz1)) $(eval $(call php5_subpackage,gmp,CSWlibgmp10 CSWlibz1)) 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 28 02:12:07 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 28 Jun 2012 00:12:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[18568] csw/mgar/pkg/imapfilter/trunk Message-ID: Revision: 18568 http://gar.svn.sourceforge.net/gar/?rev=18568&view=rev Author: bdwalton Date: 2012-06-28 00:12:07 +0000 (Thu, 28 Jun 2012) Log Message: ----------- imapfilter/trunk: home site has moved to github, update that and do a version bump Modified Paths: -------------- csw/mgar/pkg/imapfilter/trunk/Makefile csw/mgar/pkg/imapfilter/trunk/checksums Modified: csw/mgar/pkg/imapfilter/trunk/Makefile =================================================================== --- csw/mgar/pkg/imapfilter/trunk/Makefile 2012-06-27 23:54:06 UTC (rev 18567) +++ csw/mgar/pkg/imapfilter/trunk/Makefile 2012-06-28 00:12:07 UTC (rev 18568) @@ -1,5 +1,5 @@ NAME = imapfilter -VERSION = 2.2.2 +VERSION = 2.5.2 GARTYPE = v2 CATEGORIES = net @@ -15,8 +15,8 @@ supported. endef -MASTER_SITES = http://imapfilter.hellug.gr/source/ -DISTFILES = $(NAME)-$(VERSION).tar.bz2 +MASTER_SITES = https://github.com/downloads/lefcha/$(NAME)/ +DISTFILES = $(NAME)-$(VERSION).tar.gz LICENSE = LICENSE Modified: csw/mgar/pkg/imapfilter/trunk/checksums =================================================================== --- csw/mgar/pkg/imapfilter/trunk/checksums 2012-06-27 23:54:06 UTC (rev 18567) +++ csw/mgar/pkg/imapfilter/trunk/checksums 2012-06-28 00:12:07 UTC (rev 18568) @@ -1 +1 @@ -09c6ffb085a5a244dc9f3e798259f341 imapfilter-2.2.2.tar.bz2 +a22db55b57893cb53305a5d835ee7bd6 imapfilter-2.5.2.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 Thu Jun 28 02:34:19 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 28 Jun 2012 00:34:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[18569] csw/mgar/pkg/imapfilter/trunk/Makefile Message-ID: Revision: 18569 http://gar.svn.sourceforge.net/gar/?rev=18569&view=rev Author: bdwalton Date: 2012-06-28 00:34:19 +0000 (Thu, 28 Jun 2012) Log Message: ----------- imapfilter/trunk: disable patch and update configure/build commands Modified Paths: -------------- csw/mgar/pkg/imapfilter/trunk/Makefile Modified: csw/mgar/pkg/imapfilter/trunk/Makefile =================================================================== --- csw/mgar/pkg/imapfilter/trunk/Makefile 2012-06-28 00:12:07 UTC (rev 18568) +++ csw/mgar/pkg/imapfilter/trunk/Makefile 2012-06-28 00:34:19 UTC (rev 18569) @@ -28,11 +28,12 @@ RUNTIME_DEP_PKGS_CSWimapfilter += CSWlibpcre1 RUNTIME_DEP_PKGS_CSWimapfilter += CSWlibssl1-0-0 -PATCHFILES += 0001-Bludgeon-the-build-system-to-do-what-we-need.patch +#PATCHFILES += 0001-Bludgeon-the-build-system-to-do-what-we-need.patch GARCOMPILER = GNU -CONFIGURE_ARGS = -d $(prefix) -m $(mandir) +CONFIGURE_SCRIPTS = +BUILD_ARGS = all # No test suite TEST_SCRIPTS = This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Thu Jun 28 02:49:20 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 28 Jun 2012 00:49:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[18570] csw/mgar/pkg/gdal/trunk/Makefile Message-ID: Revision: 18570 http://gar.svn.sourceforge.net/gar/?rev=18570&view=rev Author: bdwalton Date: 2012-06-28 00:49:20 +0000 (Thu, 28 Jun 2012) Log Message: ----------- gdal/trunk: add the libgeos dependency and note the build dep for it as well Modified Paths: -------------- csw/mgar/pkg/gdal/trunk/Makefile Modified: csw/mgar/pkg/gdal/trunk/Makefile =================================================================== --- csw/mgar/pkg/gdal/trunk/Makefile 2012-06-28 00:34:19 UTC (rev 18569) +++ csw/mgar/pkg/gdal/trunk/Makefile 2012-06-28 00:49:20 UTC (rev 18570) @@ -22,6 +22,8 @@ PATCHFILES += 0005-Pass-proper-types-to-std-make_pair-to-satisfy-Sun-St.patch #PATCHFILES += 0001-Force-the-use-of-CSWbash.patch +BUILD_DEP_PKGS += CSWgeos-dev + PACKAGES += CSWgdal CATALOGNAME_CSWgdal = gdal SPKG_DESC_CSWgdal = $(DESCRIPTION) @@ -68,6 +70,7 @@ RUNTIME_DEP_PKGS_CSWlibgdal1-gxx += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibgdal1-gxx += CSWlibgif4 RUNTIME_DEP_PKGS_CSWlibgdal1-gxx += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWlibgdal1-gxx += CSWlibgeos-c1 PKGFILES_CSWlibgdal1-gxx += $(call baseisadirs,$(libdir),libgdal\.so\.1\.15\.0) PKGFILES_CSWlibgdal1-gxx += $(call baseisadirs,$(libdir),libgdal\.so\.1(\.\d+)*) @@ -101,6 +104,7 @@ LICENSE = LICENSE.TXT EXTRA_LIB += /opt/csw/postgresql/lib +EXTRA_LDFLAGS += -L$(libdir) -R$(libdir) 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 28 02:56:23 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 28 Jun 2012 00:56:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[18571] csw/mgar/pkg/imapfilter/trunk Message-ID: Revision: 18571 http://gar.svn.sourceforge.net/gar/?rev=18571&view=rev Author: bdwalton Date: 2012-06-28 00:56:23 +0000 (Thu, 28 Jun 2012) Log Message: ----------- imapfilter/trunk: update the build system bludgeoning patch and defined a few extra linker flags Modified Paths: -------------- csw/mgar/pkg/imapfilter/trunk/Makefile csw/mgar/pkg/imapfilter/trunk/files/0001-Bludgeon-the-build-system-to-do-what-we-need.patch Modified: csw/mgar/pkg/imapfilter/trunk/Makefile =================================================================== --- csw/mgar/pkg/imapfilter/trunk/Makefile 2012-06-28 00:49:20 UTC (rev 18570) +++ csw/mgar/pkg/imapfilter/trunk/Makefile 2012-06-28 00:56:23 UTC (rev 18571) @@ -28,10 +28,12 @@ RUNTIME_DEP_PKGS_CSWimapfilter += CSWlibpcre1 RUNTIME_DEP_PKGS_CSWimapfilter += CSWlibssl1-0-0 -#PATCHFILES += 0001-Bludgeon-the-build-system-to-do-what-we-need.patch +PATCHFILES += 0001-Bludgeon-the-build-system-to-do-what-we-need.patch GARCOMPILER = GNU +EXTRA_LDFLAGS += -lsocket -liconv + CONFIGURE_SCRIPTS = BUILD_ARGS = all Modified: csw/mgar/pkg/imapfilter/trunk/files/0001-Bludgeon-the-build-system-to-do-what-we-need.patch =================================================================== --- csw/mgar/pkg/imapfilter/trunk/files/0001-Bludgeon-the-build-system-to-do-what-we-need.patch 2012-06-28 00:49:20 UTC (rev 18570) +++ csw/mgar/pkg/imapfilter/trunk/files/0001-Bludgeon-the-build-system-to-do-what-we-need.patch 2012-06-28 00:56:23 UTC (rev 18571) @@ -1,42 +1,40 @@ -From 7ad082705998d94a16c0ecd58e1a3db0e8d4936c Mon Sep 17 00:00:00 2001 +From 4ddab6dc87cad733a900256d82e44199fe3e3d46 Mon Sep 17 00:00:00 2001 From: Ben Walton -Date: Sun, 10 Jun 2012 01:59:08 +0200 +Date: Thu, 28 Jun 2012 02:42:26 +0200 Subject: [PATCH] Bludgeon the build system to do what we need Signed-off-by: Ben Walton --- - configure | 7 +++---- - 1 file changed, 3 insertions(+), 4 deletions(-) + src/Makefile | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) -diff --git a/configure b/configure -index 6b5b0d5..bc69d56 100755 ---- a/configure -+++ b/configure -@@ -10,13 +10,13 @@ mandir="$prefix/man" - ssltls="yes" - crammd5="yes" +diff --git a/src/Makefile b/src/Makefile +index 3938401..3ee04e0 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -1,15 +1,15 @@ + DESTDIR = +-PREFIX = /usr/local ++PREFIX = /opt/csw + BINDIR = $(PREFIX)/bin + SHAREDIR = $(PREFIX)/share/imapfilter +-MANDIR = $(PREFIX)/man ++MANDIR = $(PREFIX)/share/man --incdirs="-I/usr/local/include" --libdirs="-L/usr/local/lib" -+incdirs="-I/opt/csw/include" -+libdirs="-L/opt/csw/lib" +-MYCFLAGS = +-MYLDFLAGS = +-MYLIBS = ++MYCFLAGS := $(CFLAGS) ++MYLDFLAGS := $(LDFLAGS) ++MYLIBS := $(LIBS) - mycflags="$CFLAGS -Wall -O" - myldflags="$LDFLAGS" +-INCDIRS = +-LIBDIRS = ++INCDIRS = -I$(PREFIX)/include ++LIBDIRS = -L$(PREFIX)/lib --libs="-lm -llua -lpcre" -+libs="-lm -llua -lpcre -lnsl -lsocket" - libssl="-lssl" - libcrypto="-lcrypto" - -@@ -140,7 +140,6 @@ if [ ! -f .Makefile ]; then cp -f Makefile .Makefile; fi - mv -f Makefile Makefile~ - - cat > Makefile << EOF --DESTDIR = - BINDIR = $bindir - SHAREDIR = $sharedir - MANDIR = $mandir + LIBLUA = -llua + LIBPCRE = -lpcre -- -1.7.10 +1.7.10.3 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Thu Jun 28 03:02:30 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 28 Jun 2012 01:02:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[18572] csw/mgar/pkg/imapfilter/trunk/Makefile Message-ID: Revision: 18572 http://gar.svn.sourceforge.net/gar/?rev=18572&view=rev Author: bdwalton Date: 2012-06-28 01:02:30 +0000 (Thu, 28 Jun 2012) Log Message: ----------- imapfilter/trunk: update runtime dependency list Modified Paths: -------------- csw/mgar/pkg/imapfilter/trunk/Makefile Modified: csw/mgar/pkg/imapfilter/trunk/Makefile =================================================================== --- csw/mgar/pkg/imapfilter/trunk/Makefile 2012-06-28 00:56:23 UTC (rev 18571) +++ csw/mgar/pkg/imapfilter/trunk/Makefile 2012-06-28 01:02:30 UTC (rev 18572) @@ -24,9 +24,10 @@ BUILD_DEP_PKGS += CSWlua-dev BUILD_DEP_PKGS += CSWlibpcre-dev -RUNTIME_DEP_PKGS_CSWimapfilter += CSWlua +RUNTIME_DEP_PKGS_CSWimapfilter += CSWliblua5-2 RUNTIME_DEP_PKGS_CSWimapfilter += CSWlibpcre1 RUNTIME_DEP_PKGS_CSWimapfilter += CSWlibssl1-0-0 +RUNTIME_DEP_PKGS_CSWimapfilter += CSWlibiconv2 PATCHFILES += 0001-Bludgeon-the-build-system-to-do-what-we-need.patch This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Thu Jun 28 09:19:43 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Thu, 28 Jun 2012 07:19:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[18573] csw/mgar/pkg Message-ID: Revision: 18573 http://gar.svn.sourceforge.net/gar/?rev=18573&view=rev Author: pfelecan Date: 2012-06-28 07:19:42 +0000 (Thu, 28 Jun 2012) Log Message: ----------- svn2cl/trunk: migrated from a private recipe to a GAR based recipe Added Paths: ----------- csw/mgar/pkg/svn2cl/ csw/mgar/pkg/svn2cl/Makefile csw/mgar/pkg/svn2cl/branches/ csw/mgar/pkg/svn2cl/tags/ csw/mgar/pkg/svn2cl/trunk/ csw/mgar/pkg/svn2cl/trunk/Makefile csw/mgar/pkg/svn2cl/trunk/checksums csw/mgar/pkg/svn2cl/trunk/files/ csw/mgar/pkg/svn2cl/trunk/files/0001-Author-self.patch csw/mgar/pkg/svn2cl/trunk/files/0002-Static-search-library.patch csw/mgar/pkg/svn2cl/trunk/files/COPYING Added: csw/mgar/pkg/svn2cl/Makefile =================================================================== --- csw/mgar/pkg/svn2cl/Makefile (rev 0) +++ csw/mgar/pkg/svn2cl/Makefile 2012-06-28 07:19:42 UTC (rev 18573) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/svn2cl/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/svn2cl/trunk/Makefile =================================================================== --- csw/mgar/pkg/svn2cl/trunk/Makefile (rev 0) +++ csw/mgar/pkg/svn2cl/trunk/Makefile 2012-06-28 07:19:42 UTC (rev 18573) @@ -0,0 +1,40 @@ +# $Id$ + +NAME = svn2cl +VERSION = 0.13 +GARTYPE = v2 +CATEGORIES = devel + +DESCRIPTION = An xsl stylesheet for generating a classic GNU-style ChangeLog from a subversion repository log +define BLURB + This is an xsl stylesheet for generating a classic GNU-style ChangeLog from + a subversion repository log. It is made from several changelog-like scripts + using common xslt constructs found in different places. +endef + +MASTER_SITES = http://arthurdejong.org/svn2cl/ +DISTFILES = $(DISTNAME).tar.gz +DISTFILES += COPYING +PATCHFILES = 0001-Author-self.patch +PATCHFILES += 0002-Static-search-library.patch + +RUNTIME_DEP_PKGS = CSWlibxslt + +CHECKPKG_OVERRIDES_CSWsvn2cl += surplus-dependency|CSWlibxslt + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +include gar/category.mk + +install-custom: pkgmandir = $(mandir)/man1 +install-custom: pkglibdir = $(sharedstatedir)/$(NAME) +install-custom: + ginstall --directory --mode=u=rwx,go=rx $(DESTDIR)/$(bindir) + ginstall --preserve-timestamps --mode=u=rwx,go=rx $(WORKSRC)/svn2cl.sh $(DESTDIR)/$(bindir)/svn2cl + ginstall --directory --mode=u=rwx,go=rx $(DESTDIR)/$(pkgmandir) + ginstall --preserve-timestamps --mode=u=rw,go=r $(WORKSRC)/svn2cl.1 $(DESTDIR)/$(pkgmandir) + ginstall --directory --mode=u=rwx,go=rx $(DESTDIR)/$(pkglibdir) + ginstall --preserve-timestamps --mode=u=rw,go=r $(WORKSRC)/authors.xml $(WORKSRC)/svn2cl.xsl $(WORKSRC)/svn2html.css $(WORKSRC)/svn2html.xsl $(DESTDIR)/$(pkglibdir) Property changes on: csw/mgar/pkg/svn2cl/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/svn2cl/trunk/checksums =================================================================== --- csw/mgar/pkg/svn2cl/trunk/checksums (rev 0) +++ csw/mgar/pkg/svn2cl/trunk/checksums 2012-06-28 07:19:42 UTC (rev 18573) @@ -0,0 +1 @@ +39764d18ef342145863d5d4e21610e2d svn2cl-0.13.tar.gz Added: csw/mgar/pkg/svn2cl/trunk/files/0001-Author-self.patch =================================================================== --- csw/mgar/pkg/svn2cl/trunk/files/0001-Author-self.patch (rev 0) +++ csw/mgar/pkg/svn2cl/trunk/files/0001-Author-self.patch 2012-06-28 07:19:42 UTC (rev 18573) @@ -0,0 +1,29 @@ +From 1a587a87432feefaba9aa3a8c5a614097e8da9a5 Mon Sep 17 00:00:00 2001 +From: Peter Felecan +Date: Thu, 28 Jun 2012 09:00:57 +0200 +Subject: [PATCH] Author self + +--- + authors.xml | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/authors.xml b/authors.xml +index 65f1225..bcffff2 100644 +--- a/authors.xml ++++ b/authors.xml +@@ -3,6 +3,12 @@ + + Arthur de Jong <arthur at arthurdejong.org> + ++ ++ Peter Felecan <peter at felecan.org> ++ ++ ++ Peter Felecan <peter at felecan.org> ++ + + Who's this <nobody at example.com> + +-- +1.7.10.3 + Added: csw/mgar/pkg/svn2cl/trunk/files/0002-Static-search-library.patch =================================================================== --- csw/mgar/pkg/svn2cl/trunk/files/0002-Static-search-library.patch (rev 0) +++ csw/mgar/pkg/svn2cl/trunk/files/0002-Static-search-library.patch 2012-06-28 07:19:42 UTC (rev 18573) @@ -0,0 +1,39 @@ +From 7ebafbaf1e54ea00115aa48447a5ea78323bcbf3 Mon Sep 17 00:00:00 2001 +From: Peter Felecan +Date: Thu, 28 Jun 2012 09:06:34 +0200 +Subject: [PATCH] Static search library + +--- + svn2cl.sh | 12 ++---------- + 1 file changed, 2 insertions(+), 10 deletions(-) + +diff --git a/svn2cl.sh b/svn2cl.sh +index 1c549f7..f497271 100755 +--- a/svn2cl.sh ++++ b/svn2cl.sh +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#! /usr/bin/env bash + + # svn2cl.sh - front end shell script for svn2cl.xsl, calls xsltproc + # with the correct parameters +@@ -260,15 +260,7 @@ do + esac + done + +-# find the directory that this script resides in +-prog="$0" +-while [ -h "$prog" ] +-do +- dir=`dirname "$prog"` +- prog=`ls -ld "$prog" | sed "s/^.*-> \(.*\)/\1/;/^[^/]/s,^,$dir/,"` +-done +-dir=`dirname "$prog"` +-dir=`cd "$dir" && pwd` ++dir=/opt/csw/share/svn2cl + XSL="$dir/svn2${OUTSTYLE}.xsl" + + # check if the authors file is formatted as a legacy +-- +1.7.10.3 + Added: csw/mgar/pkg/svn2cl/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/svn2cl/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/svn2cl/trunk/files/COPYING 2012-06-28 07:19:42 UTC (rev 18573) @@ -0,0 +1,26 @@ +# Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Arthur de Jong. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# 3. The name of the author may not be used to endorse or promote +# products derived from this software without specific prior +# written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY +# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE +# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER +# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN +# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Thu Jun 28 09:41:00 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Thu, 28 Jun 2012 07:41:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[18574] csw/mgar/pkg/svn2cl/trunk/Makefile Message-ID: Revision: 18574 http://gar.svn.sourceforge.net/gar/?rev=18574&view=rev Author: pfelecan Date: 2012-06-28 07:41:00 +0000 (Thu, 28 Jun 2012) Log Message: ----------- svn2cl/trunk: definitely this is architecture neutral Modified Paths: -------------- csw/mgar/pkg/svn2cl/trunk/Makefile Modified: csw/mgar/pkg/svn2cl/trunk/Makefile =================================================================== --- csw/mgar/pkg/svn2cl/trunk/Makefile 2012-06-28 07:19:42 UTC (rev 18573) +++ csw/mgar/pkg/svn2cl/trunk/Makefile 2012-06-28 07:41:00 UTC (rev 18574) @@ -20,6 +20,7 @@ RUNTIME_DEP_PKGS = CSWlibxslt +ARCHALL_CSWsvn2cl = 1 CHECKPKG_OVERRIDES_CSWsvn2cl += surplus-dependency|CSWlibxslt CONFIGURE_SCRIPTS = This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Jun 28 09:49:53 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 28 Jun 2012 07:49:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[18575] csw/mgar/pkg/lighttpd/trunk/Makefile Message-ID: Revision: 18575 http://gar.svn.sourceforge.net/gar/?rev=18575&view=rev Author: dmichelsen Date: 2012-06-28 07:49:52 +0000 (Thu, 28 Jun 2012) Log Message: ----------- lighttpd/trunk: Move finalizer to post-merge Modified Paths: -------------- csw/mgar/pkg/lighttpd/trunk/Makefile Modified: csw/mgar/pkg/lighttpd/trunk/Makefile =================================================================== --- csw/mgar/pkg/lighttpd/trunk/Makefile 2012-06-28 07:41:00 UTC (rev 18574) +++ csw/mgar/pkg/lighttpd/trunk/Makefile 2012-06-28 07:49:52 UTC (rev 18575) @@ -136,20 +136,20 @@ include gar/category.mk -post-install-modulated: - ginstall -d -m 755 $(DESTDIR)$(sysconfdir)/init.d - ginstall -m 755 $(DOWNLOADDIR)/cswlighttpd $(DESTDIR)$(sysconfdir)/init.d - # ginstall -m 644 $(WORKSRC)/doc/config/lighttpd.conf $(DESTDIR)$(sysconfdir) - # gsed -i -e 's+/usr/local+/opt/csw+g' $(DESTDIR)$(sysconfdir)/lighttpd.conf - ginstall -m 644 $(FILEDIR)/lighttpd.conf $(DESTDIR)$(sysconfdir) - gsed -i -e 's+/usr/local+/opt/csw+g' $(DESTDIR)$(sysconfdir)/lighttpd.conf - ginstall -d -m 755 $(DESTDIR)$(localstatedir)/run - ginstall -d -m 755 $(DESTDIR)$(datadir)/lighttpd-root - echo 'lighttpd is working!' > $(DESTDIR)$(datadir)/lighttpd-root/index.html - ginstall -d -m 755 $(DESTDIR)$(localstatedir)/log/lighttpd - ginstall -d -m 755 $(DESTDIR)$(sysconfdir)/pkg/$(NAME) +post-merge: + ginstall -d -m 755 $(PKGROOT)$(sysconfdir)/init.d + ginstall -m 755 $(DOWNLOADDIR)/cswlighttpd $(PKGROOT)$(sysconfdir)/init.d + # ginstall -m 644 $(WORKSRC)/doc/config/lighttpd.conf $(PKGROOT)$(sysconfdir) + # gsed -i -e 's+/usr/local+/opt/csw+g' $(PKGROOT)$(sysconfdir)/lighttpd.conf + ginstall -m 644 $(FILEDIR)/lighttpd.conf $(PKGROOT)$(sysconfdir) + gsed -i -e 's+/usr/local+/opt/csw+g' $(PKGROOT)$(sysconfdir)/lighttpd.conf + ginstall -d -m 755 $(PKGROOT)$(localstatedir)/run + ginstall -d -m 755 $(PKGROOT)$(datadir)/lighttpd-root + echo 'lighttpd is working!' > $(PKGROOT)$(datadir)/lighttpd-root/index.html + ginstall -d -m 755 $(PKGROOT)$(localstatedir)/log/lighttpd + ginstall -d -m 755 $(PKGROOT)$(sysconfdir)/pkg/$(NAME) echo "lighttpd:lighttpd:lighttpd web server::::" \ - > $(DESTDIR)$(sysconfdir)/pkg/$(NAME)/cswusergroup - (cd $(DESTDIR)$(libdir_install); ln -s . 32) - (cd $(DESTDIR)$(libdir_install); ln -s $(ISA_DEFAULT64) 64) + > $(PKGROOT)$(sysconfdir)/pkg/$(NAME)/cswusergroup + (cd $(PKGROOT)$(libdir_install); ln -s . 32) + (cd $(PKGROOT)$(libdir_install); ln -s $(ISA_DEFAULT64) 64) @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Jun 28 09:56:31 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 28 Jun 2012 07:56:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[18576] csw/mgar/pkg/lighttpd/trunk/Makefile Message-ID: Revision: 18576 http://gar.svn.sourceforge.net/gar/?rev=18576&view=rev Author: dmichelsen Date: 2012-06-28 07:56:31 +0000 (Thu, 28 Jun 2012) Log Message: ----------- lighttpd/trunk: Do modulation-specific things in post-install Modified Paths: -------------- csw/mgar/pkg/lighttpd/trunk/Makefile Modified: csw/mgar/pkg/lighttpd/trunk/Makefile =================================================================== --- csw/mgar/pkg/lighttpd/trunk/Makefile 2012-06-28 07:49:52 UTC (rev 18575) +++ csw/mgar/pkg/lighttpd/trunk/Makefile 2012-06-28 07:56:31 UTC (rev 18576) @@ -136,17 +136,20 @@ include gar/category.mk +post-install-modulated: + ginstall -d -m 755 $(DESTDIR)$(sysconfdir)/init.d + ginstall -m 755 $(DOWNLOADDIR)/cswlighttpd $(DESTDIR)$(sysconfdir)/init.d + # ginstall -m 644 $(WORKSRC)/doc/config/lighttpd.conf $(DESTDIR)$(sysconfdir) + # gsed -i -e 's+/usr/local+/opt/csw+g' $(DESTDIR)$(sysconfdir)/lighttpd.conf + ginstall -m 644 $(FILEDIR)/lighttpd.conf $(DESTDIR)$(sysconfdir) + gsed -i -e 's+/usr/local+/opt/csw+g' $(DESTDIR)$(sysconfdir)/lighttpd.conf + ginstall -d -m 755 $(DESTDIR)$(localstatedir)/run + ginstall -d -m 755 $(DESTDIR)$(datadir)/lighttpd-root + echo 'lighttpd is working!' > $(DESTDIR)$(datadir)/lighttpd-root/index.html + ginstall -d -m 755 $(DESTDIR)$(localstatedir)/log/lighttpd + @$(MAKECOOKIE) + post-merge: - ginstall -d -m 755 $(PKGROOT)$(sysconfdir)/init.d - ginstall -m 755 $(DOWNLOADDIR)/cswlighttpd $(PKGROOT)$(sysconfdir)/init.d - # ginstall -m 644 $(WORKSRC)/doc/config/lighttpd.conf $(PKGROOT)$(sysconfdir) - # gsed -i -e 's+/usr/local+/opt/csw+g' $(PKGROOT)$(sysconfdir)/lighttpd.conf - ginstall -m 644 $(FILEDIR)/lighttpd.conf $(PKGROOT)$(sysconfdir) - gsed -i -e 's+/usr/local+/opt/csw+g' $(PKGROOT)$(sysconfdir)/lighttpd.conf - ginstall -d -m 755 $(PKGROOT)$(localstatedir)/run - ginstall -d -m 755 $(PKGROOT)$(datadir)/lighttpd-root - echo 'lighttpd is working!' > $(PKGROOT)$(datadir)/lighttpd-root/index.html - ginstall -d -m 755 $(PKGROOT)$(localstatedir)/log/lighttpd ginstall -d -m 755 $(PKGROOT)$(sysconfdir)/pkg/$(NAME) echo "lighttpd:lighttpd:lighttpd web server::::" \ > $(PKGROOT)$(sysconfdir)/pkg/$(NAME)/cswusergroup 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 28 10:15:05 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 28 Jun 2012 08:15:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[18577] csw/mgar/pkg/gnome-base/libbonoboui Message-ID: Revision: 18577 http://gar.svn.sourceforge.net/gar/?rev=18577&view=rev Author: dmichelsen Date: 2012-06-28 08:15:05 +0000 (Thu, 28 Jun 2012) Log Message: ----------- gnome-base/libbonoboui: Cleanup old stuff Added Paths: ----------- csw/mgar/pkg/gnome-base/libbonoboui/branches/ csw/mgar/pkg/gnome-base/libbonoboui/tags/ csw/mgar/pkg/gnome-base/libbonoboui/tags/legacy/ csw/mgar/pkg/gnome-base/libbonoboui/tags/superlegacy/ Removed Paths: ------------- csw/mgar/pkg/gnome-base/libbonoboui/branch-c/ csw/mgar/pkg/gnome-base/libbonoboui/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 Thu Jun 28 10:18:00 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 28 Jun 2012 08:18:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[18578] csw/mgar/pkg/xmlrpc_c/trunk Message-ID: Revision: 18578 http://gar.svn.sourceforge.net/gar/?rev=18578&view=rev Author: dmichelsen Date: 2012-06-28 08:18:00 +0000 (Thu, 28 Jun 2012) Log Message: ----------- xmlrpc_c/trunk: Update to 1.16.41, does not link yet Modified Paths: -------------- csw/mgar/pkg/xmlrpc_c/trunk/Makefile csw/mgar/pkg/xmlrpc_c/trunk/checksums Modified: csw/mgar/pkg/xmlrpc_c/trunk/Makefile =================================================================== --- csw/mgar/pkg/xmlrpc_c/trunk/Makefile 2012-06-28 08:15:05 UTC (rev 18577) +++ csw/mgar/pkg/xmlrpc_c/trunk/Makefile 2012-06-28 08:18:00 UTC (rev 18578) @@ -1,5 +1,5 @@ NAME = xmlrpc-c -VERSION = 1.16.39 +VERSION = 1.16.41 CATEGORIES = lib GARTYPE = v2 @@ -19,6 +19,8 @@ PATCHFILES += 0001-Remove-inclusion-of-curl-types.h.patch PATCHFILES += 0002-Use-direct-unistd-for-close.patch +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + LICENSE = doc/COPYING DOCFILES += CREDITS DEVELOPING HISTORY INSTALL SECURITY TESTING TODO @@ -31,6 +33,9 @@ EXTRA_CPPFLAGS += -D__EXTENSIONS__ +#EXTRA_CXXFLAGS += -xclang=c99 +EXTRA_CFLAGS += -xc99=all + BUILD_OVERRIDE_VARS += CFLAGS_PERSONAL BUILD_OVERRIDE_VAR_CFLAGS_PERSONAL = $(CFLAGS) $(CPPFLAGS) Modified: csw/mgar/pkg/xmlrpc_c/trunk/checksums =================================================================== --- csw/mgar/pkg/xmlrpc_c/trunk/checksums 2012-06-28 08:15:05 UTC (rev 18577) +++ csw/mgar/pkg/xmlrpc_c/trunk/checksums 2012-06-28 08:18:00 UTC (rev 18578) @@ -1 +1 @@ -e88c9ee202890d726405b3bdfb00cfaf xmlrpc-c-1.16.39.tgz +e4909dbcd902922c85014aa8e9559fbc xmlrpc-c-1.16.41.tgz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Thu Jun 28 10:34:52 2012 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_=28Matchek=29_Blizi=C5=84ski?=) Date: Thu, 28 Jun 2012 09:34:52 +0100 Subject: [csw-devel] SF.net SVN: gar:[18518] csw/mgar/pkg/pstoedit/trunk/Makefile In-Reply-To: References: Message-ID: 2012/6/27 Peter FELECAN : > "Maciej (Matchek) Blizi?ski" writes: > >> 2012/6/25 ?: >>> Revision: 18518 >>> ? ? ? ? ?http://gar.svn.sourceforge.net/gar/?rev=18518&view=rev >>> Author: ? pfelecan >>> Date: ? ? 2012-06-25 09:55:11 +0000 (Mon, 25 Jun 2012) >>> Log Message: >>> ----------- >>> availability limited to Solaris 10 >> >> When committing code, please add the package name as the first word >> of the commit message. It makes it easier to read the timeline and >> commit logs. > > I'll do but I don't see the difference when browsing the repository; > maybe I'm not looking at the relevant place. BTW, I wasn't aware about > this convention; is this published somewhere? I look at it in the Trac timeline view: http://sourceforge.net/apps/trac/gar/timeline From maciej at opencsw.org Thu Jun 28 10:37:51 2012 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_=28Matchek=29_Blizi=C5=84ski?=) Date: Thu, 28 Jun 2012 09:37:51 +0100 Subject: [csw-devel] SF.net SVN: gar:[18512] csw/mgar/pkg/pilotlink/trunk/Makefile In-Reply-To: References: Message-ID: 2012/6/27 Peter FELECAN : > "Maciej (Matchek) Blizi?ski" writes: > >> 2012/6/23 ?: >>> Revision: 18512 >>> ? ? ? ? ?http://gar.svn.sourceforge.net/gar/?rev=18512&view=rev >>> Author: ? pfelecan >>> Date: ? ? 2012-06-23 09:37:54 +0000 (Sat, 23 Jun 2012) >>> Log Message: >>> ----------- >>> corrected end of line issues after copy&paste... >> >> I would suggest only committing after you've verified that the change >> actually works. It's less code and better quality code to review for >> others. > > Sure, but I can run checkpkg only on the build farm but my modification > takes place on my local system, on which I test but this wasn't detected > without checkpkg. Remember that I asked to run this beast also outside > the build farm? Does it not run outside the buildfarm? There are instructions how to set up a db locally: http://wiki.opencsw.org/checkpkg This is how I run a dev instance. From maciej at opencsw.org Thu Jun 28 10:40:30 2012 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_=28Matchek=29_Blizi=C5=84ski?=) Date: Thu, 28 Jun 2012 09:40:30 +0100 Subject: [csw-devel] SF.net SVN: gar:[18511] csw/mgar/pkg/pilotlink/trunk/Makefile In-Reply-To: References: Message-ID: 2012/6/27 Peter FELECAN : > *here* ?libintl.so.8 => ?/opt/csw/lib/libintl.so.8 > *here* ?libiconv.so.2 => ? ? ? ? /opt/csw/lib/libiconv.so.2 These libraries are loaded, but they immediate dependencies. If you have something like this: foo ? libfoo.so.1 ? libbar.so.2 Then you need to declare the dependency from CSWfoo to CSWlibfoo1, and CSwlibfoo1 to CSWlibbar2, but not from CSWfoo to CSWlibbar2. In other words, checkpkg tells you the right thing, and you shouldn't need to add any overrides. From maciej at opencsw.org Thu Jun 28 11:16:21 2012 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_=28Matchek=29_Blizi=C5=84ski?=) Date: Thu, 28 Jun 2012 10:16:21 +0100 Subject: [csw-devel] SF.net SVN: gar:[18440] csw/mgar/pkg/libgnet/trunk/Makefile In-Reply-To: References: Message-ID: 2012/6/27 Peter FELECAN : > *here* ?libiconv.so.2 => ? ? ? ? /opt/csw/lib/libiconv.so.2 The transitive dependency again. Let's discuss this on maintainers at . From dmichelsen at users.sourceforge.net Thu Jun 28 11:28:22 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 28 Jun 2012 09:28:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[18579] csw/mgar/pkg Message-ID: Revision: 18579 http://gar.svn.sourceforge.net/gar/?rev=18579&view=rev Author: dmichelsen Date: 2012-06-28 09:28:22 +0000 (Thu, 28 Jun 2012) Log Message: ----------- gperftools/trunk: Does not build yet Added Paths: ----------- csw/mgar/pkg/gperftools/ csw/mgar/pkg/gperftools/Makefile csw/mgar/pkg/gperftools/branches/ csw/mgar/pkg/gperftools/tags/ csw/mgar/pkg/gperftools/trunk/ csw/mgar/pkg/gperftools/trunk/Makefile csw/mgar/pkg/gperftools/trunk/checksums csw/mgar/pkg/gperftools/trunk/files/ Added: csw/mgar/pkg/gperftools/Makefile =================================================================== --- csw/mgar/pkg/gperftools/Makefile (rev 0) +++ csw/mgar/pkg/gperftools/Makefile 2012-06-28 09:28:22 UTC (rev 18579) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/gperftools/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/gperftools/trunk/Makefile =================================================================== --- csw/mgar/pkg/gperftools/trunk/Makefile (rev 0) +++ csw/mgar/pkg/gperftools/trunk/Makefile 2012-06-28 09:28:22 UTC (rev 18579) @@ -0,0 +1,25 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = gperftools +VERSION = 2.0 +GARTYPE = v2 +CATEGORIES = utils + +DESCRIPTION = Fast, multi-threaded malloc() and nifty performance analysis tools + +MASTER_SITES = $(GOOGLE_MIRROR) +DISTFILES = $(DISTNAME).tar.gz + +PACKAGING_PLATFORMS = solarsi10-sparc solarsi10-i386 + +PACKAGES += CSWmypkg +SPKG_DESC_CSWmypkg = My package +PKGFILES_CSWmypkg += $(call pkgfiles_lib,libabc.so.1) +PKGFILES_CSWmypkg += $(call baseisadirs,$(bindir),myexec) +PKGFILES_CSWmypkg += $(sysconfdir)/myconf + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Property changes on: csw/mgar/pkg/gperftools/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/gperftools/trunk/checksums =================================================================== --- csw/mgar/pkg/gperftools/trunk/checksums (rev 0) +++ csw/mgar/pkg/gperftools/trunk/checksums 2012-06-28 09:28:22 UTC (rev 18579) @@ -0,0 +1 @@ +13f6e8961bc6a26749783137995786b6 gperftools-2.0.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Jun 28 11:41:17 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 28 Jun 2012 09:41:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[18580] csw/mgar/pkg/libexplain/trunk Message-ID: Revision: 18580 http://gar.svn.sourceforge.net/gar/?rev=18580&view=rev Author: dmichelsen Date: 2012-06-28 09:41:17 +0000 (Thu, 28 Jun 2012) Log Message: ----------- libexplain/trunk: Update to 1.0.D001 Modified Paths: -------------- csw/mgar/pkg/libexplain/trunk/Makefile csw/mgar/pkg/libexplain/trunk/checksums Modified: csw/mgar/pkg/libexplain/trunk/Makefile =================================================================== --- csw/mgar/pkg/libexplain/trunk/Makefile 2012-06-28 09:28:22 UTC (rev 18579) +++ csw/mgar/pkg/libexplain/trunk/Makefile 2012-06-28 09:41:17 UTC (rev 18580) @@ -4,7 +4,7 @@ # * inspect failed tests from the testsuite NAME = libexplain -VERSION = 0.52.D002 +VERSION = 1.0.D001 GARTYPE = v2 CATEGORIES = lib @@ -23,20 +23,20 @@ SPKG_DESC_CSWexplain = Explains unix system call errors PKGFILES_CSWexplain += $(bindir)/.* PKGFILES_CSWexplain += $(mandir)/man1/.* -RUNTIME_DEP_PKGS_CSWexplain += CSWlibexplain30 +RUNTIME_DEP_PKGS_CSWexplain += CSWlibexplain52 RUNTIME_DEP_PKGS_CSWexplain += CSWlibintl8 RUNTIME_DEP_PKGS_CSWexplain += CSWlibiconv2 -PACKAGES += CSWlibexplain30 -SPKG_DESC_CSWlibexplain30 = Explains unix system call errors, libexplain.so.30 -PKGFILES_CSWlibexplain30 += $(call pkgfiles_lib,libexplain.so.30) -RUNTIME_DEP_PKGS_CSWlibexplain30 += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWlibexplain30 += CSWlibiconv2 +PACKAGES += CSWlibexplain52 +SPKG_DESC_CSWlibexplain52 = Explains unix system call errors, libexplain.so.52 +PKGFILES_CSWlibexplain52 += $(call pkgfiles_lib,libexplain.so.52) +RUNTIME_DEP_PKGS_CSWlibexplain52 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibexplain52 += CSWlibiconv2 PACKAGES += CSWlibexplain-dev -SPKG_DESC_CSWlibexplain-dev = Development files for libexplain.so.30 +SPKG_DESC_CSWlibexplain-dev = Development files for libexplain.so.52 # PKGFILES is catchall -RUNTIME_DEP_PKGS_CSWlibexplain-dev += CSWlibexplain30 +RUNTIME_DEP_PKGS_CSWlibexplain-dev += CSWlibexplain52 BUILD64_LIBS_ONLY = 1 Modified: csw/mgar/pkg/libexplain/trunk/checksums =================================================================== --- csw/mgar/pkg/libexplain/trunk/checksums 2012-06-28 09:28:22 UTC (rev 18579) +++ csw/mgar/pkg/libexplain/trunk/checksums 2012-06-28 09:41:17 UTC (rev 18580) @@ -1 +1 @@ -80f33a99ca4ac0326b8de87602c52f11 libexplain-0.52.D002.tar.gz +604ecdc642288ac324cc09612e199ee9 libexplain-1.0.D001.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 28 11:51:26 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 28 Jun 2012 09:51:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[18581] csw/mgar/pkg Message-ID: Revision: 18581 http://gar.svn.sourceforge.net/gar/?rev=18581&view=rev Author: dmichelsen Date: 2012-06-28 09:51:26 +0000 (Thu, 28 Jun 2012) Log Message: ----------- pound, pound2: Reorganize, make pound 1.x old tag, name pound2 just pound Modified Paths: -------------- csw/mgar/pkg/pound/trunk/Makefile csw/mgar/pkg/pound/trunk/checksums Added Paths: ----------- csw/mgar/pkg/pound/ csw/mgar/pkg/pound/tags/pound-1.x/ Removed Paths: ------------- csw/mgar/pkg/pound/ csw/mgar/pkg/pound2/ Modified: csw/mgar/pkg/pound/trunk/Makefile =================================================================== --- csw/mgar/pkg/pound2/trunk/Makefile 2012-06-28 01:02:30 UTC (rev 18572) +++ csw/mgar/pkg/pound/trunk/Makefile 2012-06-28 09:51:26 UTC (rev 18581) @@ -1,9 +1,9 @@ -NAME = pound2 -VERSION = 2.4.5 +NAME = pound +VERSION = 2.6 CATEGORIES = net GARTYPE = v2 -DESCRIPTION = reverse proxy load balancer +DESCRIPTION = Reverse proxy load balancer define BLURB The Pound program is a reverse proxy, load balancer and HTTPS front-end for Web server(s). Pound was developed to enable distributing the load among @@ -13,52 +13,65 @@ endef MASTER_SITES = http://www.apsis.ch/pound/ -DISTFILES = Pound-$(VERSION).tgz -DISTNAME = Pound-$(VERSION) +DISTNAME = Pound-$(VERSION) +DISTFILES += $(DISTNAME).tgz -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tgz +# adjust log/run files +PATCHFILES = patch-pound.h +PATCHFILES += patch-pound.8 -# we require -RUNTIME_DEP_PKGS = CSWosslrt CSWpcrert +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 +VENDOR_URL = http://www.apsis.ch/pound/ + +LICENSE = GPL.txt + +RUNTIME_DEP_PKGS += CSWlibssl-dev +RUNTIME_DEP_PKGS += CSWlibcurl-dev + +PACKAGES += CSWpound +SPKG_DESC_CSWpound = Reverse proxy load balancer +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWpound += CSWlibpcreposix0 +RUNTIME_DEP_PKGS_CSWpound += CSWlibssl1-0-0 +OBSOLETED_BY_CSWpound = CSWpound2 + +# This is just for example scripts +CHECKPKG_OVERRIDES_CSWpound2 += missing-dependency|CSWpython + +EXTRA_DOCS += README +EXTRA_DOCS += FAQ +EXTRA_DOCS += CHANGELOG +EXTRA_DOCS += z2_2_5_1.py +EXTRA_DOCS += z2_2_6_1.py + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-super CONFIGURE_ARGS += --enable-msdav CONFIGURE_ARGS += --with-maxbuf=8192 CONFIGURE_ARGS += --with-ssl=$(prefix) -# adjust log/run files -PATCHFILES = patch-pound.h -PATCHFILES += patch-pound.8 - # No test suite available TEST_SCRIPTS = # use a custom install -INSTALL_SCRIPTS = custom docs +INSTALL_SCRIPTS = custom extra-docs +PRESERVECONF = $(sysconfdir)/pound.cfg + include gar/category.mk install-custom: ginstall -d $(DESTDIR)$(sbindir) - ginstall -m 555 $(WORKSRC)/pound $(DESTDIR)$(sbindir)/pound2 - ginstall -m 555 $(WORKSRC)/poundctl $(DESTDIR)$(sbindir)/pound2ctl + ginstall -m 555 $(WORKSRC)/pound $(DESTDIR)$(sbindir)/pound + ginstall -m 555 $(WORKSRC)/poundctl $(DESTDIR)$(sbindir)/poundctl ginstall -d $(DESTDIR)$(mandir)/man8 - ginstall -m 644 $(WORKSRC)/pound.8 $(DESTDIR)$(mandir)/man8/pound2.8 - ginstall -m 644 $(WORKSRC)/poundctl.8 $(DESTDIR)$(mandir)/man8/pound2ctl.8 + ginstall -m 644 $(WORKSRC)/pound.8 $(DESTDIR)$(mandir)/man8/pound.8 + ginstall -m 644 $(WORKSRC)/poundctl.8 $(DESTDIR)$(mandir)/man8/poundctl.8 ginstall -d $(DESTDIR)$(sysconfdir)/$(NAME) - ginstall -m 644 $(FILEDIR)/pound2-sample.cfg $(DESTDIR)$(sysconfdir)/$(NAME) - ginstall -d $(DESTDIR)/var/opt/csw/run + ginstall -m 644 $(FILEDIR)/pound2-sample.cfg $(DESTDIR)$(sysconfdir)/pound.cfg -docs-list = $(WORKSRC)/README -docs-list += $(WORKSRC)/FAQ -docs-list += $(WORKSRC)/CHANGELOG -docs-list += $(WORKSRC)/z2_2_5_1.py -docs-list += $(WORKSRC)/z2_2_6_1.py -install-docs: +install-extra-docs: ginstall -d $(DESTDIR)$(docdir)/$(NAME) - @( for file in $(docs-list) ; do \ - ginstall -m 644 $$file $(DESTDIR)$(docdir)/$(NAME) ; \ - done ) + ginstall -m 644 $(addprefix $(WORKSRC)/,$(EXTRA_DOCS)) $(DESTDIR)$(docdir)/$(NAME) @$(MAKECOOKIE) Modified: csw/mgar/pkg/pound/trunk/checksums =================================================================== --- csw/mgar/pkg/pound2/trunk/checksums 2012-06-28 01:02:30 UTC (rev 18572) +++ csw/mgar/pkg/pound/trunk/checksums 2012-06-28 09:51:26 UTC (rev 18581) @@ -1,3 +1 @@ -4c4613e857ee14c06c61ab09e28ae503 download/Pound-2.4.5.tgz -30fabf8e6abf2e1af1cc65bc740c0124 download/patch-pound.8 -e7acc61f9ff01ecaaa628a08b207176f download/patch-pound.h +8c913b527332694943c4c67c8f152071 Pound-2.6.tgz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Thu Jun 28 11:59:15 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Thu, 28 Jun 2012 09:59:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[18582] csw/mgar/pkg Message-ID: Revision: 18582 http://gar.svn.sourceforge.net/gar/?rev=18582&view=rev Author: pfelecan Date: 2012-06-28 09:59:15 +0000 (Thu, 28 Jun 2012) Log Message: ----------- slib/trunk: started the migration from a private recipe to a GAR based recipe; not ready for release. Added Paths: ----------- csw/mgar/pkg/slib/ csw/mgar/pkg/slib/Makefile csw/mgar/pkg/slib/branches/ csw/mgar/pkg/slib/tags/ csw/mgar/pkg/slib/trunk/ csw/mgar/pkg/slib/trunk/Makefile csw/mgar/pkg/slib/trunk/checksums csw/mgar/pkg/slib/trunk/files/ csw/mgar/pkg/slib/trunk/files/0001-Fix-configure-shebang.patch csw/mgar/pkg/slib/trunk/files/0002-Fix-slib-script-shebang.patch Added: csw/mgar/pkg/slib/Makefile =================================================================== --- csw/mgar/pkg/slib/Makefile (rev 0) +++ csw/mgar/pkg/slib/Makefile 2012-06-28 09:59:15 UTC (rev 18582) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/slib/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/slib/trunk/Makefile =================================================================== --- csw/mgar/pkg/slib/trunk/Makefile (rev 0) +++ csw/mgar/pkg/slib/trunk/Makefile 2012-06-28 09:59:15 UTC (rev 18582) @@ -0,0 +1,28 @@ +# $Id$ + +NAME = slib +VERSION = 3b3 +GARTYPE = v2 +CATEGORIES = lib + +DESCRIPTION = A portable Scheme library +define BLURB + SLIB is a portable Scheme library which SCM uses +endef + +MASTER_SITES = http://groups.csail.mit.edu/mac/ftpdir/scm/ +DISTFILES = $(DISTNAME).tar.gz +PATCHFILES = 0001-Fix-configure-shebang.patch +PATCHFILES += 0002-Fix-slib-script-shebang.patch + +ARCHALL = 1 + +EXTRA_CONFIGURE_ENV = PATH=$(prefix)/gnu:$(PATH) +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_SCRIPTS = + +EXTRA_INSTALL_ENV = PATH=$(prefix)/gnu:$(PATH) + +include gar/category.mk + Property changes on: csw/mgar/pkg/slib/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/slib/trunk/checksums =================================================================== --- csw/mgar/pkg/slib/trunk/checksums (rev 0) +++ csw/mgar/pkg/slib/trunk/checksums 2012-06-28 09:59:15 UTC (rev 18582) @@ -0,0 +1 @@ +11626eef380de4f56d3082514559beb6 slib-3b3.tar.gz Added: csw/mgar/pkg/slib/trunk/files/0001-Fix-configure-shebang.patch =================================================================== --- csw/mgar/pkg/slib/trunk/files/0001-Fix-configure-shebang.patch (rev 0) +++ csw/mgar/pkg/slib/trunk/files/0001-Fix-configure-shebang.patch 2012-06-28 09:59:15 UTC (rev 18582) @@ -0,0 +1,22 @@ +From e34eda83a0ee4601ebd4a27e9796765bcf8b6d6f Mon Sep 17 00:00:00 2001 +From: Peter Felecan +Date: Thu, 28 Jun 2012 10:09:40 +0200 +Subject: [PATCH] Fix configure shebang + +--- + configure | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure b/configure +index ebd9bc8..3c82251 100755 +--- a/configure ++++ b/configure +@@ -1,4 +1,4 @@ +-#! /bin/sh ++#! /usr/bin/env bash + # This is the configure script for Voluntocracy software projects, + # hosted at "http://people.csail.mit.edu/jaffer". Parts are taken + # from a configure script generated by GNU Autoconf 2.63. +-- +1.7.10.3 + Added: csw/mgar/pkg/slib/trunk/files/0002-Fix-slib-script-shebang.patch =================================================================== --- csw/mgar/pkg/slib/trunk/files/0002-Fix-slib-script-shebang.patch (rev 0) +++ csw/mgar/pkg/slib/trunk/files/0002-Fix-slib-script-shebang.patch 2012-06-28 09:59:15 UTC (rev 18582) @@ -0,0 +1,25 @@ +From 53423919943745ce4eff6c817ca2fca695accf6d Mon Sep 17 00:00:00 2001 +From: Peter Felecan +Date: Thu, 28 Jun 2012 10:18:59 +0200 +Subject: [PATCH] Fix slib script shebang + +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 2f11a10..8cc5256 100644 +--- a/Makefile ++++ b/Makefile +@@ -269,7 +269,7 @@ install-lib: $(libfiles) installdirs + -$(INSTALL_DATA) $(libfiles) $(DESTDIR)$(libslibdir) + + install-script: slib.sh installdirs +- echo '#! /bin/sh' > slib-script ++ echo '#! /usr/bin/env bash' > slib-script + echo SCHEME_LIBRARY_PATH=$(libslibdir) >> slib-script + echo S48_VICINITY=$(S48LIB) >> slib-script + echo VERSION=$(VERSION) >> slib-script +-- +1.7.10.3 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Thu Jun 28 12:01:07 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Thu, 28 Jun 2012 10:01:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[18583] csw/mgar/pkg Message-ID: Revision: 18583 http://gar.svn.sourceforge.net/gar/?rev=18583&view=rev Author: pfelecan Date: 2012-06-28 10:01:07 +0000 (Thu, 28 Jun 2012) Log Message: ----------- scm/trunk: started packaging; not ready for release. Added Paths: ----------- csw/mgar/pkg/scm/ csw/mgar/pkg/scm/Makefile csw/mgar/pkg/scm/branches/ csw/mgar/pkg/scm/tags/ csw/mgar/pkg/scm/trunk/ csw/mgar/pkg/scm/trunk/Makefile csw/mgar/pkg/scm/trunk/checksums csw/mgar/pkg/scm/trunk/files/ csw/mgar/pkg/scm/trunk/files/0001-Fix-configure-shebang.patch Added: csw/mgar/pkg/scm/Makefile =================================================================== --- csw/mgar/pkg/scm/Makefile (rev 0) +++ csw/mgar/pkg/scm/Makefile 2012-06-28 10:01:07 UTC (rev 18583) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/scm/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/scm/trunk/Makefile =================================================================== --- csw/mgar/pkg/scm/trunk/Makefile (rev 0) +++ csw/mgar/pkg/scm/trunk/Makefile 2012-06-28 10:01:07 UTC (rev 18583) @@ -0,0 +1,32 @@ +# $Id$ + +NAME = scm +VERSION = 5e7 +GARTYPE = v2 +CATEGORIES = devel + +DESCRIPTION = The Algorithmic Language Scheme +define BLURB + SCM conforms to Revised^5 Report on the Algorithmic Language Scheme + and the IEEE P1178 specification. SCM is written in C and runs under + Amiga, Atari-ST, MacOS, MS-DOS, OS/2, NOS/VE, Unicos, VMS, Windows, + Unix, and similar systems. +endef + +WORKSRC = $(WORKDIR)/$(NAME) +PATCHDIR = $(WORKSRC) +MASTER_SITES = http://groups.csail.mit.edu/mac/ftpdir/scm/ +DISTFILES = $(DISTNAME).zip +PATCHFILES = 0001-Fix-configure-shebang.patch + +GARCOMPILER = GNU +EXTRA_CONFIGURE_ENV = PATH=$(prefix)/gnu:$(PATH) +CONFIGURE_ARGS = $(DIRPATHS) + +BUILD_SCRIPTS = custom + +include gar/category.mk + +build-custom: + cd $(WORKSRC) && $(MAKE) scmlit + $(MAKECOOKIE) Property changes on: csw/mgar/pkg/scm/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/scm/trunk/checksums =================================================================== --- csw/mgar/pkg/scm/trunk/checksums (rev 0) +++ csw/mgar/pkg/scm/trunk/checksums 2012-06-28 10:01:07 UTC (rev 18583) @@ -0,0 +1 @@ +d53c0e7f11e468a40222f59a37a71edf scm-5e7.zip Added: csw/mgar/pkg/scm/trunk/files/0001-Fix-configure-shebang.patch =================================================================== --- csw/mgar/pkg/scm/trunk/files/0001-Fix-configure-shebang.patch (rev 0) +++ csw/mgar/pkg/scm/trunk/files/0001-Fix-configure-shebang.patch 2012-06-28 10:01:07 UTC (rev 18583) @@ -0,0 +1,22 @@ +From 8e5b959fbe65c0733dce1189520cbb1832bc4d19 Mon Sep 17 00:00:00 2001 +From: Peter Felecan +Date: Thu, 28 Jun 2012 11:11:25 +0200 +Subject: [PATCH] Fix configure shebang + +--- + configure | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure b/configure +index ebd9bc8..3c82251 100755 +--- a/configure ++++ b/configure +@@ -1,4 +1,4 @@ +-#! /bin/sh ++#! /usr/bin/env bash + # This is the configure script for Voluntocracy software projects, + # hosted at "http://people.csail.mit.edu/jaffer". Parts are taken + # from a configure script generated by GNU Autoconf 2.63. +-- +1.7.10.3 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Thu Jun 28 13:43:25 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Thu, 28 Jun 2012 11:43:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[18584] csw/mgar/pkg/grip/trunk/Makefile Message-ID: Revision: 18584 http://gar.svn.sourceforge.net/gar/?rev=18584&view=rev Author: pfelecan Date: 2012-06-28 11:43:25 +0000 (Thu, 28 Jun 2012) Log Message: ----------- grip/trunk: remove explicit dependency on old SSL library Modified Paths: -------------- csw/mgar/pkg/grip/trunk/Makefile Modified: csw/mgar/pkg/grip/trunk/Makefile =================================================================== --- csw/mgar/pkg/grip/trunk/Makefile 2012-06-28 10:01:07 UTC (rev 18583) +++ csw/mgar/pkg/grip/trunk/Makefile 2012-06-28 11:43:25 UTC (rev 18584) @@ -95,7 +95,6 @@ RUNTIME_DEP_PKGS += CSWlibpixman1-0 RUNTIME_DEP_PKGS += CSWlibpng12-0 RUNTIME_DEP_PKGS += CSWlibpopt0 -RUNTIME_DEP_PKGS += CSWlibssl0-9-8 RUNTIME_DEP_PKGS += CSWlibssl1-0-0 RUNTIME_DEP_PKGS += CSWlibstdc++6 RUNTIME_DEP_PKGS += CSWlibxft2 @@ -123,7 +122,6 @@ CHECKPKG_OVERRIDES_CSWgrip += surplus-dependency|CSWlibiconv2 CHECKPKG_OVERRIDES_CSWgrip += surplus-dependency|CSWlibgailutil18 CHECKPKG_OVERRIDES_CSWgrip += surplus-dependency|CSWlibintl3 -CHECKPKG_OVERRIDES_CSWgrip += surplus-dependency|CSWlibssl0-9-8 CHECKPKG_OVERRIDES_CSWgrip += surplus-dependency|CSWlibxml2-2 CHECKPKG_OVERRIDES_CSWgrip += surplus-dependency|CSWlibpixman1-0 CHECKPKG_OVERRIDES_CSWgrip += surplus-dependency|CSWlibgnome-keyring0 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 28 14:02:18 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 28 Jun 2012 12:02:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[18585] csw/mgar/pkg/gnome-base/libgnomecanvas Message-ID: Revision: 18585 http://gar.svn.sourceforge.net/gar/?rev=18585&view=rev Author: dmichelsen Date: 2012-06-28 12:02:17 +0000 (Thu, 28 Jun 2012) Log Message: ----------- libgnomecanvas: Move old stuff away Added Paths: ----------- csw/mgar/pkg/gnome-base/libgnomecanvas/tags/legacy-phil/ Removed Paths: ------------- csw/mgar/pkg/gnome-base/libgnomecanvas/branch-c/ 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 28 14:03:12 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 28 Jun 2012 12:03:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[18586] csw/mgar/pkg/gnome-base/libgnomecanvas/trunk Message-ID: Revision: 18586 http://gar.svn.sourceforge.net/gar/?rev=18586&view=rev Author: dmichelsen Date: 2012-06-28 12:03:12 +0000 (Thu, 28 Jun 2012) Log Message: ----------- gnome-base/libgnomecanvas/trunk: Update to 2.30.3 and update dependencies Modified Paths: -------------- csw/mgar/pkg/gnome-base/libgnomecanvas/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/gnome-base/libgnomecanvas/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/gnome-base/libgnomecanvas/trunk/ Property changes on: csw/mgar/pkg/gnome-base/libgnomecanvas/trunk ___________________________________________________________________ Added: svn:ignore + work Modified: csw/mgar/pkg/gnome-base/libgnomecanvas/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnome-base/libgnomecanvas/trunk/Makefile 2012-06-28 12:02:17 UTC (rev 18585) +++ csw/mgar/pkg/gnome-base/libgnomecanvas/trunk/Makefile 2012-06-28 12:03:12 UTC (rev 18586) @@ -1,5 +1,5 @@ NAME = libgnomecanvas -VERSION = 2.26.0 +VERSION = 2.30.3 CATEGORIES = lib GARTYPE = v2 @@ -12,10 +12,37 @@ MASTER_SITES = $(GNOME_MIRROR) DISTFILES = $(DISTNAME).tar.bz2 -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2 +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 -CONFIGURE_ARGS = $(DIRPATHS) +PACKAGES += CSWlibgnomecanvas2-0 +SPKG_DESC_CSWlibgnomecanvas2-0 = GNOME 2 canvas library, libgnomecanvas-2.so.0 +PKGFILES_CSWlibgnomecanvas2-0 += $(call pkgfiles_lib,libgnomecanvas-2.so.0) +PKGFILES_CSWlibgnomecanvas2-0 += $(sharedstatedir)/locale/.* +RUNTIME_DEP_PKGS_CSWlibgnomecanvas2-0 += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWlibgnomecanvas2-0 += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWlibgnomecanvas2-0 += CSWlibgdk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWlibgnomecanvas2-0 += CSWlibgailutil18 +RUNTIME_DEP_PKGS_CSWlibgnomecanvas2-0 += CSWlibgdk-pixbuf2-0-0 +RUNTIME_DEP_PKGS_CSWlibgnomecanvas2-0 += CSWlibfontconfig1 +RUNTIME_DEP_PKGS_CSWlibgnomecanvas2-0 += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWlibgnomecanvas2-0 += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWlibgnomecanvas2-0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibgnomecanvas2-0 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibgnomecanvas2-0 += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWlibgnomecanvas2-0 += CSWpango +RUNTIME_DEP_PKGS_CSWlibgnomecanvas2-0 += CSWlibgtk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWlibgnomecanvas2-0 += CSWlibart +RUNTIME_DEP_PKGS_CSWlibgnomecanvas2-0 += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibgnomecanvas2-0 += CSWlibatk1-0-0 +OBSOLETED_BY_CSWlibgnomecanvas2-0 += CSWlibgnomecanvas +PACKAGES += CSWlibgnomecanvas-dev +SPKG_DESC_CSWlibgnomecanvas-dev = Development files for libgnomecanvas-2.so.0 +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWlibgnomecanvas-dev += CSWlibgnomecanvas2-0 + +LICENSE = COPYING.LIB + BUILD64_LIBS_ONLY = 1 include gar/category.mk Added: csw/mgar/pkg/gnome-base/libgnomecanvas/trunk/checksums =================================================================== --- csw/mgar/pkg/gnome-base/libgnomecanvas/trunk/checksums (rev 0) +++ csw/mgar/pkg/gnome-base/libgnomecanvas/trunk/checksums 2012-06-28 12:03:12 UTC (rev 18586) @@ -0,0 +1 @@ +ffcbb719c671ff5cd86e59aeba8d0b92 libgnomecanvas-2.30.3.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Jun 28 14:41:48 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 28 Jun 2012 12:41:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[18587] csw/mgar/pkg/gnome-base/libgnome Message-ID: Revision: 18587 http://gar.svn.sourceforge.net/gar/?rev=18587&view=rev Author: dmichelsen Date: 2012-06-28 12:41:48 +0000 (Thu, 28 Jun 2012) Log Message: ----------- gnome-base/libgnome: Move away old stuff Added Paths: ----------- csw/mgar/pkg/gnome-base/libgnome/branches/ csw/mgar/pkg/gnome-base/libgnome/tags/ csw/mgar/pkg/gnome-base/libgnome/tags/legacy/ csw/mgar/pkg/gnome-base/libgnome/tags/legacy-phil/ Removed Paths: ------------- csw/mgar/pkg/gnome-base/libgnome/branch-c/ csw/mgar/pkg/gnome-base/libgnome/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 Thu Jun 28 15:02:36 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 28 Jun 2012 13:02:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[18588] csw/mgar/pkg Message-ID: Revision: 18588 http://gar.svn.sourceforge.net/gar/?rev=18588&view=rev Author: dmichelsen Date: 2012-06-28 13:02:36 +0000 (Thu, 28 Jun 2012) Log Message: ----------- libcanberra/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/libcanberra/ csw/mgar/pkg/libcanberra/Makefile csw/mgar/pkg/libcanberra/branches/ csw/mgar/pkg/libcanberra/tags/ csw/mgar/pkg/libcanberra/trunk/ csw/mgar/pkg/libcanberra/trunk/Makefile csw/mgar/pkg/libcanberra/trunk/checksums csw/mgar/pkg/libcanberra/trunk/files/ Added: csw/mgar/pkg/libcanberra/Makefile =================================================================== --- csw/mgar/pkg/libcanberra/Makefile (rev 0) +++ csw/mgar/pkg/libcanberra/Makefile 2012-06-28 13:02:36 UTC (rev 18588) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/libcanberra/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/libcanberra/trunk/Makefile =================================================================== --- csw/mgar/pkg/libcanberra/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libcanberra/trunk/Makefile 2012-06-28 13:02:36 UTC (rev 18588) @@ -0,0 +1,29 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = libcanberra +VERSION = 0.29 +GARTYPE = v2 +CATEGORIES = lib + +DESCRIPTION = XDG sound theme and name specifications + +MASTER_SITES = http://0pointer.de/lennart/projects/libcanberra/ +DISTFILES = $(DISTNAME).tar.xz + +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + +PACKAGES += CSWmypkg +SPKG_DESC_CSWmypkg = My package +PKGFILES_CSWmypkg += $(call pkgfiles_lib,libabc.so.1) +PKGFILES_CSWmypkg += $(call baseisadirs,$(bindir),myexec) +PKGFILES_CSWmypkg += $(sysconfdir)/myconf + +STRIP_LIBTOOL = 1 + +CONFIGURE_ARGS = $(DIRPATHS) +# CONFIGURE_ARGS += cc_cv_LDFLAGS_-Wl,--as-needed=no +# CONFIGURE_ARGS += cc_cv_LDFLAGS_-Wl,--gc-sections=no + +include gar/category.mk + Property changes on: csw/mgar/pkg/libcanberra/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/libcanberra/trunk/checksums =================================================================== --- csw/mgar/pkg/libcanberra/trunk/checksums (rev 0) +++ csw/mgar/pkg/libcanberra/trunk/checksums 2012-06-28 13:02:36 UTC (rev 18588) @@ -0,0 +1 @@ +2594093a5d61047bd9cc87e955f86df8 libcanberra-0.29.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 Thu Jun 28 15:35:08 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 28 Jun 2012 13:35:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[18589] csw/mgar/pkg/gnome-base/libgnome/trunk Message-ID: Revision: 18589 http://gar.svn.sourceforge.net/gar/?rev=18589&view=rev Author: dmichelsen Date: 2012-06-28 13:35:07 +0000 (Thu, 28 Jun 2012) Log Message: ----------- gnome-base/libgnome/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/gnome-base/libgnome/trunk/Makefile csw/mgar/pkg/gnome-base/libgnome/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/gnome-base/libgnome/trunk/ Property changes on: csw/mgar/pkg/gnome-base/libgnome/trunk ___________________________________________________________________ Added: svn:ignore + work Copied: csw/mgar/pkg/gnome-base/libgnome/trunk/Makefile (from rev 18572, csw/mgar/pkg/gnome-base/gnomevfs2/trunk/Makefile) =================================================================== --- csw/mgar/pkg/gnome-base/libgnome/trunk/Makefile (rev 0) +++ csw/mgar/pkg/gnome-base/libgnome/trunk/Makefile 2012-06-28 13:35:07 UTC (rev 18589) @@ -0,0 +1,63 @@ +NAME = libgnome +VERSION = 2.32.1 +CATEGORIES = gnome +GARTYPE = v2 + +DESCRIPTION = The main GNOME library + +MASTER_SITES = $(GNOME_MIRROR) +DISTNAME = $(GNOME_PROJ)-$(VERSION) +DISTFILES = $(DISTNAME).tar.bz2 + +# New glib only available on Solaris 10 +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + +LICENSE = COPYING.LIB + +PACKAGES += CSWlibgnome2-0 +SPKG_DESC_CSWlibgnome2-0 = The main GNOME library, libgnome-2.so.0 +PKGFILES_CSWlibgnome2-0 += $(call pkgfiles_lib,libgnome-2.so.0) +PKGFILES_CSWlibgnome2-0 += $(sharedstatedir)/locale/.* +PKGFILES_CSWlibgnome2-0 += $(sysconfdir)/.* +PKGFILES_CSWlibgnome2-0 += $(call baseisadirs,$(libdir),bonobo/.*) +RUNTIME_DEP_PKGS_CSWlibgnome2-0 += CSWorbit2 +RUNTIME_DEP_PKGS_CSWlibgnome2-0 += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWlibgnome2-0 += CSWlibpopt0 +RUNTIME_DEP_PKGS_CSWlibgnome2-0 += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWlibgnome2-0 += CSWlibgconf2-4 +RUNTIME_DEP_PKGS_CSWlibgnome2-0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibgnome2-0 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibgnome2-0 += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibgnome2-0 += CSWgnomevfs2 +RUNTIME_DEP_PKGS_CSWlibgnome2-0 += CSWlibbonobo2 +OBSOLETED_BY_CSWlibgnome2-0 += CSWlibgnome + +PACKAGES += CSWlibgnome-dev +SPKG_DESC_CSWlibgnome-dev = Development files for libgnome-2.so.0 +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWlibgnome-dev += CSWlibgnome2-0 +RUNTIME_DEP_PKGS_CSWlibgnome-dev += CSWorbit2 +RUNTIME_DEP_PKGS_CSWlibgnome-dev += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWlibgnome-dev += CSWlibpopt0 +RUNTIME_DEP_PKGS_CSWlibgnome-dev += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWlibgnome-dev += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibgnome-dev += CSWlibgconf2-4 +RUNTIME_DEP_PKGS_CSWlibgnome-dev += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibgnome-dev += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWlibgnome-dev += CSWgnomevfs2 +RUNTIME_DEP_PKGS_CSWlibgnome-dev += CSWlibbonobo2 +RUNTIME_DEP_PKGS_CSWlibgnome-dev += CSWlibgio2-0-0 + +# These are just docs +CHECKPKG_OVERRIDES_CSWlibgnome-dev += file-with-bad-content|/usr/share|root/opt/csw/share/gtk-doc/html/libgnome/libgnome-gnome-program.html +CHECKPKG_OVERRIDES_CSWlibgnome-dev += file-with-bad-content|/usr/share|root/opt/csw/share/gtk-doc/html/libgnome/libgnome-gnome-sound.html + +BUILD64_LIBS_ONLY = 1 + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --disable-canberra + +include gar/category.mk + +# For GNU gettext +PATH := /opt/csw/gnu:$(PATH) Added: csw/mgar/pkg/gnome-base/libgnome/trunk/checksums =================================================================== --- csw/mgar/pkg/gnome-base/libgnome/trunk/checksums (rev 0) +++ csw/mgar/pkg/gnome-base/libgnome/trunk/checksums 2012-06-28 13:35:07 UTC (rev 18589) @@ -0,0 +1 @@ +a4345e6087ae6195d65a4674ffdca559 libgnome-2.32.1.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 Thu Jun 28 16:04:01 2012 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_=28Matchek=29_Blizi=C5=84ski?=) Date: Thu, 28 Jun 2012 15:04:01 +0100 Subject: [csw-devel] SF.net SVN: gar:[18579] csw/mgar/pkg In-Reply-To: References: Message-ID: 2012/6/28 : > +PACKAGING_PLATFORMS = solarsi10-sparc solarsi10-i386 Typo spotted. From maciej at opencsw.org Thu Jun 28 16:05:12 2012 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_=28Matchek=29_Blizi=C5=84ski?=) Date: Thu, 28 Jun 2012 15:05:12 +0100 Subject: [csw-devel] SF.net SVN: gar:[18584] csw/mgar/pkg/grip/trunk/Makefile In-Reply-To: References: Message-ID: 2012/6/28 : > Revision: 18584 > ? ? ? ? ?http://gar.svn.sourceforge.net/gar/?rev=18584&view=rev > Author: ? pfelecan > Date: ? ? 2012-06-28 11:43:25 +0000 (Thu, 28 Jun 2012) > Log Message: > ----------- > grip/trunk: remove explicit dependency on old SSL library > > Modified Paths: > -------------- > ? ?csw/mgar/pkg/grip/trunk/Makefile > > Modified: csw/mgar/pkg/grip/trunk/Makefile > =================================================================== > --- csw/mgar/pkg/grip/trunk/Makefile ? ?2012-06-28 10:01:07 UTC (rev 18583) > +++ csw/mgar/pkg/grip/trunk/Makefile ? ?2012-06-28 11:43:25 UTC (rev 18584) > @@ -95,7 +95,6 @@ > ?RUNTIME_DEP_PKGS ? ? ? += ? ? ?CSWlibpixman1-0 > ?RUNTIME_DEP_PKGS ? ? ? += ? ? ?CSWlibpng12-0 > ?RUNTIME_DEP_PKGS ? ? ? += ? ? ?CSWlibpopt0 > -RUNTIME_DEP_PKGS ? ? ? += ? ? ?CSWlibssl0-9-8 > ?RUNTIME_DEP_PKGS ? ? ? += ? ? ?CSWlibssl1-0-0 > ?RUNTIME_DEP_PKGS ? ? ? += ? ? ?CSWlibstdc++6 > ?RUNTIME_DEP_PKGS ? ? ? += ? ? ?CSWlibxft2 > @@ -123,7 +122,6 @@ > ?CHECKPKG_OVERRIDES_CSWgrip ? ? += ? ? ?surplus-dependency|CSWlibiconv2 > ?CHECKPKG_OVERRIDES_CSWgrip ? ? += ? ? ?surplus-dependency|CSWlibgailutil18 > ?CHECKPKG_OVERRIDES_CSWgrip ? ? += ? ? ?surplus-dependency|CSWlibintl3 > -CHECKPKG_OVERRIDES_CSWgrip ? ? += ? ? ?surplus-dependency|CSWlibssl0-9-8 > ?CHECKPKG_OVERRIDES_CSWgrip ? ? += ? ? ?surplus-dependency|CSWlibxml2-2 > ?CHECKPKG_OVERRIDES_CSWgrip ? ? += ? ? ?surplus-dependency|CSWlibpixman1-0 > ?CHECKPKG_OVERRIDES_CSWgrip ? ? += ? ? ?surplus-dependency|CSWlibgnome-keyring0 These overrides, is this the transitive dependency thing? From pfelecan at users.sourceforge.net Thu Jun 28 16:33:22 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Thu, 28 Jun 2012 14:33:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[18590] csw/mgar/pkg Message-ID: Revision: 18590 http://gar.svn.sourceforge.net/gar/?rev=18590&view=rev Author: pfelecan Date: 2012-06-28 14:33:22 +0000 (Thu, 28 Jun 2012) Log Message: ----------- opensp/trunk: migrated from a private recipe to a GAR based recipe Added Paths: ----------- csw/mgar/pkg/opensp/ csw/mgar/pkg/opensp/Makefile csw/mgar/pkg/opensp/branches/ csw/mgar/pkg/opensp/tags/ csw/mgar/pkg/opensp/trunk/ csw/mgar/pkg/opensp/trunk/Makefile csw/mgar/pkg/opensp/trunk/checksums csw/mgar/pkg/opensp/trunk/files/ Added: csw/mgar/pkg/opensp/Makefile =================================================================== --- csw/mgar/pkg/opensp/Makefile (rev 0) +++ csw/mgar/pkg/opensp/Makefile 2012-06-28 14:33:22 UTC (rev 18590) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/opensp/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/opensp/trunk/Makefile =================================================================== --- csw/mgar/pkg/opensp/trunk/Makefile (rev 0) +++ csw/mgar/pkg/opensp/trunk/Makefile 2012-06-28 14:33:22 UTC (rev 18590) @@ -0,0 +1,42 @@ +# $Id$ + +NAME = opensp +VERSION = 1.5.2 +GARTYPE = v2 +CATEGORIES = lib + +DESCRIPTION = A SGML parser called OpenSP +define BLURB + A SGML parser called OpenSP +endef + +DISTNAME = OpenSP-$(VERSION) +MASTER_SITES = $(SF_MIRRORS) +SF_PROJ = openjade +DISTFILES = $(DISTNAME).tar.gz + +GARCOMPILER = GNU +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-http +CONFIGURE_ARGS += --enable-xml-messages +CONFIGURE_ARGS += --enable-default-search-path=.:/opt/csw/share/sgml:/opt/csw/share/xml:/etc/opt/csw/sgml:/opt/csw/etc/sgml +CONFIGURE_ARGS += --disable-doc-build + +TEST_SCRIPTS = custom + +include gar/category.mk + +# there is are tests failing as when I packaged with a private recipe, +# i.e., nothing changes; I choose to consider them innocuous +test-custom: + -$(MAKE) -k -C $(WORKSRC) check + $(MAKECOOKIE) + +post-install-modulated: + mv $(DESTDIR)/$(docdir)/OpenSP $(DESTDIR)/$(docdir)/$(NAME) + mv $(DESTDIR)/$(docdir)/$(NAME)/doc $(DESTDIR)/$(docdir)/$(NAME)/html + $(MAKECOOKIE) + +# this is private and not available publicly +mydependencies: + $(HOME)/bin/ocswdeplist --package $(NAME) Property changes on: csw/mgar/pkg/opensp/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/opensp/trunk/checksums =================================================================== --- csw/mgar/pkg/opensp/trunk/checksums (rev 0) +++ csw/mgar/pkg/opensp/trunk/checksums 2012-06-28 14:33:22 UTC (rev 18590) @@ -0,0 +1 @@ +670b223c5d12cee40c9137be86b6c39b OpenSP-1.5.2.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 Thu Jun 28 17:52:35 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 28 Jun 2012 15:52:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[18591] csw/mgar/pkg/squid/trunk/Makefile Message-ID: Revision: 18591 http://gar.svn.sourceforge.net/gar/?rev=18591&view=rev Author: bdwalton Date: 2012-06-28 15:52:34 +0000 (Thu, 28 Jun 2012) Log Message: ----------- squid/trunk: update dependencies and build on sol10 instead of sol9 Modified Paths: -------------- csw/mgar/pkg/squid/trunk/Makefile Modified: csw/mgar/pkg/squid/trunk/Makefile =================================================================== --- csw/mgar/pkg/squid/trunk/Makefile 2012-06-28 14:33:22 UTC (rev 18590) +++ csw/mgar/pkg/squid/trunk/Makefile 2012-06-28 15:52:34 UTC (rev 18591) @@ -7,6 +7,8 @@ DISTNAME = $(NAME)-$(DISTVERSION) RELVER = $(shell echo $(VERSION) |gsed 's/\(^[0-9]\).*\.[0-9]*/\1/') +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + DESCRIPTION = High performance Web proxy cache define BLURB Squid is a high performance Web proxy cache that can be arranged @@ -16,8 +18,12 @@ PACKAGES = CSWsquid CATALOGNAME_CSWsquid = squid -RUNTIME_DEP_PKGS_CSWsquid = CSWoldaprt CSWosslrt CSWsasl -PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 + +RUNTIME_DEP_PKGS_CSWsquid += CSWlibssl1-0-0 +RUNTIME_DEP_PKGS_CSWsquid += CSWliblber2-4-2 +RUNTIME_DEP_PKGS_CSWsquid += CSWlibsasl2-2 +RUNTIME_DEP_PKGS_CSWsquid += CSWlibldap2-4-2 + INITSMF = /etc/opt/csw/init.d/csw$(NAME) PRESERVECONF = /etc/opt/csw/$(NAME)/cachemgr.conf PRESERVECONF = /etc/opt/csw/$(NAME)/squid.conf 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 28 21:22:47 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 28 Jun 2012 19:22:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[18592] csw/mgar/pkg/squid/trunk/Makefile Message-ID: Revision: 18592 http://gar.svn.sourceforge.net/gar/?rev=18592&view=rev Author: bdwalton Date: 2012-06-28 19:22:47 +0000 (Thu, 28 Jun 2012) Log Message: ----------- squid/trunk: work around checkpkg warning about usr/local reference by supplying a better value for a setting Modified Paths: -------------- csw/mgar/pkg/squid/trunk/Makefile Modified: csw/mgar/pkg/squid/trunk/Makefile =================================================================== --- csw/mgar/pkg/squid/trunk/Makefile 2012-06-28 15:52:34 UTC (rev 18591) +++ csw/mgar/pkg/squid/trunk/Makefile 2012-06-28 19:22:47 UTC (rev 18592) @@ -39,6 +39,7 @@ DISTFILES = $(DISTNAME).tar.bz2 DISTFILES += cswsquid +EXTRA_CPPFLAGS += -DDEFAULT_SQUID_ERROR_DIR=\\\"/etc/opt/csw/squid/errors\\\" CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --sysconfdir=/etc/opt/csw/$(NAME) 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 28 21:39:23 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 28 Jun 2012 19:39:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[18593] csw/mgar/pkg/squid/trunk Message-ID: Revision: 18593 http://gar.svn.sourceforge.net/gar/?rev=18593&view=rev Author: bdwalton Date: 2012-06-28 19:39:23 +0000 (Thu, 28 Jun 2012) Log Message: ----------- squid/trunk: patch around a usr/local reference that was hard coded in the smb auth helper Modified Paths: -------------- csw/mgar/pkg/squid/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/squid/trunk/files/0001-patch-the-SAMBAPREFIX-path-for-the-smb-auth-helper.patch Modified: csw/mgar/pkg/squid/trunk/Makefile =================================================================== --- csw/mgar/pkg/squid/trunk/Makefile 2012-06-28 19:22:47 UTC (rev 18592) +++ csw/mgar/pkg/squid/trunk/Makefile 2012-06-28 19:39:23 UTC (rev 18593) @@ -38,6 +38,7 @@ MASTER_SITES = http://www.squid-cache.org/Versions/v$(RELVER)/$(VERSION)/ DISTFILES = $(DISTNAME).tar.bz2 DISTFILES += cswsquid +PATCHFILES += 0001-patch-the-SAMBAPREFIX-path-for-the-smb-auth-helper.patch EXTRA_CPPFLAGS += -DDEFAULT_SQUID_ERROR_DIR=\\\"/etc/opt/csw/squid/errors\\\" Added: csw/mgar/pkg/squid/trunk/files/0001-patch-the-SAMBAPREFIX-path-for-the-smb-auth-helper.patch =================================================================== --- csw/mgar/pkg/squid/trunk/files/0001-patch-the-SAMBAPREFIX-path-for-the-smb-auth-helper.patch (rev 0) +++ csw/mgar/pkg/squid/trunk/files/0001-patch-the-SAMBAPREFIX-path-for-the-smb-auth-helper.patch 2012-06-28 19:39:23 UTC (rev 18593) @@ -0,0 +1,26 @@ +From fc4c66dfc5e67c853b9c1e7ed9664d7837fc686e Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Thu, 28 Jun 2012 21:24:52 +0200 +Subject: [PATCH] patch the SAMBAPREFIX path for the smb auth helper + +Signed-off-by: Ben Walton +--- + helpers/basic_auth/SMB/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/helpers/basic_auth/SMB/Makefile.am b/helpers/basic_auth/SMB/Makefile.am +index f5f833f..5c5b9f3 100644 +--- a/helpers/basic_auth/SMB/Makefile.am ++++ b/helpers/basic_auth/SMB/Makefile.am +@@ -14,7 +14,7 @@ + ## FIXME: autoconf should test for the samba path. + + SMB_AUTH_HELPER = smb_auth.sh +-SAMBAPREFIX=/usr/local/samba ++SAMBAPREFIX=/opt/csw + SMB_AUTH_HELPER_PATH = $(libexecdir)/$(SMB_AUTH_HELPER) + + libexec_SCRIPTS = $(SMB_AUTH_HELPER) +-- +1.7.10.3 + 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 28 22:40:58 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 28 Jun 2012 20:40:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[18594] csw/mgar/pkg/gnome-base/gnomevfs2/trunk/Makefile Message-ID: Revision: 18594 http://gar.svn.sourceforge.net/gar/?rev=18594&view=rev Author: dmichelsen Date: 2012-06-28 20:40:58 +0000 (Thu, 28 Jun 2012) Log Message: ----------- gnome-base/gnomevfs2: Update to new deps Modified Paths: -------------- csw/mgar/pkg/gnome-base/gnomevfs2/trunk/Makefile Modified: csw/mgar/pkg/gnome-base/gnomevfs2/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnome-base/gnomevfs2/trunk/Makefile 2012-06-28 19:39:23 UTC (rev 18593) +++ csw/mgar/pkg/gnome-base/gnomevfs2/trunk/Makefile 2012-06-28 20:40:58 UTC (rev 18594) @@ -19,6 +19,7 @@ # Many more missing BUILD_DEP_PKGS += CSWlibgamin-dev +BUILD_DEP_PKGS += CSWlibssl-dev PACKAGES += CSWgnomevfs2 SPKG_DESC_CSWgnomevfs2 += $(DESCRIPTION) @@ -38,7 +39,7 @@ RUNTIME_DEP_PKGS_CSWgnomevfs2 += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSWgnomevfs2 += CSWlibdbus-glib1-2 RUNTIME_DEP_PKGS_CSWgnomevfs2 += CSWlibcom-err3 -RUNTIME_DEP_PKGS_CSWgnomevfs2 += CSWosslrt +RUNTIME_DEP_PKGS_CSWgnomevfs2 += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWgnomevfs2 += CSWlibk5crypto3 RUNTIME_DEP_PKGS_CSWgnomevfs2 += CSWlibdbus1-3 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 28 22:43:17 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 28 Jun 2012 20:43:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[18595] csw/mgar/pkg/gnome-base/libbonoboui/trunk/Makefile Message-ID: Revision: 18595 http://gar.svn.sourceforge.net/gar/?rev=18595&view=rev Author: dmichelsen Date: 2012-06-28 20:43:17 +0000 (Thu, 28 Jun 2012) Log Message: ----------- gnome-base/libbonoboui: Initial commit Added Paths: ----------- csw/mgar/pkg/gnome-base/libbonoboui/trunk/Makefile Copied: csw/mgar/pkg/gnome-base/libbonoboui/trunk/Makefile (from rev 18572, csw/mgar/pkg/gnome-base/gnomevfs2/trunk/Makefile) =================================================================== --- csw/mgar/pkg/gnome-base/libbonoboui/trunk/Makefile (rev 0) +++ csw/mgar/pkg/gnome-base/libbonoboui/trunk/Makefile 2012-06-28 20:43:17 UTC (rev 18595) @@ -0,0 +1,28 @@ +NAME = libbonoboui +VERSION = 2.24.5 +CATEGORIES = gnome +GARTYPE = v2 + +DESCRIPTION = UI code for the GNOME 2 Object Activation Framework +define BLURB +endef + +MASTER_SITES = $(GNOME_MIRROR) +DISTNAME = $(GNOME_PROJ)-$(VERSION) +DISTFILES = $(DISTNAME).tar.bz2 + +# New glib only available on Solaris 10 +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + +BUILD64_LIBS_ONLY = 1 + +CONFIGURE_ARGS = $(DIRPATHS) +#CONFIGURE_ARGS += --enable-static=no +#CONFIGURE_ARGS += --enable-gtk-doc + +EXTRA_TEST_EXPORTS = DISPLAY + +include gar/category.mk + +# For GNU gettext +PATH := /opt/csw/gnu:$(PATH) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Jun 28 22:53:05 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 28 Jun 2012 20:53:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[18596] csw/mgar/pkg/gnome-base/libbonoboui/trunk Message-ID: Revision: 18596 http://gar.svn.sourceforge.net/gar/?rev=18596&view=rev Author: dmichelsen Date: 2012-06-28 20:53:04 +0000 (Thu, 28 Jun 2012) Log Message: ----------- gnome-base/libbonoboui: Update metadata Added Paths: ----------- csw/mgar/pkg/gnome-base/libbonoboui/trunk/checksums Property Changed: ---------------- csw/mgar/pkg/gnome-base/libbonoboui/trunk/ Property changes on: csw/mgar/pkg/gnome-base/libbonoboui/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/gnome-base/libbonoboui/trunk/checksums =================================================================== --- csw/mgar/pkg/gnome-base/libbonoboui/trunk/checksums (rev 0) +++ csw/mgar/pkg/gnome-base/libbonoboui/trunk/checksums 2012-06-28 20:53:04 UTC (rev 18596) @@ -0,0 +1 @@ +853be8e28aaa4ce48ba60be7d9046bf4 libbonoboui-2.24.5.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Thu Jun 28 23:30:19 2012 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Thu, 28 Jun 2012 21:30:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[18597] csw/mgar/pkg/postfix/trunk/Makefile Message-ID: Revision: 18597 http://gar.svn.sourceforge.net/gar/?rev=18597&view=rev Author: chninkel Date: 2012-06-28 21:30:19 +0000 (Thu, 28 Jun 2012) Log Message: ----------- postfix/trunk: updated with openssl 1.0 and postgresql 9, disabled solaris 9 build Modified Paths: -------------- csw/mgar/pkg/postfix/trunk/Makefile Modified: csw/mgar/pkg/postfix/trunk/Makefile =================================================================== --- csw/mgar/pkg/postfix/trunk/Makefile 2012-06-28 20:53:04 UTC (rev 18596) +++ csw/mgar/pkg/postfix/trunk/Makefile 2012-06-28 21:30:19 UTC (rev 18597) @@ -201,7 +201,7 @@ FEATURES += -DUSE_TLS AUXLIBS += -lssl -lcrypto BUILD_DEP_PKGS += CSWlibssl-dev -RUNTIME_DEP_PKGS += CSWlibssl0-9-8 +RUNTIME_DEP_PKGS += CSWlibssl1-0-0 # Activate support for Cyrus SASL (dovecot is incl. automatically) # http://www.postfix.org/SASL_README.html @@ -231,13 +231,15 @@ # Activate support for PostgreSQL # http://www.postfix.org/PGSQL_README.html FEATURES += -DHAS_PGSQL -INCLUDES += -I/opt/csw/postgresql/include/ -AUXLIBS += -L/opt/csw/postgresql/lib/ -R/opt/csw/postgresql/lib/ +INCLUDES += -I/opt/csw/include/ +AUXLIBS += -L/opt/csw/lib/ -R/opt/csw/lib/ AUXLIBS += -lpq -BUILD_DEP_PKGS += CSWlibpq +BUILD_DEP_PKGS += CSWpostgresql-dev RUNTIME_DEP_PKGS += CSWlibpq5 endif +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + # Postgres package outdated, libs aren't located below /opt/csw/lib/ CHECKPKG_OVERRIDES_CSWpostfix += bad-rpath-entry This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Fri Jun 29 00:27:55 2012 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Thu, 28 Jun 2012 22:27:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[18598] csw/mgar/pkg/postfix/trunk/Makefile Message-ID: Revision: 18598 http://gar.svn.sourceforge.net/gar/?rev=18598&view=rev Author: chninkel Date: 2012-06-28 22:27:55 +0000 (Thu, 28 Jun 2012) Log Message: ----------- postfix/trunk: updated to mysqlclient18 Modified Paths: -------------- csw/mgar/pkg/postfix/trunk/Makefile Modified: csw/mgar/pkg/postfix/trunk/Makefile =================================================================== --- csw/mgar/pkg/postfix/trunk/Makefile 2012-06-28 21:30:19 UTC (rev 18597) +++ csw/mgar/pkg/postfix/trunk/Makefile 2012-06-28 22:27:55 UTC (rev 18598) @@ -226,7 +226,7 @@ AUXLIBS += -L/opt/csw/lib -R/opt/csw/mysql5/lib/mysql AUXLIBS += -lmysqlclient BUILD_DEP_PKGS += CSWmysql-dev -RUNTIME_DEP_PKGS += CSWlibmysqlclient15 +RUNTIME_DEP_PKGS += CSWlibmysqlclient18 # Activate support for PostgreSQL # http://www.postfix.org/PGSQL_README.html This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Fri Jun 29 01:07:33 2012 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Thu, 28 Jun 2012 23:07:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[18599] csw/mgar/pkg/gnome-base/gnomevfs2/trunk Message-ID: Revision: 18599 http://gar.svn.sourceforge.net/gar/?rev=18599&view=rev Author: chninkel Date: 2012-06-28 23:07:33 +0000 (Thu, 28 Jun 2012) Log Message: ----------- gnome-base/gnomevfs2/trunk: added a patch to fix the unresolved symbol error Modified Paths: -------------- csw/mgar/pkg/gnome-base/gnomevfs2/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/gnome-base/gnomevfs2/trunk/files/0002-dont-use-smbc_remove_unused_server.patch Modified: csw/mgar/pkg/gnome-base/gnomevfs2/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnome-base/gnomevfs2/trunk/Makefile 2012-06-28 22:27:55 UTC (rev 18598) +++ csw/mgar/pkg/gnome-base/gnomevfs2/trunk/Makefile 2012-06-28 23:07:33 UTC (rev 18599) @@ -12,6 +12,11 @@ DISTNAME = $(GNOME_PROJ)-$(VERSION) DISTFILES = $(DISTNAME).tar.bz2 +# The smbc_remove_unused_server function has been deprecated in samba 3.2 +# but gnomevfs code has not been updated: https://bugzilla.gnome.org/show_bug.cgi?id=592341 +# Let's try to use instead the new function +PATCHFILES = 0002-dont-use-smbc_remove_unused_server.patch + # New glib only available on Solaris 10 PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 Added: csw/mgar/pkg/gnome-base/gnomevfs2/trunk/files/0002-dont-use-smbc_remove_unused_server.patch =================================================================== --- csw/mgar/pkg/gnome-base/gnomevfs2/trunk/files/0002-dont-use-smbc_remove_unused_server.patch (rev 0) +++ csw/mgar/pkg/gnome-base/gnomevfs2/trunk/files/0002-dont-use-smbc_remove_unused_server.patch 2012-06-28 23:07:33 UTC (rev 18599) @@ -0,0 +1,35 @@ +From 120ab4e1fe400d4fb9b8202f0eee10b5b1f493fd Mon Sep 17 00:00:00 2001 +From: Yann Rouillard +Date: Fri, 29 Jun 2012 00:42:48 +0200 +Subject: [PATCH] Don't use the anymore the smbc_remove_unused_server + deprecated function + +--- + modules/smb-method.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/modules/smb-method.c b/modules/smb-method.c +index 42d6c78..e6bb59e 100644 +--- a/modules/smb-method.c ++++ b/modules/smb-method.c +@@ -328,7 +328,7 @@ cache_reap_cb (void) + g_hash_table_foreach (server_cache, add_old_servers, servers); + + for (i = 0; i < servers->len; i++) { +- smbc_remove_unused_server (smb_context, ++ smbc_getFunctionRemoveUnusedServer(smb_context) (smb_context, + (SMBCSRV *)g_ptr_array_index (servers, i)); + } + +@@ -491,7 +491,7 @@ purge_cached(SMBCCTX * context) + + could_not_purge_all = FALSE; + for (i = 0; i < servers->len; i++) { +- if (smbc_remove_unused_server(context, ++ if (smbc_getFunctionRemoveUnusedServer(context)(context, + (SMBCSRV *)g_ptr_array_index (servers, i))) { + /* could not be removed */ + could_not_purge_all = TRUE; +-- +1.7.10.3 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Fri Jun 29 09:16:44 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Fri, 29 Jun 2012 07:16:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[18600] csw/mgar/pkg/opensp/trunk/Makefile Message-ID: Revision: 18600 http://gar.svn.sourceforge.net/gar/?rev=18600&view=rev Author: pfelecan Date: 2012-06-29 07:16:43 +0000 (Fri, 29 Jun 2012) Log Message: ----------- opensp/trunk: - multi-package split - overrides verification and validation Modified Paths: -------------- csw/mgar/pkg/opensp/trunk/Makefile Modified: csw/mgar/pkg/opensp/trunk/Makefile =================================================================== --- csw/mgar/pkg/opensp/trunk/Makefile 2012-06-28 23:07:33 UTC (rev 18599) +++ csw/mgar/pkg/opensp/trunk/Makefile 2012-06-29 07:16:43 UTC (rev 18600) @@ -24,6 +24,51 @@ TEST_SCRIPTS = custom +PACKAGES = CSWopensp-doc +CATALOGNAME = opensp-doc +SPKG_DESC_CSWopensp-doc = $(DESCRIPTION), documentation +OBSOLETED_BY_CSWopensp-doc += CSWopenspdoc +CATALOGNAME_CSWopenspdoc = opensp_doc_stub +ARCHALL_CSWopensp-doc = 1 +CHECKPKG_OVERRIDES_CSWopensp-doc += file-with-bad-content|/usr/share|root/opt/csw/share/doc/opensp/ChangeLog + +PACKAGES += CSWopensp-utils +CATALOGNAME_CSWopensp-utils = opensp-utils +SPKG_DESC_CSWopensp-utils = $(DESCRIPTION), utilities +PKGFILES_CSWopensp-utils = $(bindir)/.* +RUNTIME_DEP_PKGS_CSWopensp-utils += CSWlibosp5 +RUNTIME_DEP_PKGS_CSWopensp-utils += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWopensp-utils += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWopensp-utils += CSWlibstdc++6 +RUNTIME_DEP_PKGS_CSWopensp-utils += CSWperl +OBSOLETED_BY_CSWopensp-utils += CSWopensp +CATALOGNAME_CSWopensp = opensp_stub + +PACKAGES += CSWlibosp5 +CATALOGNAME_CSWlibosp5 = libosp5 +PKGFILES_CSWlibosp5 += $(call baseisadirs,$(libdir),libosp\.so\.5\.0\.0) +PKGFILES_CSWlibosp5 += $(call baseisadirs,$(libdir),libosp\.so\.5(\.\d+)*) +PKGFILES_CSWlibosp5 += /opt/csw/share/OpenSP/.* +PKGFILES_CSWlibosp5 += /opt/csw/share/locale/de/LC_MESSAGES/sp5.mo +PKGFILES_CSWlibosp5 += /opt/csw/share/locale/fr/LC_MESSAGES/sp5.mo +PKGFILES_CSWlibosp5 += /opt/csw/share/locale/ja/LC_MESSAGES/sp5.mo +PKGFILES_CSWlibosp5 += /opt/csw/share/locale/sv/LC_MESSAGES/sp5.mo +PKGFILES_CSWlibosp5 += /opt/csw/share/locale/tr/LC_MESSAGES/sp5.mo +SPKG_DESC_CSWlibosp5 += $(DESCRIPTION), libosp.so.5 +RUNTIME_DEP_PKGS_CSWopensp += CSWlibosp5 +OBSOLETED_BY_CSWlibosp5 += CSWopensprt +CATALOGNAME_CSWopensprt = opensp_rt_stub + +PACKAGES += CSWopensp-dev +CATALOGNAME_CSWopensp-dev = opensp_dev +SPKG_DESC_CSWopensp-dev += $(DESCRIPTION), development files +PKGFILES_CSWopensp-dev += /opt/csw/lib/libosp.so +PKGFILES_CSWopensp-dev += $(PKGFILES_DEVEL) +OBSOLETED_BY_CSWopensp-dev += CSWopenspdevel +CATALOGNAME_CSWopenspdevel = opensp_devel_stub +ARCHALL_CSWopensp-dev = 1 +RUNTIME_DEP_PKGS_CSWopensp-dev += CSWlibosp5 + include gar/category.mk # there is are tests failing as when I packaged with a private recipe, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Fri Jun 29 10:03:25 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Fri, 29 Jun 2012 08:03:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[18601] csw/mgar/pkg/opensp/trunk/Makefile Message-ID: Revision: 18601 http://gar.svn.sourceforge.net/gar/?rev=18601&view=rev Author: pfelecan Date: 2012-06-29 08:03:25 +0000 (Fri, 29 Jun 2012) Log Message: ----------- opensp/trunk: corrected and fine-tuned overrides Modified Paths: -------------- csw/mgar/pkg/opensp/trunk/Makefile Modified: csw/mgar/pkg/opensp/trunk/Makefile =================================================================== --- csw/mgar/pkg/opensp/trunk/Makefile 2012-06-29 07:16:43 UTC (rev 18600) +++ csw/mgar/pkg/opensp/trunk/Makefile 2012-06-29 08:03:25 UTC (rev 18601) @@ -33,14 +33,10 @@ CHECKPKG_OVERRIDES_CSWopensp-doc += file-with-bad-content|/usr/share|root/opt/csw/share/doc/opensp/ChangeLog PACKAGES += CSWopensp-utils -CATALOGNAME_CSWopensp-utils = opensp-utils +CATALOGNAME_CSWopensp-utils = opensp_utils SPKG_DESC_CSWopensp-utils = $(DESCRIPTION), utilities PKGFILES_CSWopensp-utils = $(bindir)/.* RUNTIME_DEP_PKGS_CSWopensp-utils += CSWlibosp5 -RUNTIME_DEP_PKGS_CSWopensp-utils += CSWlibintl8 -RUNTIME_DEP_PKGS_CSWopensp-utils += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWopensp-utils += CSWlibstdc++6 -RUNTIME_DEP_PKGS_CSWopensp-utils += CSWperl OBSOLETED_BY_CSWopensp-utils += CSWopensp CATALOGNAME_CSWopensp = opensp_stub @@ -55,19 +51,22 @@ PKGFILES_CSWlibosp5 += /opt/csw/share/locale/sv/LC_MESSAGES/sp5.mo PKGFILES_CSWlibosp5 += /opt/csw/share/locale/tr/LC_MESSAGES/sp5.mo SPKG_DESC_CSWlibosp5 += $(DESCRIPTION), libosp.so.5 -RUNTIME_DEP_PKGS_CSWopensp += CSWlibosp5 +RUNTIME_DEP_PKGS_CSWlibosp5 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibosp5 += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWlibosp5 += CSWlibstdc++6 OBSOLETED_BY_CSWlibosp5 += CSWopensprt CATALOGNAME_CSWopensprt = opensp_rt_stub -PACKAGES += CSWopensp-dev -CATALOGNAME_CSWopensp-dev = opensp_dev -SPKG_DESC_CSWopensp-dev += $(DESCRIPTION), development files -PKGFILES_CSWopensp-dev += /opt/csw/lib/libosp.so -PKGFILES_CSWopensp-dev += $(PKGFILES_DEVEL) -OBSOLETED_BY_CSWopensp-dev += CSWopenspdevel -CATALOGNAME_CSWopenspdevel = opensp_devel_stub -ARCHALL_CSWopensp-dev = 1 -RUNTIME_DEP_PKGS_CSWopensp-dev += CSWlibosp5 +PACKAGES += CSWopensp-dev +CATALOGNAME_CSWopensp-dev = opensp_dev +SPKG_DESC_CSWopensp-dev += $(DESCRIPTION), development files +PKGFILES_CSWopensp-dev += /opt/csw/lib/libosp.so +PKGFILES_CSWopensp-dev += $(PKGFILES_DEVEL) +OBSOLETED_BY_CSWopensp-dev += CSWopenspdevel +CATALOGNAME_CSWopenspdevel = opensp_devel_stub +ARCHALL_CSWopensp-dev = 1 +RUNTIME_DEP_PKGS_CSWopensp-dev += CSWlibosp5 +CHECKPKG_OVERRIDES_CSWopensp-dev += archall-devel-package include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Fri Jun 29 11:02:33 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Fri, 29 Jun 2012 09:02:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[18602] csw/mgar/pkg/opensp/trunk/Makefile Message-ID: Revision: 18602 http://gar.svn.sourceforge.net/gar/?rev=18602&view=rev Author: pfelecan Date: 2012-06-29 09:02:33 +0000 (Fri, 29 Jun 2012) Log Message: ----------- opensp/trunk: - catalog name correction for the documentation package - more overrides fine tuning Modified Paths: -------------- csw/mgar/pkg/opensp/trunk/Makefile Modified: csw/mgar/pkg/opensp/trunk/Makefile =================================================================== --- csw/mgar/pkg/opensp/trunk/Makefile 2012-06-29 08:03:25 UTC (rev 18601) +++ csw/mgar/pkg/opensp/trunk/Makefile 2012-06-29 09:02:33 UTC (rev 18602) @@ -25,7 +25,7 @@ TEST_SCRIPTS = custom PACKAGES = CSWopensp-doc -CATALOGNAME = opensp-doc +CATALOGNAME = opensp_doc SPKG_DESC_CSWopensp-doc = $(DESCRIPTION), documentation OBSOLETED_BY_CSWopensp-doc += CSWopenspdoc CATALOGNAME_CSWopenspdoc = opensp_doc_stub @@ -39,6 +39,9 @@ RUNTIME_DEP_PKGS_CSWopensp-utils += CSWlibosp5 OBSOLETED_BY_CSWopensp-utils += CSWopensp CATALOGNAME_CSWopensp = opensp_stub +CHECKPKG_OVERRIDES_CSWopensp-utils += missing-dependency|CSWlibintl8 +CHECKPKG_OVERRIDES_CSWopensp-utils += missing-dependency|CSWlibgcc-s1 +CHECKPKG_OVERRIDES_CSWopensp-utils += missing-dependency|CSWlibstdc++6 PACKAGES += CSWlibosp5 CATALOGNAME_CSWlibosp5 = libosp5 @@ -51,6 +54,7 @@ PKGFILES_CSWlibosp5 += /opt/csw/share/locale/sv/LC_MESSAGES/sp5.mo PKGFILES_CSWlibosp5 += /opt/csw/share/locale/tr/LC_MESSAGES/sp5.mo SPKG_DESC_CSWlibosp5 += $(DESCRIPTION), libosp.so.5 +RUNTIME_DEP_PKGS_CSWlibosp5 += CSWperl RUNTIME_DEP_PKGS_CSWlibosp5 += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibosp5 += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibosp5 += CSWlibstdc++6 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Fri Jun 29 14:55:41 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Fri, 29 Jun 2012 12:55:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[18603] csw/mgar/pkg Message-ID: Revision: 18603 http://gar.svn.sourceforge.net/gar/?rev=18603&view=rev Author: pfelecan Date: 2012-06-29 12:55:41 +0000 (Fri, 29 Jun 2012) Log Message: ----------- par2cmdline/trunk: migrated from a private recipe to a GAR based recipe Added Paths: ----------- csw/mgar/pkg/par2cmdline/ csw/mgar/pkg/par2cmdline/Makefile csw/mgar/pkg/par2cmdline/branches/ csw/mgar/pkg/par2cmdline/tags/ csw/mgar/pkg/par2cmdline/trunk/ csw/mgar/pkg/par2cmdline/trunk/Makefile csw/mgar/pkg/par2cmdline/trunk/checksums csw/mgar/pkg/par2cmdline/trunk/files/ csw/mgar/pkg/par2cmdline/trunk/files/0001-Debian-0.4-11-serial-000_unidentified.patch csw/mgar/pkg/par2cmdline/trunk/files/0002-Debian-0.4-11-serial-001_hardlinks.patch csw/mgar/pkg/par2cmdline/trunk/files/0003-Debian-0.4-11-serial-002_gcc_40_fixes.patch csw/mgar/pkg/par2cmdline/trunk/files/0004-Debian-0.4-11-serial-003_fix_crash_in_quiet_mode.patch csw/mgar/pkg/par2cmdline/trunk/files/0005-Fix-media-size-ioctl.patch csw/mgar/pkg/par2cmdline/trunk/files/0006-Fix-pretest-script.patch Added: csw/mgar/pkg/par2cmdline/Makefile =================================================================== --- csw/mgar/pkg/par2cmdline/Makefile (rev 0) +++ csw/mgar/pkg/par2cmdline/Makefile 2012-06-29 12:55:41 UTC (rev 18603) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/par2cmdline/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/par2cmdline/trunk/Makefile =================================================================== --- csw/mgar/pkg/par2cmdline/trunk/Makefile (rev 0) +++ csw/mgar/pkg/par2cmdline/trunk/Makefile 2012-06-29 12:55:41 UTC (rev 18603) @@ -0,0 +1,40 @@ +# $Id$ + +NAME = par2cmdline +VERSION = 0.4 +GARTYPE = v2 +CATEGORIES = apps + +DESCRIPTION = Program for creating and using PAR2 files to detect damage in data files and repair them if necessary +define BLURB + Program for creating and using PAR2 files to detect damage in data + files and repair them if necessary +endef + +MASTER_SITES = $(SF_MIRRORS) +SF_PROJ = parchive +DISTFILES = $(DISTNAME).tar.gz +PATCHFILES = 0001-Debian-0.4-11-serial-000_unidentified.patch +PATCHFILES += 0002-Debian-0.4-11-serial-001_hardlinks.patch +PATCHFILES += 0003-Debian-0.4-11-serial-002_gcc_40_fixes.patch +PATCHFILES += 0004-Debian-0.4-11-serial-003_fix_crash_in_quiet_mode.patch +PATCHFILES += 0005-Fix-media-size-ioctl.patch +PATCHFILES += 0006-Fix-pretest-script.patch + +GARCOMPILER = GNU +CONFIGURE_ARGS = $(DIRPATHS) + +RUNTIME_DEP_PKGS += CSWlibgcc-s1 +RUNTIME_DEP_PKGS += CSWlibstdc++6 + +include gar/category.mk + +post-install-modulated: pkgdocdir = $(docdir)/$(NAME) +post-install-modulated: + ginstall --directory --mode=u=rwx,go=rx $(DESTDIR)$(pkgdocdir) + ginstall --preserve-timestamps --mode=u=rw,go=r $(WORKSRC)/README $(DESTDIR)$(pkgdocdir) + $(MAKECOOKIE) + +# this is private and not available publicly +mydependencies: + $(HOME)/bin/ocswdeplist --package $(NAME) Property changes on: csw/mgar/pkg/par2cmdline/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/par2cmdline/trunk/checksums =================================================================== --- csw/mgar/pkg/par2cmdline/trunk/checksums (rev 0) +++ csw/mgar/pkg/par2cmdline/trunk/checksums 2012-06-29 12:55:41 UTC (rev 18603) @@ -0,0 +1 @@ +1551b63e57e3c232254dc62073b723a9 par2cmdline-0.4.tar.gz Added: csw/mgar/pkg/par2cmdline/trunk/files/0001-Debian-0.4-11-serial-000_unidentified.patch =================================================================== --- csw/mgar/pkg/par2cmdline/trunk/files/0001-Debian-0.4-11-serial-000_unidentified.patch (rev 0) +++ csw/mgar/pkg/par2cmdline/trunk/files/0001-Debian-0.4-11-serial-000_unidentified.patch 2012-06-29 12:55:41 UTC (rev 18603) @@ -0,0 +1,305 @@ +From 56d71aa95571da606492a94fcb5ff933007bab3d Mon Sep 17 00:00:00 2001 +From: Peter Felecan +Date: Fri, 29 Jun 2012 11:44:25 +0200 +Subject: [PATCH] Debian 0.4-11 serial 000_unidentified + +--- + diskfile.cpp | 27 +++++++++++---- + letype.h | 101 ++------------------------------------------------------- + md5.h | 38 +++++++++------------- + par2cmdline.h | 6 ++++ + 4 files changed, 45 insertions(+), 127 deletions(-) + +diff --git a/diskfile.cpp b/diskfile.cpp +index 6ed4ba7..8eaf710 100644 +--- a/diskfile.cpp ++++ b/diskfile.cpp +@@ -799,20 +799,33 @@ void DiskFile::SplitFilename(string filename, string &path, string &name) + bool DiskFile::FileExists(string filename) + { + struct stat st; +- return ((0 == stat(filename.c_str(), &st)) && (0 != (st.st_mode & S_IFREG))); ++ return ((0 == stat(filename.c_str(), &st)) && ++ (st.st_mode & (S_IFREG|S_IFBLK)) ); + } + + u64 DiskFile::GetFileSize(string filename) + { + struct stat st; +- if ((0 == stat(filename.c_str(), &st)) && (0 != (st.st_mode & S_IFREG))) ++ if (0 == stat(filename.c_str(), &st)) + { +- return st.st_size; +- } +- else +- { +- return 0; ++ if (st.st_mode & S_IFREG) ++ { ++ return st.st_size; ++ } ++ else if (st.st_mode & S_IFBLK) ++ { ++ FILE *fp; ++ u64 size = 0; ++ if ( NULL != (fp = fopen(filename.c_str(), "rb")) ) ++ { ++ ioctl(fileno(fp), BLKGETSIZE64, &size); ++ fclose(fp); ++ } ++ return size; ++ } + } ++ ++ return 0; + } + + +diff --git a/letype.h b/letype.h +index 68b56d4..d1f6bdd 100644 +--- a/letype.h ++++ b/letype.h +@@ -28,44 +28,15 @@ typedef u64 leu64; + + #else + +-class leu16 ++struct leu16 + { +-public: +- leu16(void); +- +- leu16(const leu16 &other); +- leu16& operator=(const leu16 &other); +- +- leu16(const u16 &other); + leu16& operator=(const u16 &other); + + operator u16(void) const; + +-protected: + u16 value; + }; + +-inline leu16::leu16(void) +-{ +-} +- +-inline leu16::leu16(const leu16 &other) +-: value(other.value) +-{ +-} +- +-inline leu16& leu16::operator =(const leu16 &other) +-{ +- value = other.value; +- return *this; +-} +- +-inline leu16::leu16(const u16 &other) +-{ +- ((unsigned char*)&value)[0] = (unsigned char)((other >> 0) & 0xff); +- ((unsigned char*)&value)[1] = (unsigned char)((other >> 8) & 0xff); +-} +- + inline leu16& leu16::operator=(const u16 &other) + { + ((unsigned char*)&value)[0] = (unsigned char)((other >> 0) & 0xff); +@@ -81,46 +52,15 @@ inline leu16::operator u16(void) const + } + + +-class leu32 ++struct leu32 + { +-public: +- leu32(void); +- +- leu32(const leu32 &other); +- leu32& operator=(const leu32 &other); +- +- leu32(const u32 &other); + leu32& operator=(const u32 &other); + + operator u32(void) const; + +-protected: + u32 value; + }; + +-inline leu32::leu32(void) +-{ +-} +- +-inline leu32::leu32(const leu32 &other) +-: value(other.value) +-{ +-} +- +-inline leu32& leu32::operator =(const leu32 &other) +-{ +- value = other.value; +- return *this; +-} +- +-inline leu32::leu32(const u32 &other) +-{ +- ((unsigned char*)&value)[0] = (unsigned char)((other >> 0) & 0xff); +- ((unsigned char*)&value)[1] = (unsigned char)((other >> 8) & 0xff); +- ((unsigned char*)&value)[2] = (unsigned char)((other >> 16) & 0xff); +- ((unsigned char*)&value)[3] = (unsigned char)((other >> 24) & 0xff); +-} +- + inline leu32& leu32::operator=(const u32 &other) + { + ((unsigned char*)&value)[0] = (unsigned char)((other >> 0) & 0xff); +@@ -140,50 +80,15 @@ inline leu32::operator u32(void) const + } + + +-class leu64 ++struct leu64 + { +-public: +- leu64(void); +- +- leu64(const leu64 &other); +- leu64& operator=(const leu64 &other); +- +- leu64(const u64 &other); + leu64& operator=(const u64 &other); + + operator u64(void) const; + +-protected: + u64 value; + }; + +-inline leu64::leu64(void) +-{ +-} +- +-inline leu64::leu64(const leu64 &other) +-: value(other.value) +-{ +-} +- +-inline leu64& leu64::operator =(const leu64 &other) +-{ +- value = other.value; +- return *this; +-} +- +-inline leu64::leu64(const u64 &other) +-{ +- ((unsigned char*)&value)[0] = (unsigned char)((other >> 0) & 0xff); +- ((unsigned char*)&value)[1] = (unsigned char)((other >> 8) & 0xff); +- ((unsigned char*)&value)[2] = (unsigned char)((other >> 16) & 0xff); +- ((unsigned char*)&value)[3] = (unsigned char)((other >> 24) & 0xff); +- ((unsigned char*)&value)[4] = (unsigned char)((other >> 32) & 0xff); +- ((unsigned char*)&value)[5] = (unsigned char)((other >> 40) & 0xff); +- ((unsigned char*)&value)[6] = (unsigned char)((other >> 48) & 0xff); +- ((unsigned char*)&value)[7] = (unsigned char)((other >> 56) & 0xff); +-} +- + inline leu64& leu64::operator=(const u64 &other) + { + ((unsigned char*)&value)[0] = (unsigned char)((other >> 0) & 0xff); +diff --git a/md5.h b/md5.h +index ade2223..b87d9f1 100644 +--- a/md5.h ++++ b/md5.h +@@ -20,6 +20,13 @@ + #ifndef __MD5_H__ + #define __MD5_H__ + ++#ifdef WIN32 ++#pragma pack(push, 1) ++#define PACKED ++#else ++#define PACKED __attribute__ ((packed)) ++#endif ++ + // This file defines the MD5Hash and MD5Context objects which are used + // to compute and manipulate the MD5 Hash values for a block of data. + +@@ -35,12 +42,11 @@ + + // MD5 Hash value + +-class MD5Hash +-{ +-public: +- // Constructor does not initialise the value +- MD5Hash(void) {}; ++struct MD5Hash; ++ostream& operator<<(ostream &s, const MD5Hash &hash); + ++struct MD5Hash ++{ + // Comparison operators + bool operator==(const MD5Hash &other) const; + bool operator!=(const MD5Hash &other) const; +@@ -54,13 +60,8 @@ public: + friend ostream& operator<<(ostream &s, const MD5Hash &hash); + string print(void) const; + +- // Copy and assignment +- MD5Hash(const MD5Hash &other); +- MD5Hash& operator=(const MD5Hash &other); +- +-public: + u8 hash[16]; // 16 byte MD5 Hash value +-}; ++} PACKED; + + // Intermediate computation state + +@@ -144,16 +145,9 @@ inline bool MD5Hash::operator<=(const MD5Hash &other) const + return !other.operator<(*this); + } + +-inline MD5Hash::MD5Hash(const MD5Hash &other) +-{ +- memcpy(&hash, &other.hash, sizeof(hash)); +-} +- +-inline MD5Hash& MD5Hash::operator=(const MD5Hash &other) +-{ +- memcpy(&hash, &other.hash, sizeof(hash)); +- +- return *this; +-} ++#ifdef WIN32 ++#pragma pack(pop) ++#endif ++#undef PACKED + + #endif // __MD5_H__ +diff --git a/par2cmdline.h b/par2cmdline.h +index afd4dcc..9d8f103 100644 +--- a/par2cmdline.h ++++ b/par2cmdline.h +@@ -132,6 +132,10 @@ typedef unsigned int u32; + typedef unsigned long long u64; + #endif + ++// FIXME: this is not done right w/ autoconf ++#include ++#include ++ + #if HAVE_SYS_STAT_H + # include + #endif +@@ -179,6 +183,8 @@ typedef unsigned long long u64; + #include + #include + #include ++#include ++#include + #include + #include + +-- +1.7.10.3 + Added: csw/mgar/pkg/par2cmdline/trunk/files/0002-Debian-0.4-11-serial-001_hardlinks.patch =================================================================== --- csw/mgar/pkg/par2cmdline/trunk/files/0002-Debian-0.4-11-serial-001_hardlinks.patch (rev 0) +++ csw/mgar/pkg/par2cmdline/trunk/files/0002-Debian-0.4-11-serial-001_hardlinks.patch 2012-06-29 12:55:41 UTC (rev 18603) @@ -0,0 +1,29 @@ +From 17ded79c040155c3ce94910245f26f8e7f340bb8 Mon Sep 17 00:00:00 2001 +From: Peter Felecan +Date: Fri, 29 Jun 2012 13:01:25 +0200 +Subject: [PATCH] Debian 0.4-11 serial 001_hardlinks + +--- + Makefile.am | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 5db5804..9d1cc4a 100755 +--- a/Makefile.am ++++ b/Makefile.am +@@ -55,9 +55,9 @@ EXTRA_DIST = PORTING ROADMAP par2cmdline.sln par2cmdline.vcproj \ + TESTS = pretest test1 test2 test3 test4 test5 test6 posttest + + install-exec-hook : +- ln -f $(DESTDIR)$(bindir)/par2$(EXEEXT) $(DESTDIR)$(bindir)/par2create$(EXEEXT) +- ln -f $(DESTDIR)$(bindir)/par2$(EXEEXT) $(DESTDIR)$(bindir)/par2verify$(EXEEXT) +- ln -f $(DESTDIR)$(bindir)/par2$(EXEEXT) $(DESTDIR)$(bindir)/par2repair$(EXEEXT) ++ ln -sf $(bindir)/par2$(EXEEXT) $(DESTDIR)$(bindir)/par2create$(EXEEXT) ++ ln -sf $(bindir)/par2$(EXEEXT) $(DESTDIR)$(bindir)/par2verify$(EXEEXT) ++ ln -sf $(bindir)/par2$(EXEEXT) $(DESTDIR)$(bindir)/par2repair$(EXEEXT) + + uninstall-hook : + rm -f $(DESTDIR)$(bindir)/par2create$(EXEEXT) +-- +1.7.10.3 + Added: csw/mgar/pkg/par2cmdline/trunk/files/0003-Debian-0.4-11-serial-002_gcc_40_fixes.patch =================================================================== --- csw/mgar/pkg/par2cmdline/trunk/files/0003-Debian-0.4-11-serial-002_gcc_40_fixes.patch (rev 0) +++ csw/mgar/pkg/par2cmdline/trunk/files/0003-Debian-0.4-11-serial-002_gcc_40_fixes.patch 2012-06-29 12:55:41 UTC (rev 18603) @@ -0,0 +1,70 @@ +From 3b386d104d43e9f421fda957412738600d4ba627 Mon Sep 17 00:00:00 2001 +From: Peter Felecan +Date: Fri, 29 Jun 2012 13:04:30 +0200 +Subject: [PATCH] Debian 0.4-11 serial gcc_40_fixes + +--- + reedsolomon.cpp | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/reedsolomon.cpp b/reedsolomon.cpp +index d7f96e6..82b3d9a 100644 +--- a/reedsolomon.cpp ++++ b/reedsolomon.cpp +@@ -51,7 +51,7 @@ u32 gcd(u32 a, u32 b) + } + } + +-bool ReedSolomon::SetInput(const vector &present) ++template <> bool ReedSolomon::SetInput(const vector &present) + { + inputcount = (u32)present.size(); + +@@ -80,7 +80,7 @@ bool ReedSolomon::SetInput(const vector &present) + return true; + } + +-bool ReedSolomon::SetInput(u32 count) ++template <> bool ReedSolomon::SetInput(u32 count) + { + inputcount = count; + +@@ -101,7 +101,7 @@ bool ReedSolomon::SetInput(u32 count) + return true; + } + +-bool ReedSolomon::Process(size_t size, u32 inputindex, const void *inputbuffer, u32 outputindex, void *outputbuffer) ++template <> bool ReedSolomon::Process(size_t size, u32 inputindex, const void *inputbuffer, u32 outputindex, void *outputbuffer) + { + // Look up the appropriate element in the RS matrix + Galois8 factor = leftmatrix[outputindex * (datapresent + datamissing) + inputindex]; +@@ -189,7 +189,7 @@ bool ReedSolomon::Process(size_t size, u32 inputindex, const void *inpu + + // Set which of the source files are present and which are missing + // and compute the base values to use for the vandermonde matrix. +-bool ReedSolomon::SetInput(const vector &present) ++template <> bool ReedSolomon::SetInput(const vector &present) + { + inputcount = (u32)present.size(); + +@@ -233,7 +233,7 @@ bool ReedSolomon::SetInput(const vector &present) + + // Record that the specified number of source files are all present + // and compute the base values to use for the vandermonde matrix. +-bool ReedSolomon::SetInput(u32 count) ++template <> bool ReedSolomon::SetInput(u32 count) + { + inputcount = count; + +@@ -267,7 +267,7 @@ bool ReedSolomon::SetInput(u32 count) + return true; + } + +-bool ReedSolomon::Process(size_t size, u32 inputindex, const void *inputbuffer, u32 outputindex, void *outputbuffer) ++template <> bool ReedSolomon::Process(size_t size, u32 inputindex, const void *inputbuffer, u32 outputindex, void *outputbuffer) + { + // Look up the appropriate element in the RS matrix + +-- +1.7.10.3 + Added: csw/mgar/pkg/par2cmdline/trunk/files/0004-Debian-0.4-11-serial-003_fix_crash_in_quiet_mode.patch =================================================================== --- csw/mgar/pkg/par2cmdline/trunk/files/0004-Debian-0.4-11-serial-003_fix_crash_in_quiet_mode.patch (rev 0) +++ csw/mgar/pkg/par2cmdline/trunk/files/0004-Debian-0.4-11-serial-003_fix_crash_in_quiet_mode.patch 2012-06-29 12:55:41 UTC (rev 18603) @@ -0,0 +1,30 @@ +From ca09fd103683e78638ab5a995c0ed532b1f1b1cf Mon Sep 17 00:00:00 2001 +From: Peter Felecan +Date: Fri, 29 Jun 2012 14:01:00 +0200 +Subject: [PATCH] Debian 0.4-11 serial 003_fix_crash_in_quiet_mode + +--- + par2creatorsourcefile.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/par2creatorsourcefile.cpp b/par2creatorsourcefile.cpp +index fceb6cd..2e81f6c 100644 +--- a/par2creatorsourcefile.cpp ++++ b/par2creatorsourcefile.cpp +@@ -213,11 +213,12 @@ bool Par2CreatorSourceFile::Open(CommandLine::NoiseLevel noiselevel, const Comma + } + } + ++ offset += want; ++ + if (noiselevel > CommandLine::nlQuiet) + { + // Display progress + u32 oldfraction = (u32)(1000 * offset / filesize); +- offset += want; + u32 newfraction = (u32)(1000 * offset / filesize); + if (oldfraction != newfraction) + { +-- +1.7.10.3 + Added: csw/mgar/pkg/par2cmdline/trunk/files/0005-Fix-media-size-ioctl.patch =================================================================== --- csw/mgar/pkg/par2cmdline/trunk/files/0005-Fix-media-size-ioctl.patch (rev 0) +++ csw/mgar/pkg/par2cmdline/trunk/files/0005-Fix-media-size-ioctl.patch 2012-06-29 12:55:41 UTC (rev 18603) @@ -0,0 +1,28 @@ +From 020c08037f52bb74a9f2d159f3d3eeac19c9baff Mon Sep 17 00:00:00 2001 +From: Peter Felecan +Date: Fri, 29 Jun 2012 14:09:08 +0200 +Subject: [PATCH] Fix media size ioctl + +Inspired by the Debian serial patch 004_kfreebsd.diff and http://diskscrub.googlecode.com/git-history/04fcaadaef7ff8aae7b1268d788cb896556b1c55/src/getsize.c +--- + diskfile.cpp | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/diskfile.cpp b/diskfile.cpp +index 8eaf710..59c3085 100644 +--- a/diskfile.cpp ++++ b/diskfile.cpp +@@ -27,6 +27,10 @@ static char THIS_FILE[]=__FILE__; + #endif + #endif + ++#if defined(__sun__) ++#include ++#define BLKGETSIZE64 DKIOCGMEDIAINFO ++#endif + + #ifdef WIN32 + ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// +-- +1.7.10.3 + Added: csw/mgar/pkg/par2cmdline/trunk/files/0006-Fix-pretest-script.patch =================================================================== --- csw/mgar/pkg/par2cmdline/trunk/files/0006-Fix-pretest-script.patch (rev 0) +++ csw/mgar/pkg/par2cmdline/trunk/files/0006-Fix-pretest-script.patch 2012-06-29 12:55:41 UTC (rev 18603) @@ -0,0 +1,25 @@ +From fe3e78e74fec62782f4f31308a2c5c53300e5bab Mon Sep 17 00:00:00 2001 +From: Peter Felecan +Date: Fri, 29 Jun 2012 14:40:45 +0200 +Subject: [PATCH] Fix pretest script + +--- + pretest | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pretest b/pretest +index 2c50406..b6f6ba5 100755 +--- a/pretest ++++ b/pretest +@@ -4,7 +4,7 @@ rm -f test*.log + rm -rf testdir + mkdir testdir && cd testdir || { echo "ERROR: Could not change to test directory" ; exit 1; } >&2 + +-gunzip -c ../$srcdir/testdata.tar.gz | tar xf - || { echo "ERROR: Could not extra test files" ; exit 1; } >&2 ++gunzip -c $srcdir/testdata.tar.gz | tar xf - || { echo "ERROR: Could not extra test files" ; exit 1; } >&2 + + cp test-0.data test-0.data.orig + cp test-1.data test-1.data.orig +-- +1.7.10.3 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Fri Jun 29 15:10:48 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Fri, 29 Jun 2012 13:10:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[18604] csw/mgar/pkg/par2cmdline/trunk/Makefile Message-ID: Revision: 18604 http://gar.svn.sourceforge.net/gar/?rev=18604&view=rev Author: pfelecan Date: 2012-06-29 13:10:48 +0000 (Fri, 29 Jun 2012) Log Message: ----------- par2cmdline/trunk: shortened package description Modified Paths: -------------- csw/mgar/pkg/par2cmdline/trunk/Makefile Modified: csw/mgar/pkg/par2cmdline/trunk/Makefile =================================================================== --- csw/mgar/pkg/par2cmdline/trunk/Makefile 2012-06-29 12:55:41 UTC (rev 18603) +++ csw/mgar/pkg/par2cmdline/trunk/Makefile 2012-06-29 13:10:48 UTC (rev 18604) @@ -5,7 +5,7 @@ GARTYPE = v2 CATEGORIES = apps -DESCRIPTION = Program for creating and using PAR2 files to detect damage in data files and repair them if necessary +DESCRIPTION = Program for creating and using PAR2 files define BLURB Program for creating and using PAR2 files to detect damage in data files and repair them if necessary This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Fri Jun 29 15:24:49 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Fri, 29 Jun 2012 13:24:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[18605] csw/mgar/pkg/par2cmdline/trunk/Makefile Message-ID: Revision: 18605 http://gar.svn.sourceforge.net/gar/?rev=18605&view=rev Author: pfelecan Date: 2012-06-29 13:24:49 +0000 (Fri, 29 Jun 2012) Log Message: ----------- par2cmdline/trunk: linit to Solaris 10 platforms Modified Paths: -------------- csw/mgar/pkg/par2cmdline/trunk/Makefile Modified: csw/mgar/pkg/par2cmdline/trunk/Makefile =================================================================== --- csw/mgar/pkg/par2cmdline/trunk/Makefile 2012-06-29 13:10:48 UTC (rev 18604) +++ csw/mgar/pkg/par2cmdline/trunk/Makefile 2012-06-29 13:24:49 UTC (rev 18605) @@ -27,6 +27,9 @@ RUNTIME_DEP_PKGS += CSWlibgcc-s1 RUNTIME_DEP_PKGS += CSWlibstdc++6 +PACKAGING_PLATFORMS = solaris10-sparc +PACKAGING_PLATFORMS += solaris10-i386 + include gar/category.mk post-install-modulated: pkgdocdir = $(docdir)/$(NAME) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at users.sourceforge.net Fri Jun 29 15:47:36 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Fri, 29 Jun 2012 13:47:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[18606] csw/mgar/pkg/opensp/trunk/Makefile Message-ID: Revision: 18606 http://gar.svn.sourceforge.net/gar/?rev=18606&view=rev Author: pfelecan Date: 2012-06-29 13:47:35 +0000 (Fri, 29 Jun 2012) Log Message: ----------- opensp/trunk: use gnu tools; all phases PATH have /opt/csw/gnu at the beginning of the list Modified Paths: -------------- csw/mgar/pkg/opensp/trunk/Makefile Modified: csw/mgar/pkg/opensp/trunk/Makefile =================================================================== --- csw/mgar/pkg/opensp/trunk/Makefile 2012-06-29 13:24:49 UTC (rev 18605) +++ csw/mgar/pkg/opensp/trunk/Makefile 2012-06-29 13:47:35 UTC (rev 18606) @@ -22,8 +22,15 @@ CONFIGURE_ARGS += --enable-default-search-path=.:/opt/csw/share/sgml:/opt/csw/share/xml:/etc/opt/csw/sgml:/opt/csw/etc/sgml CONFIGURE_ARGS += --disable-doc-build +# wish I can define these globally: +CONFIGURE_ENV_PATH = /opt/csw/gnu:$(PATH) +BUILD_ENV_PATH = /opt/csw/gnu:$(PATH) +TEST_ENV_PATH = /opt/csw/gnu:$(PATH) + TEST_SCRIPTS = custom +INSTALL_ENV_PATH = /opt/csw/gnu:$(PATH) + PACKAGES = CSWopensp-doc CATALOGNAME = opensp_doc SPKG_DESC_CSWopensp-doc = $(DESCRIPTION), documentation This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at opencsw.org Fri Jun 29 19:54:30 2012 From: pfelecan at opencsw.org (Peter FELECAN) Date: Fri, 29 Jun 2012 19:54:30 +0200 Subject: [csw-devel] SF.net SVN: gar:[18584] csw/mgar/pkg/grip/trunk/Makefile In-Reply-To: ("Maciej (Matchek) =?utf-8?Q?Blizi=C5=84ski=22's?= message of "Thu, 28 Jun 2012 15:05:12 +0100") References: Message-ID: "Maciej (Matchek) Blizi?ski" writes: > These overrides, is this the transitive dependency thing? yes and NEEDED from readelf and elfdump point of view -- Peter From maciej at opencsw.org Fri Jun 29 20:46:31 2012 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_=28Matchek=29_Blizi=C5=84ski?=) Date: Fri, 29 Jun 2012 19:46:31 +0100 Subject: [csw-devel] SF.net SVN: gar:[18584] csw/mgar/pkg/grip/trunk/Makefile In-Reply-To: References: Message-ID: 2012/6/29 Peter FELECAN > > "Maciej (Matchek) Blizi?ski" writes: > > > These overrides, is this the transitive dependency thing? > > yes and ?NEEDED from readelf and elfdump point of view So you disagree with this post? http://lists.opencsw.org/pipermail/maintainers/2012-June/016921.html From maciej at opencsw.org Sat Jun 30 17:22:48 2012 From: maciej at opencsw.org (=?UTF-8?Q?Maciej_=28Matchek=29_Blizi=C5=84ski?=) Date: Sat, 30 Jun 2012 16:22:48 +0100 Subject: [csw-devel] SF.net SVN: gar:[16652] csw/mgar/pkg/subversion/trunk/Makefile In-Reply-To: References: <20120623202407.GA27730@quince.home.blizinski.pl> Message-ID: 2012/6/24 Peter FELECAN > > Maciej Blizi?ski writes: > > On Mon, Jan 02, 2012 at 08:17:25PM +0000, rthurner at users.sourceforge.net > > wrote: > >> +CHECKPKG_OVERRIDES_CSWpythonsvn += > >> discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/svn/repos.pyc > >> +CHECKPKG_OVERRIDES_CSWpythonsvn += > >> discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/svn/wc.pyc > >> +CHECKPKG_OVERRIDES_CSWpythonsvn += > >> discouraged-path-in-pkgmap|/opt/csw/lib/svn/python/site-packages/libsvn/__init__.pyc > >> (...) > > > > We don't ship *.pyc files in Python packages. We use the pycompile class > > instead, and generate the *.pyc files locally. Instead of overriding the > > error tags, you can remove the files in a post-install-modulated step > > and set the pycompile class on them. > > Sincerely, I don't get the rationale of this: pyc as elc (e-lisp > compiled) are architecture neutral. The only reason that I can imagine > is that compiling on the target, i.e., on which the package containing > the source is installed, uses environmental, i.e., specific, > information, e.g. Python's current version. > > As our Python reference, can you enlighten us on this? Yes, the *.pyc and *.pyo files are platform-independent. I found the corresponding Debian policy document: http://www.debian.org/doc/packaging-manuals/python-policy/ch-module_packages.html#s-byte_compilation "(...) the corresponding byte-compiled modules (foo.pyc files) and optimized modules (foo.pyo files) must not ship in the package." "Pure Python modules in private installation directories that are byte-compiled with the default Python version must be forcefully byte-compiled again when the default Python version changes." It's not stated directly, but it sounds like the byte-compiled files are dependent on the version of Python runtime. Compiling them in post-install allows to not update the packaged modules if the runtime changes and the module is source-compatible with the new runtime. Maciej