From romeotheriault at users.sourceforge.net Mon Oct 1 05:49:57 2012 From: romeotheriault at users.sourceforge.net (romeotheriault at users.sourceforge.net) Date: Mon, 01 Oct 2012 03:49:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[19340] csw/mgar/pkg/lang-python/salt/trunk/Makefile Message-ID: Revision: 19340 http://gar.svn.sourceforge.net/gar/?rev=19340&view=rev Author: romeotheriault Date: 2012-10-01 03:49:57 +0000 (Mon, 01 Oct 2012) Log Message: ----------- lang-python/salt/trunk: version bump to 0.10.3 Modified Paths: -------------- csw/mgar/pkg/lang-python/salt/trunk/Makefile Modified: csw/mgar/pkg/lang-python/salt/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/salt/trunk/Makefile 2012-09-30 21:25:33 UTC (rev 19339) +++ csw/mgar/pkg/lang-python/salt/trunk/Makefile 2012-10-01 03:49:57 UTC (rev 19340) @@ -1,5 +1,5 @@ NAME = salt -VERSION = 0.10.2 +VERSION = 0.10.3 GARTYPE = v2 CATEGORIES = python This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From romeotheriault at users.sourceforge.net Mon Oct 1 05:54:03 2012 From: romeotheriault at users.sourceforge.net (romeotheriault at users.sourceforge.net) Date: Mon, 01 Oct 2012 03:54:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[19341] csw/mgar/pkg/lang-python/salt/trunk/checksums Message-ID: Revision: 19341 http://gar.svn.sourceforge.net/gar/?rev=19341&view=rev Author: romeotheriault Date: 2012-10-01 03:54:02 +0000 (Mon, 01 Oct 2012) Log Message: ----------- lang-python/salt/trunk: checksum update Modified Paths: -------------- csw/mgar/pkg/lang-python/salt/trunk/checksums Modified: csw/mgar/pkg/lang-python/salt/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/salt/trunk/checksums 2012-10-01 03:49:57 UTC (rev 19340) +++ csw/mgar/pkg/lang-python/salt/trunk/checksums 2012-10-01 03:54:02 UTC (rev 19341) @@ -1 +1 @@ -fbef8746177f60caa47364f0163a393e salt-0.10.2.tar.gz +f62f22838d5978b1f7457aa7db4e3277 salt-0.10.3.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 Mon Oct 1 06:24:24 2012 From: romeotheriault at users.sourceforge.net (romeotheriault at users.sourceforge.net) Date: Mon, 01 Oct 2012 04:24:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[19342] csw/mgar/pkg/lang-python/salt/trunk/files Message-ID: Revision: 19342 http://gar.svn.sourceforge.net/gar/?rev=19342&view=rev Author: romeotheriault Date: 2012-10-01 04:24:24 +0000 (Mon, 01 Oct 2012) Log Message: ----------- lang-python/salt/trunk: update init scripts to work with new version of salt Modified Paths: -------------- csw/mgar/pkg/lang-python/salt/trunk/files/salt-master csw/mgar/pkg/lang-python/salt/trunk/files/salt-minion Modified: csw/mgar/pkg/lang-python/salt/trunk/files/salt-master =================================================================== --- csw/mgar/pkg/lang-python/salt/trunk/files/salt-master 2012-10-01 03:54:02 UTC (rev 19341) +++ csw/mgar/pkg/lang-python/salt/trunk/files/salt-master 2012-10-01 04:24:24 UTC (rev 19342) @@ -5,15 +5,15 @@ PATH=/opt/csw/bin:$PATH export PATH -CONF_FILE=/etc/opt/csw/salt/master +CONF_DIR=/etc/opt/csw/salt PIDFILE=/var/run/salt-master.pid SALTMASTER=/opt/csw/bin/salt-master -[ ! -f ${CONF_FILE} ] && exit $CONF_FILE +[ ! -f ${CONF_DIR} ] && exit $CONF_DIR start_service() { /bin/rm -f ${PIDFILE} - $SALTMASTER -d -c ${CONF_FILE} 2>&1 + $SALTMASTER -d -c ${CONF_DIR} 2>&1 } stop_service() { Modified: csw/mgar/pkg/lang-python/salt/trunk/files/salt-minion =================================================================== --- csw/mgar/pkg/lang-python/salt/trunk/files/salt-minion 2012-10-01 03:54:02 UTC (rev 19341) +++ csw/mgar/pkg/lang-python/salt/trunk/files/salt-minion 2012-10-01 04:24:24 UTC (rev 19342) @@ -5,15 +5,15 @@ PATH=/opt/csw/bin:$PATH export PATH -CONF_FILE=/etc/opt/csw/salt/minion +CONF_DIR=/etc/opt/csw/salt PIDFILE=/var/run/salt-minion.pid SALTMINION=/opt/csw/bin/salt-minion -[ ! -f ${CONF_FILE} ] && exit $CONF_FILE +[ ! -d ${CONF_DIR} ] && exit $CONF_DIR start_service() { /bin/rm -f ${PIDFILE} - $SALTMINION -d -c ${CONF_FILE} 2>&1 + $SALTMINION -d -c ${CONF_DIR} 2>&1 } stop_service() { 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 Oct 1 11:24:59 2012 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Mon, 01 Oct 2012 09:24:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[19343] csw/mgar/pkg/ffmpeg/trunk/Makefile Message-ID: Revision: 19343 http://gar.svn.sourceforge.net/gar/?rev=19343&view=rev Author: janholzh Date: 2012-10-01 09:24:59 +0000 (Mon, 01 Oct 2012) Log Message: ----------- ffmpeg/trunk: remove no needed deps, do to -Z ignore Modified Paths: -------------- csw/mgar/pkg/ffmpeg/trunk/Makefile Modified: csw/mgar/pkg/ffmpeg/trunk/Makefile =================================================================== --- csw/mgar/pkg/ffmpeg/trunk/Makefile 2012-10-01 04:24:24 UTC (rev 19342) +++ csw/mgar/pkg/ffmpeg/trunk/Makefile 2012-10-01 09:24:59 UTC (rev 19343) @@ -37,14 +37,10 @@ PACKAGES += CSWlibavcodec54 SPKG_DESC_CSWlibavcodec54 = FFMPEG library libavcodec.so.54 PKGFILES_CSWlibavcodec54 += $(call pkgfiles_lib,libavcodec.so.54) -RUNTIME_DEP_PKGS_CSWlibavcodec54 += CSWlibbz2-1-0 RUNTIME_DEP_PKGS_CSWlibavcodec54 += CSWlibvorbisenc2 RUNTIME_DEP_PKGS_CSWlibavcodec54 += CSWlibavutil51 RUNTIME_DEP_PKGS_CSWlibavdevice54 += CSWlibavfilter2 -RUNTIME_DEP_PKGS_CSWlibavcodec54 += CSWlibsdl1-2-0 RUNTIME_DEP_PKGS_CSWlibavcodec54 += CSWlibz1 -RUNTIME_DEP_PKGS_CSWlibavcodec54 += CSWlibogg0 -RUNTIME_DEP_PKGS_CSWlibavcodec54 += CSWlibfreetype6 RUNTIME_DEP_PKGS_CSWlibavcodec54 += CSWlibvorbis0 RUNTIME_DEP_PKGS_CSWlibavcodec54 += CSWlibmp3lame0 RUNTIME_DEP_PKGS_CSWlibavcodec54 += CSWlibtheoradec1 @@ -75,108 +71,39 @@ SPKG_DESC_CSWlibavfilter2 = FFMPEG library libavfilter.so.2 PKGFILES_CSWlibavfilter2 += $(call pkgfiles_lib,libavfilter.so.2) RUNTIME_DEP_PKGS_CSWlibavfilter2 += CSWlibavformat54 -RUNTIME_DEP_PKGS_CSWlibavfilter2 += CSWlibbz2-1-0 -RUNTIME_DEP_PKGS_CSWlibavfilter2 += CSWlibvorbisenc2 RUNTIME_DEP_PKGS_CSWlibavfilter2 += CSWlibswscale2 RUNTIME_DEP_PKGS_CSWlibavfilter2 += CSWlibavutil51 -RUNTIME_DEP_PKGS_CSWlibavfilter2 += CSWlibsdl1-2-0 -RUNTIME_DEP_PKGS_CSWlibavfilter2 += CSWlibz1 -RUNTIME_DEP_PKGS_CSWlibavfilter2 += CSWlibogg0 RUNTIME_DEP_PKGS_CSWlibavfilter2 += CSWlibavcodec54 RUNTIME_DEP_PKGS_CSWlibavfilter2 += CSWlibswresample0 -RUNTIME_DEP_PKGS_CSWlibavfilter2 += CSWlibvorbis0 RUNTIME_DEP_PKGS_CSWlibavfilter2 += CSWlibfreetype6 -RUNTIME_DEP_PKGS_CSWlibavfilter2 += CSWlibmp3lame0 -RUNTIME_DEP_PKGS_CSWlibavfilter2 += CSWlibtheoradec1 -RUNTIME_DEP_PKGS_CSWlibavfilter2 += CSWlibspeex1 -RUNTIME_DEP_PKGS_CSWlibavfilter2 += CSWlibtheoraenc1 -RUNTIME_DEP_PKGS_CSWlibavfilter2 += CSWlibx264-125 RUNTIME_DEP_PKGS_CSWlibavfilter2 += CSWlibpostproc52 PACKAGES += CSWlibavformat54 SPKG_DESC_CSWlibavformat54 = FFMPEG library libavformat.so.54 PKGFILES_CSWlibavformat54 += $(call pkgfiles_lib,libavformat.so.54) RUNTIME_DEP_PKGS_CSWlibavformat54 += CSWlibbz2-1-0 -RUNTIME_DEP_PKGS_CSWlibavformat54 += CSWlibvorbisenc2 -RUNTIME_DEP_PKGS_CSWlibavformat54 += CSWlibvorbis0 RUNTIME_DEP_PKGS_CSWlibavformat54 += CSWlibavutil51 -RUNTIME_DEP_PKGS_CSWlibavformat54 += CSWlibsdl1-2-0 RUNTIME_DEP_PKGS_CSWlibavformat54 += CSWlibz1 -RUNTIME_DEP_PKGS_CSWlibavformat54 += CSWlibogg0 -RUNTIME_DEP_PKGS_CSWlibavformat54 += CSWlibfreetype6 RUNTIME_DEP_PKGS_CSWlibavformat54 += CSWlibavcodec54 -RUNTIME_DEP_PKGS_CSWlibavformat54 += CSWlibmp3lame0 -RUNTIME_DEP_PKGS_CSWlibavformat54 += CSWlibtheoradec1 -RUNTIME_DEP_PKGS_CSWlibavformat54 += CSWlibtheoraenc1 -RUNTIME_DEP_PKGS_CSWlibavformat54 += CSWlibspeex1 -RUNTIME_DEP_PKGS_CSWlibavformat54 += CSWlibx264-125 PACKAGES += CSWlibavutil51 SPKG_DESC_CSWlibavutil51 = FFMPEG library libavutil.so.51 PKGFILES_CSWlibavutil51 += $(call pkgfiles_lib,libavutil.so.51) -RUNTIME_DEP_PKGS_CSWlibavutil51 += CSWlibbz2-1-0 -RUNTIME_DEP_PKGS_CSWlibavutil51 += CSWlibvorbisenc2 -RUNTIME_DEP_PKGS_CSWlibavutil51 += CSWlibsdl1-2-0 -RUNTIME_DEP_PKGS_CSWlibavutil51 += CSWlibz1 -RUNTIME_DEP_PKGS_CSWlibavutil51 += CSWlibogg0 -RUNTIME_DEP_PKGS_CSWlibavutil51 += CSWlibvorbis0 -RUNTIME_DEP_PKGS_CSWlibavutil51 += CSWlibfreetype6 -RUNTIME_DEP_PKGS_CSWlibavutil51 += CSWlibmp3lame0 -RUNTIME_DEP_PKGS_CSWlibavutil51 += CSWlibtheoradec1 -RUNTIME_DEP_PKGS_CSWlibavutil51 += CSWlibspeex1 -RUNTIME_DEP_PKGS_CSWlibavutil51 += CSWlibtheoraenc1 -RUNTIME_DEP_PKGS_CSWlibavutil51 += CSWlibx264-125 PACKAGES += CSWlibpostproc52 SPKG_DESC_CSWlibpostproc52 = FFMPEG library libpostproc.so.52 PKGFILES_CSWlibpostproc52 += $(call pkgfiles_lib,libpostproc.so.52) -RUNTIME_DEP_PKGS_CSWlibpostproc52 += CSWlibbz2-1-0 -RUNTIME_DEP_PKGS_CSWlibpostproc52 += CSWlibvorbisenc2 RUNTIME_DEP_PKGS_CSWlibpostproc52 += CSWlibavutil51 -RUNTIME_DEP_PKGS_CSWlibpostproc52 += CSWlibsdl1-2-0 -RUNTIME_DEP_PKGS_CSWlibpostproc52 += CSWlibz1 -RUNTIME_DEP_PKGS_CSWlibpostproc52 += CSWlibogg0 -RUNTIME_DEP_PKGS_CSWlibpostproc52 += CSWlibfreetype6 -RUNTIME_DEP_PKGS_CSWlibpostproc52 += CSWlibvorbis0 -RUNTIME_DEP_PKGS_CSWlibpostproc52 += CSWlibmp3lame0 -RUNTIME_DEP_PKGS_CSWlibpostproc52 += CSWlibtheoradec1 -RUNTIME_DEP_PKGS_CSWlibpostproc52 += CSWlibtheoraenc1 -RUNTIME_DEP_PKGS_CSWlibpostproc52 += CSWlibspeex1 -RUNTIME_DEP_PKGS_CSWlibpostproc52 += CSWlibx264-125 PACKAGES += CSWlibswscale2 SPKG_DESC_CSWlibswscale2 = FFMPEG library libswscale.so.2 PKGFILES_CSWlibswscale2 += $(call pkgfiles_lib,libswscale.so.2) -RUNTIME_DEP_PKGS_CSWlibswscale2 += CSWlibbz2-1-0 -RUNTIME_DEP_PKGS_CSWlibswscale2 += CSWlibvorbisenc2 RUNTIME_DEP_PKGS_CSWlibswscale2 += CSWlibavutil51 -RUNTIME_DEP_PKGS_CSWlibswscale2 += CSWlibsdl1-2-0 -RUNTIME_DEP_PKGS_CSWlibswscale2 += CSWlibz1 -RUNTIME_DEP_PKGS_CSWlibswscale2 += CSWlibogg0 -RUNTIME_DEP_PKGS_CSWlibswscale2 += CSWlibfreetype6 -RUNTIME_DEP_PKGS_CSWlibswscale2 += CSWlibvorbis0 -RUNTIME_DEP_PKGS_CSWlibswscale2 += CSWlibmp3lame0 -RUNTIME_DEP_PKGS_CSWlibswscale2 += CSWlibtheoradec1 -RUNTIME_DEP_PKGS_CSWlibswscale2 += CSWlibtheoraenc1 -RUNTIME_DEP_PKGS_CSWlibswscale2 += CSWlibspeex1 -RUNTIME_DEP_PKGS_CSWlibswscale2 += CSWlibx264-125 PACKAGES += CSWlibswresample0 SPKG_DESC_CSWlibswresample0 = FFMPEG library libswresample.so.0 PKGFILES_CSWlibswresample0 += $(call pkgfiles_lib,libswresample.so.0) -RUNTIME_DEP_PKGS_CSWlibswresample0 += CSWlibbz2-1-0 -RUNTIME_DEP_PKGS_CSWlibswresample0 += CSWlibvorbisenc2 RUNTIME_DEP_PKGS_CSWlibswresample0 += CSWlibavutil51 -RUNTIME_DEP_PKGS_CSWlibswresample0 += CSWlibsdl1-2-0 -RUNTIME_DEP_PKGS_CSWlibswresample0 += CSWlibz1 -RUNTIME_DEP_PKGS_CSWlibswresample0 += CSWlibogg0 -RUNTIME_DEP_PKGS_CSWlibswresample0 += CSWlibfreetype6 -RUNTIME_DEP_PKGS_CSWlibswresample0 += CSWlibvorbis0 -RUNTIME_DEP_PKGS_CSWlibswresample0 += CSWlibmp3lame0 -RUNTIME_DEP_PKGS_CSWlibswresample0 += CSWlibtheoradec1 -RUNTIME_DEP_PKGS_CSWlibswresample0 += CSWlibtheoraenc1 -RUNTIME_DEP_PKGS_CSWlibswresample0 += CSWlibspeex1 -RUNTIME_DEP_PKGS_CSWlibswresample0 += CSWlibx264-125 PACKAGES += CSWffmpeg-dev SPKG_DESC_CSWffmpeg-dev = Development files for several FFMPEG shared libraries @@ -195,25 +122,14 @@ SPKG_DESC_CSWffmpeg = Very fast video and audio converter # PKGFILES is catchall RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibavformat54 -RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibbz2-1-0 -RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibvorbisenc2 RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibswscale2 RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibavutil51 RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibsdl1-2-0 -RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibz1 -RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibogg0 RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibavcodec54 -RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibfreetype6 RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibavdevice54 RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibswresample0 -RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibvorbis0 -RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibmp3lame0 -RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibtheoradec1 -RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibtheoraenc1 RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibavfilter2 -RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibspeex1 RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibpostproc52 -RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibx264-125 # These are all examples CHECKPKG_OVERRIDES_CSWffmpeg += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/ffmpeg.1 @@ -224,7 +140,8 @@ #EXTRA_MODULATORS = SHARED #MODULATIONS_SHARED = yes no -BUILD64_LIBS_ONLY = 1 +BUILD64 = 1 +ISAEXEC = 1 GARCOMPILER = GNU 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 Oct 1 12:01:51 2012 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Mon, 01 Oct 2012 10:01:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[19344] csw/mgar/pkg/netatalk/trunk Message-ID: Revision: 19344 http://gar.svn.sourceforge.net/gar/?rev=19344&view=rev Author: janholzh Date: 2012-10-01 10:01:51 +0000 (Mon, 01 Oct 2012) Log Message: ----------- netatalk/trunk: update to 3.0.1, does not build with sun studio, gcc build broken do to bug in krb5-config Modified Paths: -------------- csw/mgar/pkg/netatalk/trunk/Makefile csw/mgar/pkg/netatalk/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/netatalk/trunk/files/0001-fix-Makefile.am.patch Modified: csw/mgar/pkg/netatalk/trunk/Makefile =================================================================== --- csw/mgar/pkg/netatalk/trunk/Makefile 2012-10-01 09:24:59 UTC (rev 19343) +++ csw/mgar/pkg/netatalk/trunk/Makefile 2012-10-01 10:01:51 UTC (rev 19344) @@ -2,7 +2,7 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = netatalk -VERSION = 3.0 +VERSION = 3.0.1 GARTYPE = v2 CATEGORIES = server @@ -13,9 +13,9 @@ MASTER_SITES = $(SF_MIRROR) DISTFILES = $(DISTNAME).tar.gz -PATCHFILES += 0001-fix-Makefile.am.patch PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 +GARCOMPILER = GNU PACKAGES += CSWlibatalk1 CATALOGNAME_CSWlibatalk1 = libatalk1 @@ -39,10 +39,9 @@ # uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES # UPSTREAM_MASTER_SITES = -CONFIGURE_ARGS = $(DIRPATHS) --disable-static --with-ssl-dir=/opt/csw --with-bdb=/opt/csw/bdb47 --with-libiconv=/opt/csw --disable-tcp-wrappers --disable-bundled-libevent --disable-silent-rules +CONFIGURE_ARGS = $(DIRPATHS) --disable-static --with-ssl-dir=/opt/csw --with-bdb=/opt/csw/bdb47 --with-libiconv=/opt/csw --disable-tcp-wrappers --disable-silent-rules --with-libevent-header=/opt/csw/include --with-libevent-lib=/opt/csw/lib -EXTRA_LINKER_FLAGS = -z ignore -I/opt/csw/include -levent -#EXTRA_CPP_FLAGS= -I/opt/csw/include -levent +#EXTRA_LINKER_FLAGS = -levent include gar/category.mk Modified: csw/mgar/pkg/netatalk/trunk/checksums =================================================================== --- csw/mgar/pkg/netatalk/trunk/checksums 2012-10-01 09:24:59 UTC (rev 19343) +++ csw/mgar/pkg/netatalk/trunk/checksums 2012-10-01 10:01:51 UTC (rev 19344) @@ -1 +1 @@ -ad022c1bdd0392ee3522bc8bf32874a4 netatalk-3.0.tar.gz +0d9446247e1eb260bf4205ea075958c0 netatalk-3.0.1.tar.gz Deleted: csw/mgar/pkg/netatalk/trunk/files/0001-fix-Makefile.am.patch =================================================================== --- csw/mgar/pkg/netatalk/trunk/files/0001-fix-Makefile.am.patch 2012-10-01 09:24:59 UTC (rev 19343) +++ csw/mgar/pkg/netatalk/trunk/files/0001-fix-Makefile.am.patch 2012-10-01 10:01:51 UTC (rev 19344) @@ -1,24 +0,0 @@ -From ecab0a10502b499bdaffba6a191be0545065d50c Mon Sep 17 00:00:00 2001 -From: Jan Holzhueter -Date: Wed, 22 Aug 2012 14:23:58 +0200 -Subject: [PATCH] fix Makefile.am - ---- - Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index 448375a..4fdb716 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,6 +1,6 @@ - # Makefile.am for top level of netatalk package - --SUBDIRS = libatalk libevent bin config etc man contrib distrib include doc macros test -+SUBDIRS = libatalk bin config etc man contrib distrib include doc macros test - - EXTRA_DIST = CONTRIBUTORS COPYRIGHT COPYING NEWS VERSION - --- -1.7.11.3 - 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 Oct 1 15:19:53 2012 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Mon, 01 Oct 2012 13:19:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[19345] csw/mgar/pkg/ffmpeg/trunk Message-ID: Revision: 19345 http://gar.svn.sourceforge.net/gar/?rev=19345&view=rev Author: janholzh Date: 2012-10-01 13:19:53 +0000 (Mon, 01 Oct 2012) Log Message: ----------- ffmpeg/trunk: update to 1.0 Modified Paths: -------------- csw/mgar/pkg/ffmpeg/trunk/Makefile csw/mgar/pkg/ffmpeg/trunk/checksums csw/mgar/pkg/ffmpeg/trunk/files/0004-remove-GNU-ld-specific-options.patch Modified: csw/mgar/pkg/ffmpeg/trunk/Makefile =================================================================== --- csw/mgar/pkg/ffmpeg/trunk/Makefile 2012-10-01 10:01:51 UTC (rev 19344) +++ csw/mgar/pkg/ffmpeg/trunk/Makefile 2012-10-01 13:19:53 UTC (rev 19345) @@ -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.2 +VERSION = 1.0 CATEGORIES = lib GARTYPE = v2 @@ -23,7 +23,7 @@ PATCHFILES += 0001-fix-version.sh.patch PATCHFILES += 0003-change-linker-flags.patch -PATCHFILES += 0003-fix_a_few_shells.patch +#PATCHFILES += 0003-fix_a_few_shells.patch PATCHFILES += 0004-remove-GNU-ld-specific-options.patch LICENSE = COPYING.GPLv3 @@ -39,7 +39,7 @@ PKGFILES_CSWlibavcodec54 += $(call pkgfiles_lib,libavcodec.so.54) RUNTIME_DEP_PKGS_CSWlibavcodec54 += CSWlibvorbisenc2 RUNTIME_DEP_PKGS_CSWlibavcodec54 += CSWlibavutil51 -RUNTIME_DEP_PKGS_CSWlibavdevice54 += CSWlibavfilter2 +RUNTIME_DEP_PKGS_CSWlibavdevice54 += CSWlibavfilter3 RUNTIME_DEP_PKGS_CSWlibavcodec54 += CSWlibz1 RUNTIME_DEP_PKGS_CSWlibavcodec54 += CSWlibvorbis0 RUNTIME_DEP_PKGS_CSWlibavcodec54 += CSWlibmp3lame0 @@ -67,16 +67,16 @@ RUNTIME_DEP_PKGS_CSWlibavdevice54 += CSWlibspeex1 RUNTIME_DEP_PKGS_CSWlibavdevice54 += CSWlibx264-125 -PACKAGES += CSWlibavfilter2 -SPKG_DESC_CSWlibavfilter2 = FFMPEG library libavfilter.so.2 -PKGFILES_CSWlibavfilter2 += $(call pkgfiles_lib,libavfilter.so.2) -RUNTIME_DEP_PKGS_CSWlibavfilter2 += CSWlibavformat54 -RUNTIME_DEP_PKGS_CSWlibavfilter2 += CSWlibswscale2 -RUNTIME_DEP_PKGS_CSWlibavfilter2 += CSWlibavutil51 -RUNTIME_DEP_PKGS_CSWlibavfilter2 += CSWlibavcodec54 -RUNTIME_DEP_PKGS_CSWlibavfilter2 += CSWlibswresample0 -RUNTIME_DEP_PKGS_CSWlibavfilter2 += CSWlibfreetype6 -RUNTIME_DEP_PKGS_CSWlibavfilter2 += CSWlibpostproc52 +PACKAGES += CSWlibavfilter3 +SPKG_DESC_CSWlibavfilter3 = FFMPEG library libavfilter.so.3 +PKGFILES_CSWlibavfilter3 += $(call pkgfiles_lib,libavfilter.so.3) +RUNTIME_DEP_PKGS_CSWlibavfilter3 += CSWlibavformat54 +RUNTIME_DEP_PKGS_CSWlibavfilter3 += CSWlibswscale2 +RUNTIME_DEP_PKGS_CSWlibavfilter3 += CSWlibavutil51 +RUNTIME_DEP_PKGS_CSWlibavfilter3 += CSWlibavcodec54 +RUNTIME_DEP_PKGS_CSWlibavfilter3 += CSWlibswresample0 +RUNTIME_DEP_PKGS_CSWlibavfilter3 += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWlibavfilter3 += CSWlibpostproc52 PACKAGES += CSWlibavformat54 SPKG_DESC_CSWlibavformat54 = FFMPEG library libavformat.so.54 @@ -110,7 +110,7 @@ PKGFILES_CSWffmpeg-dev += $(PKGFILES_DEVEL) RUNTIME_DEP_PKGS_CSWffmpeg-dev += CSWlibavcodec54 RUNTIME_DEP_PKGS_CSWffmpeg-dev += CSWlibavdevice54 -RUNTIME_DEP_PKGS_CSWffmpeg-dev += CSWlibavfilter2 +RUNTIME_DEP_PKGS_CSWffmpeg-dev += CSWlibavfilter3 RUNTIME_DEP_PKGS_CSWffmpeg-dev += CSWlibavformat54 RUNTIME_DEP_PKGS_CSWffmpeg-dev += CSWlibavutil51 RUNTIME_DEP_PKGS_CSWffmpeg-dev += CSWlibpostproc52 @@ -128,7 +128,7 @@ RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibavcodec54 RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibavdevice54 RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibswresample0 -RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibavfilter2 +RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibavfilter3 RUNTIME_DEP_PKGS_CSWffmpeg += CSWlibpostproc52 # These are all examples Modified: csw/mgar/pkg/ffmpeg/trunk/checksums =================================================================== --- csw/mgar/pkg/ffmpeg/trunk/checksums 2012-10-01 10:01:51 UTC (rev 19344) +++ csw/mgar/pkg/ffmpeg/trunk/checksums 2012-10-01 13:19:53 UTC (rev 19345) @@ -1 +1 @@ -93c1908022567b321df74db7214da6ac ffmpeg-0.11.2.tar.bz2 +3ed526cea20c1bffb5a37f7730f710bd ffmpeg-1.0.tar.bz2 Modified: csw/mgar/pkg/ffmpeg/trunk/files/0004-remove-GNU-ld-specific-options.patch =================================================================== --- csw/mgar/pkg/ffmpeg/trunk/files/0004-remove-GNU-ld-specific-options.patch 2012-10-01 10:01:51 UTC (rev 19344) +++ csw/mgar/pkg/ffmpeg/trunk/files/0004-remove-GNU-ld-specific-options.patch 2012-10-01 13:19:53 UTC (rev 19345) @@ -1,24 +1,24 @@ -From 38f1e7dee2711117bc6f9cde25ab2a31531cb5e6 Mon Sep 17 00:00:00 2001 -From: Yann Rouillard -Date: Sat, 29 Sep 2012 17:19:27 +0200 -Subject: [PATCH] Remove GNU ld specific options +From 14fb2a6aa9fc69358b7d0148da0674279fdcdf1c Mon Sep 17 00:00:00 2001 +From: Jan Holzhueter +Date: Mon, 1 Oct 2012 14:47:53 +0200 +Subject: [PATCH] remove-linkerflags --- configure | 1 - 1 file changed, 1 deletion(-) diff --git a/configure b/configure -index fa6e845..505508e 100755 +index ac429ef..03992c4 100755 --- a/configure +++ b/configure -@@ -3372,7 +3372,6 @@ enabled extra_warnings && check_cflags -Winline +@@ -3813,7 +3813,6 @@ enabled extra_warnings && check_cflags -Winline # add some linker flags check_ldflags -Wl,--warn-common -check_ldflags -Wl,-rpath-link=libpostproc:libswresample:libswscale:libavfilter:libavdevice:libavformat:libavcodec:libavutil:libavresample test_ldflags -Wl,-Bsymbolic && append SHFLAGS -Wl,-Bsymbolic - enabled xmm_clobber_test && \ + enabled xmm_clobber_test && -- 1.7.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 Tue Oct 2 10:32:08 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 02 Oct 2012 08:32:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[19346] csw/mgar/pkg/apache2/branches Message-ID: Revision: 19346 http://gar.svn.sourceforge.net/gar/?rev=19346&view=rev Author: bdwalton Date: 2012-10-02 08:32:08 +0000 (Tue, 02 Oct 2012) Log Message: ----------- apache2/branches/apache24: adding a stub for some 2.4 work Added Paths: ----------- csw/mgar/pkg/apache2/branches/apache24/ csw/mgar/pkg/apache2/branches/apache24/Makefile csw/mgar/pkg/apache2/branches/apache24/checksums csw/mgar/pkg/apache2/branches/apache24/files/ csw/mgar/pkg/apache2/branches/apache24/files/config.layout csw/mgar/pkg/apache2/branches/apache24/files/cswapache2 Property changes on: csw/mgar/pkg/apache2/branches/apache24 ___________________________________________________________________ Added: svn:ignore + cookies download work Added: csw/mgar/pkg/apache2/branches/apache24/Makefile =================================================================== --- csw/mgar/pkg/apache2/branches/apache24/Makefile (rev 0) +++ csw/mgar/pkg/apache2/branches/apache24/Makefile 2012-10-02 08:32:08 UTC (rev 19346) @@ -0,0 +1,344 @@ +# $Id: Makefile 18185 2012-06-01 02:30:46Z bdwalton $ + +NAME = httpd +VERSION = 2.4.3 +CATEGORIES = server +GARTYPE = v2 + +DESCRIPTION = A high performance HTTP server. +define BLURB + Apache is the world\'s most popular HTTP server, being quite possibly the + best around in terms of functionality, efficiency, security and speed. +endef + +# Source location +MASTER_SITES = http://www.eu.apache.org/dist/httpd/ + +# work around dumb checkpkg not recognizing the license file ... +LICENSE = LICENSE + +# Build multiple mpm's and merge them all into one install +EXTRA_MODULATORS = MPM +# !!!NOTE, NOTE, NOTE!!! prefork must be last as it's the one where +# all modules are built. This affects the default httpd.conf that +# gets generated. The other modulations will generate httpd.conf +# files that lack the important LoadModule lines. This is primarily +# useful at version bump time when files/httpd.conf.CSW may need an +# update to reflect new modules, etc. +MODULATIONS_MPM = worker prefork + +MERGE_SCRIPTS_isa-default-mpm-prefork = copy-all +MERGE_SCRIPTS_isa-default-mpm-worker = copy-all + +# Visitor information +SPKG_SOURCEURL = http://httpd.apache.org/ + +DISTFILES = $(NAME)-$(VERSION).tar.gz +DISTFILES += config.layout +# Standard package bits +DISTFILES += cswapache2 + +# The PACKAGES variable tell GAR which packages to build +PACKAGES = CSWapache2 CSWapache2-dev CSWapache2-manual CSWap2suexec +PACKAGES += CSWap2worker CSWapache2-utils +# These packages are dummy versions to make dependencies nicer +# as various things depend on them currently +PACKAGES += CSWap2prefork CSWapache2rt CSWapache2c + +BUILD_DEP_PKGS += CSWlibaprutil-dev + +OBSOLETED_BY_CSWapache2-dev = CSWapache2-devel + +ARCHALL_CSWapache2-manual = 1 +ARCHALL_CSWap2prefork = 1 +ARCHALL_CSWapache2rt = 1 +ARCHALL_CSWapache2c = 1 + +CATALOGNAME_CSWapache2 = apache2 +CATALOGNAME_CSWapache2-dev = apache2_dev +CATALOGNAME_CSWapache2-manual = apache2_manual +CATALOGNAME_CSWapache2-utils = apache2_utils +CATALOGNAME_CSWap2suexec = ap2_suexec +CATALOGNAME_CSWap2prefork = ap2_prefork +CATALOGNAME_CSWap2worker = ap2_worker +CATALOGNAME_CSWapache2rt = apache2rt + +SPKG_DESC_CSWapache2 = A high performance Unix-based HTTP server. +SPKG_DESC_CSWapache2-dev = The development files for Apache2. +SPKG_DESC_CSWapache2-manual = The Apache2 manual files. +SPKG_DESC_CSWapache2-utils = Utility programs for Apache2. +SPKG_DESC_CSWap2suexec = The standard suEXEC binary for Apache2. +SPKG_DESC_CSWap2worker = The apache worker mpm. +SPKG_DESC_CSWap2prefork = A stub for the old prefork mpm package. +SPKG_DESC_CSWapache2rt = A stub for the old apache2rt package. +SPKG_DESC_CSWapache2c = A stub for the old apache2c package. + +RUNTIME_DEP_PKGS_CSWapache2 += CSWlibiconv2 CSWosslutils +RUNTIME_DEP_PKGS_CSWapache2 += CSWliblber2-4-2 CSWlibldap2-4-2 +# the loadable ldap module dynamically opens files in this apr sub-package +RUNTIME_DEP_PKGS_CSWapache2 += CSWlibaprutil1-ldap +RUNTIME_DEP_PKGS_CSWapache2 += CSWlibssl1-0-0 CSWlibz1 +RUNTIME_DEP_PKGS_CSWapache2 += CSWbdb48 CSWlibexpat1 +RUNTIME_DEP_PKGS_CSWapache2 += CSWlibaprutil1-0 CSWlibapr1-0 +RUNTIME_DEP_PKGS_CSWapache2 += CSWapache2c CSWperl CSWapache2-utils +# Note: This is required because apxs uses ap{r,u}-1-config +RUNTIME_DEP_PKGS_CSWapache2 += CSWlibapr-dev CSWlibaprutil-dev +# Note: This is included as something in mod_dav uses dlopen to leverage it +RUNTIME_DEP_PKGS_CSWapache2 += CSWlibaprutil1-dbm-db +RUNTIME_DEP_PKGS_CSWapache2-manual = CSWapache2 +RUNTIME_DEP_PKGS_CSWapache2-dev = CSWapache2 +RUNTIME_DEP_PKGS_CSWapache2-utils += CSWlibaprutil1-0 +RUNTIME_DEP_PKGS_CSWapache2-utils += CSWlibapr1-0 +RUNTIME_DEP_PKGS_CSWapache2-utils += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWapache2-utils += CSWlibexpat1 +RUNTIME_DEP_PKGS_CSWapache2-utils += CSWbdb48 +RUNTIME_DEP_PKGS_CSWapache2-utils += CSWlibssl1-0-0 +RUNTIME_DEP_PKGS_CSWapache2-utils += CSWperl +RUNTIME_DEP_PKGS_CSWap2suexec = CSWapache2 +RUNTIME_DEP_PKGS_CSWap2prefork = CSWapache2 CSWapache2c +RUNTIME_DEP_PKGS_CSWap2worker = CSWapache2 CSWap2prefork +RUNTIME_DEP_PKGS_CSWap2worker += CSWlibapr1-0 CSWlibaprutil1-0 +RUNTIME_DEP_PKGS_CSWap2worker += CSWlibexpat1 +RUNTIME_DEP_PKGS_CSWap2worker += CSWbdb48 CSWlibiconv2 CSWapache2c +RUNTIME_DEP_PKGS_CSWapache2rt = CSWapache2 + +CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWosslutils +CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWapache2c +CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWperl +CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWapache2-utils +CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWlibapr-dev +CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWlibaprutil-dev +CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWlibaprutil1-dbm-db +CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWlibaprutil1-ldap +CHECKPKG_OVERRIDES_CSWapache2-utils += surplus-dependency|CSWperl +CHECKPKG_OVERRIDES_CSWapache2-utils += missing-dependency|CSWapache2 +CHECKPKG_OVERRIDES_CSWap2prefork += surplus-dependency|CSWapache2 +CHECKPKG_OVERRIDES_CSWap2prefork += surplus-dependency|CSWapache2c +CHECKPKG_OVERRIDES_CSWap2worker += surplus-dependency|CSWap2prefork +CHECKPKG_OVERRIDES_CSWap2worker += surplus-dependency|CSWapache2c +CHECKPKG_OVERRIDES_CSWapache2rt += surplus-dependency|CSWapache2 + +CHECKPKG_OVERRIDES_CSWapache2-dev += file-with-bad-content|/usr/local|root/opt/csw/apache2/include/httpd.h + +# these will eventually go away... +CHECKPKG_OVERRIDES_CSWap2suexec += catalogname-does-not-match-pkgname|pkgname=CSWap2suexec|catalogname=ap2_suexec|expected-catalogname=ap2suexec +CHECKPKG_OVERRIDES_CSWap2worker += catalogname-does-not-match-pkgname|pkgname=CSWap2worker|catalogname=ap2_worker|expected-catalogname=ap2worker +CHECKPKG_OVERRIDES_CSWap2prefork += catalogname-does-not-match-pkgname|pkgname=CSWap2prefork|catalogname=ap2_prefork|expected-catalogname=ap2prefork + +# User requested... +BUILD64 = 1 + +# We need this to get bdb48/lib into the runpath +EXTRA_LIB = $(prefix)/bdb48/lib + +# The SMF support: you don't need to specify cswinitsmf any more. You need to +# make sure the the /etc/opt/csw/init.d/cswapache file gets installed during +# the post-install stage, and add "INITSMF = /etc/opt/csw/init.d/cswapache" to +# the Makefile. +INITSMF = /etc/opt/csw/init.d/cswapache2 + +POSTMSG = /opt/csw/share/doc/apache2/README.CSW + +AP2_MODS = 1 +AP2_MODFILES = *suexec*\.so + +ALTERNATIVES_CSWapache2 = prefork +ALTERNATIVES_CSWap2worker = worker +ALTERNATIVE_prefork = /opt/csw/apache2/sbin/httpd httpd /opt/csw/apache2/sbin/httpd.prefork 50 +ALTERNATIVE_worker = /opt/csw/apache2/sbin/httpd httpd /opt/csw/apache2/sbin/httpd.worker 100 + +# Build Configuration +CONFIGURE_ARGS += --with-apr=$(prefix)/bin/apr-1-config +CONFIGURE_ARGS += --with-apr-util=$(prefix)/bin/apu-1-config +CONFIGURE_ARGS += --with-mpm=$(MPM) +CONFIGURE_ARGS += --disable-static +CONFIGURE_ARGS += --enable-layout=csw +CONFIGURE_ARGS += --enable-rule=SSL_EXPERIMENTAL +CONFIGURE_ARGS += --enable-ssl +CONFIGURE_ARGS += --with-z=$(prefix) +CONFIGURE_ARGS += --with-ssl=$(prefix) + +ifneq ($(MPM),prefork) +CONFIGURE_ARGS += --enable-modules=none +CONFIGURE_ARGS += --disable-actions +CONFIGURE_ARGS += --disable-alias +CONFIGURE_ARGS += --disable-authn-file +CONFIGURE_ARGS += --disable-authn-default +CONFIGURE_ARGS += --disable-authz-host +CONFIGURE_ARGS += --disable-authz-user +CONFIGURE_ARGS += --disable-authz-groupfile +CONFIGURE_ARGS += --disable-authz-default +CONFIGURE_ARGS += --disable-auth-basic +CONFIGURE_ARGS += --disable-asis +CONFIGURE_ARGS += --disable-auth +CONFIGURE_ARGS += --disable-autoindex +CONFIGURE_ARGS += --disable-cgi +CONFIGURE_ARGS += --disable-cgid +CONFIGURE_ARGS += --disable-charset-lite +CONFIGURE_ARGS += --disable-dir +CONFIGURE_ARGS += --disable-env +CONFIGURE_ARGS += --disable-filter +CONFIGURE_ARGS += --disable-imap +CONFIGURE_ARGS += --disable-include +CONFIGURE_ARGS += --disable-log-config +CONFIGURE_ARGS += --disable-mime +CONFIGURE_ARGS += --disable-negotiation +CONFIGURE_ARGS += --disable-setenvif +CONFIGURE_ARGS += --disable-ssl +CONFIGURE_ARGS += --disable-status +CONFIGURE_ARGS += --disable-userdir +CONFIGURE_ARGS += --disable-version +else +CONFIGURE_ARGS += --enable-suexec +CONFIGURE_ARGS += --with-suexec-caller=nobody +CONFIGURE_ARGS += --with-suexec-docroot=$(prefix)/apache2/share/htdocs +CONFIGURE_ARGS += --with-suexec-userdir=public_html +CONFIGURE_ARGS += --with-suexec-uidmin=100 +CONFIGURE_ARGS += --with-suexec-gidmin=100 +CONFIGURE_ARGS += --with-suexec-logfile=$(prefix)/apache2/var/log/suexec_log +CONFIGURE_ARGS += --with-suexec-bin=$(prefix)/apache2/sbin/suexec +CONFIGURE_ARGS += --with-suexec-safepath=/opt/csw/bin:/usr/bin:/bin +CONFIGURE_ARGS += --enable-authn-alias +CONFIGURE_ARGS += --enable-authnz-ldap +CONFIGURE_ARGS += --enable-file-cache +CONFIGURE_ARGS += --enable-cache +CONFIGURE_ARGS += --enable-disk-cache +CONFIGURE_ARGS += --enable-mem-cache +CONFIGURE_ARGS += --enable-bucketeer +CONFIGURE_ARGS += --enable-charset-lite +CONFIGURE_ARGS += --enable-ldap +CONFIGURE_ARGS += --enable-log-forensic +CONFIGURE_ARGS += --enable-usertrack +CONFIGURE_ARGS += --enable-unique-id +CONFIGURE_ARGS += --enable-version +CONFIGURE_ARGS += --enable-proxy +CONFIGURE_ARGS += --enable-proxy-connect +CONFIGURE_ARGS += --enable-proxy-ftp +CONFIGURE_ARGS += --enable-proxy-http +CONFIGURE_ARGS += --enable-proxy-ajp +CONFIGURE_ARGS += --enable-proxy-balancer +CONFIGURE_ARGS += --enable-cgid +CONFIGURE_ARGS += --enable-dav-lock +CONFIGURE_ARGS += --enable-mods-shared=all +endif + +# Fixup target variables +APACHE_ROOT = $(DESTDIR)$(prefix)/apache2 +LIBTOOL_LADIR = $(APACHE_ROOT)/lib +STRIP_DIRS = $(APACHE_ROOT)/sbin $(APACHE_ROOT)/libexec + +PKGFILES_CSWapache2-utils = .*sbin/ab .*sbin/dbmmanage .*sbin/htdbm +PKGFILES_CSWapache2-utils += .*sbin/htdigest .*sbin/htpasswd .*sbin/logresolve +PKGFILES_CSWapache2-utils += .*sbin/htcacheclean .*sbin/rotatelogs +PKGFILES_CSWapache2-utils += .*sbin/checkgid +PKGFILES_CSWapache2-utils += .*man8/ab.8 .*man1/dbmmanage.1 .*man1/htdbm.1 +PKGFILES_CSWapache2-utils += .*man1/htdigest.1 .*man1/htpasswd.1 +PKGFILES_CSWapache2-utils += .*man8/logresolve.8 +PKGFILES_CSWapache2-utils += .*man8/htcacheclean .*man8/rotatelogs +PKGFILES_CSWap2suexec = .*sbin/suexec .*libexec/.*suexec.* .*/man/.*suexec.* +PKGFILES_CSWap2suexec += .*ap2mod/suexec +PKGFILES_CSWapache2-dev = .*include/.* .*\.(a|la) +PKGFILES_CSWapache2-manual = .*share/.*manual.* .*etc/extra/httpd-manual.conf +PKGFILES_CSWap2prefork = .*share/doc/ap2_prefork.* +PKGFILES_CSWap2worker = .*share/doc/ap2_worker.* .*sbin/httpd.worker +PKGFILES_CSWapache2rt = .*share/doc/apache2rt.* +PKGFILES_CSWapache2c = .*share/doc/apache2c.* + +#PROTOTYPE_FILTER = awk '$$$$3 == "/opt/csw/apache2/sbin/suexec" { $$$$4 = "4755" }; $$$$3 ~ /cswap2mod/ { $$$$4 = "0555" }; { print }' + +TEST_TARGET = test + +include gar/category.mk + +CFLAGS := -DSSL_EXPERIMENTAL -DSSL_ENGINE $(CFLAGS) + +FIXCONFIG_DIRS = $(DESTDIR) +FIXCONFIG_RMPATHS = $(DESTDIR) + +pre-configure-modulated: + (cd $(WORKDIR)/$(NAME)-$(VERSION); ./buildconf) + @gsed -e s,INSTALL_PREFIX,$(prefix)/apache2,g \ + $(WORKDIR)/config.layout > $(WORKDIR)/$(NAME)-$(VERSION)/config.layout + @$(MAKECOOKIE) + + +post-install-modulated: rename-httpd copy-local-files create-templates copy-readmes + +copy-readmes: + @(cd $(WORKDIR); for f in README.CSW*; do \ + p=`echo $$f | sed 's/README.CSW.//'`; \ + ginstall -d -m0755 $(DESTDIR)/$(prefix)/share/doc/$$p; \ + ginstall -m 0644 $$f $(DESTDIR)/$(prefix)/share/doc/$$p/README.CSW; \ + done) + @$(MAKECOOKIE) + +rename-httpd: + @if test -f $(APACHE_ROOT)/sbin/httpd ; then \ + ( cd $(APACHE_ROOT)/sbin ; mv httpd httpd.$(MPM) ) ; \ + fi + + +# Copy in specialized templates +copy-local-files: + @ginstall -d $(DESTDIR)/etc/opt/csw/init.d + @ginstall $(WORKDIR)/cswapache2 $(DESTDIR)/etc/opt/csw/init.d + @ginstall $(WORKDIR)/update20to22 $(APACHE_ROOT)/sbin + @$(MAKECOOKIE) + +# Create stock templates +template_list = share/htdocs/index.html +template_list += etc/extra/httpd-autoindex.conf +template_list += etc/extra/httpd-dav.conf +template_list += etc/extra/httpd-default.conf +template_list += etc/extra/httpd-info.conf +template_list += etc/extra/httpd-languages.conf +template_list += etc/extra/httpd-multilang-errordoc.conf +template_list += etc/extra/httpd-userdir.conf +template_list += etc/extra/httpd-vhosts.conf +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" + @( cd $(DESTDIR)$(prefix)/apache2 ; \ + for file in $(template_list) ; do \ + gmv -v $$file $$file.CSW ; \ + done ) + @$(MAKECOOKIE) + + +post-merge: + @(cd $(PKGROOT)/$(prefix)/apache2/etc/; \ + for f in httpd.conf extra/httpd-ssl.conf; do \ + perl -pi -e 's/User.*daemon.*/User \@USER\@/; \ + s/Group.*daemon.*/Group \@GROUP\@/; \ + s/#*ServerName www.example.com/ServerName \@HOSTNAME\@/; \ + s/ServerAdmin you\@example.com/ServerAdmin \@ADMIN\@/; \ + s/^(LoadModule.*suexec.*)/#$$1/; \ + s/^#(Include.*httpd-mpm.conf)/$$1/; \ + s/^#(Include.*httpd-ssl.conf)/$$1/' $$f; \ + mv $$f $$f.CSW; \ + done ) + @echo Fixing usr/local references in the online manaual... + @(cd $(PKGROOT)/$(prefix)/apache2/share/manual; \ + /opt/csw/bin/gfind . -type f -print0 | \ + /opt/csw/bin/gxargs -0 \ + perl -pi \ + -e 's@/usr/local/apache2*@/opt/csw/apache2 at g;' \ + -e 's@/usr/local@/opt/csw/apache2 at g') + @echo Fixing export/home references in the online manaual... + @(cd $(PKGROOT)/$(prefix)/apache2/share/manual; \ + /opt/csw/bin/gfind . -type f -print0 | \ + /opt/csw/bin/gxargs -0 \ + perl -pi \ + -e 's@/export/home@/home at g;') + @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/branches/apache24/checksums =================================================================== --- csw/mgar/pkg/apache2/branches/apache24/checksums (rev 0) +++ csw/mgar/pkg/apache2/branches/apache24/checksums 2012-10-02 08:32:08 UTC (rev 19346) @@ -0,0 +1 @@ +538dccd22dd18466fff3ec7948495417 httpd-2.4.3.tar.gz Added: csw/mgar/pkg/apache2/branches/apache24/files/config.layout =================================================================== --- csw/mgar/pkg/apache2/branches/apache24/files/config.layout (rev 0) +++ csw/mgar/pkg/apache2/branches/apache24/files/config.layout 2012-10-02 08:32:08 UTC (rev 19346) @@ -0,0 +1,23 @@ +# CSW Layout + + prefix: INSTALL_PREFIX + exec_prefix: ${prefix} + bindir: ${exec_prefix}/bin + sbindir: ${exec_prefix}/sbin + libdir: ${exec_prefix}/lib + libexecdir: ${exec_prefix}/libexec + datadir: ${prefix}/share + mandir: ${datadir}/man + sysconfdir: /etc/${prefix}/apache24 + installbuilddir: ${datadir}/build + errordir: ${datadir}/error + iconsdir: ${datadir}/icons + htdocsdir: ${datadir}/htdocs + manualdir: ${datadir}/manual + cgidir: ${datadir}/cgi-bin + includedir: ${exec_prefix}/include + localstatedir: /var/${prefix} + runtimedir: /var/run + logfiledir: ${localstatedir}/log + proxycachedir: ${localstatedir}/proxy + Added: csw/mgar/pkg/apache2/branches/apache24/files/cswapache2 =================================================================== --- csw/mgar/pkg/apache2/branches/apache24/files/cswapache2 (rev 0) +++ csw/mgar/pkg/apache2/branches/apache24/files/cswapache2 2012-10-02 08:32:08 UTC (rev 19346) @@ -0,0 +1,44 @@ +#!/sbin/sh +# +# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. +# +# ident "@(#)http-apache2 1.2 04/11/11 SMI" +# + +#RC_KNUM 16 +#RC_SNUM 80 +#RC_KLEV 0,1,2,S +#RC_SLEV 3 +#FMRI network + +APACHE_HOME=/opt/csw/apache2 +CONF_FILE=$APACHE_HOME/etc/httpd.conf +APACHECTL=$APACHE_HOME/sbin/apachectl + +[ ! -f "$CONF_FILE" ] && exit 0 +[ ! -x "$APACHECTL" ] && exit 0 + +case "$1" in +start) + cmd=$1 + if [ -f "$APACHE_HOME/etc/server.crt" ]; then + cmd="$cmd -DSSL" + fi + ;; +restart) + cmd="restart" + ;; +graceful) + cmd="graceful" + ;; +stop) + cmd="stop" + ;; +*) + echo "Usage: $0 {start|stop|restart|graceful}" + exit 1 + ;; +esac + +exec $APACHECTL -f $CONF_FILE -k $cmd 2>&1 Property changes on: csw/mgar/pkg/apache2/branches/apache24/files/cswapache2 ___________________________________________________________________ Added: svn:executable + * 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 Oct 2 10:32:58 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 02 Oct 2012 08:32:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[19347] csw/mgar/pkg/wireshark/trunk Message-ID: Revision: 19347 http://gar.svn.sourceforge.net/gar/?rev=19347&view=rev Author: dmichelsen Date: 2012-10-02 08:32:58 +0000 (Tue, 02 Oct 2012) Log Message: ----------- wireshark/trunk: Update to 1.8.2, disable LUA for now Modified Paths: -------------- csw/mgar/pkg/wireshark/trunk/Makefile csw/mgar/pkg/wireshark/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/wireshark/trunk/files/0001-Solaris-9-doesn-t-have-stdint.h.patch csw/mgar/pkg/wireshark/trunk/files/0002-Don-t-return-value-in-void-functions.patch Modified: csw/mgar/pkg/wireshark/trunk/Makefile =================================================================== --- csw/mgar/pkg/wireshark/trunk/Makefile 2012-10-02 08:32:08 UTC (rev 19346) +++ csw/mgar/pkg/wireshark/trunk/Makefile 2012-10-02 08:32:58 UTC (rev 19347) @@ -1,5 +1,5 @@ NAME = wireshark -VERSION = 1.6.8 +VERSION = 1.8.2 CATEGORIES = apps GARTYPE = v2 @@ -13,12 +13,6 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(NAME)-$(VERSION).tar.bz2 -#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 @@ -36,11 +30,15 @@ BUILD_DEP_PKGS += CSWlibpcap-dev BUILD_DEP_PKGS += CSWlibsmi-dev BUILD_DEP_PKGS += CSWlibkrb5-dev -BUILD_DEP_PKGS += CSWossldevel +BUILD_DEP_PKGS += CSWlibssl-dev BUILD_DEP_PKGS += CSWlibgnutls-dev -BUILD_DEP_PKGS += CSWlua +# BUILD_DEP_PKGS += CSWlua BUILD_DEP_PKGS += CSWgeoip-dev +# Lua support disabled because luaL_register is checked during autoconf which +# is deprecated as described in http://lua-users.org/wiki/LuaFiveTwo +# https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7409 + PACKAGES += CSWwireshark SPKG_DESC_CSWwireshark = Wireshark (was Ethereal) is a free network protocol analyzer # PKGFILES is catchall @@ -56,7 +54,7 @@ RUNTIME_DEP_PKGS_CSWwireshark += CSWlibkrb5-3 RUNTIME_DEP_PKGS_CSWwireshark += CSWlibk5crypto3 RUNTIME_DEP_PKGS_CSWwireshark += CSWlibgnutls26 -RUNTIME_DEP_PKGS_CSWwireshark += CSWlua +# RUNTIME_DEP_PKGS_CSWwireshark += CSWlua RUNTIME_DEP_PKGS_CSWwireshark += CSWlibcairo2 RUNTIME_DEP_PKGS_CSWwireshark += CSWlibgeoip1 RUNTIME_DEP_PKGS_CSWwireshark += CSWlibfontconfig1 @@ -94,6 +92,11 @@ REINPLACE_WITH_mibs = /opt/csw/share/mibs REINPLACE_FILES_mibs += epan/oids.c +# Do not use LD_OPTIONS as it leads to the new version being built against old +# wireshark private libs +LD_OPTIONS = +EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS) + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-usr-local=no CONFIGURE_ARGS += --with-ssl=/opt/csw Modified: csw/mgar/pkg/wireshark/trunk/checksums =================================================================== --- csw/mgar/pkg/wireshark/trunk/checksums 2012-10-02 08:32:08 UTC (rev 19346) +++ csw/mgar/pkg/wireshark/trunk/checksums 2012-10-02 08:32:58 UTC (rev 19347) @@ -1 +1 @@ -dcdc5f4904af5804b622c955a30974e2 wireshark-1.6.8.tar.bz2 +5e3ea7eed50dace479e12f49d24506f4 wireshark-1.8.2.tar.bz2 Deleted: csw/mgar/pkg/wireshark/trunk/files/0001-Solaris-9-doesn-t-have-stdint.h.patch =================================================================== --- csw/mgar/pkg/wireshark/trunk/files/0001-Solaris-9-doesn-t-have-stdint.h.patch 2012-10-02 08:32:08 UTC (rev 19346) +++ csw/mgar/pkg/wireshark/trunk/files/0001-Solaris-9-doesn-t-have-stdint.h.patch 2012-10-02 08:32:58 UTC (rev 19347) @@ -1,26 +0,0 @@ -From dd7dcff4a05a4dfdd2e2db961c633e15fff4f8eb Mon Sep 17 00:00:00 2001 -From: Roger Hakansson -Date: Thu, 23 Sep 2010 21:19:05 +0200 -Subject: [PATCH] Solaris 9 doesn't have stdint.h - ---- - epan/wslua/lua_bitop.c | 4 ++ - 1 files changed, 4 insertions(+) - -diff --git a/epan/wslua/lua_bitop.c b/epan/wslua/lua_bitop.c -index e358e7a..6603eb6 100644 ---- a/epan/wslua/lua_bitop.c -+++ b/epan/wslua/lua_bitop.c -@@ -40,8 +40,12 @@ typedef __int32 int32_t; - typedef unsigned __int32 uint32_t; - typedef unsigned __int64 uint64_t; - #else -+#if defined(__SUNPRO_C) || defined (__SUNPRO_CC) -+#include -+#else - #include - #endif -+#endif - - typedef int32_t SBits; - typedef uint32_t UBits; Deleted: csw/mgar/pkg/wireshark/trunk/files/0002-Don-t-return-value-in-void-functions.patch =================================================================== --- csw/mgar/pkg/wireshark/trunk/files/0002-Don-t-return-value-in-void-functions.patch 2012-10-02 08:32:08 UTC (rev 19346) +++ csw/mgar/pkg/wireshark/trunk/files/0002-Don-t-return-value-in-void-functions.patch 2012-10-02 08:32:58 UTC (rev 19347) @@ -1,25 +0,0 @@ -From 583bad1ad03a42d33e51108f2db484b0ef063b68 Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Thu, 24 Nov 2011 16:40:06 +0100 -Subject: [PATCH] Don't return value in void functions - ---- - epan/dissectors/packet-capwap.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/epan/dissectors/packet-capwap.c b/epan/dissectors/packet-capwap.c -index 21afadc..b572492 100644 ---- a/epan/dissectors/packet-capwap.c -+++ b/epan/dissectors/packet-capwap.c -@@ -1376,7 +1376,7 @@ dissect_capwap_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) - { - const int len_rem = tvb_length_remaining(tvb, offset); - if (len_rem <= 0) -- return offset; -+ return; - - pinfo->fragmented = TRUE; - --- -1.7.6.1 - 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 Oct 2 10:38:01 2012 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Tue, 02 Oct 2012 08:38:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[19348] csw/mgar/pkg/ffmpeg/trunk/Makefile Message-ID: Revision: 19348 http://gar.svn.sourceforge.net/gar/?rev=19348&view=rev Author: janholzh Date: 2012-10-02 08:38:00 +0000 (Tue, 02 Oct 2012) Log Message: ----------- ffmpeg/trunk: enable pic on all 64bit builds Modified Paths: -------------- csw/mgar/pkg/ffmpeg/trunk/Makefile Modified: csw/mgar/pkg/ffmpeg/trunk/Makefile =================================================================== --- csw/mgar/pkg/ffmpeg/trunk/Makefile 2012-10-02 08:32:58 UTC (rev 19347) +++ csw/mgar/pkg/ffmpeg/trunk/Makefile 2012-10-02 08:38:00 UTC (rev 19348) @@ -176,11 +176,12 @@ #no asm on sparc CONFIGURE_ARGS_sparc = --disable-asm -#sparcv9 needs --enable-pic -CONFIGURE_ARGS_sparcv9 += --enable-pic +#64bit needs --enable-pic +CONFIGURE_ARGS_64 += --enable-pic CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARCH)) CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(ISA)) +CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(MEMORYMODEL)) # Needs two builds one shared one static maybe in the future #CONFIGURE_ARGS-SHARED-yes += --enable-shared 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 Oct 2 11:02:12 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 02 Oct 2012 09:02:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[19349] csw/mgar/pkg/lang-python Message-ID: Revision: 19349 http://gar.svn.sourceforge.net/gar/?rev=19349&view=rev Author: dmichelsen Date: 2012-10-02 09:02:12 +0000 (Tue, 02 Oct 2012) Log Message: ----------- lang-python/scapy: Relocate from pkg/ Added Paths: ----------- csw/mgar/pkg/lang-python/scapy/ csw/mgar/pkg/lang-python/scapy/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/lang-python/scapy/trunk/Makefile Deleted: csw/mgar/pkg/lang-python/scapy/trunk/Makefile =================================================================== --- csw/mgar/pkg/scapy/trunk/Makefile 2012-09-29 21:31:59 UTC (rev 19334) +++ csw/mgar/pkg/lang-python/scapy/trunk/Makefile 2012-10-02 09:02:12 UTC (rev 19349) @@ -1,44 +0,0 @@ -# $Id$ -# TODO (release-critical prefixed with !, non release-critical with *) -# -NAME = scapy -VERSION = 2.2.0 -GARTYPE = v2 -CATEGORIES = python - -DESCRIPTION = A powerful interactive packet manipulation program - -MASTER_SITES += http://www.secdev.org/projects/scapy/files/ -DISTFILES += $(DISTNAME).tar.gz - -VENDOR_URL = http://www.secdev.org/projects/scapy/ - -PACKAGES += CSWpy-scapy -SPKG_DESC_CSWmypkg = A powerful interactive packet manipulation program -# PKGFILES is catchall -# We need this for share/wireshark/manuf -RUNTIME_DEP_PKGS_CSWpy-scapy += CSWwireshark -CHECKPKG_OVERRIDES_CSWpy-scapy += surplus-dependency|CSWwireshark -# We need this for share/nmap/nmap-os-fingerprints -RUNTIME_DEP_PKGS_CSWpy-scapy += CSWnmap -CHECKPKG_OVERRIDES_CSWpy-scapy += surplus-dependency|CSWnmap - -REINPLACEMENTS += wireshark-manuf -REINPLACE_MATCH_wireshark-manuf = /usr/share/wireshark/wireshark/manuf -REINPLACE_WITH_wireshark-manuf = /opt/csw/share/wireshark/manuf -REINPLACE_FILES_wireshark-manuf += scapy/data.py -REINPLACE_FILES_wireshark-manuf += scapy/utils6.py - -REINPLACEMENTS += nmap-os-fingerprints -REINPLACE_MATCH_nmap-os-fingerprints = /usr/share/nmap/nmap-os-fingerprints -REINPLACE_WITH_nmap-os-fingerprints = /opt/csw/share/nmap/nmap-os-fingerprints -REINPLACE_FILES_nmap-os-fingerprints += scapy/modules/nmap.py - -# There is no testsuite -TEST_SCRIPTS = - -include gar/category.mk - -post-install-modulated: - -gunzip $(DESTDIR)$(mandir)/man1/scapy.1.gz - @$(MAKECOOKIE) Copied: csw/mgar/pkg/lang-python/scapy/trunk/Makefile (from rev 19335, csw/mgar/pkg/scapy/trunk/Makefile) =================================================================== --- csw/mgar/pkg/lang-python/scapy/trunk/Makefile (rev 0) +++ csw/mgar/pkg/lang-python/scapy/trunk/Makefile 2012-10-02 09:02:12 UTC (rev 19349) @@ -0,0 +1,45 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = scapy +VERSION = 2.2.0 +GARTYPE = v2 +CATEGORIES = python + +DESCRIPTION = A powerful interactive packet manipulation program + +MASTER_SITES += http://www.secdev.org/projects/scapy/files/ +DISTFILES += $(DISTNAME).tar.gz + +VENDOR_URL = http://www.secdev.org/projects/scapy/ + +PACKAGES += CSWpy-scapy +SPKG_DESC_CSWmypkg = A powerful interactive packet manipulation program +# PKGFILES is catchall +ARCHALL_CSWpy-scapy = 1 +# We need this for share/wireshark/manuf +RUNTIME_DEP_PKGS_CSWpy-scapy += CSWwireshark +CHECKPKG_OVERRIDES_CSWpy-scapy += surplus-dependency|CSWwireshark +# We need this for share/nmap/nmap-os-fingerprints +RUNTIME_DEP_PKGS_CSWpy-scapy += CSWnmap +CHECKPKG_OVERRIDES_CSWpy-scapy += surplus-dependency|CSWnmap + +REINPLACEMENTS += wireshark-manuf +REINPLACE_MATCH_wireshark-manuf = /usr/share/wireshark/wireshark/manuf +REINPLACE_WITH_wireshark-manuf = /opt/csw/share/wireshark/manuf +REINPLACE_FILES_wireshark-manuf += scapy/data.py +REINPLACE_FILES_wireshark-manuf += scapy/utils6.py + +REINPLACEMENTS += nmap-os-fingerprints +REINPLACE_MATCH_nmap-os-fingerprints = /usr/share/nmap/nmap-os-fingerprints +REINPLACE_WITH_nmap-os-fingerprints = /opt/csw/share/nmap/nmap-os-fingerprints +REINPLACE_FILES_nmap-os-fingerprints += scapy/modules/nmap.py + +# There is no testsuite +TEST_SCRIPTS = + +include gar/category.mk + +post-install-modulated: + -gunzip $(DESTDIR)$(mandir)/man1/scapy.1.gz + @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Oct 2 11:35:25 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 02 Oct 2012 09:35:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[19350] csw/mgar/pkg/lang-python Message-ID: Revision: 19350 http://gar.svn.sourceforge.net/gar/?rev=19350&view=rev Author: dmichelsen Date: 2012-10-02 09:35:24 +0000 (Tue, 02 Oct 2012) Log Message: ----------- lang-python/qpid/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/lang-python/qpid/ csw/mgar/pkg/lang-python/qpid/Makefile csw/mgar/pkg/lang-python/qpid/branches/ csw/mgar/pkg/lang-python/qpid/tags/ csw/mgar/pkg/lang-python/qpid/trunk/ csw/mgar/pkg/lang-python/qpid/trunk/Makefile csw/mgar/pkg/lang-python/qpid/trunk/checksums csw/mgar/pkg/lang-python/qpid/trunk/files/ Added: csw/mgar/pkg/lang-python/qpid/Makefile =================================================================== --- csw/mgar/pkg/lang-python/qpid/Makefile (rev 0) +++ csw/mgar/pkg/lang-python/qpid/Makefile 2012-10-02 09:35:24 UTC (rev 19350) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/lang-python/qpid/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/lang-python/qpid/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/qpid/trunk/Makefile (rev 0) +++ csw/mgar/pkg/lang-python/qpid/trunk/Makefile 2012-10-02 09:35:24 UTC (rev 19350) @@ -0,0 +1,29 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = qpid +VERSION = 0.18 +GARTYPE = v2 +CATEGORIES = python + +DESCRIPTION = Open Source AMQP Messaging + +#MASTER_SITES += http://www.apache.org/dyn/closer.cgi/$(NAME)/$(VERSION)/ +MASTER_SITES += http://apache.openmirror.de/$(NAME)/$(VERSION)/ +DISTFILES += $(DISTNAME).tar.gz + +VENDOR_URL = http://qpid.apache.org +LICENSE = python/LICENSE.txt + +PACKAGES += CSWpy-qpid +SPKG_DESC_CSWmypkg = Open source AMQP messaging +# PKGFILES is catchall +ARCHALL_CSWpy-qpid = 1 + +WORKSRC = $(WORKDIR)/$(DISTNAME)/python + +# There is no testsuite +TEST_SCRIPTS = + +include gar/category.mk + Property changes on: csw/mgar/pkg/lang-python/qpid/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/lang-python/qpid/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/qpid/trunk/checksums (rev 0) +++ csw/mgar/pkg/lang-python/qpid/trunk/checksums 2012-10-02 09:35:24 UTC (rev 19350) @@ -0,0 +1 @@ +081143304efacdf33d0c3f6c74c35271 qpid-0.18.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 Oct 2 12:02:45 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 02 Oct 2012 10:02:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[19351] csw/mgar/pkg/apache2/branches/apache24 Message-ID: Revision: 19351 http://gar.svn.sourceforge.net/gar/?rev=19351&view=rev Author: bdwalton Date: 2012-10-02 10:02:45 +0000 (Tue, 02 Oct 2012) Log Message: ----------- apache2/branches/apache24: trim out apache 2.2 stuff for now; add a config.layout patch Modified Paths: -------------- csw/mgar/pkg/apache2/branches/apache24/Makefile Added Paths: ----------- csw/mgar/pkg/apache2/branches/apache24/files/0001-Add-an-OpenCSW-option-to-config.layout.patch Removed Paths: ------------- csw/mgar/pkg/apache2/branches/apache24/files/config.layout Modified: csw/mgar/pkg/apache2/branches/apache24/Makefile =================================================================== --- csw/mgar/pkg/apache2/branches/apache24/Makefile 2012-10-02 09:35:24 UTC (rev 19350) +++ csw/mgar/pkg/apache2/branches/apache24/Makefile 2012-10-02 10:02:45 UTC (rev 19351) @@ -18,17 +18,17 @@ LICENSE = LICENSE # Build multiple mpm's and merge them all into one install -EXTRA_MODULATORS = MPM +#EXTRA_MODULATORS = MPM # !!!NOTE, NOTE, NOTE!!! prefork must be last as it's the one where # all modules are built. This affects the default httpd.conf that # gets generated. The other modulations will generate httpd.conf # files that lack the important LoadModule lines. This is primarily # useful at version bump time when files/httpd.conf.CSW may need an # update to reflect new modules, etc. -MODULATIONS_MPM = worker prefork +#MODULATIONS_MPM = worker prefork -MERGE_SCRIPTS_isa-default-mpm-prefork = copy-all -MERGE_SCRIPTS_isa-default-mpm-worker = copy-all +# MERGE_SCRIPTS_isa-default-mpm-prefork = copy-all +# MERGE_SCRIPTS_isa-default-mpm-worker = copy-all # Visitor information SPKG_SOURCEURL = http://httpd.apache.org/ @@ -38,115 +38,16 @@ # Standard package bits DISTFILES += cswapache2 -# The PACKAGES variable tell GAR which packages to build -PACKAGES = CSWapache2 CSWapache2-dev CSWapache2-manual CSWap2suexec -PACKAGES += CSWap2worker CSWapache2-utils -# These packages are dummy versions to make dependencies nicer -# as various things depend on them currently -PACKAGES += CSWap2prefork CSWapache2rt CSWapache2c +PATCHFILES += 0001-Add-an-OpenCSW-option-to-config.layout.patch BUILD_DEP_PKGS += CSWlibaprutil-dev -OBSOLETED_BY_CSWapache2-dev = CSWapache2-devel - -ARCHALL_CSWapache2-manual = 1 -ARCHALL_CSWap2prefork = 1 -ARCHALL_CSWapache2rt = 1 -ARCHALL_CSWapache2c = 1 - -CATALOGNAME_CSWapache2 = apache2 -CATALOGNAME_CSWapache2-dev = apache2_dev -CATALOGNAME_CSWapache2-manual = apache2_manual -CATALOGNAME_CSWapache2-utils = apache2_utils -CATALOGNAME_CSWap2suexec = ap2_suexec -CATALOGNAME_CSWap2prefork = ap2_prefork -CATALOGNAME_CSWap2worker = ap2_worker -CATALOGNAME_CSWapache2rt = apache2rt - -SPKG_DESC_CSWapache2 = A high performance Unix-based HTTP server. -SPKG_DESC_CSWapache2-dev = The development files for Apache2. -SPKG_DESC_CSWapache2-manual = The Apache2 manual files. -SPKG_DESC_CSWapache2-utils = Utility programs for Apache2. -SPKG_DESC_CSWap2suexec = The standard suEXEC binary for Apache2. -SPKG_DESC_CSWap2worker = The apache worker mpm. -SPKG_DESC_CSWap2prefork = A stub for the old prefork mpm package. -SPKG_DESC_CSWapache2rt = A stub for the old apache2rt package. -SPKG_DESC_CSWapache2c = A stub for the old apache2c package. - -RUNTIME_DEP_PKGS_CSWapache2 += CSWlibiconv2 CSWosslutils -RUNTIME_DEP_PKGS_CSWapache2 += CSWliblber2-4-2 CSWlibldap2-4-2 -# the loadable ldap module dynamically opens files in this apr sub-package -RUNTIME_DEP_PKGS_CSWapache2 += CSWlibaprutil1-ldap -RUNTIME_DEP_PKGS_CSWapache2 += CSWlibssl1-0-0 CSWlibz1 -RUNTIME_DEP_PKGS_CSWapache2 += CSWbdb48 CSWlibexpat1 -RUNTIME_DEP_PKGS_CSWapache2 += CSWlibaprutil1-0 CSWlibapr1-0 -RUNTIME_DEP_PKGS_CSWapache2 += CSWapache2c CSWperl CSWapache2-utils -# Note: This is required because apxs uses ap{r,u}-1-config -RUNTIME_DEP_PKGS_CSWapache2 += CSWlibapr-dev CSWlibaprutil-dev -# Note: This is included as something in mod_dav uses dlopen to leverage it -RUNTIME_DEP_PKGS_CSWapache2 += CSWlibaprutil1-dbm-db -RUNTIME_DEP_PKGS_CSWapache2-manual = CSWapache2 -RUNTIME_DEP_PKGS_CSWapache2-dev = CSWapache2 -RUNTIME_DEP_PKGS_CSWapache2-utils += CSWlibaprutil1-0 -RUNTIME_DEP_PKGS_CSWapache2-utils += CSWlibapr1-0 -RUNTIME_DEP_PKGS_CSWapache2-utils += CSWlibiconv2 -RUNTIME_DEP_PKGS_CSWapache2-utils += CSWlibexpat1 -RUNTIME_DEP_PKGS_CSWapache2-utils += CSWbdb48 -RUNTIME_DEP_PKGS_CSWapache2-utils += CSWlibssl1-0-0 -RUNTIME_DEP_PKGS_CSWapache2-utils += CSWperl -RUNTIME_DEP_PKGS_CSWap2suexec = CSWapache2 -RUNTIME_DEP_PKGS_CSWap2prefork = CSWapache2 CSWapache2c -RUNTIME_DEP_PKGS_CSWap2worker = CSWapache2 CSWap2prefork -RUNTIME_DEP_PKGS_CSWap2worker += CSWlibapr1-0 CSWlibaprutil1-0 -RUNTIME_DEP_PKGS_CSWap2worker += CSWlibexpat1 -RUNTIME_DEP_PKGS_CSWap2worker += CSWbdb48 CSWlibiconv2 CSWapache2c -RUNTIME_DEP_PKGS_CSWapache2rt = CSWapache2 - -CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWosslutils -CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWperl -CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWapache2-utils -CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWlibapr-dev -CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWlibaprutil-dev -CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWlibaprutil1-dbm-db -CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWlibaprutil1-ldap -CHECKPKG_OVERRIDES_CSWapache2-utils += surplus-dependency|CSWperl -CHECKPKG_OVERRIDES_CSWapache2-utils += missing-dependency|CSWapache2 -CHECKPKG_OVERRIDES_CSWap2prefork += surplus-dependency|CSWapache2 -CHECKPKG_OVERRIDES_CSWap2prefork += surplus-dependency|CSWapache2c -CHECKPKG_OVERRIDES_CSWap2worker += surplus-dependency|CSWap2prefork -CHECKPKG_OVERRIDES_CSWap2worker += surplus-dependency|CSWapache2c -CHECKPKG_OVERRIDES_CSWapache2rt += surplus-dependency|CSWapache2 - -CHECKPKG_OVERRIDES_CSWapache2-dev += file-with-bad-content|/usr/local|root/opt/csw/apache2/include/httpd.h - -# these will eventually go away... -CHECKPKG_OVERRIDES_CSWap2suexec += catalogname-does-not-match-pkgname|pkgname=CSWap2suexec|catalogname=ap2_suexec|expected-catalogname=ap2suexec -CHECKPKG_OVERRIDES_CSWap2worker += catalogname-does-not-match-pkgname|pkgname=CSWap2worker|catalogname=ap2_worker|expected-catalogname=ap2worker -CHECKPKG_OVERRIDES_CSWap2prefork += catalogname-does-not-match-pkgname|pkgname=CSWap2prefork|catalogname=ap2_prefork|expected-catalogname=ap2prefork - -# User requested... -BUILD64 = 1 - -# We need this to get bdb48/lib into the runpath -EXTRA_LIB = $(prefix)/bdb48/lib - # The SMF support: you don't need to specify cswinitsmf any more. You need to # make sure the the /etc/opt/csw/init.d/cswapache file gets installed during # the post-install stage, and add "INITSMF = /etc/opt/csw/init.d/cswapache" to # the Makefile. INITSMF = /etc/opt/csw/init.d/cswapache2 -POSTMSG = /opt/csw/share/doc/apache2/README.CSW - -AP2_MODS = 1 -AP2_MODFILES = *suexec*\.so - -ALTERNATIVES_CSWapache2 = prefork -ALTERNATIVES_CSWap2worker = worker -ALTERNATIVE_prefork = /opt/csw/apache2/sbin/httpd httpd /opt/csw/apache2/sbin/httpd.prefork 50 -ALTERNATIVE_worker = /opt/csw/apache2/sbin/httpd httpd /opt/csw/apache2/sbin/httpd.worker 100 - # Build Configuration CONFIGURE_ARGS += --with-apr=$(prefix)/bin/apr-1-config CONFIGURE_ARGS += --with-apr-util=$(prefix)/bin/apu-1-config @@ -158,94 +59,11 @@ CONFIGURE_ARGS += --with-z=$(prefix) CONFIGURE_ARGS += --with-ssl=$(prefix) -ifneq ($(MPM),prefork) -CONFIGURE_ARGS += --enable-modules=none -CONFIGURE_ARGS += --disable-actions -CONFIGURE_ARGS += --disable-alias -CONFIGURE_ARGS += --disable-authn-file -CONFIGURE_ARGS += --disable-authn-default -CONFIGURE_ARGS += --disable-authz-host -CONFIGURE_ARGS += --disable-authz-user -CONFIGURE_ARGS += --disable-authz-groupfile -CONFIGURE_ARGS += --disable-authz-default -CONFIGURE_ARGS += --disable-auth-basic -CONFIGURE_ARGS += --disable-asis -CONFIGURE_ARGS += --disable-auth -CONFIGURE_ARGS += --disable-autoindex -CONFIGURE_ARGS += --disable-cgi -CONFIGURE_ARGS += --disable-cgid -CONFIGURE_ARGS += --disable-charset-lite -CONFIGURE_ARGS += --disable-dir -CONFIGURE_ARGS += --disable-env -CONFIGURE_ARGS += --disable-filter -CONFIGURE_ARGS += --disable-imap -CONFIGURE_ARGS += --disable-include -CONFIGURE_ARGS += --disable-log-config -CONFIGURE_ARGS += --disable-mime -CONFIGURE_ARGS += --disable-negotiation -CONFIGURE_ARGS += --disable-setenvif -CONFIGURE_ARGS += --disable-ssl -CONFIGURE_ARGS += --disable-status -CONFIGURE_ARGS += --disable-userdir -CONFIGURE_ARGS += --disable-version -else -CONFIGURE_ARGS += --enable-suexec -CONFIGURE_ARGS += --with-suexec-caller=nobody -CONFIGURE_ARGS += --with-suexec-docroot=$(prefix)/apache2/share/htdocs -CONFIGURE_ARGS += --with-suexec-userdir=public_html -CONFIGURE_ARGS += --with-suexec-uidmin=100 -CONFIGURE_ARGS += --with-suexec-gidmin=100 -CONFIGURE_ARGS += --with-suexec-logfile=$(prefix)/apache2/var/log/suexec_log -CONFIGURE_ARGS += --with-suexec-bin=$(prefix)/apache2/sbin/suexec -CONFIGURE_ARGS += --with-suexec-safepath=/opt/csw/bin:/usr/bin:/bin -CONFIGURE_ARGS += --enable-authn-alias -CONFIGURE_ARGS += --enable-authnz-ldap -CONFIGURE_ARGS += --enable-file-cache -CONFIGURE_ARGS += --enable-cache -CONFIGURE_ARGS += --enable-disk-cache -CONFIGURE_ARGS += --enable-mem-cache -CONFIGURE_ARGS += --enable-bucketeer -CONFIGURE_ARGS += --enable-charset-lite -CONFIGURE_ARGS += --enable-ldap -CONFIGURE_ARGS += --enable-log-forensic -CONFIGURE_ARGS += --enable-usertrack -CONFIGURE_ARGS += --enable-unique-id -CONFIGURE_ARGS += --enable-version -CONFIGURE_ARGS += --enable-proxy -CONFIGURE_ARGS += --enable-proxy-connect -CONFIGURE_ARGS += --enable-proxy-ftp -CONFIGURE_ARGS += --enable-proxy-http -CONFIGURE_ARGS += --enable-proxy-ajp -CONFIGURE_ARGS += --enable-proxy-balancer -CONFIGURE_ARGS += --enable-cgid -CONFIGURE_ARGS += --enable-dav-lock -CONFIGURE_ARGS += --enable-mods-shared=all -endif - # Fixup target variables -APACHE_ROOT = $(DESTDIR)$(prefix)/apache2 +APACHE_ROOT = $(DESTDIR)$(prefix) LIBTOOL_LADIR = $(APACHE_ROOT)/lib STRIP_DIRS = $(APACHE_ROOT)/sbin $(APACHE_ROOT)/libexec -PKGFILES_CSWapache2-utils = .*sbin/ab .*sbin/dbmmanage .*sbin/htdbm -PKGFILES_CSWapache2-utils += .*sbin/htdigest .*sbin/htpasswd .*sbin/logresolve -PKGFILES_CSWapache2-utils += .*sbin/htcacheclean .*sbin/rotatelogs -PKGFILES_CSWapache2-utils += .*sbin/checkgid -PKGFILES_CSWapache2-utils += .*man8/ab.8 .*man1/dbmmanage.1 .*man1/htdbm.1 -PKGFILES_CSWapache2-utils += .*man1/htdigest.1 .*man1/htpasswd.1 -PKGFILES_CSWapache2-utils += .*man8/logresolve.8 -PKGFILES_CSWapache2-utils += .*man8/htcacheclean .*man8/rotatelogs -PKGFILES_CSWap2suexec = .*sbin/suexec .*libexec/.*suexec.* .*/man/.*suexec.* -PKGFILES_CSWap2suexec += .*ap2mod/suexec -PKGFILES_CSWapache2-dev = .*include/.* .*\.(a|la) -PKGFILES_CSWapache2-manual = .*share/.*manual.* .*etc/extra/httpd-manual.conf -PKGFILES_CSWap2prefork = .*share/doc/ap2_prefork.* -PKGFILES_CSWap2worker = .*share/doc/ap2_worker.* .*sbin/httpd.worker -PKGFILES_CSWapache2rt = .*share/doc/apache2rt.* -PKGFILES_CSWapache2c = .*share/doc/apache2c.* - -#PROTOTYPE_FILTER = awk '$$$$3 == "/opt/csw/apache2/sbin/suexec" { $$$$4 = "4755" }; $$$$3 ~ /cswap2mod/ { $$$$4 = "0555" }; { print }' - TEST_TARGET = test include gar/category.mk @@ -260,85 +78,3 @@ @gsed -e s,INSTALL_PREFIX,$(prefix)/apache2,g \ $(WORKDIR)/config.layout > $(WORKDIR)/$(NAME)-$(VERSION)/config.layout @$(MAKECOOKIE) - - -post-install-modulated: rename-httpd copy-local-files create-templates copy-readmes - -copy-readmes: - @(cd $(WORKDIR); for f in README.CSW*; do \ - p=`echo $$f | sed 's/README.CSW.//'`; \ - ginstall -d -m0755 $(DESTDIR)/$(prefix)/share/doc/$$p; \ - ginstall -m 0644 $$f $(DESTDIR)/$(prefix)/share/doc/$$p/README.CSW; \ - done) - @$(MAKECOOKIE) - -rename-httpd: - @if test -f $(APACHE_ROOT)/sbin/httpd ; then \ - ( cd $(APACHE_ROOT)/sbin ; mv httpd httpd.$(MPM) ) ; \ - fi - - -# Copy in specialized templates -copy-local-files: - @ginstall -d $(DESTDIR)/etc/opt/csw/init.d - @ginstall $(WORKDIR)/cswapache2 $(DESTDIR)/etc/opt/csw/init.d - @ginstall $(WORKDIR)/update20to22 $(APACHE_ROOT)/sbin - @$(MAKECOOKIE) - -# Create stock templates -template_list = share/htdocs/index.html -template_list += etc/extra/httpd-autoindex.conf -template_list += etc/extra/httpd-dav.conf -template_list += etc/extra/httpd-default.conf -template_list += etc/extra/httpd-info.conf -template_list += etc/extra/httpd-languages.conf -template_list += etc/extra/httpd-multilang-errordoc.conf -template_list += etc/extra/httpd-userdir.conf -template_list += etc/extra/httpd-vhosts.conf -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" - @( cd $(DESTDIR)$(prefix)/apache2 ; \ - for file in $(template_list) ; do \ - gmv -v $$file $$file.CSW ; \ - done ) - @$(MAKECOOKIE) - - -post-merge: - @(cd $(PKGROOT)/$(prefix)/apache2/etc/; \ - for f in httpd.conf extra/httpd-ssl.conf; do \ - perl -pi -e 's/User.*daemon.*/User \@USER\@/; \ - s/Group.*daemon.*/Group \@GROUP\@/; \ - s/#*ServerName www.example.com/ServerName \@HOSTNAME\@/; \ - s/ServerAdmin you\@example.com/ServerAdmin \@ADMIN\@/; \ - s/^(LoadModule.*suexec.*)/#$$1/; \ - s/^#(Include.*httpd-mpm.conf)/$$1/; \ - s/^#(Include.*httpd-ssl.conf)/$$1/' $$f; \ - mv $$f $$f.CSW; \ - done ) - @echo Fixing usr/local references in the online manaual... - @(cd $(PKGROOT)/$(prefix)/apache2/share/manual; \ - /opt/csw/bin/gfind . -type f -print0 | \ - /opt/csw/bin/gxargs -0 \ - perl -pi \ - -e 's@/usr/local/apache2*@/opt/csw/apache2 at g;' \ - -e 's@/usr/local@/opt/csw/apache2 at g') - @echo Fixing export/home references in the online manaual... - @(cd $(PKGROOT)/$(prefix)/apache2/share/manual; \ - /opt/csw/bin/gfind . -type f -print0 | \ - /opt/csw/bin/gxargs -0 \ - perl -pi \ - -e 's@/export/home@/home at g;') - @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/branches/apache24/files/0001-Add-an-OpenCSW-option-to-config.layout.patch =================================================================== --- csw/mgar/pkg/apache2/branches/apache24/files/0001-Add-an-OpenCSW-option-to-config.layout.patch (rev 0) +++ csw/mgar/pkg/apache2/branches/apache24/files/0001-Add-an-OpenCSW-option-to-config.layout.patch 2012-10-02 10:02:45 UTC (rev 19351) @@ -0,0 +1,45 @@ +From 6625eb4c5833cbee96ccb143f6d4e3d4f367b4b3 Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Tue, 2 Oct 2012 11:08:04 +0200 +Subject: [PATCH] Add an OpenCSW option to config.layout + +Signed-off-by: Ben Walton +--- + config.layout | 24 ++++++++++++++++++++++++ + 1 file changed, 24 insertions(+) + +diff --git a/config.layout b/config.layout +index 35a325a..b21a3d4 100644 +--- a/config.layout ++++ b/config.layout +@@ -370,3 +370,27 @@ + logfiledir: ${localstatedir}/log/httpd + proxycachedir: ${localstatedir}/cache/httpd + ++ ++# CSW Layout ++ ++ prefix: /opt/csw ++ exec_prefix: ${prefix} ++ bindir: ${prefix}/bin ++ sbindir: ${prefix}/sbin ++ libdir: ${prefix}/lib/apache24 ++ libexecdir: ${libdir}/modules ++ installbuilddir: ${libdir}/build ++ sysconfdir: /etc/${prefix}/apache24 ++ mandir: ${prefix}/share/man ++ datadir: /var/${prefix}/apache24 ++ errordir: ${datadir}/error ++ iconsdir: ${datadir}/icons ++ htdocsdir: ${datadir}/htdocs ++ manualdir: ${datadir}/manual ++ cgidir: ${datadir}/cgi-bin ++ includedir: ${prefix}/include/apache24 ++ localstatedir: /var/${prefix} ++ runtimedir: /var/run ++ logfiledir: ${localstatedir}/log/apache24 ++ proxycachedir: ${localstatedir}/apache24/proxy ++ +-- +1.7.12 + Deleted: csw/mgar/pkg/apache2/branches/apache24/files/config.layout =================================================================== --- csw/mgar/pkg/apache2/branches/apache24/files/config.layout 2012-10-02 09:35:24 UTC (rev 19350) +++ csw/mgar/pkg/apache2/branches/apache24/files/config.layout 2012-10-02 10:02:45 UTC (rev 19351) @@ -1,23 +0,0 @@ -# CSW Layout - - prefix: INSTALL_PREFIX - exec_prefix: ${prefix} - bindir: ${exec_prefix}/bin - sbindir: ${exec_prefix}/sbin - libdir: ${exec_prefix}/lib - libexecdir: ${exec_prefix}/libexec - datadir: ${prefix}/share - mandir: ${datadir}/man - sysconfdir: /etc/${prefix}/apache24 - installbuilddir: ${datadir}/build - errordir: ${datadir}/error - iconsdir: ${datadir}/icons - htdocsdir: ${datadir}/htdocs - manualdir: ${datadir}/manual - cgidir: ${datadir}/cgi-bin - includedir: ${exec_prefix}/include - localstatedir: /var/${prefix} - runtimedir: /var/run - logfiledir: ${localstatedir}/log - proxycachedir: ${localstatedir}/proxy - 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 Oct 2 12:04:36 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 02 Oct 2012 10:04:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[19352] csw/mgar/pkg/apache2/branches/apache24/Makefile Message-ID: Revision: 19352 http://gar.svn.sourceforge.net/gar/?rev=19352&view=rev Author: bdwalton Date: 2012-10-02 10:04:36 +0000 (Tue, 02 Oct 2012) Log Message: ----------- apache2/branches/apache24: drop config.layout from DISTFILES too now that it is a patch instead Modified Paths: -------------- csw/mgar/pkg/apache2/branches/apache24/Makefile Modified: csw/mgar/pkg/apache2/branches/apache24/Makefile =================================================================== --- csw/mgar/pkg/apache2/branches/apache24/Makefile 2012-10-02 10:02:45 UTC (rev 19351) +++ csw/mgar/pkg/apache2/branches/apache24/Makefile 2012-10-02 10:04:36 UTC (rev 19352) @@ -34,7 +34,6 @@ SPKG_SOURCEURL = http://httpd.apache.org/ DISTFILES = $(NAME)-$(VERSION).tar.gz -DISTFILES += config.layout # Standard package bits DISTFILES += cswapache2 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 Oct 2 13:02:58 2012 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Tue, 02 Oct 2012 11:02:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[19353] csw/mgar/pkg/postgresql/branches/postgresql-8.4 Message-ID: Revision: 19353 http://gar.svn.sourceforge.net/gar/?rev=19353&view=rev Author: guengel Date: 2012-10-02 11:02:58 +0000 (Tue, 02 Oct 2012) Log Message: ----------- postgresql/branches/postgresql-8.4: new upstream release 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/0002-Run-tests-in-var-tmp-pgsql-tmp_check.patch 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-10-02 10:04:36 UTC (rev 19352) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.4/Makefile 2012-10-02 11:02:58 UTC (rev 19353) @@ -90,7 +90,7 @@ BASE_VERSION = 8.4 VERSION_NODOT = $(subst .,_,$(BASE_VERSION)) BASE_VERSION_NODOT = $(subst .,,$(BASE_VERSION)) -PATCHLEVEL = 13 +PATCHLEVEL = 14 VERSION = $(BASE_VERSION).$(PATCHLEVEL) CATEGORIES = apps @@ -274,11 +274,8 @@ 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 += 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) ) @@ -299,9 +296,6 @@ 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 += CSWlibxslt1 -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibxml2-2 -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibgssapi-krb5-2 #ALTERNATIVES_CSW$(NAME)$(BASE_VERSION_NODOT)-client = $(foreach i,$(NEEDED_ISAS), client_$(i)) PACKAGES += CSW$(NAME)$(BASE_VERSION_NODOT)-contrib @@ -319,8 +313,6 @@ RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibpq5 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) ) #ALTERNATIVES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib = $(foreach i,$(NEEDED_ISAS), contrib_$(i)) @@ -366,7 +358,6 @@ 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 PACKAGES += CSWlibecpg6 SPKG_DESC_CSWlibecpg6 = PostgreSQL $(VERSION), libecpg Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.4/checksums =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.4/checksums 2012-10-02 10:04:36 UTC (rev 19352) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.4/checksums 2012-10-02 11:02:58 UTC (rev 19353) @@ -1 +1 @@ -220657cf9c37e6688c7501d28b2ce8ef postgresql-8.4.13.tar.bz2 +f35bb3698bade8065dc53ac15f00214d postgresql-8.4.14.tar.bz2 Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.4/files/0002-Run-tests-in-var-tmp-pgsql-tmp_check.patch =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.4/files/0002-Run-tests-in-var-tmp-pgsql-tmp_check.patch 2012-10-02 10:04:36 UTC (rev 19352) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.4/files/0002-Run-tests-in-var-tmp-pgsql-tmp_check.patch 2012-10-02 11:02:58 UTC (rev 19353) @@ -16,8 +16,8 @@ check: all - $(pg_regress_call) --temp-install=./tmp_check --top-builddir=$(top_builddir) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) $(TEMP_CONF) -+ install -d /var/tmp/pgsql/tmp_check -+ $(pg_regress_call) --temp-install=/var/tmp/pgsql/tmp_check --top-builddir=$(top_builddir) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) $(TEMP_CONF) ++ install -d /var/tmp/pgsql/tmp_check/84 ++ $(pg_regress_call) --temp-install=/var/tmp/pgsql/tmp_check/84 --top-builddir=$(top_builddir) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) $(TEMP_CONF) installcheck: all $(pg_regress_call) --psqldir="$(PSQLDIR)" --schedule=$(srcdir)/serial_schedule @@ -26,7 +26,7 @@ bigcheck: all - $(pg_regress_call) --temp-install=./tmp_check --top-builddir=$(top_builddir) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) numeric_big -+ $(pg_regress_call) --temp-install=/var/tmp/pgsql/tmp_check --top-builddir=$(top_builddir) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) numeric_big ++ $(pg_regress_call) --temp-install=/var/tmp/pgsql/tmp_check/84 --top-builddir=$(top_builddir) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) numeric_big ## @@ -35,7 +35,7 @@ rm -f $(output_files) $(input_files) rm -rf testtablespace - rm -rf results tmp_check log -+ rm -rf results /var/tmp/pgsql/tmp_check log ++ rm -rf results /var/tmp/pgsql/tmp_check/84 log rm -f regression.diffs regression.out regress.out run_check.out -- 1.7.6.1 Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.4/files/changelog.CSW =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.4/files/changelog.CSW 2012-10-02 10:04:36 UTC (rev 19352) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.4/files/changelog.CSW 2012-10-02 11:02:58 UTC (rev 19353) @@ -1,3 +1,10 @@ +postgresql84 (8.4.14,REV=2012.10.02) + + * New upstream release 8.4.14. + + -- Rafael Ostertag Tue, 02 Oct 2012 07:40:08+0200 + + postgresql84 (8.4.13,REV=2012.08.22) * New upstream release 8.4.13. 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 Oct 2 13:05:03 2012 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Tue, 02 Oct 2012 11:05:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[19354] csw/mgar/pkg/ffmpeg/trunk/Makefile Message-ID: Revision: 19354 http://gar.svn.sourceforge.net/gar/?rev=19354&view=rev Author: janholzh Date: 2012-10-02 11:05:03 +0000 (Tue, 02 Oct 2012) Log Message: ----------- ffmpeg/trunk: force pic mode via extra_cflags Modified Paths: -------------- csw/mgar/pkg/ffmpeg/trunk/Makefile Modified: csw/mgar/pkg/ffmpeg/trunk/Makefile =================================================================== --- csw/mgar/pkg/ffmpeg/trunk/Makefile 2012-10-02 11:02:58 UTC (rev 19353) +++ csw/mgar/pkg/ffmpeg/trunk/Makefile 2012-10-02 11:05:03 UTC (rev 19354) @@ -151,13 +151,6 @@ NODIRPATHS += --sysconfdir NODIRPATHS += --sharedstatedir -#EXTRA_CFLAGS-64 += -xcode=pic32 -#EXTRA_CFLAGS-64 += -fPIC -#EXTRA_CFLAGS += $(EXTRA_CFLAGS-$(MEMORYMODEL)) - -#EXTRA_CXXFLAGS-64 += -fPIC -#EXTRA_CXXFLAGS += $(EXTRA_CXXFLAGS-$(MEMORYMODEL)) - CONFIGURE_ARGS += --prefix=$(prefix) CONFIGURE_ARGS += --bindir=$(bindir) CONFIGURE_ARGS += --datadir=$(datadir) @@ -176,8 +169,10 @@ #no asm on sparc CONFIGURE_ARGS_sparc = --disable-asm -#64bit needs --enable-pic -CONFIGURE_ARGS_64 += --enable-pic +#64bit needs pic code +EXTRA_CFLAGS_sparcv9 = -xcode=pic13 +EXTRA_CFLAGS_amd64 = -Kpic +EXTRA_CFLAGS += $(EXTRA_CFLAGS_$(ISA)) CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARCH)) CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(ISA)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From opk at users.sourceforge.net Tue Oct 2 13:26:10 2012 From: opk at users.sourceforge.net (opk at users.sourceforge.net) Date: Tue, 02 Oct 2012 11:26:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[19355] csw/mgar/pkg/zsh/trunk Message-ID: Revision: 19355 http://gar.svn.sourceforge.net/gar/?rev=19355&view=rev Author: opk Date: 2012-10-02 11:26:10 +0000 (Tue, 02 Oct 2012) Log Message: ----------- /var/tmp/opk/mgar/zsh/trunk: update to 5.0.0 Modified Paths: -------------- csw/mgar/pkg/zsh/trunk/Makefile csw/mgar/pkg/zsh/trunk/checksums Modified: csw/mgar/pkg/zsh/trunk/Makefile =================================================================== --- csw/mgar/pkg/zsh/trunk/Makefile 2012-10-02 11:05:03 UTC (rev 19354) +++ csw/mgar/pkg/zsh/trunk/Makefile 2012-10-02 11:26:10 UTC (rev 19355) @@ -1,5 +1,5 @@ NAME = zsh -VERSION = 4.3.17 +VERSION = 5.0.0 CATEGORIES = devel GARTYPE = v2 Modified: csw/mgar/pkg/zsh/trunk/checksums =================================================================== --- csw/mgar/pkg/zsh/trunk/checksums 2012-10-02 11:05:03 UTC (rev 19354) +++ csw/mgar/pkg/zsh/trunk/checksums 2012-10-02 11:26:10 UTC (rev 19355) @@ -1 +1 @@ -8258967060b2654f30001a011946ac6a zsh-4.3.17.tar.bz2 +e8484468925cec8d9a84b8b04797e764 zsh-5.0.0.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 Tue Oct 2 13:58:36 2012 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Tue, 02 Oct 2012 11:58:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[19356] csw/mgar/pkg/postgresql/branches/postgresql-9.0 Message-ID: Revision: 19356 http://gar.svn.sourceforge.net/gar/?rev=19356&view=rev Author: guengel Date: 2012-10-02 11:58:36 +0000 (Tue, 02 Oct 2012) Log Message: ----------- postgresql/branches/postgresql-9.0: New upstream release 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/0000-Run-tests-in-var-tmp-pgsql-tmp_check.patch 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-10-02 11:26:10 UTC (rev 19355) +++ csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile 2012-10-02 11:58:36 UTC (rev 19356) @@ -90,7 +90,7 @@ BASE_VERSION = 9.0 VERSION_NODOT = $(subst .,_,$(BASE_VERSION)) BASE_VERSION_NODOT = $(subst .,,$(BASE_VERSION)) -PATCHLEVEL = 9 +PATCHLEVEL = 10 VERSION = $(BASE_VERSION).$(PATCHLEVEL) CATEGORIES = apps @@ -276,11 +276,8 @@ 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 += CSWlibxslt1 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibgssapi-krb5-2 #ALTERNATIVES_CSW$(NAME)$(BASE_VERSION_NODOT)-server = $(foreach i,$(NEEDED_ISAS), server_$(i)) @@ -298,9 +295,6 @@ 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 += CSWlibxslt1 -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibxml2-2 -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibgssapi-krb5-2 #ALTERNATIVES_CSW$(NAME)$(BASE_VERSION_NODOT)-client = $(foreach i,$(NEEDED_ISAS), client_$(i)) PACKAGES += CSW$(NAME)$(BASE_VERSION_NODOT)-contrib @@ -318,8 +312,6 @@ RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibpq5 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 #ALTERNATIVES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib = $(foreach i,$(NEEDED_ISAS), contrib_$(i)) PACKAGES += CSW$(NAME)-dev @@ -363,7 +355,6 @@ 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 PACKAGES += CSWlibecpg6 SPKG_DESC_CSWlibecpg6 = PostgreSQL $(VERSION), libecpg Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.0/checksums =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-9.0/checksums 2012-10-02 11:26:10 UTC (rev 19355) +++ csw/mgar/pkg/postgresql/branches/postgresql-9.0/checksums 2012-10-02 11:58:36 UTC (rev 19356) @@ -1 +1 @@ -284303098b161240fd13df7c251822a5 postgresql-9.0.9.tar.bz2 +d2c9ad7267d83ff373cb92eb4807386a postgresql-9.0.10.tar.bz2 Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/0000-Run-tests-in-var-tmp-pgsql-tmp_check.patch =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/0000-Run-tests-in-var-tmp-pgsql-tmp_check.patch 2012-10-02 11:26:10 UTC (rev 19355) +++ csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/0000-Run-tests-in-var-tmp-pgsql-tmp_check.patch 2012-10-02 11:58:36 UTC (rev 19356) @@ -16,8 +16,8 @@ check: all - $(pg_regress_call) --temp-install=./tmp_check --top-builddir=$(top_builddir) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) $(TEMP_CONF) -+ install -d /var/tmp/pgsql/tmp_check -+ $(pg_regress_call) --temp-install=/var/tmp/pgsql/tmp_check --top-builddir=$(top_builddir) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) $(TEMP_CONF) ++ install -d /var/tmp/pgsql/tmp_check/90 ++ $(pg_regress_call) --temp-install=/var/tmp/pgsql/tmp_check/90 --top-builddir=$(top_builddir) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) $(TEMP_CONF) installcheck: all $(pg_regress_call) --psqldir="$(PSQLDIR)" --schedule=$(srcdir)/serial_schedule @@ -26,8 +26,8 @@ bigcheck: all - $(pg_regress_call) --temp-install=./tmp_check --top-builddir=$(top_builddir) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) numeric_big -+ install -d /var/tmp/pgsql/tmp_check -+ $(pg_regress_call) --temp-install=/var/tmp/pgsql/tmp_check --top-builddir=$(top_builddir) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) numeric_big ++ install -d /var/tmp/pgsql/tmp_check/90 ++ $(pg_regress_call) --temp-install=/var/tmp/pgsql/tmp_check/90 --top-builddir=$(top_builddir) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) numeric_big ## @@ -36,7 +36,7 @@ rm -f $(output_files) $(input_files) rm -rf testtablespace - rm -rf results tmp_check log -+ rm -rf results /var/tmp/pgsql/tmp_check log ++ rm -rf results /var/tmp/pgsql/tmp_check/90 log rm -f regression.diffs regression.out regress.out run_check.out -- 1.7.6.1 Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/changelog.CSW =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/changelog.CSW 2012-10-02 11:26:10 UTC (rev 19355) +++ csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/changelog.CSW 2012-10-02 11:58:36 UTC (rev 19356) @@ -1,3 +1,10 @@ +postgresql90 (9.0.10,REV=2012.10.02) + + * New upstream release 9.0.10. + + -- Rafael Ostertag Tue, 02 Oct 2012 10:59:08+0200 + + postgresql90 (9.0.9,REV=2012.08.22) * New upstream release 9.0.9. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From opk at users.sourceforge.net Tue Oct 2 14:02:48 2012 From: opk at users.sourceforge.net (opk at users.sourceforge.net) Date: Tue, 02 Oct 2012 12:02:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[19357] csw/mgar/pkg/zsh/trunk/Makefile Message-ID: Revision: 19357 http://gar.svn.sourceforge.net/gar/?rev=19357&view=rev Author: opk Date: 2012-10-02 12:02:47 +0000 (Tue, 02 Oct 2012) Log Message: ----------- /var/tmp/opk/mgar/zsh/trunk: update build dependency Modified Paths: -------------- csw/mgar/pkg/zsh/trunk/Makefile Modified: csw/mgar/pkg/zsh/trunk/Makefile =================================================================== --- csw/mgar/pkg/zsh/trunk/Makefile 2012-10-02 11:58:36 UTC (rev 19356) +++ csw/mgar/pkg/zsh/trunk/Makefile 2012-10-02 12:02:47 UTC (rev 19357) @@ -20,7 +20,7 @@ LICENSE = LICENCE RUNTIME_DEP_PKGS = CSWlibiconv2 CSWlibncursesw5 CSWlibpcre1 CSWlibgdbm4 -BUILD_DEP_PKGS = CSWpcre +BUILD_DEP_PKGS = CSWlibpcre-dev SPKG_SOURCEURL = http://www.zsh.org UPSTREAM_MASTER_SITES = http://www.zsh.org/pub/ 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 Oct 2 14:43:26 2012 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Tue, 02 Oct 2012 12:43:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[19358] csw/mgar/pkg/ffmpeg/trunk/Makefile Message-ID: Revision: 19358 http://gar.svn.sourceforge.net/gar/?rev=19358&view=rev Author: janholzh Date: 2012-10-02 12:43:26 +0000 (Tue, 02 Oct 2012) Log Message: ----------- ffmpeg/trunk: enable pic on all 64bit builds,and disable a bad patch Modified Paths: -------------- csw/mgar/pkg/ffmpeg/trunk/Makefile Modified: csw/mgar/pkg/ffmpeg/trunk/Makefile =================================================================== --- csw/mgar/pkg/ffmpeg/trunk/Makefile 2012-10-02 12:02:47 UTC (rev 19357) +++ csw/mgar/pkg/ffmpeg/trunk/Makefile 2012-10-02 12:43:26 UTC (rev 19358) @@ -22,7 +22,8 @@ DISTFILES = $(DISTNAME).tar.bz2 PATCHFILES += 0001-fix-version.sh.patch -PATCHFILES += 0003-change-linker-flags.patch +#not good patch do not use it anymore +#PATCHFILES += 0003-change-linker-flags.patch #PATCHFILES += 0003-fix_a_few_shells.patch PATCHFILES += 0004-remove-GNU-ld-specific-options.patch @@ -169,10 +170,8 @@ #no asm on sparc CONFIGURE_ARGS_sparc = --disable-asm -#64bit needs pic code -EXTRA_CFLAGS_sparcv9 = -xcode=pic13 -EXTRA_CFLAGS_amd64 = -Kpic -EXTRA_CFLAGS += $(EXTRA_CFLAGS_$(ISA)) +#64bit needs pic code +CONFIGURE_ARGS_64 = --enable-pic CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARCH)) CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(ISA)) 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 Oct 2 15:09:20 2012 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Tue, 02 Oct 2012 13:09:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[19359] csw/mgar/pkg/postgresql/branches/postgresql-8.3 Message-ID: Revision: 19359 http://gar.svn.sourceforge.net/gar/?rev=19359&view=rev Author: guengel Date: 2012-10-02 13:09:19 +0000 (Tue, 02 Oct 2012) Log Message: ----------- postgresql/branches/postgresql-8.3: New upstream release Modified Paths: -------------- csw/mgar/pkg/postgresql/branches/postgresql-8.3/Makefile csw/mgar/pkg/postgresql/branches/postgresql-8.3/checksums csw/mgar/pkg/postgresql/branches/postgresql-8.3/files/0002-Run-tests-in-var-tmp-pgsql-tmp_check.patch 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-10-02 12:43:26 UTC (rev 19358) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.3/Makefile 2012-10-02 13:09:19 UTC (rev 19359) @@ -90,7 +90,7 @@ BASE_VERSION = 8.3 VERSION_NODOT = $(subst .,_,$(BASE_VERSION)) BASE_VERSION_NODOT = $(subst .,,$(BASE_VERSION)) -PATCHLEVEL = 20 +PATCHLEVEL = 21 VERSION = $(BASE_VERSION).$(PATCHLEVEL) CATEGORIES = apps @@ -272,11 +272,8 @@ 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 += 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) ) @@ -297,9 +294,6 @@ 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 += CSWlibxslt1 -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibxml2-2 -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibgssapi-krb5-2 #ALTERNATIVES_CSW$(NAME)$(BASE_VERSION_NODOT)-client = $(foreach i,$(NEEDED_ISAS), client_$(i)) PACKAGES += CSW$(NAME)$(BASE_VERSION_NODOT)-contrib @@ -317,8 +311,6 @@ RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibpq5 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) ) #ALTERNATIVES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib = $(foreach i,$(NEEDED_ISAS), contrib_$(i)) @@ -364,7 +356,6 @@ 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 PACKAGES += CSWlibecpg6 SPKG_DESC_CSWlibecpg6 = PostgreSQL $(VERSION), libecpg Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.3/checksums =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.3/checksums 2012-10-02 12:43:26 UTC (rev 19358) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.3/checksums 2012-10-02 13:09:19 UTC (rev 19359) @@ -1 +1 @@ -a35e7823fcd66cbd8f904711c413fd2a postgresql-8.3.20.tar.bz2 +3ac75d74a1cc7a6c442f1652f73e1d56 postgresql-8.3.21.tar.bz2 Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.3/files/0002-Run-tests-in-var-tmp-pgsql-tmp_check.patch =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.3/files/0002-Run-tests-in-var-tmp-pgsql-tmp_check.patch 2012-10-02 12:43:26 UTC (rev 19358) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.3/files/0002-Run-tests-in-var-tmp-pgsql-tmp_check.patch 2012-10-02 13:09:19 UTC (rev 19359) @@ -16,8 +16,8 @@ check: all - ./pg_regress --temp-install=./tmp_check --top-builddir=$(top_builddir) --srcdir="$(abs_srcdir)" --temp-port=$(TEMP_PORT) --schedule="$(srcdir)"/parallel_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql $(MAXCONNOPT) $(NOLOCALE) $(TEMP_CONF) -+ install -d /var/tmp/pgsql/tmp_check -+ ./pg_regress --temp-install=/var/tmp/pgsql/tmp_check --top-builddir=$(top_builddir) --srcdir="$(abs_srcdir)" --temp-port=$(TEMP_PORT) --schedule="$(srcdir)"/parallel_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql $(MAXCONNOPT) $(NOLOCALE) $(TEMP_CONF) ++ install -d /var/tmp/pgsql/tmp_check/82 ++ ./pg_regress --temp-install=/var/tmp/pgsql/tmp_check/82 --top-builddir=$(top_builddir) --srcdir="$(abs_srcdir)" --temp-port=$(TEMP_PORT) --schedule="$(srcdir)"/parallel_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql $(MAXCONNOPT) $(NOLOCALE) $(TEMP_CONF) installcheck: all ./pg_regress --psqldir="$(PSQLDIR)" --schedule="$(srcdir)"/serial_schedule --srcdir="$(abs_srcdir)" --multibyte=$(MULTIBYTE) --load-language=plpgsql $(NOLOCALE) @@ -26,8 +26,8 @@ bigcheck: all - ./pg_regress --temp-install=./tmp_check --top-builddir=$(top_builddir) --srcdir="$(abs_srcdir)" --temp-port=$(TEMP_PORT) --schedule="$(srcdir)"/parallel_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql $(MAXCONNOPT) $(NOLOCALE) numeric_big -+ install -d /var/tmp/pgsql/tmp_check -+ ./pg_regress --temp-install=/var/tmp/pgsql/tmp_check --top-builddir=$(top_builddir) --srcdir="$(abs_srcdir)" --temp-port=$(TEMP_PORT) --schedule="$(srcdir)"/parallel_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql $(MAXCONNOPT) $(NOLOCALE) numeric_big ++ install -d /var/tmp/pgsql/tmp_check/82 ++ ./pg_regress --temp-install=/var/tmp/pgsql/tmp_check/82 --top-builddir=$(top_builddir) --srcdir="$(abs_srcdir)" --temp-port=$(TEMP_PORT) --schedule="$(srcdir)"/parallel_schedule --multibyte=$(MULTIBYTE) --load-language=plpgsql $(MAXCONNOPT) $(NOLOCALE) numeric_big ## @@ -36,7 +36,7 @@ # things created by various check targets rm -rf testtablespace - rm -rf results tmp_check log -+ rm -rf results /var/tmp/pgsql/tmp_check log ++ rm -rf results /var/tmp/pgsql/tmp_check/82 log rm -f regression.diffs regression.out regress.out run_check.out ifeq ($(PORTNAME), cygwin) rm -f regress.def Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.3/files/changelog.CSW =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.3/files/changelog.CSW 2012-10-02 12:43:26 UTC (rev 19358) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.3/files/changelog.CSW 2012-10-02 13:09:19 UTC (rev 19359) @@ -1,3 +1,10 @@ +postgresql83 (8.3.21,REV=2012.10.02) + + * New upstream release 8.3.21. + + -- Rafael Ostertag Tue, 02 Oct 2012 07:40:08+0200 + + postgresql83 (8.3.20,REV=2012.08.22) * New upstream release 8.3.20. 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 Oct 2 15:39:25 2012 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Tue, 02 Oct 2012 13:39:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[19360] csw/mgar/pkg/ffmpeg/trunk/Makefile Message-ID: Revision: 19360 http://gar.svn.sourceforge.net/gar/?rev=19360&view=rev Author: janholzh Date: 2012-10-02 13:39:25 +0000 (Tue, 02 Oct 2012) Log Message: ----------- ffmpeg/trunk: enable pic for sparcv8 too Modified Paths: -------------- csw/mgar/pkg/ffmpeg/trunk/Makefile Modified: csw/mgar/pkg/ffmpeg/trunk/Makefile =================================================================== --- csw/mgar/pkg/ffmpeg/trunk/Makefile 2012-10-02 13:09:19 UTC (rev 19359) +++ csw/mgar/pkg/ffmpeg/trunk/Makefile 2012-10-02 13:39:25 UTC (rev 19360) @@ -48,6 +48,7 @@ RUNTIME_DEP_PKGS_CSWlibavcodec54 += CSWlibtheoraenc1 RUNTIME_DEP_PKGS_CSWlibavcodec54 += CSWlibspeex1 RUNTIME_DEP_PKGS_CSWlibavcodec54 += CSWlibx264-125 +RUNTIME_DEP_PKGS_CSWlibavcodec54 += CSWlibgcc-s1 PACKAGES += CSWlibavdevice54 SPKG_DESC_CSWlibavdevice54 = FFMPEG library libavdevice.so.54 @@ -67,6 +68,7 @@ RUNTIME_DEP_PKGS_CSWlibavdevice54 += CSWlibfreetype6 RUNTIME_DEP_PKGS_CSWlibavdevice54 += CSWlibspeex1 RUNTIME_DEP_PKGS_CSWlibavdevice54 += CSWlibx264-125 +RUNTIME_DEP_PKGS_CSWlibavdevice54 += CSWlibgcc-s1 PACKAGES += CSWlibavfilter3 SPKG_DESC_CSWlibavfilter3 = FFMPEG library libavfilter.so.3 @@ -78,6 +80,7 @@ RUNTIME_DEP_PKGS_CSWlibavfilter3 += CSWlibswresample0 RUNTIME_DEP_PKGS_CSWlibavfilter3 += CSWlibfreetype6 RUNTIME_DEP_PKGS_CSWlibavfilter3 += CSWlibpostproc52 +RUNTIME_DEP_PKGS_CSWlibavfilter3 += CSWlibgcc-s1 PACKAGES += CSWlibavformat54 SPKG_DESC_CSWlibavformat54 = FFMPEG library libavformat.so.54 @@ -86,25 +89,30 @@ RUNTIME_DEP_PKGS_CSWlibavformat54 += CSWlibavutil51 RUNTIME_DEP_PKGS_CSWlibavformat54 += CSWlibz1 RUNTIME_DEP_PKGS_CSWlibavformat54 += CSWlibavcodec54 +RUNTIME_DEP_PKGS_CSWlibavformat54 += CSWlibgcc-s1 PACKAGES += CSWlibavutil51 SPKG_DESC_CSWlibavutil51 = FFMPEG library libavutil.so.51 PKGFILES_CSWlibavutil51 += $(call pkgfiles_lib,libavutil.so.51) +RUNTIME_DEP_PKGS_CSWlibavutil51 += CSWlibgcc-s1 PACKAGES += CSWlibpostproc52 SPKG_DESC_CSWlibpostproc52 = FFMPEG library libpostproc.so.52 PKGFILES_CSWlibpostproc52 += $(call pkgfiles_lib,libpostproc.so.52) RUNTIME_DEP_PKGS_CSWlibpostproc52 += CSWlibavutil51 +RUNTIME_DEP_PKGS_CSWlibpostproc52 += CSWlibgcc-s1 PACKAGES += CSWlibswscale2 SPKG_DESC_CSWlibswscale2 = FFMPEG library libswscale.so.2 PKGFILES_CSWlibswscale2 += $(call pkgfiles_lib,libswscale.so.2) RUNTIME_DEP_PKGS_CSWlibswscale2 += CSWlibavutil51 +RUNTIME_DEP_PKGS_CSWlibswscale2 += CSWlibgcc-s1 PACKAGES += CSWlibswresample0 SPKG_DESC_CSWlibswresample0 = FFMPEG library libswresample.so.0 PKGFILES_CSWlibswresample0 += $(call pkgfiles_lib,libswresample.so.0) RUNTIME_DEP_PKGS_CSWlibswresample0 += CSWlibavutil51 +RUNTIME_DEP_PKGS_CSWlibswresample0 += CSWlibgcc-s1 PACKAGES += CSWffmpeg-dev SPKG_DESC_CSWffmpeg-dev = Development files for several FFMPEG shared libraries @@ -170,8 +178,9 @@ #no asm on sparc CONFIGURE_ARGS_sparc = --disable-asm -#64bit needs pic code -CONFIGURE_ARGS_64 = --enable-pic +#64bit and sparc needs pic code +CONFIGURE_ARGS_amd64 = --enable-pic +CONFIGURE_ARGS_sparc = --enable-pic CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARCH)) CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(ISA)) 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 Oct 2 17:19:37 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 02 Oct 2012 15:19:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[19361] csw/mgar/pkg/apache2/branches/apache24/Makefile Message-ID: Revision: 19361 http://gar.svn.sourceforge.net/gar/?rev=19361&view=rev Author: bdwalton Date: 2012-10-02 15:19:37 +0000 (Tue, 02 Oct 2012) Log Message: ----------- apache2/branches/apache24: update configure options to start fresh for 2.4; drop other 2.2 mgar targets Modified Paths: -------------- csw/mgar/pkg/apache2/branches/apache24/Makefile Modified: csw/mgar/pkg/apache2/branches/apache24/Makefile =================================================================== --- csw/mgar/pkg/apache2/branches/apache24/Makefile 2012-10-02 13:39:25 UTC (rev 19360) +++ csw/mgar/pkg/apache2/branches/apache24/Makefile 2012-10-02 15:19:37 UTC (rev 19361) @@ -48,14 +48,15 @@ INITSMF = /etc/opt/csw/init.d/cswapache2 # Build Configuration -CONFIGURE_ARGS += --with-apr=$(prefix)/bin/apr-1-config -CONFIGURE_ARGS += --with-apr-util=$(prefix)/bin/apu-1-config -CONFIGURE_ARGS += --with-mpm=$(MPM) -CONFIGURE_ARGS += --disable-static -CONFIGURE_ARGS += --enable-layout=csw -CONFIGURE_ARGS += --enable-rule=SSL_EXPERIMENTAL -CONFIGURE_ARGS += --enable-ssl -CONFIGURE_ARGS += --with-z=$(prefix) +CONFIGURE_ARGS = --with-apr=$(prefix) +CONFIGURE_ARGS += --with-pcre=$(prefix) +CONFIGURE_ARGS += --with-libxml2=$(prefix) +CONFIGURE_ARGS += --with-lua=$(prefix) +CONFIGURE_ARGS += --enable-mpms-shared=all +CONFIGURE_ARGS += --enable-layout=OpenCSW +CONFIGURE_ARGS += --enable-mods-shared=all +CONFIGURE_ARGS += --enable-privileges +CONFIGURE_ARGS += --enable-vhost-alias CONFIGURE_ARGS += --with-ssl=$(prefix) # Fixup target variables @@ -69,11 +70,3 @@ CFLAGS := -DSSL_EXPERIMENTAL -DSSL_ENGINE $(CFLAGS) -FIXCONFIG_DIRS = $(DESTDIR) -FIXCONFIG_RMPATHS = $(DESTDIR) - -pre-configure-modulated: - (cd $(WORKDIR)/$(NAME)-$(VERSION); ./buildconf) - @gsed -e s,INSTALL_PREFIX,$(prefix)/apache2,g \ - $(WORKDIR)/config.layout > $(WORKDIR)/$(NAME)-$(VERSION)/config.layout - @$(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 Tue Oct 2 17:33:58 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 02 Oct 2012 15:33:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[19362] csw/mgar/pkg/apache2/branches/apache24/Makefile Message-ID: Revision: 19362 http://gar.svn.sourceforge.net/gar/?rev=19362&view=rev Author: bdwalton Date: 2012-10-02 15:33:58 +0000 (Tue, 02 Oct 2012) Log Message: ----------- apache2/branches/apache24: make this a solaris 10 only package Modified Paths: -------------- csw/mgar/pkg/apache2/branches/apache24/Makefile Modified: csw/mgar/pkg/apache2/branches/apache24/Makefile =================================================================== --- csw/mgar/pkg/apache2/branches/apache24/Makefile 2012-10-02 15:19:37 UTC (rev 19361) +++ csw/mgar/pkg/apache2/branches/apache24/Makefile 2012-10-02 15:33:58 UTC (rev 19362) @@ -5,6 +5,8 @@ CATEGORIES = server GARTYPE = v2 +PACKAGING_PLATFORMS = solaris10-i386 solaris10-sparc + DESCRIPTION = A high performance HTTP server. define BLURB Apache is the world\'s most popular HTTP server, being quite possibly the This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From opk at users.sourceforge.net Tue Oct 2 17:54:45 2012 From: opk at users.sourceforge.net (opk at users.sourceforge.net) Date: Tue, 02 Oct 2012 15:54:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[19363] csw/mgar/pkg/nmh/trunk Message-ID: Revision: 19363 http://gar.svn.sourceforge.net/gar/?rev=19363&view=rev Author: opk Date: 2012-10-02 15:54:45 +0000 (Tue, 02 Oct 2012) Log Message: ----------- nmh/trunk: update to 1.5 Modified Paths: -------------- csw/mgar/pkg/nmh/trunk/Makefile csw/mgar/pkg/nmh/trunk/checksums csw/mgar/pkg/nmh/trunk/files/0000-skip-chgrp-of-inc.patch Added Paths: ----------- csw/mgar/pkg/nmh/trunk/files/0001-use-csw-locations.patch Modified: csw/mgar/pkg/nmh/trunk/Makefile =================================================================== --- csw/mgar/pkg/nmh/trunk/Makefile 2012-10-02 15:33:58 UTC (rev 19362) +++ csw/mgar/pkg/nmh/trunk/Makefile 2012-10-02 15:54:45 UTC (rev 19363) @@ -1,6 +1,6 @@ # $Id$ NAME = nmh -VERSION = 1.4 +VERSION = 1.5 CATEGORIES = apps GARTYPE = v2 @@ -18,8 +18,7 @@ SPKG_SOURCEURL = http://www.nongnu.org/nmh/ UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz -RUNTIME_DEP_PKGS += CSWlibiconv2 -PATCHFILES += 0000-skip-chgrp-of-inc.patch +RUNTIME_DEP_PKGS += CSWlibreadline6 CSWlibiconv2 LICENSE = COPYRIGHT PRESERVECONF = /etc/opt/csw/nmh/mts.conf @@ -28,4 +27,11 @@ --libdir=$(libdir)/nmh --sysconfdir=$(sysconfdir)/nmh TEST_SCRIPTS = +EXTRA_MERGE_EXCLUDE_FILES = $(datadir)/doc/nmh/(contrib.*|INSTALL|COPYRIGHT|README.developers|README.manpages) + +CHECKPKG_OVERRIDES_CSWnmh += file-with-bad-content|/usr/local|root/opt/csw/share/doc/nmh/FAQ +CHECKPKG_OVERRIDES_CSWnmh += file-with-bad-content|/usr/local|root/opt/csw/share/doc/nmh/MAIL.FILTERING +CHECKPKG_OVERRIDES_CSWnmh += file-with-bad-content|/export/home|root/opt/csw/share/doc/nmh/README-ATTACHMENTS + + include gar/category.mk Modified: csw/mgar/pkg/nmh/trunk/checksums =================================================================== --- csw/mgar/pkg/nmh/trunk/checksums 2012-10-02 15:33:58 UTC (rev 19362) +++ csw/mgar/pkg/nmh/trunk/checksums 2012-10-02 15:54:45 UTC (rev 19363) @@ -1 +1 @@ -ef55286a821c53dc52b8974977c011ca nmh-1.4.tar.gz +5a7bc5a157f4428f7660bb882e842375 nmh-1.5.tar.gz Modified: csw/mgar/pkg/nmh/trunk/files/0000-skip-chgrp-of-inc.patch =================================================================== --- csw/mgar/pkg/nmh/trunk/files/0000-skip-chgrp-of-inc.patch 2012-10-02 15:33:58 UTC (rev 19362) +++ csw/mgar/pkg/nmh/trunk/files/0000-skip-chgrp-of-inc.patch 2012-10-02 15:54:45 UTC (rev 19363) @@ -1,5 +1,5 @@ From db3d12ec17a80fad52a5a463ad42bfbc6d70ad91 Mon Sep 17 00:00:00 2001 -From: Oliver Kiddle +From: Oliver Kiddle Date: Mon, 25 Oct 2010 12:52:51 +0200 Subject: [PATCH] skip chgrp of inc Added: csw/mgar/pkg/nmh/trunk/files/0001-use-csw-locations.patch =================================================================== --- csw/mgar/pkg/nmh/trunk/files/0001-use-csw-locations.patch (rev 0) +++ csw/mgar/pkg/nmh/trunk/files/0001-use-csw-locations.patch 2012-10-02 15:54:45 UTC (rev 19363) @@ -0,0 +1,25 @@ +From dcd309fb58c93684a68cde8baeb0fa09b03de8f8 Mon Sep 17 00:00:00 2001 +From: Oliver Kiddle +Date: Tue, 2 Oct 2012 17:46:52 +0200 +Subject: [PATCH 3/3] use csw locations + +--- + docs/COMPLETION-ZSH | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/docs/COMPLETION-ZSH b/docs/COMPLETION-ZSH +index 5c10cc8..d60f789 100644 +--- a/docs/COMPLETION-ZSH ++++ b/docs/COMPLETION-ZSH +@@ -93,7 +93,7 @@ mhfile () { + local mhfpath file + # EDIT ME + # Array containing all the places nmh will look for templates etc. +- mhfpath=(~/Mail /usr/local/nmh/lib) ++ mhfpath=(~/Mail /etc/opt/csw/nmh /opt/csw/etc/nmh) + + # Emulate completeinword behaviour as appropriate + local wordstr +-- +1.7.10.3 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From opk at users.sourceforge.net Tue Oct 2 18:33:57 2012 From: opk at users.sourceforge.net (opk at users.sourceforge.net) Date: Tue, 02 Oct 2012 16:33:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[19364] csw/mgar/pkg/nmh/trunk Message-ID: Revision: 19364 http://gar.svn.sourceforge.net/gar/?rev=19364&view=rev Author: opk Date: 2012-10-02 16:33:57 +0000 (Tue, 02 Oct 2012) Log Message: ----------- nmh/trunk: correct nmh patches Modified Paths: -------------- csw/mgar/pkg/nmh/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/nmh/trunk/files/0000-skip-chgrp-of-inc.patch Modified: csw/mgar/pkg/nmh/trunk/Makefile =================================================================== --- csw/mgar/pkg/nmh/trunk/Makefile 2012-10-02 15:54:45 UTC (rev 19363) +++ csw/mgar/pkg/nmh/trunk/Makefile 2012-10-02 16:33:57 UTC (rev 19364) @@ -22,6 +22,8 @@ LICENSE = COPYRIGHT PRESERVECONF = /etc/opt/csw/nmh/mts.conf +PATCHFILES += 0001-use-csw-locations.patch + CONFIGURE_ARGS = --enable-pop --enable-masquerade='' --with-mts=sendmail \ --prefix=$(prefix) --mandir=$(mandir) --datadir=$(datadir)/nmh \ --libdir=$(libdir)/nmh --sysconfdir=$(sysconfdir)/nmh Deleted: csw/mgar/pkg/nmh/trunk/files/0000-skip-chgrp-of-inc.patch =================================================================== --- csw/mgar/pkg/nmh/trunk/files/0000-skip-chgrp-of-inc.patch 2012-10-02 15:54:45 UTC (rev 19363) +++ csw/mgar/pkg/nmh/trunk/files/0000-skip-chgrp-of-inc.patch 2012-10-02 16:33:57 UTC (rev 19364) @@ -1,29 +0,0 @@ -From db3d12ec17a80fad52a5a463ad42bfbc6d70ad91 Mon Sep 17 00:00:00 2001 -From: Oliver Kiddle -Date: Mon, 25 Oct 2010 12:52:51 +0200 -Subject: [PATCH] skip chgrp of inc - ---- - uip/Makefile.in | 6 +----- - 1 files changed, 1 insertions(+), 5 deletions(-) - -diff --git a/uip/Makefile.in b/uip/Makefile.in -index b3c6717..2919bb9 100644 ---- a/uip/Makefile.in -+++ b/uip/Makefile.in -@@ -282,11 +282,7 @@ install-misc: - - # install commands with special installation needs (thus no $(SCMDS) use here) - install-scmds: -- if test x$(SETGID_MAIL) != x; then \ -- $(INSTALL_PROGRAM) -g $(MAIL_SPOOL_GRP) -m 2755 inc $(DESTDIR)$(bindir)/$$cmd; \ -- else \ -- $(INSTALL_PROGRAM) inc $(DESTDIR)$(bindir)/$$cmd; \ -- fi -+ $(INSTALL_PROGRAM) inc $(DESTDIR)$(bindir)/$$cmd - - uninstall: - for cmd in $(CMDS); do \ --- -1.7.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 Tue Oct 2 22:29:00 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 02 Oct 2012 20:29:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[19365] csw/mgar/pkg/apache2/branches/apache24/Makefile Message-ID: Revision: 19365 http://gar.svn.sourceforge.net/gar/?rev=19365&view=rev Author: bdwalton Date: 2012-10-02 20:28:59 +0000 (Tue, 02 Oct 2012) Log Message: ----------- apache2/branches/apache24: force bdb48 into rpath, set package name (no splits for now) Modified Paths: -------------- csw/mgar/pkg/apache2/branches/apache24/Makefile Modified: csw/mgar/pkg/apache2/branches/apache24/Makefile =================================================================== --- csw/mgar/pkg/apache2/branches/apache24/Makefile 2012-10-02 16:33:57 UTC (rev 19364) +++ csw/mgar/pkg/apache2/branches/apache24/Makefile 2012-10-02 20:28:59 UTC (rev 19365) @@ -39,6 +39,8 @@ # Standard package bits DISTFILES += cswapache2 +PACKAGES = CSWapache24 + PATCHFILES += 0001-Add-an-OpenCSW-option-to-config.layout.patch BUILD_DEP_PKGS += CSWlibaprutil-dev @@ -49,6 +51,9 @@ # the Makefile. INITSMF = /etc/opt/csw/init.d/cswapache2 +# We need this to get bdb48/lib into the runpath +EXTRA_LIB = $(prefix)/bdb48/lib + # Build Configuration CONFIGURE_ARGS = --with-apr=$(prefix) CONFIGURE_ARGS += --with-pcre=$(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 Tue Oct 2 23:19:02 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 02 Oct 2012 21:19:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[19366] csw/mgar/pkg/apache2/branches/apache24/Makefile Message-ID: Revision: 19366 http://gar.svn.sourceforge.net/gar/?rev=19366&view=rev Author: bdwalton Date: 2012-10-02 21:19:02 +0000 (Tue, 02 Oct 2012) Log Message: ----------- apache2/branches/apache24: add library dependencies Modified Paths: -------------- csw/mgar/pkg/apache2/branches/apache24/Makefile Modified: csw/mgar/pkg/apache2/branches/apache24/Makefile =================================================================== --- csw/mgar/pkg/apache2/branches/apache24/Makefile 2012-10-02 20:28:59 UTC (rev 19365) +++ csw/mgar/pkg/apache2/branches/apache24/Makefile 2012-10-02 21:19:02 UTC (rev 19366) @@ -41,6 +41,18 @@ PACKAGES = CSWapache24 +RUNTIME_DEP_PKGS_CSWapache24 += CSWliblber2-4-2 +RUNTIME_DEP_PKGS_CSWapache24 += CSWlibaprutil1-0 +RUNTIME_DEP_PKGS_CSWapache24 += CSWlibssl1-0-0 +RUNTIME_DEP_PKGS_CSWapache24 += CSWlibexpat1 +RUNTIME_DEP_PKGS_CSWapache24 += CSWlibz1 +RUNTIME_DEP_PKGS_CSWapache24 += CSWlibpcre1 +RUNTIME_DEP_PKGS_CSWapache24 += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWapache24 += CSWbdb48 +RUNTIME_DEP_PKGS_CSWapache24 += CSWliblua5-2 +RUNTIME_DEP_PKGS_CSWapache24 += CSWlibapr1-0 +RUNTIME_DEP_PKGS_CSWapache24 += CSWlibldap2-4-2 + PATCHFILES += 0001-Add-an-OpenCSW-option-to-config.layout.patch BUILD_DEP_PKGS += CSWlibaprutil-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 Tue Oct 2 23:30:57 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 02 Oct 2012 21:30:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[19367] csw/mgar/pkg/apache2/branches/apache24/Makefile Message-ID: Revision: 19367 http://gar.svn.sourceforge.net/gar/?rev=19367&view=rev Author: bdwalton Date: 2012-10-02 21:30:57 +0000 (Tue, 02 Oct 2012) Log Message: ----------- apache2/branches/apache24: split out the manual package Modified Paths: -------------- csw/mgar/pkg/apache2/branches/apache24/Makefile Modified: csw/mgar/pkg/apache2/branches/apache24/Makefile =================================================================== --- csw/mgar/pkg/apache2/branches/apache24/Makefile 2012-10-02 21:19:02 UTC (rev 19366) +++ csw/mgar/pkg/apache2/branches/apache24/Makefile 2012-10-02 21:30:57 UTC (rev 19367) @@ -40,7 +40,7 @@ DISTFILES += cswapache2 PACKAGES = CSWapache24 - +SPKG_DESC_CSWapache24 = $(DESCRIPTION) RUNTIME_DEP_PKGS_CSWapache24 += CSWliblber2-4-2 RUNTIME_DEP_PKGS_CSWapache24 += CSWlibaprutil1-0 RUNTIME_DEP_PKGS_CSWapache24 += CSWlibssl1-0-0 @@ -53,6 +53,12 @@ RUNTIME_DEP_PKGS_CSWapache24 += CSWlibapr1-0 RUNTIME_DEP_PKGS_CSWapache24 += CSWlibldap2-4-2 +PACKAGES += CSWapache24-manual +SPKG_DESC_CSWapache24-manual = The Apache 2.4 Manual +PKGFILES_CSWapache24-manual = /var/opt/csw/apache24/manual.* +RUNTIME_DEPS_CSWapache24-manual = CSWapache24 +CHECKPKG_OVERRIDES_CSWapache24-manual += file-with-bad-content + PATCHFILES += 0001-Add-an-OpenCSW-option-to-config.layout.patch BUILD_DEP_PKGS += CSWlibaprutil-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 Wed Oct 3 08:43:16 2012 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Wed, 03 Oct 2012 06:43:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[19368] csw/mgar/pkg/postgresql/branches/postgresql-9.1 Message-ID: Revision: 19368 http://gar.svn.sourceforge.net/gar/?rev=19368&view=rev Author: guengel Date: 2012-10-03 06:43:16 +0000 (Wed, 03 Oct 2012) Log Message: ----------- postgresql/branches/postgresql-9.1: New upstream release Modified Paths: -------------- csw/mgar/pkg/postgresql/branches/postgresql-9.1/Makefile csw/mgar/pkg/postgresql/branches/postgresql-9.1/checksums csw/mgar/pkg/postgresql/branches/postgresql-9.1/files/0000-Run-tests-in-var-tmp-pgsql-tmp_check.patch csw/mgar/pkg/postgresql/branches/postgresql-9.1/files/changelog.CSW Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.1/Makefile =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-9.1/Makefile 2012-10-02 21:30:57 UTC (rev 19367) +++ csw/mgar/pkg/postgresql/branches/postgresql-9.1/Makefile 2012-10-03 06:43:16 UTC (rev 19368) @@ -90,7 +90,7 @@ BASE_VERSION = 9.1 VERSION_NODOT = $(subst .,_,$(BASE_VERSION)) BASE_VERSION_NODOT = $(subst .,,$(BASE_VERSION)) -PATCHLEVEL = 5 +PATCHLEVEL = 6 VERSION = $(BASE_VERSION).$(PATCHLEVEL) CATEGORIES = apps GARTYPE = v2 @@ -324,11 +324,8 @@ 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 += CSWlibxslt1 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibgssapi-krb5-2 #ALTERNATIVES_CSW$(NAME)$(BASE_VERSION_NODOT)-server = $(foreach i,$(NEEDED_ISAS), server_$(i)) @@ -346,9 +343,6 @@ 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 += CSWlibxslt1 -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibxml2-2 -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibgssapi-krb5-2 #ALTERNATIVES_CSW$(NAME)$(BASE_VERSION_NODOT)-client = $(foreach i,$(NEEDED_ISAS), client_$(i)) PACKAGES += CSW$(NAME)$(BASE_VERSION_NODOT)-contrib @@ -369,8 +363,6 @@ RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibpq5 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 #ALTERNATIVES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib = $(foreach i,$(NEEDED_ISAS), contrib_$(i)) PACKAGES += CSW$(NAME)-dev @@ -414,7 +406,6 @@ 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 PACKAGES += CSWlibecpg6 SPKG_DESC_CSWlibecpg6 = PostgreSQL $(VERSION), libecpg Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.1/checksums =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-9.1/checksums 2012-10-02 21:30:57 UTC (rev 19367) +++ csw/mgar/pkg/postgresql/branches/postgresql-9.1/checksums 2012-10-03 06:43:16 UTC (rev 19368) @@ -1 +1 @@ -c784decb60615aa94c6a31601bc6ffd2 postgresql-9.1.5.tar.bz2 +000755f66c0de58bbd4cd2b89b45b8e2 postgresql-9.1.6.tar.bz2 Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.1/files/0000-Run-tests-in-var-tmp-pgsql-tmp_check.patch =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-9.1/files/0000-Run-tests-in-var-tmp-pgsql-tmp_check.patch 2012-10-02 21:30:57 UTC (rev 19367) +++ csw/mgar/pkg/postgresql/branches/postgresql-9.1/files/0000-Run-tests-in-var-tmp-pgsql-tmp_check.patch 2012-10-03 06:43:16 UTC (rev 19368) @@ -17,11 +17,11 @@ pg_regress_locale_flags = $(if $(ENCODING),--encoding=$(ENCODING)) $(NOLOCALE) -pg_regress_check = $(top_builddir)/src/test/regress/pg_regress --inputdir=$(srcdir) --temp-install=./tmp_check --top-builddir=$(top_builddir) $(pg_regress_locale_flags) -+pg_regress_check = $(top_builddir)/src/test/regress/pg_regress --inputdir=$(srcdir) --temp-install=/var/tmp/pgsql/tmp_check --top-builddir=$(top_builddir) $(pg_regress_locale_flags) ++pg_regress_check = $(top_builddir)/src/test/regress/pg_regress --inputdir=$(srcdir) --temp-install=/var/tmp/pgsql/tmp_check/91 --top-builddir=$(top_builddir) $(pg_regress_locale_flags) pg_regress_installcheck = $(top_builddir)/src/test/regress/pg_regress --inputdir=$(srcdir) --psqldir='$(PSQLDIR)' $(pg_regress_locale_flags) -pg_regress_clean_files = results/ regression.diffs regression.out tmp_check/ log/ -+pg_regress_clean_files = results/ regression.diffs regression.out /var/tmp/pgsql/tmp_check log/ ++pg_regress_clean_files = results/ regression.diffs regression.out /var/tmp/pgsql/tmp_check/91 log/ ########################################################################## @@ -33,7 +33,7 @@ REGRESS_OPTS = --dlpath=. check: all tablespace-setup -+ install -d /var/tmp/pgsql/tmp_check ++ install -d /var/tmp/pgsql/tmp_check/91 $(pg_regress_check) $(REGRESS_OPTS) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) $(TEMP_CONF) $(EXTRA_TESTS) installcheck: all tablespace-setup @@ -41,7 +41,7 @@ $(pg_regress_installcheck) $(REGRESS_OPTS) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) $(EXTRA_TESTS) standbycheck: all -+ install -d /var/tmp/pgsql/tmp_check ++ install -d /var/tmp/pgsql/tmp_check/91 $(pg_regress_installcheck) $(REGRESS_OPTS) --schedule=$(srcdir)/standby_schedule --use-existing # old interfaces follow... @@ -49,11 +49,11 @@ runtest-parallel: installcheck-parallel bigtest: all tablespace-setup -+ install -d /var/tmp/pgsql/tmp_check ++ install -d /var/tmp/pgsql/tmp_check/91 $(pg_regress_installcheck) $(REGRESS_OPTS) --schedule=$(srcdir)/serial_schedule numeric_big bigcheck: all tablespace-setup -+ install -d /var/tmp/pgsql/tmp_check ++ install -d /var/tmp/pgsql/tmp_check/91 $(pg_regress_check) $(REGRESS_OPTS) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) numeric_big Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.1/files/changelog.CSW =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-9.1/files/changelog.CSW 2012-10-02 21:30:57 UTC (rev 19367) +++ csw/mgar/pkg/postgresql/branches/postgresql-9.1/files/changelog.CSW 2012-10-03 06:43:16 UTC (rev 19368) @@ -1,3 +1,10 @@ +postgresql91 (9.1.6,REV=2012.10.03) + + * New upstream release 9.1.6. + + -- Rafael Ostertag Tue, 02 Oct 2012 15:14:12+0200 + + postgresql91 (9.1.5,REV=2012.08.22) * New upstream release 9.1.5. 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 Oct 3 08:43:37 2012 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Wed, 03 Oct 2012 06:43:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[19369] csw/mgar/pkg/postgresql/trunk Message-ID: Revision: 19369 http://gar.svn.sourceforge.net/gar/?rev=19369&view=rev Author: guengel Date: 2012-10-03 06:43:37 +0000 (Wed, 03 Oct 2012) Log Message: ----------- postgresql/trunk: New upstream release 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-10-03 06:43:16 UTC (rev 19368) +++ csw/mgar/pkg/postgresql/trunk/Makefile 2012-10-03 06:43:37 UTC (rev 19369) @@ -90,7 +90,7 @@ BASE_VERSION = 9.2 VERSION_NODOT = $(subst .,_,$(BASE_VERSION)) BASE_VERSION_NODOT = $(subst .,,$(BASE_VERSION)) -PATCHLEVEL = 0 +PATCHLEVEL = 1 VERSION = $(BASE_VERSION).$(PATCHLEVEL) CATEGORIES = apps GARTYPE = v2 @@ -131,9 +131,9 @@ # FreeBSD postgresql port. # # 8.4 has removed ipcclean -BIN_NAMES_SERVER = initdb pg_controldata pg_ctl pg_resetxlog pg_receivexlog pg_basebackup postmaster postgres +BIN_NAMES_SERVER = postmaster initdb pg_controldata pg_ctl pg_resetxlog pg_receivexlog pg_basebackup postgres BIN_NAMES_DEVEL = ecpg pg_config -BIN_NAMES_CLIENT = clusterdb createdb createlang createuser dropdb droplang dropuser pg_dump pg_dumpall pg_restore psql reindexdb vacuumdb clusterdb +BIN_NAMES_CLIENT = psql clusterdb createdb createlang createuser dropdb droplang dropuser pg_dump pg_dumpall pg_restore reindexdb vacuumdb clusterdb BIN_NAMES_CONTRIB = oid2name pgbench pg_standby vacuumlo pg_upgrade pg_archivecleanup pg_test_fsync pg_test_timing # These are shared objects used by the server. Please note, contrib installs # also shared object in the same place, so make sure you don't mix up things @@ -329,11 +329,9 @@ 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 += CSWlibxslt1 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-server += CSWlibgssapi-krb5-2 #ALTERNATIVES_CSW$(NAME)$(BASE_VERSION_NODOT)-server = $(foreach i,$(NEEDED_ISAS), server_$(i)) @@ -351,9 +349,6 @@ 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 += CSWlibxslt1 -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibxml2-2 -RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-client += CSWlibgssapi-krb5-2 #ALTERNATIVES_CSW$(NAME)$(BASE_VERSION_NODOT)-client = $(foreach i,$(NEEDED_ISAS), client_$(i)) PACKAGES += CSW$(NAME)$(BASE_VERSION_NODOT)-contrib @@ -374,8 +369,6 @@ RUNTIME_DEP_PKGS_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib += CSWlibpq5 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 #ALTERNATIVES_CSW$(NAME)$(BASE_VERSION_NODOT)-contrib = $(foreach i,$(NEEDED_ISAS), contrib_$(i)) PACKAGES += CSW$(NAME)-dev @@ -419,7 +412,6 @@ 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 PACKAGES += CSWlibecpg6 SPKG_DESC_CSWlibecpg6 = PostgreSQL $(VERSION), libecpg Modified: csw/mgar/pkg/postgresql/trunk/checksums =================================================================== --- csw/mgar/pkg/postgresql/trunk/checksums 2012-10-03 06:43:16 UTC (rev 19368) +++ csw/mgar/pkg/postgresql/trunk/checksums 2012-10-03 06:43:37 UTC (rev 19369) @@ -1 +1 @@ -8c4c32a4abe8cf61b02c8366181ede50 postgresql-9.2.0.tar.bz2 +c0b4799ea9850eae3ead14f0a60e9418 postgresql-9.2.1.tar.bz2 Modified: csw/mgar/pkg/postgresql/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/postgresql/trunk/files/changelog.CSW 2012-10-03 06:43:16 UTC (rev 19368) +++ csw/mgar/pkg/postgresql/trunk/files/changelog.CSW 2012-10-03 06:43:37 UTC (rev 19369) @@ -1,3 +1,10 @@ +postgresql92 (9.2.1,REV=2012.10.03) + + * New upstream release 9.2.1 + + -- Rafael Ostertag Tue, 02 Oct 2012 15:16:34 +0200 + + postgresql92 (9.2.0,REV=2012.09.16) * New upstream release 9.2.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 Oct 3 10:43:38 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 03 Oct 2012 08:43:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[19370] csw/mgar/pkg/apache2/branches/apache24/Makefile Message-ID: Revision: 19370 http://gar.svn.sourceforge.net/gar/?rev=19370&view=rev Author: bdwalton Date: 2012-10-03 08:43:38 +0000 (Wed, 03 Oct 2012) Log Message: ----------- apache2/branches/apache24: split out the dev package Modified Paths: -------------- csw/mgar/pkg/apache2/branches/apache24/Makefile Modified: csw/mgar/pkg/apache2/branches/apache24/Makefile =================================================================== --- csw/mgar/pkg/apache2/branches/apache24/Makefile 2012-10-03 06:43:37 UTC (rev 19369) +++ csw/mgar/pkg/apache2/branches/apache24/Makefile 2012-10-03 08:43:38 UTC (rev 19370) @@ -59,6 +59,10 @@ RUNTIME_DEPS_CSWapache24-manual = CSWapache24 CHECKPKG_OVERRIDES_CSWapache24-manual += file-with-bad-content +PACKAGES += CSWapache24-dev +SPKG_DESC_CSWapache24-dev = The Apache 2.4 Development Files +PKGFILES_CSWapache24-dev = $(PKGFILES_DEVEL) + PATCHFILES += 0001-Add-an-OpenCSW-option-to-config.layout.patch BUILD_DEP_PKGS += CSWlibaprutil-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 Wed Oct 3 10:57:50 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 03 Oct 2012 08:57:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[19371] csw/mgar/pkg/apache2/branches/apache24/Makefile Message-ID: Revision: 19371 http://gar.svn.sourceforge.net/gar/?rev=19371&view=rev Author: bdwalton Date: 2012-10-03 08:57:50 +0000 (Wed, 03 Oct 2012) Log Message: ----------- apache2/branches/apache24: make the manual package arch neutral Modified Paths: -------------- csw/mgar/pkg/apache2/branches/apache24/Makefile Modified: csw/mgar/pkg/apache2/branches/apache24/Makefile =================================================================== --- csw/mgar/pkg/apache2/branches/apache24/Makefile 2012-10-03 08:43:38 UTC (rev 19370) +++ csw/mgar/pkg/apache2/branches/apache24/Makefile 2012-10-03 08:57:50 UTC (rev 19371) @@ -54,6 +54,7 @@ RUNTIME_DEP_PKGS_CSWapache24 += CSWlibldap2-4-2 PACKAGES += CSWapache24-manual +ARCHALL_CSWapache24-manual = 1 SPKG_DESC_CSWapache24-manual = The Apache 2.4 Manual PKGFILES_CSWapache24-manual = /var/opt/csw/apache24/manual.* RUNTIME_DEPS_CSWapache24-manual = CSWapache24 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 Oct 3 22:14:12 2012 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 03 Oct 2012 20:14:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[19372] csw/mgar/pkg/gcc4/trunk/Makefile Message-ID: Revision: 19372 http://gar.svn.sourceforge.net/gar/?rev=19372&view=rev Author: wahwah Date: 2012-10-03 20:14:12 +0000 (Wed, 03 Oct 2012) Log Message: ----------- gcc4/trunk: Don't reset LD_OPTIONS Modified Paths: -------------- csw/mgar/pkg/gcc4/trunk/Makefile Modified: csw/mgar/pkg/gcc4/trunk/Makefile =================================================================== --- csw/mgar/pkg/gcc4/trunk/Makefile 2012-10-03 08:57:50 UTC (rev 19371) +++ csw/mgar/pkg/gcc4/trunk/Makefile 2012-10-03 20:14:12 UTC (rev 19372) @@ -532,8 +532,6 @@ # We need GNU find as find PATH := /opt/csw/gnu:$(PATH) -# This override sets the right RPATH on libstdc++ and other libraries. -LD_OPTIONS := -R/opt/csw/lib -R/opt/csw/lib/\$$ISALIST CONFIGURE_ENV := PATH=$(PATH) CC=$(CC) LD_OPTIONS="$(LD_OPTIONS)" BUILD_ENV := PATH=$(PATH) LD_OPTIONS="$(LD_OPTIONS)" INSTALL_ENV := PATH=$(PATH) 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 Oct 4 10:42:32 2012 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Thu, 04 Oct 2012 08:42:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[19373] csw/mgar/pkg/x264/trunk Message-ID: Revision: 19373 http://gar.svn.sourceforge.net/gar/?rev=19373&view=rev Author: janholzh Date: 2012-10-04 08:42:32 +0000 (Thu, 04 Oct 2012) Log Message: ----------- x264/trunk: update to REV 2216 Revision Links: -------------- http://gar.svn.sourceforge.net/gar/?rev=2216&view=rev Modified Paths: -------------- csw/mgar/pkg/x264/trunk/Makefile csw/mgar/pkg/x264/trunk/files/0001-replace-version.sh.patch Modified: csw/mgar/pkg/x264/trunk/Makefile =================================================================== --- csw/mgar/pkg/x264/trunk/Makefile 2012-10-03 20:14:12 UTC (rev 19372) +++ csw/mgar/pkg/x264/trunk/Makefile 2012-10-04 08:42:32 UTC (rev 19373) @@ -15,7 +15,7 @@ #MASTER_SITES = http://repo.or.cz/w/x264.git/snapshot/ #DISTFILES = c522ad1fed167d0e985e4f9dcdee042473cf74db.tar.gz GIT_REPOS = http://git.videolan.org/git/x264.git -GIT_TREEISH_tig.git = 999b753ff0f4dc872077f4fa90d465e948cbe656 +GIT_TREEISH_tig.git = 198a7ea13ccb727d4ea24b29f5da9b0292387309 # This Patch file needs to be updated on every new version! PATCHFILES += 0001-replace-version.sh.patch @@ -32,8 +32,10 @@ PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 GARCOMPILER = GCC4 SKIPTEST = 1 -BUILD64_LIBS_ONLY = 1 +BUILD64 = 1 +ISAEXEC = 1 + BUILD_DEP_PKGS += CSWffmpeg-dev @@ -49,30 +51,28 @@ PACKAGES += CSWx264 SPKG_DESC_CSWx264 = $(DESCRIPTION) # PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWx264 += CSWlibavcodec54 RUNTIME_DEP_PKGS_CSWx264 += CSWlibavformat54 -RUNTIME_DEP_PKGS_CSWx264 += CSWlibavcodec54 RUNTIME_DEP_PKGS_CSWx264 += CSWlibswscale2 RUNTIME_DEP_PKGS_CSWx264 += CSWlibavutil51 -PACKAGES += CSWlibx264-125 -CATALOGNAME_CSWlibx264-125 = libx264_125 -PKGFILES_CSWlibx264-125 += $(call baseisadirs,$(libdir),libx264\.so\.125) -PKGFILES_CSWlibx264-125 += $(call baseisadirs,$(libdir),libx264\.so\.125(\.\d+)*) -SPKG_DESC_CSWlibx264-125 += $(DESCRIPTION), libx264.so.125 -RUNTIME_DEP_PKGS_CSWlibx264-125 += CSWlibgcc-s1 +PACKAGES += CSWlibx264-128 +CATALOGNAME_CSWlibx264-128 = libx264_128 +PKGFILES_CSWlibx264-128 += $(call baseisadirs,$(libdir),libx264\.so\.128) +PKGFILES_CSWlibx264-128 += $(call baseisadirs,$(libdir),libx264\.so\.128(\.\d+)*) +SPKG_DESC_CSWlibx264-128 += $(DESCRIPTION), libx264.so.128 +RUNTIME_DEP_PKGS_CSWlibx264-128 += CSWlibgcc-s1 PACKAGES += CSWlibx264-dev CATALOGNAME_CSWlibx264-dev = libx264_dev SPKG_DESC_CSWlibx264-dev += $(DESCRIPTION), development files PKGFILES_CSWlibx264-dev += /opt/csw/lib/libx264.so PKGFILES_CSWlibx264-dev += $(PKGFILES_DEVEL) -RUNTIME_DEP_PKGS_CSWlibx264-dev += CSWlibx264-125 +RUNTIME_DEP_PKGS_CSWlibx264-dev += CSWlibx264-128 #Some overrides CHECKPKG_OVERRIDES += pkginfo-description-not-starting-with-uppercase -CHECKPKG_OVERRIDES_CSWlibx264-125 += pkginfo-description-not-starting-with-uppercase -# seems to be checkpkg bug: -CHECKPKG_OVERRIDES_CSWlibx264-125 += non-uniform-lib-versions-in-package|sonames=libx264.so.125 +CHECKPKG_OVERRIDES_CSWlibx264-128 += pkginfo-description-not-starting-with-uppercase Modified: csw/mgar/pkg/x264/trunk/files/0001-replace-version.sh.patch =================================================================== --- csw/mgar/pkg/x264/trunk/files/0001-replace-version.sh.patch 2012-10-03 20:14:12 UTC (rev 19372) +++ csw/mgar/pkg/x264/trunk/files/0001-replace-version.sh.patch 2012-10-04 08:42:32 UTC (rev 19373) @@ -37,10 +37,10 @@ -API=`grep '#define X264_BUILD' < x264.h | sed -e 's/.* \([1-9][0-9]*\).*/\1/'` -echo "#define X264_POINTVER \"0.$API.$VER\"" + -+echo "#define X264_REV 2200" ++echo "#define X264_REV 2216" +echo "#define X264_REV_DIFF 0" -+echo '#define X264_VERSION " r2200 999b753"' -+echo '#define X264_POINTVER "0.125.2200 999b753"' ++echo '#define X264_VERSION " r2216 198a7ea"' ++echo '#define X264_POINTVER "0.128.2216 198a7ea"' +exit 0 -- 1.7.9 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 Oct 4 10:51:15 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 04 Oct 2012 08:51:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[19374] csw/mgar/pkg/apache2/branches/apache24 Message-ID: Revision: 19374 http://gar.svn.sourceforge.net/gar/?rev=19374&view=rev Author: bdwalton Date: 2012-10-04 08:51:14 +0000 (Thu, 04 Oct 2012) Log Message: ----------- apache2/branches/apache24: patch out a usr/local reference and hack out a few others Modified Paths: -------------- csw/mgar/pkg/apache2/branches/apache24/Makefile Added Paths: ----------- csw/mgar/pkg/apache2/branches/apache24/files/0002-Switch-usr-local-for-opt-csw-in-default-cgi-path.patch Modified: csw/mgar/pkg/apache2/branches/apache24/Makefile =================================================================== --- csw/mgar/pkg/apache2/branches/apache24/Makefile 2012-10-04 08:42:32 UTC (rev 19373) +++ csw/mgar/pkg/apache2/branches/apache24/Makefile 2012-10-04 08:51:14 UTC (rev 19374) @@ -52,6 +52,7 @@ RUNTIME_DEP_PKGS_CSWapache24 += CSWliblua5-2 RUNTIME_DEP_PKGS_CSWapache24 += CSWlibapr1-0 RUNTIME_DEP_PKGS_CSWapache24 += CSWlibldap2-4-2 +CHECKPKG_OVERRIDES_CSWapache24 += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/htdbm.1 PACKAGES += CSWapache24-manual ARCHALL_CSWapache24-manual = 1 @@ -65,6 +66,7 @@ PKGFILES_CSWapache24-dev = $(PKGFILES_DEVEL) PATCHFILES += 0001-Add-an-OpenCSW-option-to-config.layout.patch +PATCHFILES += 0002-Switch-usr-local-for-opt-csw-in-default-cgi-path.patch BUILD_DEP_PKGS += CSWlibaprutil-dev @@ -100,3 +102,8 @@ CFLAGS := -DSSL_EXPERIMENTAL -DSSL_ENGINE $(CFLAGS) +post-merge: + @(cd $(PKGROOT)/$(sysconfdir)/apache24; \ + rm -rf original; \ + perl -pi -e 's|/usr/local/apache2|/etc/opt/csw/apache24|g' httpd.conf ) + @$(MAKECOOKIE) Added: csw/mgar/pkg/apache2/branches/apache24/files/0002-Switch-usr-local-for-opt-csw-in-default-cgi-path.patch =================================================================== --- csw/mgar/pkg/apache2/branches/apache24/files/0002-Switch-usr-local-for-opt-csw-in-default-cgi-path.patch (rev 0) +++ csw/mgar/pkg/apache2/branches/apache24/files/0002-Switch-usr-local-for-opt-csw-in-default-cgi-path.patch 2012-10-04 08:51:14 UTC (rev 19374) @@ -0,0 +1,29 @@ +From 4565f79569130fc4ec0bae99fd3829785394f937 Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Mon, 28 Feb 2011 01:23:44 +0100 +Subject: [PATCH] Switch usr/local for opt/csw in default cgi path + +Modify the default PATH for cgi scripts to use /opt/csw/bin as the +final element instead of /usr/local/bin. + +Signed-off-by: Ben Walton +--- + include/httpd.h | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/include/httpd.h b/include/httpd.h +index 40351b7..0fff717 100644 +--- a/include/httpd.h ++++ b/include/httpd.h +@@ -150,7 +150,7 @@ extern "C" { + + /** The default path for CGI scripts if none is currently set */ + #ifndef DEFAULT_PATH +-#define DEFAULT_PATH "/bin:/usr/bin:/usr/ucb:/usr/bsd:/usr/local/bin" ++#define DEFAULT_PATH "/bin:/usr/bin:/usr/ucb:/usr/bsd:/opt/csw/bin" + #endif + + /** The path to the suExec wrapper, can be overridden in Configuration */ +-- +1.7.3.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 Oct 4 13:29:22 2012 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Thu, 04 Oct 2012 11:29:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[19375] csw/mgar/pkg/ffmpeg/trunk/Makefile Message-ID: Revision: 19375 http://gar.svn.sourceforge.net/gar/?rev=19375&view=rev Author: janholzh Date: 2012-10-04 11:29:21 +0000 (Thu, 04 Oct 2012) Log Message: ----------- ffmpeg/trunk: bind against libx264-128 Modified Paths: -------------- csw/mgar/pkg/ffmpeg/trunk/Makefile Modified: csw/mgar/pkg/ffmpeg/trunk/Makefile =================================================================== --- csw/mgar/pkg/ffmpeg/trunk/Makefile 2012-10-04 08:51:14 UTC (rev 19374) +++ csw/mgar/pkg/ffmpeg/trunk/Makefile 2012-10-04 11:29:21 UTC (rev 19375) @@ -47,7 +47,7 @@ RUNTIME_DEP_PKGS_CSWlibavcodec54 += CSWlibtheoradec1 RUNTIME_DEP_PKGS_CSWlibavcodec54 += CSWlibtheoraenc1 RUNTIME_DEP_PKGS_CSWlibavcodec54 += CSWlibspeex1 -RUNTIME_DEP_PKGS_CSWlibavcodec54 += CSWlibx264-125 +RUNTIME_DEP_PKGS_CSWlibavcodec54 += CSWlibx264-128 RUNTIME_DEP_PKGS_CSWlibavcodec54 += CSWlibgcc-s1 PACKAGES += CSWlibavdevice54 @@ -67,7 +67,7 @@ RUNTIME_DEP_PKGS_CSWlibavdevice54 += CSWlibtheoraenc1 RUNTIME_DEP_PKGS_CSWlibavdevice54 += CSWlibfreetype6 RUNTIME_DEP_PKGS_CSWlibavdevice54 += CSWlibspeex1 -RUNTIME_DEP_PKGS_CSWlibavdevice54 += CSWlibx264-125 +RUNTIME_DEP_PKGS_CSWlibavdevice54 += CSWlibx264-128 RUNTIME_DEP_PKGS_CSWlibavdevice54 += CSWlibgcc-s1 PACKAGES += CSWlibavfilter3 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 Oct 4 16:36:55 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 04 Oct 2012 14:36:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[19376] csw/mgar/pkg/apache2/branches/apache24/Makefile Message-ID: Revision: 19376 http://gar.svn.sourceforge.net/gar/?rev=19376&view=rev Author: bdwalton Date: 2012-10-04 14:36:54 +0000 (Thu, 04 Oct 2012) Log Message: ----------- apache2/branches/apache24: fix up usr/local references in man pages instead of using overrides Modified Paths: -------------- csw/mgar/pkg/apache2/branches/apache24/Makefile Modified: csw/mgar/pkg/apache2/branches/apache24/Makefile =================================================================== --- csw/mgar/pkg/apache2/branches/apache24/Makefile 2012-10-04 11:29:21 UTC (rev 19375) +++ csw/mgar/pkg/apache2/branches/apache24/Makefile 2012-10-04 14:36:54 UTC (rev 19376) @@ -52,7 +52,6 @@ RUNTIME_DEP_PKGS_CSWapache24 += CSWliblua5-2 RUNTIME_DEP_PKGS_CSWapache24 += CSWlibapr1-0 RUNTIME_DEP_PKGS_CSWapache24 += CSWlibldap2-4-2 -CHECKPKG_OVERRIDES_CSWapache24 += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/htdbm.1 PACKAGES += CSWapache24-manual ARCHALL_CSWapache24-manual = 1 @@ -105,5 +104,8 @@ post-merge: @(cd $(PKGROOT)/$(sysconfdir)/apache24; \ rm -rf original; \ - perl -pi -e 's|/usr/local/apache2|/etc/opt/csw/apache24|g' httpd.conf ) + perl -pi -e 's|/usr/local/apache2|/etc/opt/csw/apache24|g' httpd.conf ; \ + cd $(PKGROOT)/$(mandir); \ + perl -pi -e 's|usr/local/etc/apache|etc/opt/csw/apache24|g' man1/*; \ + perl -pi -e 's|/usr/local/apache2|/etc/opt/csw/apache2|g' man8/* ) @$(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 Oct 4 17:14:12 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 04 Oct 2012 15:14:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[19377] csw/mgar/pkg/apache2/branches/apache24 Message-ID: Revision: 19377 http://gar.svn.sourceforge.net/gar/?rev=19377&view=rev Author: bdwalton Date: 2012-10-04 15:14:12 +0000 (Thu, 04 Oct 2012) Log Message: ----------- apache2/branches/apache24: update the init script for new version Modified Paths: -------------- csw/mgar/pkg/apache2/branches/apache24/Makefile Added Paths: ----------- csw/mgar/pkg/apache2/branches/apache24/files/cswapache24 Removed Paths: ------------- csw/mgar/pkg/apache2/branches/apache24/files/cswapache2 Modified: csw/mgar/pkg/apache2/branches/apache24/Makefile =================================================================== --- csw/mgar/pkg/apache2/branches/apache24/Makefile 2012-10-04 14:36:54 UTC (rev 19376) +++ csw/mgar/pkg/apache2/branches/apache24/Makefile 2012-10-04 15:14:12 UTC (rev 19377) @@ -36,8 +36,7 @@ SPKG_SOURCEURL = http://httpd.apache.org/ DISTFILES = $(NAME)-$(VERSION).tar.gz -# Standard package bits -DISTFILES += cswapache2 +DISTFILES += cswapache24 PACKAGES = CSWapache24 SPKG_DESC_CSWapache24 = $(DESCRIPTION) Deleted: csw/mgar/pkg/apache2/branches/apache24/files/cswapache2 =================================================================== --- csw/mgar/pkg/apache2/branches/apache24/files/cswapache2 2012-10-04 14:36:54 UTC (rev 19376) +++ csw/mgar/pkg/apache2/branches/apache24/files/cswapache2 2012-10-04 15:14:12 UTC (rev 19377) @@ -1,44 +0,0 @@ -#!/sbin/sh -# -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# ident "@(#)http-apache2 1.2 04/11/11 SMI" -# - -#RC_KNUM 16 -#RC_SNUM 80 -#RC_KLEV 0,1,2,S -#RC_SLEV 3 -#FMRI network - -APACHE_HOME=/opt/csw/apache2 -CONF_FILE=$APACHE_HOME/etc/httpd.conf -APACHECTL=$APACHE_HOME/sbin/apachectl - -[ ! -f "$CONF_FILE" ] && exit 0 -[ ! -x "$APACHECTL" ] && exit 0 - -case "$1" in -start) - cmd=$1 - if [ -f "$APACHE_HOME/etc/server.crt" ]; then - cmd="$cmd -DSSL" - fi - ;; -restart) - cmd="restart" - ;; -graceful) - cmd="graceful" - ;; -stop) - cmd="stop" - ;; -*) - echo "Usage: $0 {start|stop|restart|graceful}" - exit 1 - ;; -esac - -exec $APACHECTL -f $CONF_FILE -k $cmd 2>&1 Added: csw/mgar/pkg/apache2/branches/apache24/files/cswapache24 =================================================================== --- csw/mgar/pkg/apache2/branches/apache24/files/cswapache24 (rev 0) +++ csw/mgar/pkg/apache2/branches/apache24/files/cswapache24 2012-10-04 15:14:12 UTC (rev 19377) @@ -0,0 +1,44 @@ +#!/sbin/sh +# +# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. +# +# ident "@(#)http-apache2 1.2 04/11/11 SMI" +# + +#RC_KNUM 16 +#RC_SNUM 80 +#RC_KLEV 0,1,2,S +#RC_SLEV 3 +#FMRI network + +APACHE_HOME=/opt/csw/ +CONF_FILE=/etc/opt/csw/apache24/httpd.conf +APACHECTL=$APACHE_HOME/sbin/apachectl + +[ ! -f "$CONF_FILE" ] && exit 0 +[ ! -x "$APACHECTL" ] && exit 0 + +case "$1" in +start) + cmd=$1 + if [ -f "$APACHE_HOME/etc/server.crt" ]; then + cmd="$cmd -DSSL" + fi + ;; +restart) + cmd="restart" + ;; +graceful) + cmd="graceful" + ;; +stop) + cmd="stop" + ;; +*) + echo "Usage: $0 {start|stop|restart|graceful}" + exit 1 + ;; +esac + +exec $APACHECTL -f $CONF_FILE -k $cmd 2>&1 Property changes on: csw/mgar/pkg/apache2/branches/apache24/files/cswapache24 ___________________________________________________________________ Added: svn:executable + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Thu Oct 4 20:51:59 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 04 Oct 2012 18:51:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[19378] csw/mgar/pkg/apache2/branches/apache24/Makefile Message-ID: Revision: 19378 http://gar.svn.sourceforge.net/gar/?rev=19378&view=rev Author: bdwalton Date: 2012-10-04 18:51:59 +0000 (Thu, 04 Oct 2012) Log Message: ----------- apache2/branches/apache24: install the init script and add smf support Modified Paths: -------------- csw/mgar/pkg/apache2/branches/apache24/Makefile Modified: csw/mgar/pkg/apache2/branches/apache24/Makefile =================================================================== --- csw/mgar/pkg/apache2/branches/apache24/Makefile 2012-10-04 15:14:12 UTC (rev 19377) +++ csw/mgar/pkg/apache2/branches/apache24/Makefile 2012-10-04 18:51:59 UTC (rev 19378) @@ -68,11 +68,7 @@ BUILD_DEP_PKGS += CSWlibaprutil-dev -# The SMF support: you don't need to specify cswinitsmf any more. You need to -# make sure the the /etc/opt/csw/init.d/cswapache file gets installed during -# the post-install stage, and add "INITSMF = /etc/opt/csw/init.d/cswapache" to -# the Makefile. -INITSMF = /etc/opt/csw/init.d/cswapache2 +INITSMF = /etc/opt/csw/init.d/cswapache24 # We need this to get bdb48/lib into the runpath EXTRA_LIB = $(prefix)/bdb48/lib @@ -107,4 +103,6 @@ cd $(PKGROOT)/$(mandir); \ perl -pi -e 's|usr/local/etc/apache|etc/opt/csw/apache24|g' man1/*; \ perl -pi -e 's|/usr/local/apache2|/etc/opt/csw/apache2|g' man8/* ) + @( ginstall -d $(PKGROOT)/etc/opt/csw/init.d; \ + ginstall $(WORKSRC_FIRSTMOD)/../cswapache24 $(PKGROOT)/etc/opt/csw/init.d ) @$(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 Oct 4 21:27:28 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 04 Oct 2012 19:27:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[19379] csw/mgar/pkg/apache2/branches/apache24/Makefile Message-ID: Revision: 19379 http://gar.svn.sourceforge.net/gar/?rev=19379&view=rev Author: bdwalton Date: 2012-10-04 19:27:28 +0000 (Thu, 04 Oct 2012) Log Message: ----------- apache2/branches/apache24: mv envvars* to the server root directory so they can be handled as config files Modified Paths: -------------- csw/mgar/pkg/apache2/branches/apache24/Makefile Modified: csw/mgar/pkg/apache2/branches/apache24/Makefile =================================================================== --- csw/mgar/pkg/apache2/branches/apache24/Makefile 2012-10-04 18:51:59 UTC (rev 19378) +++ csw/mgar/pkg/apache2/branches/apache24/Makefile 2012-10-04 19:27:28 UTC (rev 19379) @@ -105,4 +105,9 @@ perl -pi -e 's|/usr/local/apache2|/etc/opt/csw/apache2|g' man8/* ) @( ginstall -d $(PKGROOT)/etc/opt/csw/init.d; \ ginstall $(WORKSRC_FIRSTMOD)/../cswapache24 $(PKGROOT)/etc/opt/csw/init.d ) + @(cd $(PKGROOT)/$(sbindir); \ + for f in envvars*; do \ + mv $$f $(PKGROOT)/$(sysconfdir)/apache24/; \ + ln -s $(sysconfdir)/apache24/$$f $$f; \ + done ) @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Thu Oct 4 21:41:00 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 04 Oct 2012 19:41:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[19380] csw/mgar/pkg/apache2/branches/apache24/Makefile Message-ID: Revision: 19380 http://gar.svn.sourceforge.net/gar/?rev=19380&view=rev Author: bdwalton Date: 2012-10-04 19:41:00 +0000 (Thu, 04 Oct 2012) Log Message: ----------- apache2/branches/apache24: setup config preservation Modified Paths: -------------- csw/mgar/pkg/apache2/branches/apache24/Makefile Modified: csw/mgar/pkg/apache2/branches/apache24/Makefile =================================================================== --- csw/mgar/pkg/apache2/branches/apache24/Makefile 2012-10-04 19:27:28 UTC (rev 19379) +++ csw/mgar/pkg/apache2/branches/apache24/Makefile 2012-10-04 19:41:00 UTC (rev 19380) @@ -70,6 +70,24 @@ INITSMF = /etc/opt/csw/init.d/cswapache24 +PRESERVECONF += $(sysconfdir)/apache24/envvars +PRESERVECONF += $(sysconfdir)/apache24/mime.types +PRESERVECONF += $(sysconfdir)/apache24/extra/httpd-manual.conf +PRESERVECONF += $(sysconfdir)/apache24/extra/httpd-userdir.conf +PRESERVECONF += $(sysconfdir)/apache24/extra/httpd-languages.conf +PRESERVECONF += $(sysconfdir)/apache24/extra/httpd-vhosts.conf +PRESERVECONF += $(sysconfdir)/apache24/extra/httpd-info.conf +PRESERVECONF += $(sysconfdir)/apache24/extra/proxy-html.conf +PRESERVECONF += $(sysconfdir)/apache24/extra/httpd-dav.conf +PRESERVECONF += $(sysconfdir)/apache24/extra/httpd-multilang-errordoc.conf +PRESERVECONF += $(sysconfdir)/apache24/extra/httpd-autoindex.conf +PRESERVECONF += $(sysconfdir)/apache24/extra/httpd-mpm.conf +PRESERVECONF += $(sysconfdir)/apache24/extra/httpd-default.conf +PRESERVECONF += $(sysconfdir)/apache24/extra/httpd-ssl.conf +PRESERVECONF += $(sysconfdir)/apache24/envvars-std +PRESERVECONF += $(sysconfdir)/apache24/magic +PRESERVECONF += $(sysconfdir)/apache24/httpd.conf + # We need this to get bdb48/lib into the runpath EXTRA_LIB = $(prefix)/bdb48/lib @@ -99,7 +117,7 @@ post-merge: @(cd $(PKGROOT)/$(sysconfdir)/apache24; \ rm -rf original; \ - perl -pi -e 's|/usr/local/apache2|/etc/opt/csw/apache24|g' httpd.conf ; \ + perl -pi -e 's|/usr/local/apache2|/etc/opt/csw/apache24|g' httpd.conf.CSW ; \ cd $(PKGROOT)/$(mandir); \ perl -pi -e 's|usr/local/etc/apache|etc/opt/csw/apache24|g' man1/*; \ perl -pi -e 's|/usr/local/apache2|/etc/opt/csw/apache2|g' man8/* ) 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 Oct 4 21:43:51 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 04 Oct 2012 19:43:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[19381] csw/mgar/pkg/apache2/branches/apache24/Makefile Message-ID: Revision: 19381 http://gar.svn.sourceforge.net/gar/?rev=19381&view=rev Author: bdwalton Date: 2012-10-04 19:43:51 +0000 (Thu, 04 Oct 2012) Log Message: ----------- apache2/branches/apache24: drop some legacy modulation stuff Modified Paths: -------------- csw/mgar/pkg/apache2/branches/apache24/Makefile Modified: csw/mgar/pkg/apache2/branches/apache24/Makefile =================================================================== --- csw/mgar/pkg/apache2/branches/apache24/Makefile 2012-10-04 19:41:00 UTC (rev 19380) +++ csw/mgar/pkg/apache2/branches/apache24/Makefile 2012-10-04 19:43:51 UTC (rev 19381) @@ -19,19 +19,6 @@ # work around dumb checkpkg not recognizing the license file ... LICENSE = LICENSE -# Build multiple mpm's and merge them all into one install -#EXTRA_MODULATORS = MPM -# !!!NOTE, NOTE, NOTE!!! prefork must be last as it's the one where -# all modules are built. This affects the default httpd.conf that -# gets generated. The other modulations will generate httpd.conf -# files that lack the important LoadModule lines. This is primarily -# useful at version bump time when files/httpd.conf.CSW may need an -# update to reflect new modules, etc. -#MODULATIONS_MPM = worker prefork - -# MERGE_SCRIPTS_isa-default-mpm-prefork = copy-all -# MERGE_SCRIPTS_isa-default-mpm-worker = copy-all - # Visitor information SPKG_SOURCEURL = http://httpd.apache.org/ 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 Oct 5 10:44:55 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Fri, 05 Oct 2012 08:44:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[19382] csw/mgar/pkg/gthumb/trunk Message-ID: Revision: 19382 http://gar.svn.sourceforge.net/gar/?rev=19382&view=rev Author: cgrzemba Date: 2012-10-05 08:44:54 +0000 (Fri, 05 Oct 2012) Log Message: ----------- gthumb/trunk: rebuild, minor version bump Modified Paths: -------------- csw/mgar/pkg/gthumb/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/gthumb/trunk/files/0001-configure.ac.patch Modified: csw/mgar/pkg/gthumb/trunk/Makefile =================================================================== --- csw/mgar/pkg/gthumb/trunk/Makefile 2012-10-04 19:43:51 UTC (rev 19381) +++ csw/mgar/pkg/gthumb/trunk/Makefile 2012-10-05 08:44:54 UTC (rev 19382) @@ -3,33 +3,34 @@ # NAME = gthumb VERSION = 2.10.12 +# VERSION = 2.12.4 SUBDIR=$(basename $(VERSION)) GARTYPE = v2 CATEGORIES = gnome -DESCRIPTION = Brief description +DESCRIPTION = Image organizer define BLURB - Long description + gThumb is an image viewer and browser for the GNOME Desktop. It also includes an importer tool for transferring photos from cameras. endef -MASTER_SITES = http://ftp.gnome.org/pub/gnome/sources/gthumb/$(SUBDIR) -DISTFILES = $(NAME)-$(VERSION).tar.gz +MASTER_SITES = http://ftp.gnome.org/pub/gnome/sources/gthumb/$(SUBDIR)/ +DISTFILES = $(NAME)-$(VERSION).tar.gz # xz -# 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 +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 STRIP_LIBTOOL = 1 +# PATCHFILES += 0001-configure.ac.patch PATCHFILES += mkdtemp-patch +BUILD_DEP_PKGS += CSWlibgtk2-dev +BUILD_DEP_PKGS += CSWlibglib2-dev +BUILD_DEP_PKGS += CSWlibgconf-dev +BUILD_DEP_PKGS += CSWlibexif-dev +# BUILD_DEP_PKGS += CSWlibunique-dev +# BUILD_DEP_PKGS += CSWlibsoupdevel +# BUILD_DEP_PKGS += CSWgnomekeyring-dev + PACKAGES += CSWlibgthumb PKGFILES_CSWlibgthumb += $(call baseisadirs,$(libdir),libgthumb\.so) SPKG_DESC_CSWlibgthumb += $(DESCRIPTION), libgthumb.so @@ -40,13 +41,13 @@ 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 += CSWlibgnomecanvas2-0 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 += CSWlibgnome2-0 RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSWlibgthumb += CSWlibgtk-x11-2-0-0 RUNTIME_DEP_PKGS_CSWlibgthumb += CSWorbit2 @@ -80,13 +81,13 @@ 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 += CSWlibgnomecanvas2-0 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 += CSWlibgnome2-0 RUNTIME_DEP_PKGS_CSWgthumb += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSWgthumb += CSWlibgtk-x11-2-0-0 RUNTIME_DEP_PKGS_CSWgthumb += CSWorbit2 @@ -110,8 +111,17 @@ # for xmllint EXTRA_TEST_ENV += http_proxy=http://proxy:3128 +EXTRA_PKG_CONFIG_PATH += /opt/csw/X11/lib/pkgconfig CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --disable-gnome-3 include gar/category.mk +# pre-configure-modulated: +# cd $(WORKSRC) && rm ltmain.sh && libtoolize --copy --force +# cd $(WORKSRC) && aclocal +# cd $(WORKSRC) && autoconf --force +# cd $(WORKSRC) && automake -a -c -f +# @$(MAKECOOKIE) + PATH:=/opt/csw/gnu:$(PATH) Added: csw/mgar/pkg/gthumb/trunk/files/0001-configure.ac.patch =================================================================== --- csw/mgar/pkg/gthumb/trunk/files/0001-configure.ac.patch (rev 0) +++ csw/mgar/pkg/gthumb/trunk/files/0001-configure.ac.patch 2012-10-05 08:44:54 UTC (rev 19382) @@ -0,0 +1,11 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -61,7 +61,7 @@ LIBCHAMPLAIN_REQUIRED=0.8.0 + dnl =========================================================================== + + CFLAGS=${CFLAGS-:""} +-CFLAGS="$CFLAGS -fPIC -DPIC -Wl,--as-needed" ++CFLAGS="$CFLAGS -fPIC -DPIC" + + AC_ARG_ENABLE(deprecated, + AS_HELP_STRING([--disable-deprecated], [do not use deprecated API]), This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bilko50000 at users.sourceforge.net Fri Oct 5 12:07:53 2012 From: bilko50000 at users.sourceforge.net (bilko50000 at users.sourceforge.net) Date: Fri, 05 Oct 2012 10:07:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[19383] csw/mgar/pkg/lang-python/pycrypto/trunk Message-ID: Revision: 19383 http://gar.svn.sourceforge.net/gar/?rev=19383&view=rev Author: bilko50000 Date: 2012-10-05 10:07:53 +0000 (Fri, 05 Oct 2012) Log Message: ----------- New release Modified Paths: -------------- csw/mgar/pkg/lang-python/pycrypto/trunk/Makefile csw/mgar/pkg/lang-python/pycrypto/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/lang-python/pycrypto/trunk/files/0001-On-Solaris-Use-sys-inttypes.h-instead-of-stdint.h.patch csw/mgar/pkg/lang-python/pycrypto/trunk/files/0002-Substitute-hardcoded-usr-local-bin-python.patch Modified: csw/mgar/pkg/lang-python/pycrypto/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pycrypto/trunk/Makefile 2012-10-05 08:44:54 UTC (rev 19382) +++ csw/mgar/pkg/lang-python/pycrypto/trunk/Makefile 2012-10-05 10:07:53 UTC (rev 19383) @@ -10,7 +10,7 @@ # NAME = pycrypto -VERSION = 2.3 +VERSION = 2.6 GARTYPE = v2 CATEGORIES = python @@ -26,11 +26,7 @@ LICENSE = COPYRIGHT PACKAGES = CSWpy-crypto -RUNTIME_DEP_PKGS = CSWlibgmp +RUNTIME_DEP_PKGS = CSWlibgmp10 RUNTIME_DEP_PKGS += CSWlibpython2-6-1-0 -# c.f. https://bugs.launchpad.net/pycrypto/+bug/518871 -PATCHFILES += 0001-On-Solaris-Use-sys-inttypes.h-instead-of-stdint.h.patch -PATCHFILES += 0002-Substitute-hardcoded-usr-local-bin-python.patch - include gar/category.mk Modified: csw/mgar/pkg/lang-python/pycrypto/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/pycrypto/trunk/checksums 2012-10-05 08:44:54 UTC (rev 19382) +++ csw/mgar/pkg/lang-python/pycrypto/trunk/checksums 2012-10-05 10:07:53 UTC (rev 19383) @@ -1 +1 @@ -2b811cfbfc342d83ee614097effb8101 pycrypto-2.3.tar.gz +270d1fe83a39e0467a66a22bb files/pycrypto-2.6.tar.gz Deleted: csw/mgar/pkg/lang-python/pycrypto/trunk/files/0001-On-Solaris-Use-sys-inttypes.h-instead-of-stdint.h.patch =================================================================== --- csw/mgar/pkg/lang-python/pycrypto/trunk/files/0001-On-Solaris-Use-sys-inttypes.h-instead-of-stdint.h.patch 2012-10-05 08:44:54 UTC (rev 19382) +++ csw/mgar/pkg/lang-python/pycrypto/trunk/files/0001-On-Solaris-Use-sys-inttypes.h-instead-of-stdint.h.patch 2012-10-05 10:07:53 UTC (rev 19383) @@ -1,70 +0,0 @@ -From 002603e46cedd91813e2aa0dd1b2b0e24497079e Mon Sep 17 00:00:00 2001 -From: Sebastian Kayser -Date: Sat, 18 Jun 2011 12:54:05 +0200 -Subject: [PATCH] On Solaris, Use sys/inttypes.h instead of stdint.h - -Required because Solaris < 10 doesn't ship with stdint.h. On Solaris 10, -both (sys/inttypes.h and stdint.h) end up including sys/int_types.h, so -this should also be fine for Solaris 10. ---- - src/Blowfish.c | 6 ++++++ - src/RIPEMD160.c | 6 ++++++ - src/_counter.h | 5 +++++ - 3 files changed, 17 insertions(+), 0 deletions(-) - -diff --git a/src/Blowfish.c b/src/Blowfish.c -index f0d8594..d6e4b7c 100644 ---- a/src/Blowfish.c -+++ b/src/Blowfish.c -@@ -27,7 +27,13 @@ - */ - - #include -+ -+#if defined(__sun) || defined(__sun__) -+#include -+#else - #include -+#endif -+ - #include - #include "Python.h" - -diff --git a/src/RIPEMD160.c b/src/RIPEMD160.c -index da2e72c..51cfcac 100644 ---- a/src/RIPEMD160.c -+++ b/src/RIPEMD160.c -@@ -44,7 +44,13 @@ - */ - - #include -+ -+#if defined(__sun) || defined(__sun__) -+#include -+#else - #include -+#endif -+ - #include - #include "Python.h" - -diff --git a/src/_counter.h b/src/_counter.h -index faaf63f..1f2a31c 100644 ---- a/src/_counter.h -+++ b/src/_counter.h -@@ -24,7 +24,12 @@ - #ifndef PCT__COUNTER_H - #define PCT__COUNTER_H - -+#if defined(__sun) || defined(__sun__) -+#include -+#else - #include -+#endif -+ - #include "Python.h" - - typedef struct { --- -1.7.5.4 - Deleted: csw/mgar/pkg/lang-python/pycrypto/trunk/files/0002-Substitute-hardcoded-usr-local-bin-python.patch =================================================================== --- csw/mgar/pkg/lang-python/pycrypto/trunk/files/0002-Substitute-hardcoded-usr-local-bin-python.patch 2012-10-05 08:44:54 UTC (rev 19382) +++ csw/mgar/pkg/lang-python/pycrypto/trunk/files/0002-Substitute-hardcoded-usr-local-bin-python.patch 2012-10-05 10:07:53 UTC (rev 19383) @@ -1,22 +0,0 @@ -From c2c98941699d20c6797d8dfd21938d0b299c5fd3 Mon Sep 17 00:00:00 2001 -From: Sebastian Kayser -Date: Sat, 18 Jun 2011 14:27:02 +0200 -Subject: [PATCH] Substitute hardcoded /usr/local/bin/python - ---- - lib/Crypto/Util/RFC1751.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/lib/Crypto/Util/RFC1751.py b/lib/Crypto/Util/RFC1751.py -index 85e0e99..f25ed8f 100644 ---- a/lib/Crypto/Util/RFC1751.py -+++ b/lib/Crypto/Util/RFC1751.py -@@ -1,4 +1,4 @@ --#!/usr/local/bin/python -+#!/usr/bin/env python - # rfc1751.py : Converts between 128-bit strings and a human-readable - # sequence of words, as defined in RFC1751: "A Convention for - # Human-Readable 128-bit Keys", by Daniel L. McDonald. --- -1.7.5.4 - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From cgrzemba at users.sourceforge.net Fri Oct 5 13:11:35 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Fri, 05 Oct 2012 11:11:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[19384] csw/mgar/pkg/gtk2/trunk/Makefile Message-ID: Revision: 19384 http://gar.svn.sourceforge.net/gar/?rev=19384&view=rev Author: cgrzemba Date: 2012-10-05 11:11:35 +0000 (Fri, 05 Oct 2012) Log Message: ----------- gtk2/trunk: skip test because: cannot open display Modified Paths: -------------- csw/mgar/pkg/gtk2/trunk/Makefile Modified: csw/mgar/pkg/gtk2/trunk/Makefile =================================================================== --- csw/mgar/pkg/gtk2/trunk/Makefile 2012-10-05 10:07:53 UTC (rev 19383) +++ csw/mgar/pkg/gtk2/trunk/Makefile 2012-10-05 11:11:35 UTC (rev 19384) @@ -274,6 +274,9 @@ BUILD64 = 1 +# failed with: Gtk-WARNING **: cannot open display: :101 +SKIPTEST = 1 + # This is because gtk.immodules resides in $(sysconfdir)/gtk-2.0. If # we don't take the memory model into account, 32/64 bit libs would # get the wrong IM Modules list in gtk.immodules (see also the pango 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 Oct 5 13:48:29 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Fri, 05 Oct 2012 11:48:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[19385] csw/mgar/pkg/gtk2/trunk/Makefile Message-ID: Revision: 19385 http://gar.svn.sourceforge.net/gar/?rev=19385&view=rev Author: cgrzemba Date: 2012-10-05 11:48:29 +0000 (Fri, 05 Oct 2012) Log Message: ----------- gtk2/trunk: trailing space prevents working SKIPTEST Modified Paths: -------------- csw/mgar/pkg/gtk2/trunk/Makefile Modified: csw/mgar/pkg/gtk2/trunk/Makefile =================================================================== --- csw/mgar/pkg/gtk2/trunk/Makefile 2012-10-05 11:11:35 UTC (rev 19384) +++ csw/mgar/pkg/gtk2/trunk/Makefile 2012-10-05 11:48:29 UTC (rev 19385) @@ -275,7 +275,7 @@ BUILD64 = 1 # failed with: Gtk-WARNING **: cannot open display: :101 -SKIPTEST = 1 +SKIPTEST = 1 # This is because gtk.immodules resides in $(sysconfdir)/gtk-2.0. If # we don't take the memory model into account, 32/64 bit libs would This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bilko50000 at users.sourceforge.net Fri Oct 5 18:08:37 2012 From: bilko50000 at users.sourceforge.net (bilko50000 at users.sourceforge.net) Date: Fri, 05 Oct 2012 16:08:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[19386] csw/mgar/pkg Message-ID: Revision: 19386 http://gar.svn.sourceforge.net/gar/?rev=19386&view=rev Author: bilko50000 Date: 2012-10-05 16:08:37 +0000 (Fri, 05 Oct 2012) Log Message: ----------- /home/crisb/mgar/pkg/bzr/trunk: Initial package Added Paths: ----------- csw/mgar/pkg/bzr/ csw/mgar/pkg/bzr/Makefile csw/mgar/pkg/bzr/branches/ csw/mgar/pkg/bzr/tags/ csw/mgar/pkg/bzr/trunk/ csw/mgar/pkg/bzr/trunk/Makefile csw/mgar/pkg/bzr/trunk/checksums csw/mgar/pkg/bzr/trunk/files/ Copied: csw/mgar/pkg/bzr/Makefile (from rev 19385, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/bzr/Makefile (rev 0) +++ csw/mgar/pkg/bzr/Makefile 2012-10-05 16:08:37 UTC (rev 19386) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) Added: csw/mgar/pkg/bzr/trunk/Makefile =================================================================== --- csw/mgar/pkg/bzr/trunk/Makefile (rev 0) +++ csw/mgar/pkg/bzr/trunk/Makefile 2012-10-05 16:08:37 UTC (rev 19386) @@ -0,0 +1,25 @@ +# $Id: Makefile 19383 2012-10-05 10:07:53Z bilko50000 $ +# + +NAME = bzr +VERSION = 2.5.1 +GARTYPE = v2 +CATEGORIES = python + +DESCRIPTION = Next generation distributed version control +define BLURB + Bazaar is a distributed revision control system. It allows team members + to branch and merge upstream code very easily. +endef + +MASTER_SITES = http://launchpad.net/bzr/2.5/$(VERSION)/\+download/ +DISTFILES = $(DISTNAME).tar.gz +LICENSE = COPYRIGHT +PACKAGES = CSWbzr + +RUNTIME_DEP_PKGS = CSWpython +RUNTIME_DEP_PKGS += CSWpy-crypto +RUNTIME_DEP_PKGS += CSWpy-paramiko + +include gar/category.mk + Added: csw/mgar/pkg/bzr/trunk/checksums =================================================================== --- csw/mgar/pkg/bzr/trunk/checksums (rev 0) +++ csw/mgar/pkg/bzr/trunk/checksums 2012-10-05 16:08:37 UTC (rev 19386) @@ -0,0 +1 @@ +ac5079858364a046071000d5cdccb67b bzr-2.5.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bilko50000 at users.sourceforge.net Fri Oct 5 20:39:56 2012 From: bilko50000 at users.sourceforge.net (bilko50000 at users.sourceforge.net) Date: Fri, 05 Oct 2012 18:39:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[19387] csw/mgar/pkg/bzr/trunk/Makefile Message-ID: Revision: 19387 http://gar.svn.sourceforge.net/gar/?rev=19387&view=rev Author: bilko50000 Date: 2012-10-05 18:39:56 +0000 (Fri, 05 Oct 2012) Log Message: ----------- /home/crisb/mgar/pkg/bzr/trunk: Add some fixes Modified Paths: -------------- csw/mgar/pkg/bzr/trunk/Makefile Modified: csw/mgar/pkg/bzr/trunk/Makefile =================================================================== --- csw/mgar/pkg/bzr/trunk/Makefile 2012-10-05 16:08:37 UTC (rev 19386) +++ csw/mgar/pkg/bzr/trunk/Makefile 2012-10-05 18:39:56 UTC (rev 19387) @@ -14,12 +14,21 @@ MASTER_SITES = http://launchpad.net/bzr/2.5/$(VERSION)/\+download/ DISTFILES = $(DISTNAME).tar.gz -LICENSE = COPYRIGHT PACKAGES = CSWbzr +LICENSE = COPYING.txt +TEST_SCRIPTS = -RUNTIME_DEP_PKGS = CSWpython -RUNTIME_DEP_PKGS += CSWpy-crypto +RUNTIME_DEP_PKGS = CSWpy-crypto RUNTIME_DEP_PKGS += CSWpy-paramiko +RUNTIME_DEP_PKGS += CSWlibpython2-6-1-0 +CHECKPKG_OVERRIDES_CSWbzr += surplus-dependency|CSWpy-crypto +CHECKPKG_OVERRIDES_CSWbzr += surplus-dependency|CSWpy-paramiko +CHECKPKG_OVERRIDES_CSWbzr += pkgname-does-not-start-with-CSWpy- +CHECKPKG_OVERRIDES_CSWbzr += catalogname-does-not-start-with-py_ +CHECKPKG_OVERRIDES_CSWbzr += file-with-bad-content|/usr/local|root/opt/csw/lib/python/site-packages/bzrlib/transport/http/_urllib2_wrappers.py +CHECKPKG_OVERRIDES_CSWbzr += disallowed-path|opt/csw/man/man1 +CHECKPKG_OVERRIDES_CSWbzr += disallowed-path|opt/csw/man/man1/bzr.1 + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bilko50000 at users.sourceforge.net Fri Oct 5 20:54:59 2012 From: bilko50000 at users.sourceforge.net (bilko50000 at users.sourceforge.net) Date: Fri, 05 Oct 2012 18:54:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[19388] csw/mgar/pkg/bzr/trunk/ Message-ID: Revision: 19388 http://gar.svn.sourceforge.net/gar/?rev=19388&view=rev Author: bilko50000 Date: 2012-10-05 18:54:59 +0000 (Fri, 05 Oct 2012) Log Message: ----------- /home/crisb/mgar/pkg/bzr/trunk: Add ignore prop Property Changed: ---------------- csw/mgar/pkg/bzr/trunk/ Property changes on: csw/mgar/pkg/bzr/trunk ___________________________________________________________________ Added: svn:ignore + work This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dam at opencsw.org Fri Oct 5 21:16:16 2012 From: dam at opencsw.org (Dagobert Michelsen) Date: Fri, 5 Oct 2012 21:16:16 +0200 Subject: [csw-devel] SF.net SVN: gar:[19387] csw/mgar/pkg/bzr/trunk/Makefile In-Reply-To: References: Message-ID: <7EB39C5A-ACF1-43D4-9864-E66D903E11EB@opencsw.org> Hi Cris, Am 05.10.2012 um 20:39 schrieb bilko50000 at users.sourceforge.net: > Revision: 19387 > http://gar.svn.sourceforge.net/gar/?rev=19387&view=rev > Author: bilko50000 > Date: 2012-10-05 18:39:56 +0000 (Fri, 05 Oct 2012) > Log Message: > ----------- > /home/crisb/mgar/pkg/bzr/trunk: Add some fixes > > Modified Paths: > -------------- > csw/mgar/pkg/bzr/trunk/Makefile > > Modified: csw/mgar/pkg/bzr/trunk/Makefile > =================================================================== > --- csw/mgar/pkg/bzr/trunk/Makefile 2012-10-05 16:08:37 UTC (rev 19386) > +++ csw/mgar/pkg/bzr/trunk/Makefile 2012-10-05 18:39:56 UTC (rev 19387) > @@ -14,12 +14,21 @@ > > MASTER_SITES = http://launchpad.net/bzr/2.5/$(VERSION)/\+download/ > DISTFILES = $(DISTNAME).tar.gz > -LICENSE = COPYRIGHT > PACKAGES = CSWbzr > +LICENSE = COPYING.txt > +TEST_SCRIPTS = > > -RUNTIME_DEP_PKGS = CSWpython > -RUNTIME_DEP_PKGS += CSWpy-crypto > +RUNTIME_DEP_PKGS = CSWpy-crypto > RUNTIME_DEP_PKGS += CSWpy-paramiko > +RUNTIME_DEP_PKGS += CSWlibpython2-6-1-0 > > +CHECKPKG_OVERRIDES_CSWbzr += surplus-dependency|CSWpy-crypto > +CHECKPKG_OVERRIDES_CSWbzr += surplus-dependency|CSWpy-paramiko > +CHECKPKG_OVERRIDES_CSWbzr += pkgname-does-not-start-with-CSWpy- > +CHECKPKG_OVERRIDES_CSWbzr += catalogname-does-not-start-with-py_ > +CHECKPKG_OVERRIDES_CSWbzr += file-with-bad-content|/usr/local|root/opt/csw/lib/python/site-packages/bzrlib/transport/http/_urllib2_wrappers.py > +CHECKPKG_OVERRIDES_CSWbzr += disallowed-path|opt/csw/man/man1 > +CHECKPKG_OVERRIDES_CSWbzr += disallowed-path|opt/csw/man/man1/bzr.1 Please do not override these pathes as manpages must be in /opt/csw/share/man. Please also see http://wiki.opencsw.org/checkpkg-error-tags#toc18 Best regards -- Dago > + > 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 bilko50000 at users.sourceforge.net Fri Oct 5 22:01:23 2012 From: bilko50000 at users.sourceforge.net (bilko50000 at users.sourceforge.net) Date: Fri, 05 Oct 2012 20:01:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[19389] csw/mgar/pkg/bzr/trunk/Makefile Message-ID: Revision: 19389 http://gar.svn.sourceforge.net/gar/?rev=19389&view=rev Author: bilko50000 Date: 2012-10-05 20:01:22 +0000 (Fri, 05 Oct 2012) Log Message: ----------- Put man pages in correct location Modified Paths: -------------- csw/mgar/pkg/bzr/trunk/Makefile Modified: csw/mgar/pkg/bzr/trunk/Makefile =================================================================== --- csw/mgar/pkg/bzr/trunk/Makefile 2012-10-05 18:54:59 UTC (rev 19388) +++ csw/mgar/pkg/bzr/trunk/Makefile 2012-10-05 20:01:22 UTC (rev 19389) @@ -27,8 +27,9 @@ CHECKPKG_OVERRIDES_CSWbzr += pkgname-does-not-start-with-CSWpy- CHECKPKG_OVERRIDES_CSWbzr += catalogname-does-not-start-with-py_ CHECKPKG_OVERRIDES_CSWbzr += file-with-bad-content|/usr/local|root/opt/csw/lib/python/site-packages/bzrlib/transport/http/_urllib2_wrappers.py -CHECKPKG_OVERRIDES_CSWbzr += disallowed-path|opt/csw/man/man1 -CHECKPKG_OVERRIDES_CSWbzr += disallowed-path|opt/csw/man/man1/bzr.1 include gar/category.mk +post-install-modulated: + @mv $(DESTDIR)/opt/csw/man $(DESTDIR)/opt/csw/share + 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 Oct 7 19:45:16 2012 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sun, 07 Oct 2012 17:45:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[19390] csw/mgar/pkg Message-ID: Revision: 19390 http://gar.svn.sourceforge.net/gar/?rev=19390&view=rev Author: guengel Date: 2012-10-07 17:45:16 +0000 (Sun, 07 Oct 2012) Log Message: ----------- autoconf-archive/trunk: Initial release Added Paths: ----------- csw/mgar/pkg/autoconf-archive/ csw/mgar/pkg/autoconf-archive/branches/ csw/mgar/pkg/autoconf-archive/tags/ csw/mgar/pkg/autoconf-archive/trunk/ csw/mgar/pkg/autoconf-archive/trunk/Makefile csw/mgar/pkg/autoconf-archive/trunk/checksums csw/mgar/pkg/autoconf-archive/trunk/files/ csw/mgar/pkg/autoconf-archive/trunk/files/changelog.CSW Property changes on: csw/mgar/pkg/autoconf-archive/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/autoconf-archive/trunk/Makefile =================================================================== --- csw/mgar/pkg/autoconf-archive/trunk/Makefile (rev 0) +++ csw/mgar/pkg/autoconf-archive/trunk/Makefile 2012-10-07 17:45:16 UTC (rev 19390) @@ -0,0 +1,44 @@ +# $Id: Makefile 13420 2011-02-20 21:04:03Z bdwalton $ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = autoconf-archive +VERSION = 2012.09.08 +GARTYPE = v2 +CATEGORIES = devel +ARCHALL = 1 + +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + +DESCRIPTION = Collection of macros for GNU Autoconf +define BLURB + The GNU Autoconf Archive is a collection of more than 450 macros for GNU Autoconf that have been contributed as free software by friendly supporters of the cause from all over the Internet. +endef + +MASTER_SITES = $(GNU_MIRROR) +DISTFILES = $(DISTNAME).tar.xz +DISTFILES += changelog.CSW + +# 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.xz + +# 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 = + +CHECKPKG_OVERRIDES_CSWautoconf-archive += file-with-bad-content| +CHECKPKG_OVERRIDES_CSWautoconf-archive += surplus-dependency|CSWautoconf + +RUNTIME_DEP_PKGS = CSWautoconf + +CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + +post-merge: + if [ -d $(PKGROOT)$(datadir)/autoconf-archive ] ; then \ + mv $(PKGROOT)$(datadir)/autoconf-archive/* $(PKGROOT)$(docdir)/autoconf_archive/ ; \ + rmdir $(PKGROOT)$(datadir)/autoconf-archive ; \ + fi + @$(MAKECOOKIE) Added: csw/mgar/pkg/autoconf-archive/trunk/checksums =================================================================== --- csw/mgar/pkg/autoconf-archive/trunk/checksums (rev 0) +++ csw/mgar/pkg/autoconf-archive/trunk/checksums 2012-10-07 17:45:16 UTC (rev 19390) @@ -0,0 +1 @@ +670ca8a5d2d85437f034f0448ee9470d autoconf-archive-2012.09.08.tar.xz Added: csw/mgar/pkg/autoconf-archive/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/autoconf-archive/trunk/files/changelog.CSW (rev 0) +++ csw/mgar/pkg/autoconf-archive/trunk/files/changelog.CSW 2012-10-07 17:45:16 UTC (rev 19390) @@ -0,0 +1,5 @@ +autoconf-archive (2012.09.08,REV=2012.10.07) + + * Initial release. + + -- Rafael Ostertag Sun, 07 Oct 2012 19:19:59 +0200 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 Oct 8 14:59:53 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 08 Oct 2012 12:59:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[19391] csw/mgar/pkg/git/trunk Message-ID: Revision: 19391 http://gar.svn.sourceforge.net/gar/?rev=19391&view=rev Author: bdwalton Date: 2012-10-08 12:59:52 +0000 (Mon, 08 Oct 2012) Log Message: ----------- git/trunk: version bump; patch out a non-portable option in a test Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile csw/mgar/pkg/git/trunk/checksums Added Paths: ----------- csw/mgar/pkg/git/trunk/files/0007-t-t5400-send-pack-Use-POSIX-options-to-cp-for-portab.patch Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2012-10-07 17:45:16 UTC (rev 19390) +++ csw/mgar/pkg/git/trunk/Makefile 2012-10-08 12:59:52 UTC (rev 19391) @@ -1,5 +1,5 @@ NAME = git -VERSION = 1.7.12 +VERSION = 1.7.12.2 #PATCHLEVEL = rc4 DISTNAME = $(NAME)-$(VERSION) CATEGORIES = devel @@ -122,6 +122,7 @@ # to the selection of available utf8 locales. PATCHFILES_isa-sparcv8 += 0005-Force-en_US.UTF-8-for-a-git-svn-test.patch PATCHFILES += 0006-Patch-out-a-few-usr-share-references.patch +PATCHFILES += 0007-t-t5400-send-pack-Use-POSIX-options-to-cp-for-portab.patch fdirs = $(bindir_install) $(mandir) $(libexecdir_install) define _git_files Modified: csw/mgar/pkg/git/trunk/checksums =================================================================== --- csw/mgar/pkg/git/trunk/checksums 2012-10-07 17:45:16 UTC (rev 19390) +++ csw/mgar/pkg/git/trunk/checksums 2012-10-08 12:59:52 UTC (rev 19391) @@ -1 +1 @@ -ceb1a6b17a3e33bbc70eadf8fce5876c git-1.7.12.tar.gz +5aa5d146825f74fee889ca5408e4e00b git-1.7.12.2.tar.gz Added: csw/mgar/pkg/git/trunk/files/0007-t-t5400-send-pack-Use-POSIX-options-to-cp-for-portab.patch =================================================================== --- csw/mgar/pkg/git/trunk/files/0007-t-t5400-send-pack-Use-POSIX-options-to-cp-for-portab.patch (rev 0) +++ csw/mgar/pkg/git/trunk/files/0007-t-t5400-send-pack-Use-POSIX-options-to-cp-for-portab.patch 2012-10-08 12:59:52 UTC (rev 19391) @@ -0,0 +1,29 @@ +From 3ed782c5e1a154271147391f93766f3e3836a30c Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Mon, 8 Oct 2012 09:28:47 +0200 +Subject: [PATCH] t/t5400-send-pack: Use POSIX options to cp for portability + +Avoid a GNU-ism in the cp options used by t5400-send-pack for +portability. Use -pR instead of -a. + +Signed-off-by: Ben Walton +--- + t/t5400-send-pack.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/t/t5400-send-pack.sh b/t/t5400-send-pack.sh +index 250c720..65b3b0f 100755 +--- a/t/t5400-send-pack.sh ++++ b/t/t5400-send-pack.sh +@@ -159,7 +159,7 @@ test_expect_success 'receive-pack runs auto-gc in remote repo' ' + git commit -a -m "Second commit" && + git repack + ) && +- cp -a parent child && ++ cp -pR parent child && + ( + # Set the child to auto-pack if more than one pack exists + cd child && +-- +1.7.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 Mon Oct 8 22:28:11 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 08 Oct 2012 20:28:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[19392] csw/mgar/pkg/git/trunk Message-ID: Revision: 19392 http://gar.svn.sourceforge.net/gar/?rev=19392&view=rev Author: bdwalton Date: 2012-10-08 20:28:11 +0000 (Mon, 08 Oct 2012) Log Message: ----------- git/trunk: version bump; disable the ,p, in the package name since that patch is no longer required 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-10-08 12:59:52 UTC (rev 19391) +++ csw/mgar/pkg/git/trunk/Makefile 2012-10-08 20:28:11 UTC (rev 19392) @@ -1,5 +1,5 @@ NAME = git -VERSION = 1.7.12.2 +VERSION = 1.7.12.3 #PATCHLEVEL = rc4 DISTNAME = $(NAME)-$(VERSION) CATEGORIES = devel @@ -9,10 +9,6 @@ VENDOR_URL = http://git-scm.org/ -# the getpassphrase patch is a non-build-related fix; mantis 4943 -# polish for upstream, but local for now -VERSION_FLAG_PATCH = 1 - NO_SVN_TESTS=YesPlease GIT_TEST_OPTS=-i -v -d EXTRA_TEST_EXPORTS = NO_SVN_TESTS GIT_TEST_OPTS Modified: csw/mgar/pkg/git/trunk/checksums =================================================================== --- csw/mgar/pkg/git/trunk/checksums 2012-10-08 12:59:52 UTC (rev 19391) +++ csw/mgar/pkg/git/trunk/checksums 2012-10-08 20:28:11 UTC (rev 19392) @@ -1 +1 @@ -5aa5d146825f74fee889ca5408e4e00b git-1.7.12.2.tar.gz +c3c1e2d56794fcc46e31fd8cb0e71252 git-1.7.12.3.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 Tue Oct 9 11:22:47 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Tue, 09 Oct 2012 09:22:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[19393] csw/mgar/pkg/389-ds-base/trunk Message-ID: Revision: 19393 http://gar.svn.sourceforge.net/gar/?rev=19393&view=rev Author: cgrzemba Date: 2012-10-09 09:22:47 +0000 (Tue, 09 Oct 2012) Log Message: ----------- 389-ds-base/trunk: minor version bump 1.2.11.15 Modified Paths: -------------- csw/mgar/pkg/389-ds-base/trunk/Makefile csw/mgar/pkg/389-ds-base/trunk/checksums Modified: csw/mgar/pkg/389-ds-base/trunk/Makefile =================================================================== --- csw/mgar/pkg/389-ds-base/trunk/Makefile 2012-10-08 20:28:11 UTC (rev 19392) +++ csw/mgar/pkg/389-ds-base/trunk/Makefile 2012-10-09 09:22:47 UTC (rev 19393) @@ -2,7 +2,7 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = 389-ds-base -VERSION = 1.2.11.14 +VERSION = 1.2.11.15 GARTYPE = v2 CATEGORIES = server Modified: csw/mgar/pkg/389-ds-base/trunk/checksums =================================================================== --- csw/mgar/pkg/389-ds-base/trunk/checksums 2012-10-08 20:28:11 UTC (rev 19392) +++ csw/mgar/pkg/389-ds-base/trunk/checksums 2012-10-09 09:22:47 UTC (rev 19393) @@ -1 +1 @@ -d7e7969be34e18e5c8e1e40f3b9d5124 389-ds-base-1.2.11.14.tar.bz2 +ae6bc25834728bcd9dd96ef82094c2bd 389-ds-base-1.2.11.15.tar.bz2 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 Oct 9 13:01:24 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Tue, 09 Oct 2012 11:01:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[19394] csw/mgar/pkg/389-admin/trunk Message-ID: Revision: 19394 http://gar.svn.sourceforge.net/gar/?rev=19394&view=rev Author: cgrzemba Date: 2012-10-09 11:01:24 +0000 (Tue, 09 Oct 2012) Log Message: ----------- 389-admin/trunk: bump version 1.1.30 Modified Paths: -------------- csw/mgar/pkg/389-admin/trunk/Makefile csw/mgar/pkg/389-admin/trunk/checksums Modified: csw/mgar/pkg/389-admin/trunk/Makefile =================================================================== --- csw/mgar/pkg/389-admin/trunk/Makefile 2012-10-09 09:22:47 UTC (rev 19393) +++ csw/mgar/pkg/389-admin/trunk/Makefile 2012-10-09 11:01:24 UTC (rev 19394) @@ -2,7 +2,7 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = 389-admin -VERSION = 1.1.29 +VERSION = 1.1.30 GARTYPE = v2 CATEGORIES = lib @@ -11,7 +11,7 @@ The enterprise-class Open Source LDAP server for Linux. It is hardened by real-world use, is full-featured, supports multi-master replication, and already handles many of the largest LDAP deployments in the world. The 389 Directory Server can be downloaded for free and set up in less than an hour using the graphical console. endef -MASTER_SITES = http://port389.org/sources +MASTER_SITES = http://port389.org/sources/ DISTFILES = $(NAME)-$(VERSION).tar.bz2 DISTFILES += CSW389-admin.preremove Modified: csw/mgar/pkg/389-admin/trunk/checksums =================================================================== --- csw/mgar/pkg/389-admin/trunk/checksums 2012-10-09 09:22:47 UTC (rev 19393) +++ csw/mgar/pkg/389-admin/trunk/checksums 2012-10-09 11:01:24 UTC (rev 19394) @@ -1 +1 @@ -4bda83e9f5644e0bd25fdf7b6ce9e5ee 389-admin-1.1.29.tar.bz2 +2a163a73d9eb96062b27e5d94e36e80f 389-admin-1.1.30.tar.bz2 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 Oct 9 13:14:17 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Tue, 09 Oct 2012 11:14:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[19395] csw/mgar/pkg Message-ID: Revision: 19395 http://gar.svn.sourceforge.net/gar/?rev=19395&view=rev Author: cgrzemba Date: 2012-10-09 11:14:16 +0000 (Tue, 09 Oct 2012) Log Message: ----------- gtklp/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/gtklp/ csw/mgar/pkg/gtklp/Makefile csw/mgar/pkg/gtklp/branches/ csw/mgar/pkg/gtklp/tags/ csw/mgar/pkg/gtklp/trunk/ csw/mgar/pkg/gtklp/trunk/Makefile csw/mgar/pkg/gtklp/trunk/checksums csw/mgar/pkg/gtklp/trunk/files/ Added: csw/mgar/pkg/gtklp/Makefile =================================================================== --- csw/mgar/pkg/gtklp/Makefile (rev 0) +++ csw/mgar/pkg/gtklp/Makefile 2012-10-09 11:14:16 UTC (rev 19395) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/gtklp/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/gtklp/trunk/Makefile =================================================================== --- csw/mgar/pkg/gtklp/trunk/Makefile (rev 0) +++ csw/mgar/pkg/gtklp/trunk/Makefile 2012-10-09 11:14:16 UTC (rev 19395) @@ -0,0 +1,35 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = gtklp +VERSION = 1.2.9 +GARTYPE = v2 +CATEGORIES = apps + +DESCRIPTION = GTK Gui for CUPS +define BLURB + Gtk-Interface for CUPS Client with theme-support, IPP support, Printer specific options, all standard-cups options +endef + +MASTER_SITES = $(SF_MIRRORS) +DISTFILES = $(DISTNAME).src.tar.gz + +GARCOMPILER = SOS12U3 + +BUILD_DEP_PKGS += CSWlibkr5-dev +BUILD_DEP_PKGS += CSWlibgnutls-dev +BUILD_DEP_PKGS += CSWlibgcrypt-dev + +RUNTIME_DEP_PKGS_CSWgtklp += CSWlibgdk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWgtklp += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWgtklp += CSWlibgdk-pixbuf2-0-0 +RUNTIME_DEP_PKGS_CSWgtklp += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWgtklp += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWgtklp += CSWlibgtk-x11-2-0-0 +RUNTIME_DEP_PKGS_CSWgtklp += CSWlibcups2 + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-forte + +include gar/category.mk + Property changes on: csw/mgar/pkg/gtklp/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/gtklp/trunk/checksums =================================================================== --- csw/mgar/pkg/gtklp/trunk/checksums (rev 0) +++ csw/mgar/pkg/gtklp/trunk/checksums 2012-10-09 11:14:16 UTC (rev 19395) @@ -0,0 +1 @@ +822b04c9eba65aa14c1d6fd4a3454a37 gtklp-1.2.9.src.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 Tue Oct 9 13:26:52 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Tue, 09 Oct 2012 11:26:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[19396] csw/mgar/pkg/389-admin/trunk/Makefile Message-ID: Revision: 19396 http://gar.svn.sourceforge.net/gar/?rev=19396&view=rev Author: cgrzemba Date: 2012-10-09 11:26:52 +0000 (Tue, 09 Oct 2012) Log Message: ----------- 389-admin/trunk: update runtime dependencies Modified Paths: -------------- csw/mgar/pkg/389-admin/trunk/Makefile Modified: csw/mgar/pkg/389-admin/trunk/Makefile =================================================================== --- csw/mgar/pkg/389-admin/trunk/Makefile 2012-10-09 11:14:16 UTC (rev 19395) +++ csw/mgar/pkg/389-admin/trunk/Makefile 2012-10-09 11:26:52 UTC (rev 19396) @@ -47,22 +47,22 @@ RUNTIME_DEP_PKGS_CSW389-admin-dev += CSWlibds-admin-serv0 PACKAGES += CSW389-admin -OBSOLETED_BY_CSW389-admin = CSW389admin +# OBSOLETED_BY_CSW389-admin = CSW389admin SPKG_DESC_CSW389-admin += $(DESCRIPTION) INITSMF = /etc/opt/csw/init.d/dirsrv-admin RUNTIME_DEP_PKGS_CSW389-admin += CSWap2worker RUNTIME_DEP_PKGS_CSW389-admin += CSWap2modnss RUNTIME_DEP_PKGS_CSW389-admin += CSWlibprldap60 RUNTIME_DEP_PKGS_CSW389-admin += CSWlibldif60 -RUNTIME_DEP_PKGS_CSW389-admin += CSWlibicudata48 +RUNTIME_DEP_PKGS_CSW389-admin += CSWlibicudata49 RUNTIME_DEP_PKGS_CSW389-admin += CSWperl RUNTIME_DEP_PKGS_CSW389-admin += CSWlibadmsslutil0 RUNTIME_DEP_PKGS_CSW389-admin += CSWlibsasl2-2 RUNTIME_DEP_PKGS_CSW389-admin += CSWlibplc4 RUNTIME_DEP_PKGS_CSW389-admin += CSWlibssldap60 RUNTIME_DEP_PKGS_CSW389-admin += CSWlibnspr4 -RUNTIME_DEP_PKGS_CSW389-admin += CSWlibicuuc48 -RUNTIME_DEP_PKGS_CSW389-admin += CSWlibicui18n48 +RUNTIME_DEP_PKGS_CSW389-admin += CSWlibicuuc49 +RUNTIME_DEP_PKGS_CSW389-admin += CSWlibicui18n49 RUNTIME_DEP_PKGS_CSW389-admin += CSWlibds-admin-serv0 RUNTIME_DEP_PKGS_CSW389-admin += CSWlibadminutil0 RUNTIME_DEP_PKGS_CSW389-admin += CSWlibplds4 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 Oct 9 14:22:47 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Tue, 09 Oct 2012 12:22:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[19397] csw/mgar/pkg/gtklp/trunk/Makefile Message-ID: Revision: 19397 http://gar.svn.sourceforge.net/gar/?rev=19397&view=rev Author: cgrzemba Date: 2012-10-09 12:22:46 +0000 (Tue, 09 Oct 2012) Log Message: ----------- gtklp/trunk: add runtime dependencies Modified Paths: -------------- csw/mgar/pkg/gtklp/trunk/Makefile Modified: csw/mgar/pkg/gtklp/trunk/Makefile =================================================================== --- csw/mgar/pkg/gtklp/trunk/Makefile 2012-10-09 11:26:52 UTC (rev 19396) +++ csw/mgar/pkg/gtklp/trunk/Makefile 2012-10-09 12:22:46 UTC (rev 19397) @@ -15,8 +15,9 @@ DISTFILES = $(DISTNAME).src.tar.gz GARCOMPILER = SOS12U3 +PACKAGING_PLATFORMS = Solaris10-sparc Solaris10-i386 -BUILD_DEP_PKGS += CSWlibkr5-dev +BUILD_DEP_PKGS += CSWlibkrb5-dev BUILD_DEP_PKGS += CSWlibgnutls-dev BUILD_DEP_PKGS += CSWlibgcrypt-dev @@ -27,6 +28,21 @@ RUNTIME_DEP_PKGS_CSWgtklp += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWgtklp += CSWlibgtk-x11-2-0-0 RUNTIME_DEP_PKGS_CSWgtklp += CSWlibcups2 +RUNTIME_DEP_PKGS_CSWgtklp += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWgtklp += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWgtklp += CSWlibz1 +RUNTIME_DEP_PKGS_CSWgtklp += CSWlibgcrypt11 +RUNTIME_DEP_PKGS_CSWgtklp += CSWlibgpg-error0 +RUNTIME_DEP_PKGS_CSWgtklp += CSWlibcairo2 +RUNTIME_DEP_PKGS_CSWgtklp += CSWlibfreetype6 +RUNTIME_DEP_PKGS_CSWgtklp += CSWlibkrb5-3 +RUNTIME_DEP_PKGS_CSWgtklp += CSWlibatk1-0-0 +RUNTIME_DEP_PKGS_CSWgtklp += CSWpango +RUNTIME_DEP_PKGS_CSWgtklp += CSWlibfontconfig1 +RUNTIME_DEP_PKGS_CSWgtklp += CSWlibcom-err3 +RUNTIME_DEP_PKGS_CSWgtklp += CSWlibk5crypto3 +RUNTIME_DEP_PKGS_CSWgtklp += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWgtklp += CSWlibgnutls26 CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --enable-forte 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 Oct 9 14:53:10 2012 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Tue, 09 Oct 2012 12:53:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[19398] csw/mgar/pkg/cfengine3/trunk Message-ID: Revision: 19398 http://gar.svn.sourceforge.net/gar/?rev=19398&view=rev Author: guengel Date: 2012-10-09 12:53:10 +0000 (Tue, 09 Oct 2012) Log Message: ----------- cfengine3/trunk: New upstream release Modified Paths: -------------- csw/mgar/pkg/cfengine3/trunk/Makefile csw/mgar/pkg/cfengine3/trunk/checksums csw/mgar/pkg/cfengine3/trunk/files/changelog.CSW Added Paths: ----------- csw/mgar/pkg/cfengine3/trunk/files/0005-Remove-unsupported-compiler-options.patch Removed Paths: ------------- csw/mgar/pkg/cfengine3/trunk/files/0001-Remove-unsupported-compiler-options.patch csw/mgar/pkg/cfengine3/trunk/files/map.cfengine3 Modified: csw/mgar/pkg/cfengine3/trunk/Makefile =================================================================== --- csw/mgar/pkg/cfengine3/trunk/Makefile 2012-10-09 12:22:46 UTC (rev 19397) +++ csw/mgar/pkg/cfengine3/trunk/Makefile 2012-10-09 12:53:10 UTC (rev 19398) @@ -1,7 +1,7 @@ # $Id$ # NAME = cfengine3 -VERSION = 3.3.5 +VERSION = 3.3.7 CATEGORIES = utils GARTYPE = v2 GARCOMPILER = SOS12U1 @@ -26,7 +26,6 @@ DISTFILES += csw$(NAME)-cfserverd DISTFILES += README.CSW DISTFILES += changelog.CSW -DISTFILES += map.cfengine3 VENDOR_URL = http://www.cfengine.com/community UFILES_REGEX = cfengine-(\d+(?:\.\d+)*).tar.gz @@ -40,12 +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-Avoid-passing-NULL-pointer-to-CfOut-in-FnCallHostInN.patch +#PATCHFILES += 0001-Remove-unsupported-compiler-options.patch PATCHFILES += 0000-Optimization-debug-flags-adjusted-for-use-with-SunSt.patch # See comment in patch PATCHFILES += 0000-Do-not-perform-acceptance-test.patch +PATCHFILES += 0002-Add-include-alloca.h-in-gcov-stub.c.patch +PATCHFILES += 0005-Remove-unsupported-compiler-options.patch # # CUSTOM VARIABLES @@ -131,7 +131,7 @@ # We use this because libpromises will be moved to this private # directory (see also move-libpromises:) -EXTRA_LDFLAGS += -R$(libdir)/$(NAME) -z ignore -Bdirect -M "$(abspath $(WORKDIR)/map.cfengine3)" +EXTRA_LDFLAGS += -R$(libdir)/$(NAME) # Those libs are used by configure to detect getaddrinfo() EXTRA_CONFIGURE_ENV = LIBS="-lsocket -lnsl" Modified: csw/mgar/pkg/cfengine3/trunk/checksums =================================================================== --- csw/mgar/pkg/cfengine3/trunk/checksums 2012-10-09 12:22:46 UTC (rev 19397) +++ csw/mgar/pkg/cfengine3/trunk/checksums 2012-10-09 12:53:10 UTC (rev 19398) @@ -1 +1 @@ -a26eaa18f475de07f8ce122e4a4521d4 cfengine-3.3.5.tar.gz +26c28a86c7385b7ace51fb2ce6b10dba cfengine-3.3.7.tar.gz Deleted: csw/mgar/pkg/cfengine3/trunk/files/0001-Remove-unsupported-compiler-options.patch =================================================================== --- csw/mgar/pkg/cfengine3/trunk/files/0001-Remove-unsupported-compiler-options.patch 2012-10-09 12:22:46 UTC (rev 19397) +++ csw/mgar/pkg/cfengine3/trunk/files/0001-Remove-unsupported-compiler-options.patch 2012-10-09 12:53:10 UTC (rev 19398) @@ -1,39 +0,0 @@ -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/0005-Remove-unsupported-compiler-options.patch =================================================================== --- csw/mgar/pkg/cfengine3/trunk/files/0005-Remove-unsupported-compiler-options.patch (rev 0) +++ csw/mgar/pkg/cfengine3/trunk/files/0005-Remove-unsupported-compiler-options.patch 2012-10-09 12:53:10 UTC (rev 19398) @@ -0,0 +1,49 @@ +From 008e0369d158cb20703097a4e1e5239048e9d7f8 Mon Sep 17 00:00:00 2001 +From: Rafael Ostertag +Date: Tue, 9 Oct 2012 14:29:23 +0200 +Subject: [PATCH] Remove unsupported compiler options + +Remove unsupported compiler options. Also set -z interpose on evalfunction_test, since it overwrites functions. +--- + tests/unit/Makefile.am | 2 +- + tests/unit/Makefile.in | 4 ++-- + 2 files changed, 3 insertions(+), 3 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 71e500e..b972a4d 100644 +--- a/tests/unit/Makefile.in ++++ b/tests/unit/Makefile.in +@@ -123,7 +123,7 @@ domainname_test_LDADD = $(LDADD) + domainname_test_DEPENDENCIES = ../../src/libpromises.la libtest.la + evalfunction_test_SOURCES = evalfunction_test.c + evalfunction_test_OBJECTS = evalfunction_test.$(OBJEXT) +-evalfunction_test_LDADD = $(LDADD) ++evalfunction_test_LDADD = $(LDADD) -z interpose + evalfunction_test_DEPENDENCIES = ../../src/libpromises.la libtest.la + am_file_writer_test_OBJECTS = \ + file_writer_test-file_writer_test.$(OBJEXT) \ +@@ -467,7 +467,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.12 + Modified: csw/mgar/pkg/cfengine3/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/cfengine3/trunk/files/changelog.CSW 2012-10-09 12:22:46 UTC (rev 19397) +++ csw/mgar/pkg/cfengine3/trunk/files/changelog.CSW 2012-10-09 12:53:10 UTC (rev 19398) @@ -1,3 +1,10 @@ +cfengine3 (3.3.7,REV=2012.10.09) + + * New upstream release 3.3.7. + + -- Rafael Ostertag Tue, 09 Oct 2012 14:48:49 +0200 + + cfengine3 (3.3.5,REV=2012.08.21) * New upstream release 3.3.5. Deleted: csw/mgar/pkg/cfengine3/trunk/files/map.cfengine3 =================================================================== --- csw/mgar/pkg/cfengine3/trunk/files/map.cfengine3 2012-10-09 12:22:46 UTC (rev 19397) +++ csw/mgar/pkg/cfengine3/trunk/files/map.cfengine3 2012-10-09 12:53:10 UTC (rev 19398) @@ -1 +0,0 @@ -libc.so - SUNW_1.22.5 SUNWprivate_1.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 Oct 9 15:10:26 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Tue, 09 Oct 2012 13:10:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[19399] csw/mgar/pkg Message-ID: Revision: 19399 http://gar.svn.sourceforge.net/gar/?rev=19399&view=rev Author: wilbury Date: 2012-10-09 13:10:26 +0000 (Tue, 09 Oct 2012) Log Message: ----------- php5_ffmpeg/trunk: Initial commit, php5_ffmpeg-current Added Paths: ----------- csw/mgar/pkg/php5_ffmpeg/ csw/mgar/pkg/php5_ffmpeg/Makefile csw/mgar/pkg/php5_ffmpeg/branches/ csw/mgar/pkg/php5_ffmpeg/tags/ csw/mgar/pkg/php5_ffmpeg/trunk/ csw/mgar/pkg/php5_ffmpeg/trunk/Makefile csw/mgar/pkg/php5_ffmpeg/trunk/checksums csw/mgar/pkg/php5_ffmpeg/trunk/files/ Added: csw/mgar/pkg/php5_ffmpeg/Makefile =================================================================== --- csw/mgar/pkg/php5_ffmpeg/Makefile (rev 0) +++ csw/mgar/pkg/php5_ffmpeg/Makefile 2012-10-09 13:10:26 UTC (rev 19399) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/php5_ffmpeg/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/php5_ffmpeg/trunk/Makefile =================================================================== --- csw/mgar/pkg/php5_ffmpeg/trunk/Makefile (rev 0) +++ csw/mgar/pkg/php5_ffmpeg/trunk/Makefile 2012-10-09 13:10:26 UTC (rev 19399) @@ -0,0 +1,71 @@ +# $Id$ + +NAME = ffmpeg +VERSION = current +CATEGORIES = lang +GARTYPE = v2 + +# to match php5 +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + +DESCRIPTION = APC Extention for PHP +define BLURB + The Alternative PHP Cache (APC) is a free and open opcode cache for PHP. + It was conceived of to provide a free, open, and robust framework + for caching and optimizing PHP intermediate code. +endef + +PHP_PREFIX = $(prefix)/php5 +PHP_BIN = $(PHP_PREFIX)/bin + +PHP5_EXT = 1 + +PHP5ROOT = $(DESTDIR)/$(PHP_PREFIX) +STRIP_DIRS += $(PHP5ROOT)/lib/php/extensions/*/ +STRIP_DIRS += $(PHP5ROOT)/bin + +SPKG_SOURCEURL = http://us.php.net/apc/ +MASTER_SITES = http://www.wilbury.sk/private/files/ +DISTNAME = $(NAME)-$(VERSION) + +DISTFILES = $(DISTNAME).tar.bz2 +WORKSRC = $(WORKDIR)/ffmpeg-php + +GARCOMPILER = GCC4 + +PACKAGES = CSWphp5-ffmpeg +OBSOLETED_BY_CSWphp5-ffmpeg = CSWphp5ffmpeg +CATALOG_NAME_CSWphp5ffmpeg = php5_ffmpeg_stub +SPKG_DESC_CSWphp5-ffmpeg = APC Extention for PHP5 +RUNTIME_DEP_PKGS_CSWphp5-ffmpeg = CSWphp5 +RUNTIME_DEP_PKGS_CSWphp5-ffmpeg += CSWlibgcc-s1 +RUNTIME_DEP_PKGS_CSWphp5-ffmpeg += CSWlibswscale2 +RUNTIME_DEP_PKGS_CSWphp5-ffmpeg += CSWlibavcodec54 +RUNTIME_DEP_PKGS_CSWphp5-ffmpeg += CSWlibavformat54 +BUILD_DEPS = CSWapache2 CSWphp5-dev + +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --with-php-config=$(bindir)/php-config +CONFIGURE_ARGS += --with-ffmpeg=shared,$(prefix) + +LICENSE_TEXT = License + +# These should stop the test suite from asking to send results by +# mail. +NO_INTERACTION = 1 +EXTRA_TEST_EXPORTS = NO_INTERACTION + +# this thing doesn't use destdir. export install_root with the same +# value +INSTALL_ROOT = $(DESTDIR) +EXTRA_INSTALL_EXPORTS = INSTALL_ROOT + +TEST_TARGET = + +CHECKPKG_OVERRIDES_CSWphp5-ffmpeg += surplus-dependency|CSWphp5 + +include gar/category.mk + +post-extract-isa-$(ISA_DEFAULT_$(GARCH)): + @( cd $(WORKSRC) ; $(PHP_BIN)/phpize ) + @$(MAKECOOKIE) Property changes on: csw/mgar/pkg/php5_ffmpeg/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/php5_ffmpeg/trunk/checksums =================================================================== --- csw/mgar/pkg/php5_ffmpeg/trunk/checksums (rev 0) +++ csw/mgar/pkg/php5_ffmpeg/trunk/checksums 2012-10-09 13:10:26 UTC (rev 19399) @@ -0,0 +1 @@ +f416a4d1d0d0cf2bd30d220ea1d1af6a ffmpeg-current.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 Oct 9 16:23:51 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Tue, 09 Oct 2012 14:23:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[19400] csw/mgar/pkg/emacs/trunk Message-ID: Revision: 19400 http://gar.svn.sourceforge.net/gar/?rev=19400&view=rev Author: pfelecan Date: 2012-10-09 14:23:51 +0000 (Tue, 09 Oct 2012) Log Message: ----------- emacs/trunk: bump version as in upstream Modified Paths: -------------- csw/mgar/pkg/emacs/trunk/Makefile csw/mgar/pkg/emacs/trunk/checksums csw/mgar/pkg/emacs/trunk/files/0001-activate-Xft-for-configure.patch Added Paths: ----------- csw/mgar/pkg/emacs/trunk/files/0002-Filter-ImageMagik-OpenMP-compiler-flag.patch csw/mgar/pkg/emacs/trunk/files/0003-Satisfy-micro-tasking-library.patch Modified: csw/mgar/pkg/emacs/trunk/Makefile =================================================================== --- csw/mgar/pkg/emacs/trunk/Makefile 2012-10-09 13:10:26 UTC (rev 19399) +++ csw/mgar/pkg/emacs/trunk/Makefile 2012-10-09 14:23:51 UTC (rev 19400) @@ -2,7 +2,7 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = emacs -VERSION = 23.4 +VERSION = 24.2 GARTYPE = v2 CATEGORIES = apps @@ -62,10 +62,16 @@ BUILD_DEP_PKGS += CSWpkgconfig BUILD_DEP_PKGS += CSWsunx11devel +LINKER_MAPS = +LINKER_DIRECT = +LINKER_IGNORE = + PACKAGING_PLATFORMS = solaris10-sparc PACKAGING_PLATFORMS += solaris10-i386 PATCHFILES += 0001-activate-Xft-for-configure.patch +PATCHFILES += 0002-Filter-ImageMagik-OpenMP-compiler-flag.patch +PATCHFILES += 0003-Satisfy-micro-tasking-library.patch EXTRA_MODULATORS = FEATURES MODULATIONS_FEATURES = athena @@ -117,9 +123,6 @@ SPKG_DESC_CSWemacs-common = $(DESCRIPTION) - architecture neutral common components CATALOGNAME_CSWemacs-common = emacs_common CHECKPKG_OVERRIDES_CSWemacs-common += missing-dependency|CSWemacscommon -CHECKPKG_OVERRIDES_CSWemacs-common += archall-with-arch-paths|/opt/csw/libexec/emacs/23.4/i386-pc-solaris2.10 -CHECKPKG_OVERRIDES_CSWemacs-common += archall-with-arch-paths|/opt/csw/libexec/emacs/23.4/i386-pc-solaris2.10/rcs2log -CHECKPKG_OVERRIDES_CSWemacs-common += archall-with-arch-paths|/opt/csw/libexec/emacs/23.4/i386-pc-solaris2.10/vcdiff CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/share|root/opt/csw/share/info/dbus CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/share|root/opt/csw/share/info/elisp-3 CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/share|root/opt/csw/share/info/emacs-6 @@ -221,13 +224,7 @@ PKGFILES_CSWemacs-bin-common += /opt/csw/bin/ebrowse PKGFILES_CSWemacs-bin-common += /opt/csw/bin/emacsclient PKGFILES_CSWemacs-bin-common += /opt/csw/bin/etags -PKGFILES_CSWemacs-bin-common += /opt/csw/libexec/emacs/$(VERSION)/[^/]*solaris[^/]*/digest-doc -PKGFILES_CSWemacs-bin-common += /opt/csw/libexec/emacs/$(VERSION)/[^/]*solaris[^/]*/fakemail -PKGFILES_CSWemacs-bin-common += /opt/csw/libexec/emacs/$(VERSION)/[^/]*solaris[^/]*/hexl -PKGFILES_CSWemacs-bin-common += /opt/csw/libexec/emacs/$(VERSION)/[^/]*solaris[^/]*/movemail -PKGFILES_CSWemacs-bin-common += /opt/csw/libexec/emacs/$(VERSION)/[^/]*solaris[^/]*/profile -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 +PKGFILES_CSWemacs-bin-common += /opt/csw/libexec/emacs/$(VERSION)/.* PACKAGES += CSWemacs SPKG_DESC_CSWemacs = $(DESCRIPTION) - metapackage for generic dependencies @@ -379,8 +376,8 @@ CATALOGNAME_CSWemacsnox = emacs_nox_stub RUNTIME_DEP_PKGS_CSWemacs-nox = CSWemacs-common RUNTIME_DEP_PKGS_CSWemacs-nox += CSWemacs-bin-common -CHECKPKG_OVERRIDES_CSWemacs-nox += file-with-bad-content|/usr/local|root/opt/csw/bin/emacs-23.4-nox -CHECKPKG_OVERRIDES_CSWemacs-nox += file-with-bad-content|/usr/share|root/opt/csw/bin/emacs-23.4-nox +CHECKPKG_OVERRIDES_CSWemacs-nox += file-with-bad-content|/usr/local|root/opt/csw/bin/emacs-$(VERSION)-nox +CHECKPKG_OVERRIDES_CSWemacs-nox += file-with-bad-content|/usr/share|root/opt/csw/bin/emacs-$(VERSION)-nox CHECKPKG_OVERRIDES_CSWemacs-nox += file-with-bad-content|/usr/local|root/opt/csw/bin/emacs-nox 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 Modified: csw/mgar/pkg/emacs/trunk/checksums =================================================================== --- csw/mgar/pkg/emacs/trunk/checksums 2012-10-09 13:10:26 UTC (rev 19399) +++ csw/mgar/pkg/emacs/trunk/checksums 2012-10-09 14:23:51 UTC (rev 19400) @@ -1 +1 @@ -070c68ad8e3c31fb3cb2414feaf5e6f0 emacs-23.4.tar.bz2 +1676803a50e8adc817fdaaebb9234f14 emacs-24.2.tar.bz2 Modified: csw/mgar/pkg/emacs/trunk/files/0001-activate-Xft-for-configure.patch =================================================================== --- csw/mgar/pkg/emacs/trunk/files/0001-activate-Xft-for-configure.patch 2012-10-09 13:10:26 UTC (rev 19399) +++ csw/mgar/pkg/emacs/trunk/files/0001-activate-Xft-for-configure.patch 2012-10-09 14:23:51 UTC (rev 19400) @@ -1,17 +1,17 @@ -From 2bf4fad0be05e3b11a3f233c16f0f681a11641bd Mon Sep 17 00:00:00 2001 +From 904e9283e718e1b14276ee8f7047f9106c48b6bc Mon Sep 17 00:00:00 2001 From: Peter Felecan -Date: Tue, 22 May 2012 14:04:49 +0200 +Date: Fri, 5 Oct 2012 11:41:59 +0200 Subject: [PATCH] activate Xft for configure --- - configure | 3 +++ + configure | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configure b/configure -index d894fe6..affbb9f 100755 +index 3e3cec2..fb229b7 100755 --- a/configure +++ b/configure -@@ -589,6 +589,9 @@ ac_includes_default="\ +@@ -597,6 +597,9 @@ ac_includes_default="\ #endif #ifdef HAVE_UNISTD_H # include @@ -20,7 +20,7 @@ +# include #endif" - ac_config_libobj_dir=src + ac_header_list= -- -1.7.10 +1.7.12 Added: csw/mgar/pkg/emacs/trunk/files/0002-Filter-ImageMagik-OpenMP-compiler-flag.patch =================================================================== --- csw/mgar/pkg/emacs/trunk/files/0002-Filter-ImageMagik-OpenMP-compiler-flag.patch (rev 0) +++ csw/mgar/pkg/emacs/trunk/files/0002-Filter-ImageMagik-OpenMP-compiler-flag.patch 2012-10-09 14:23:51 UTC (rev 19400) @@ -0,0 +1,25 @@ +From bcc80204005ab2cdce7346594ad66c3a0ba6b65a Mon Sep 17 00:00:00 2001 +From: Peter Felecan +Date: Mon, 8 Oct 2012 10:47:01 +0200 +Subject: [PATCH] Filter ImageMagik OpenMP compiler flag + +--- + configure | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure b/configure +index fb229b7..97e73cd 100755 +--- a/configure ++++ b/configure +@@ -10902,7 +10902,7 @@ $as_echo "yes" >&6; } + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking IMAGEMAGICK_CFLAGS" >&5 + $as_echo_n "checking IMAGEMAGICK_CFLAGS... " >&6; } +- IMAGEMAGICK_CFLAGS=`$PKG_CONFIG --cflags "$IMAGEMAGICK_MODULE"|sed -e 's,///*,/,g'` ++ IMAGEMAGICK_CFLAGS=`$PKG_CONFIG --cflags "$IMAGEMAGICK_MODULE"|sed -e 's,///*,/,g' | sed -e 's/-xopenmp//'` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IMAGEMAGICK_CFLAGS" >&5 + $as_echo "$IMAGEMAGICK_CFLAGS" >&6; } + +-- +1.7.12 + Added: csw/mgar/pkg/emacs/trunk/files/0003-Satisfy-micro-tasking-library.patch =================================================================== --- csw/mgar/pkg/emacs/trunk/files/0003-Satisfy-micro-tasking-library.patch (rev 0) +++ csw/mgar/pkg/emacs/trunk/files/0003-Satisfy-micro-tasking-library.patch 2012-10-09 14:23:51 UTC (rev 19400) @@ -0,0 +1,25 @@ +From 245630d8dac76f63102503ca388c51ff45afba2e Mon Sep 17 00:00:00 2001 +From: Peter Felecan +Date: Tue, 9 Oct 2012 11:43:31 +0200 +Subject: [PATCH] Satisfy micro-tasking library + +--- + Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.in b/Makefile.in +index 9a9be4f..08c1aed 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -314,7 +314,7 @@ epaths-force: FRC + # running more than 1 process in the leim directory, especially for + # the $TIT files there. + leim: src Makefile FRC +- (export PARALLEL; PARALLEL=0; cd $@; $(MAKE) all $(MFLAGS) \ ++ (export PARALLEL; PARALLEL=1; cd $@; $(MAKE) all $(MFLAGS) \ + CC='${CC}' CFLAGS='${CFLAGS}' CPPFLAGS='${CPPFLAGS}' \ + LDFLAGS='${LDFLAGS}' MAKE='${MAKE}') + +-- +1.7.12 + 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 Oct 9 20:15:32 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 09 Oct 2012 18:15:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[19401] csw/mgar/pkg/x3270/trunk Message-ID: Revision: 19401 http://gar.svn.sourceforge.net/gar/?rev=19401&view=rev Author: dmichelsen Date: 2012-10-09 18:15:32 +0000 (Tue, 09 Oct 2012) Log Message: ----------- x3270/trunk: Update to 3.3.12ga11 and TCL 8.5 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-10-09 14:23:51 UTC (rev 19400) +++ csw/mgar/pkg/x3270/trunk/Makefile 2012-10-09 18:15:32 UTC (rev 19401) @@ -1,7 +1,7 @@ # $Id$ NAME = x3270 BASEREL = 3.3 -VERSION = $(BASEREL).12ga7 +VERSION = $(BASEREL).12ga11 CATEGORIES = apps GARTYPE = v2 @@ -16,9 +16,6 @@ # https://sourceforge.net/tracker/?func=detail&aid=3151250&group_id=153338&atid=787364 PATCHFILES += 0002-Propagate-CFLAGS-to-building-of-version.o.patch -# PATCHFILES += x3270-3.3.6_DBCS.patch -# PATCHFILES += c3270-3.3_ncurses.patch - # File name regex to get notifications about upstream software releases UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*)-src.tar.gz @@ -28,7 +25,7 @@ LICENSE = c3270-$(BASEREL)/LICENSE -BUILD_DEP_PKGS += CSWtcl +BUILD_DEP_PKGS += CSWtcl-dev BUILD_DEP_PKGS += CSWlibiconv-dev BUILD_DEP_PKGS += CSWlibreadline-dev BUILD_DEP_PKGS += CSWlibssl-dev @@ -37,7 +34,7 @@ PACKAGES += CSWx3270 SPKG_DESC_CSWx3270 = An IBM 3270 terminal emulator # PKGFILES is catchall -RUNTIME_DEP_PKGS_CSWx3270 += CSWtcl +RUNTIME_DEP_PKGS_CSWx3270 += CSWlibtcl8-5 RUNTIME_DEP_PKGS_CSWx3270 += CSWlibiconv2 RUNTIME_DEP_PKGS_CSWx3270 += CSWlibreadline6 RUNTIME_DEP_PKGS_CSWx3270 += CSWlibssl1-0-0 Modified: csw/mgar/pkg/x3270/trunk/checksums =================================================================== --- csw/mgar/pkg/x3270/trunk/checksums 2012-10-09 14:23:51 UTC (rev 19400) +++ csw/mgar/pkg/x3270/trunk/checksums 2012-10-09 18:15:32 UTC (rev 19401) @@ -1 +1 @@ -5a501ed84d522c02d3c7ed3e36a00d0a suite3270-3.3.12ga7-src.tgz +a4e4a3b14d4a67ca759319b70c1e55d8 suite3270-3.3.12ga11-src.tgz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From igalic at users.sourceforge.net Tue Oct 9 22:32:00 2012 From: igalic at users.sourceforge.net (igalic at users.sourceforge.net) Date: Tue, 09 Oct 2012 20:32:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[19402] csw/mgar/pkg/trafficserver/trunk Message-ID: Revision: 19402 http://gar.svn.sourceforge.net/gar/?rev=19402&view=rev Author: igalic Date: 2012-10-09 20:32:00 +0000 (Tue, 09 Oct 2012) Log Message: ----------- trafficserver/trunk: new release Modified Paths: -------------- csw/mgar/pkg/trafficserver/trunk/Makefile csw/mgar/pkg/trafficserver/trunk/checksums Modified: csw/mgar/pkg/trafficserver/trunk/Makefile =================================================================== --- csw/mgar/pkg/trafficserver/trunk/Makefile 2012-10-09 18:15:32 UTC (rev 19401) +++ csw/mgar/pkg/trafficserver/trunk/Makefile 2012-10-09 20:32:00 UTC (rev 19402) @@ -2,7 +2,7 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = trafficserver -VERSION = 3.1.4-unstable +VERSION = 3.2.3 GARTYPE = v2 CATEGORIES = server @@ -11,15 +11,15 @@ Apache Traffic Server is fast, scalable and extensible HTTP/1.1 compliant caching proxy server endef -MASTER_SITES = http://people.apache.org/~zwoop/rel-candidates/ +MASTER_SITES = http://people.apache.org/~igalic/releases DISTFILES = $(DISTNAME).tar.bz2 PACKAGING_PLATFORMS = solaris10-i386 BUILD64_ONLY = 1 ISAEXEC = 1 -pkgsysuser = $(shell /opt/csw/gnu/id -nu) -pkgsysgroup = $(shell /opt/csw/gnu/id -ng) +# this breaks, since its introduction, so disable it (for now) +LINKER_MAPS = CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --sysconfdir=$(sysconfdir)/$(NAME) @@ -31,8 +31,7 @@ CONFIGURE_ARGS += --with-lzma=$(prefix) CONFIGURE_ARGS += --with-expat=$(prefix) CONFIGURE_ARGS += --enable-hwloc -CONFIGURE_ARGS += --with-user=$(pkgsysuser) -CONFIGURE_ARGS += --with-group=$(pkgsysgroup) +CONFIGURE_ARGS += --disable-silent-rules PROTOTYPE_MODIFIERS += data PROTOTYPE_FILES_data += $(sysconfdir)/?.* @@ -40,12 +39,10 @@ PROTOTYPE_USER_data = nobody PROTOTYPE_GROUP_data = nobody -REINPLACE_MATCH = $(pkgsysuser) -REINPLACE_WITH = nobody -REINPLACE_FILES += $(sysconfidir)/$(NAME)/records.config -REINPLACE_WHEN = postinstall - STRIP_LIBTOOL = 1 +GARCOMPILER = SOS12U3 + include gar/category.mk +PATH := /opt/csw/gnu:$(PATH) Modified: csw/mgar/pkg/trafficserver/trunk/checksums =================================================================== --- csw/mgar/pkg/trafficserver/trunk/checksums 2012-10-09 18:15:32 UTC (rev 19401) +++ csw/mgar/pkg/trafficserver/trunk/checksums 2012-10-09 20:32:00 UTC (rev 19402) @@ -1 +1 @@ -c81e71a636d225e7ff8140a1d412b17a trafficserver-3.0.5.tar.bz2 +29e6fb1123e6f42cae2c54b936607e44 trafficserver-3.2.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 Tue Oct 9 22:33:49 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 09 Oct 2012 20:33:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[19403] csw/mgar/pkg/torque/trunk/Makefile Message-ID: Revision: 19403 http://gar.svn.sourceforge.net/gar/?rev=19403&view=rev Author: dmichelsen Date: 2012-10-09 20:33:48 +0000 (Tue, 09 Oct 2012) Log Message: ----------- torque/trunk: Update to TCL 8.5 Modified Paths: -------------- csw/mgar/pkg/torque/trunk/Makefile Modified: csw/mgar/pkg/torque/trunk/Makefile =================================================================== --- csw/mgar/pkg/torque/trunk/Makefile 2012-10-09 20:32:00 UTC (rev 19402) +++ csw/mgar/pkg/torque/trunk/Makefile 2012-10-09 20:33:48 UTC (rev 19403) @@ -6,18 +6,23 @@ VERSION = 3.0.2 CATEGORIES = utils GARTYPE = v2 + DESCRIPTION = Batch job scheduling system -define BLURB -endef -SPKG_SOURCEURL = http://www.clusterresources.com/products/torque-resource-manager.php -MASTER_SITES = http://www.clusterresources.com/downloads/torque/ + +MASTER_SITES += http://www.adaptivecomputing.com/resources/downloads/torque/ +DISTFILES += $(DISTNAME).tar.gz PATCHFILES += 0001-daemonize-function-prototype.patch -DISTFILES = $(NAME)-$(VERSION).tar.gz + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-server-home GARCOMPILER = GNU +# CSWtk 8.5 is only available on Solaris 10 +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + +VENDOR_URL = http://www.clusterresources.com/products/torque-resource-manager.php + LICENSE = PBS_License_2.5.txt PACKAGES = CSWtorque @@ -37,9 +42,8 @@ SPKG_DESC_CSWtorque-dev += $(DESCRIPTION), development files PKGFILES_CSWtorque-dev += $(PKGFILES_DEVEL) -RUNTIME_DEP_PKGS_CSWtorque += CSWlibncurses5 -RUNTIME_DEP_PKGS_CSWtorque += CSWtk -RUNTIME_DEP_PKGS_CSWtorque += CSWtcl +RUNTIME_DEP_PKGS_CSWtorque += CSWlibtk8-5 +RUNTIME_DEP_PKGS_CSWtorque += CSWlibtcl8-5 RUNTIME_DEP_PKGS_CSWtorque += CSWlibreadline6 CHECKPKG_OVERRIDES_CSWtorque += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/qsub.1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From igalic at users.sourceforge.net Wed Oct 10 06:31:49 2012 From: igalic at users.sourceforge.net (igalic at users.sourceforge.net) Date: Wed, 10 Oct 2012 04:31:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[19404] csw/mgar/pkg/trafficserver/trunk Message-ID: Revision: 19404 http://gar.svn.sourceforge.net/gar/?rev=19404&view=rev Author: igalic Date: 2012-10-10 04:31:49 +0000 (Wed, 10 Oct 2012) Log Message: ----------- trafficserver/trunk: add runtime deps, remove /usr/local/lib from link paths. Modified Paths: -------------- csw/mgar/pkg/trafficserver/trunk/Makefile csw/mgar/pkg/trafficserver/trunk/checksums Modified: csw/mgar/pkg/trafficserver/trunk/Makefile =================================================================== --- csw/mgar/pkg/trafficserver/trunk/Makefile 2012-10-09 20:33:48 UTC (rev 19403) +++ csw/mgar/pkg/trafficserver/trunk/Makefile 2012-10-10 04:31:49 UTC (rev 19404) @@ -43,6 +43,22 @@ GARCOMPILER = SOS12U3 +RUNTIME_DEP_PKGS_CSWtrafficserver += CSWlibiconv2 +RUNTIME_DEP_PKGS_CSWtrafficserver += CSWlibssl1-0-0 +RUNTIME_DEP_PKGS_CSWtrafficserver += CSWlibz1 +RUNTIME_DEP_PKGS_CSWtrafficserver += CSWlibtcl8-5 +RUNTIME_DEP_PKGS_CSWtrafficserver += CSWlibpcre1 +RUNTIME_DEP_PKGS_CSWtrafficserver += CSWstlport +RUNTIME_DEP_PKGS_CSWtrafficserver += CSWlibhwloc5 +RUNTIME_DEP_PKGS_CSWtrafficserver += CSWlibexpat1 +RUNTIME_DEP_PKGS_CSWtrafficserver += CSWlibreadline6 +RUNTIME_DEP_PKGS_CSWtrafficserver += CSWliblzma5 + include gar/category.mk PATH := /opt/csw/gnu:$(PATH) + +pre-configure-modulated: + ( sed -i -ne 's|TS_ADDTO(LDFLAGS, [-L/usr/local/lib])||' configure.ac && \ + autoreconf -if ) + Modified: csw/mgar/pkg/trafficserver/trunk/checksums =================================================================== --- csw/mgar/pkg/trafficserver/trunk/checksums 2012-10-09 20:33:48 UTC (rev 19403) +++ csw/mgar/pkg/trafficserver/trunk/checksums 2012-10-10 04:31:49 UTC (rev 19404) @@ -1 +1 @@ -29e6fb1123e6f42cae2c54b936607e44 trafficserver-3.2.3.tar.bz2 +29e6fb1123e6f42cae2c54b936607e44 trafficserver-3.2.3.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From igalic at users.sourceforge.net Wed Oct 10 06:38:07 2012 From: igalic at users.sourceforge.net (igalic at users.sourceforge.net) Date: Wed, 10 Oct 2012 04:38:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[19405] csw/mgar/pkg/trafficserver/trunk/Makefile Message-ID: Revision: 19405 http://gar.svn.sourceforge.net/gar/?rev=19405&view=rev Author: igalic Date: 2012-10-10 04:38:06 +0000 (Wed, 10 Oct 2012) Log Message: ----------- trafficserver/trunk: cd $(WORKSRC), before pre-configure-modulated... Modified Paths: -------------- csw/mgar/pkg/trafficserver/trunk/Makefile Modified: csw/mgar/pkg/trafficserver/trunk/Makefile =================================================================== --- csw/mgar/pkg/trafficserver/trunk/Makefile 2012-10-10 04:31:49 UTC (rev 19404) +++ csw/mgar/pkg/trafficserver/trunk/Makefile 2012-10-10 04:38:06 UTC (rev 19405) @@ -59,6 +59,6 @@ PATH := /opt/csw/gnu:$(PATH) pre-configure-modulated: - ( sed -i -ne 's|TS_ADDTO(LDFLAGS, [-L/usr/local/lib])||' configure.ac && \ - autoreconf -if ) + cd $(WORKSRC) && sed -i -ne 's|TS_ADDTO(LDFLAGS, [-L/usr/local/lib])||' configure.ac + cd $(WORKSRC) && autoreconf -if 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 Oct 10 09:32:51 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Wed, 10 Oct 2012 07:32:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[19406] csw/mgar/pkg/emacs/trunk/Makefile Message-ID: Revision: 19406 http://gar.svn.sourceforge.net/gar/?rev=19406&view=rev Author: pfelecan Date: 2012-10-10 07:32:51 +0000 (Wed, 10 Oct 2012) Log Message: ----------- emacs/trunk: - do not generate compressed manual pages and info files - new build dependencies - new run-time dependencies - adapted overrides as much as possible Modified Paths: -------------- csw/mgar/pkg/emacs/trunk/Makefile Modified: csw/mgar/pkg/emacs/trunk/Makefile =================================================================== --- csw/mgar/pkg/emacs/trunk/Makefile 2012-10-10 04:38:06 UTC (rev 19405) +++ csw/mgar/pkg/emacs/trunk/Makefile 2012-10-10 07:32:51 UTC (rev 19406) @@ -26,6 +26,7 @@ BUILD_DEP_PKGS = CSWcoreutils BUILD_DEP_PKGS += CSWfconfig-dev BUILD_DEP_PKGS += CSWglib2devel +BUILD_DEP_PKGS += CSWimagemagick-dev BUILD_DEP_PKGS += CSWlibatk-dev BUILD_DEP_PKGS += CSWlibbz2-dev BUILD_DEP_PKGS += CSWlibcairo-dev @@ -38,11 +39,13 @@ BUILD_DEP_PKGS += CSWlibgdk-pixbuf-dev BUILD_DEP_PKGS += CSWlibgif-dev BUILD_DEP_PKGS += CSWlibglib2-dev +BUILD_DEP_PKGS += CSWlibgnutls-dev BUILD_DEP_PKGS += CSWlibgtk2-dev BUILD_DEP_PKGS += CSWlibiconv-dev BUILD_DEP_PKGS += CSWlibjbig-dev BUILD_DEP_PKGS += CSWlibjpeg-dev BUILD_DEP_PKGS += CSWlibm17n-dev +BUILD_DEP_PKGS += CSWlibncurses-dev BUILD_DEP_PKGS += CSWlibotf-dev BUILD_DEP_PKGS += CSWlibpixman-dev BUILD_DEP_PKGS += CSWlibpng-dev @@ -56,6 +59,7 @@ BUILD_DEP_PKGS += CSWlibxdmcpdevel BUILD_DEP_PKGS += CSWlibxft2devel BUILD_DEP_PKGS += CSWlibxml2-dev +BUILD_DEP_PKGS += CSWlibxpm-dev BUILD_DEP_PKGS += CSWlibxpmdevel BUILD_DEP_PKGS += CSWlibz-dev BUILD_DEP_PKGS += CSWpangodevel @@ -101,6 +105,7 @@ EXTRA_CONFIGURE_ARGS_nox += --without-x CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --without-compress-info CONFIGURE_ARGS += $(EXTRA_CONFIGURE_ARGS_$(FEATURES)) MERGE_SCRIPTS_isa-default-features-athena = copy-all @@ -170,13 +175,13 @@ CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/$(VERSION)/etc/DOC-$(VERSION).1 CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/$(VERSION)/lisp/man.elc CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/$(VERSION)/lisp/paths.el -CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/$(VERSION)/lisp/complete.elc CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/$(VERSION)/lisp/ffap.elc CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/$(VERSION)/lisp/ps-bdf.elc CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/$(VERSION)/lisp/find-file.elc CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/$(VERSION)/lisp/loaddefs.el CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/$(VERSION)/lisp/ldefs-boot.el CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/$(VERSION)/lisp/woman.elc +CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/$(VERSION)/lisp/obsolete/complete.elc CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/$(VERSION)/lisp/progmodes/idlwave.elc CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/$(VERSION)/lisp/progmodes/idlw-help.elc CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/$(VERSION)/lisp/progmodes/m4-mode.elc @@ -188,6 +193,8 @@ CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/$(VERSION)/lisp/gnus/gnus-art.elc CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/$(VERSION)/lisp/gnus/mailcap.elc CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/$(VERSION)/lisp/net/tramp.elc +CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/$(VERSION)/lisp/net/tramp-loaddefs.el +CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/emacs/$(VERSION)/lisp/net/tramp-sh.elc CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/emacs.1 # as we use alternatives, we need to obsolete emacs_chooser; # emacs_common, being the root dependence of all emacs related @@ -237,8 +244,8 @@ 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 = CSWemacs-bin-common +RUNTIME_DEP_PKGS_CSWemacs-athena += CSWemacs-common RUNTIME_DEP_PKGS_CSWemacs-athena += CSWfconfig RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibbz2-1-0 RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibcairo2 @@ -253,16 +260,20 @@ 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 += CSWlibgnutls26 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 += CSWlibm17n-utils RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibm17n0 -RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibm17n-utils +RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibmagickcore5 +RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibmagickwand5 +RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibncurses5 +RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibotf-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 @@ -270,10 +281,10 @@ RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibtiff3 RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibxft2 RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSWemacs-athena += CSWlibxpm4 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 @@ -304,8 +315,8 @@ CATALOGNAME_CSWemacs-gtk = emacs_gtk OBSOLETED_BY_CSWemacs-gtk = CSWemacsgtk CATALOGNAME_CSWemacsgtk = emacs_gtk_stub -RUNTIME_DEP_PKGS_CSWemacs-gtk = CSWemacs-common -RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWemacs-bin-common +RUNTIME_DEP_PKGS_CSWemacs-gtk = CSWemacs-bin-common +RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWemacs-common RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWfconfig RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibatk1-0-0 RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibbz2-1-0 @@ -314,8 +325,8 @@ RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibdatrie1 RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibdbus1-3 RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibexpat1 +RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibfontconfig1 RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibfreetype6 -RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibfontconfig1 RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibgconf2-4 RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibgdk-pixbuf2-0-0 @@ -324,6 +335,7 @@ RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibgio2-0-0 RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibgnutls26 RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibgthread2-0-0 RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibgtk-x11-2-0-0 @@ -331,10 +343,13 @@ RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibintl8 RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibjbig2 RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibjpeg7 +RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibm17n-utils RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibm17n0 -RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibm17n-utils +RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibmagickcore5 +RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibmagickwand5 +RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibncurses5 +RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibotf-utils RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibotf0 -RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibotf-utils RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibpixman1-0 RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibpng12-0 RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibrsvg2-2 @@ -342,6 +357,7 @@ RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibtiff3 RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibxft2 RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibxml2-2 +RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibxpm4 RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibxrender RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibz1 RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWorbit2 @@ -374,8 +390,11 @@ CATALOGNAME_CSWemacsnox = emacs_nox OBSOLETED_BY_CSWemacs-nox = CSWemacsnox CATALOGNAME_CSWemacsnox = emacs_nox_stub -RUNTIME_DEP_PKGS_CSWemacs-nox = CSWemacs-common -RUNTIME_DEP_PKGS_CSWemacs-nox += CSWemacs-bin-common +RUNTIME_DEP_PKGS_CSWemacs-nox = CSWemacs-bin-common +RUNTIME_DEP_PKGS_CSWemacs-nox += CSWemacs-common +RUNTIME_DEP_PKGS_CSWemacs-nox += CSWlibgnutls26 +RUNTIME_DEP_PKGS_CSWemacs-nox += CSWlibncurses5 +RUNTIME_DEP_PKGS_CSWemacs-nox += CSWlibxml2-2 CHECKPKG_OVERRIDES_CSWemacs-nox += file-with-bad-content|/usr/local|root/opt/csw/bin/emacs-$(VERSION)-nox CHECKPKG_OVERRIDES_CSWemacs-nox += file-with-bad-content|/usr/share|root/opt/csw/bin/emacs-$(VERSION)-nox CHECKPKG_OVERRIDES_CSWemacs-nox += file-with-bad-content|/usr/local|root/opt/csw/bin/emacs-nox This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From igalic at users.sourceforge.net Wed Oct 10 10:56:53 2012 From: igalic at users.sourceforge.net (igalic at users.sourceforge.net) Date: Wed, 10 Oct 2012 08:56:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[19407] csw/mgar/pkg/trafficserver/trunk/Makefile Message-ID: Revision: 19407 http://gar.svn.sourceforge.net/gar/?rev=19407&view=rev Author: igalic Date: 2012-10-10 08:56:52 +0000 (Wed, 10 Oct 2012) Log Message: ----------- trafficserver/trunk: use full path. Modified Paths: -------------- csw/mgar/pkg/trafficserver/trunk/Makefile Modified: csw/mgar/pkg/trafficserver/trunk/Makefile =================================================================== --- csw/mgar/pkg/trafficserver/trunk/Makefile 2012-10-10 07:32:51 UTC (rev 19406) +++ csw/mgar/pkg/trafficserver/trunk/Makefile 2012-10-10 08:56:52 UTC (rev 19407) @@ -59,6 +59,5 @@ PATH := /opt/csw/gnu:$(PATH) pre-configure-modulated: - cd $(WORKSRC) && sed -i -ne 's|TS_ADDTO(LDFLAGS, [-L/usr/local/lib])||' configure.ac - cd $(WORKSRC) && autoreconf -if - + cd $(WORKSRC) && /opt/csw/gnu/sed -i -ne 's|TS_ADDTO(LDFLAGS, [-L/usr/local/lib])||' configure.ac + cd $(WORKSRC) && /opt/csw/bin/autoreconf -if 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 Oct 10 11:04:13 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 10 Oct 2012 09:04:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[19408] csw/mgar/pkg/trafficserver/trunk/Makefile Message-ID: Revision: 19408 http://gar.svn.sourceforge.net/gar/?rev=19408&view=rev Author: dmichelsen Date: 2012-10-10 09:04:13 +0000 (Wed, 10 Oct 2012) Log Message: ----------- trafficserver/trunk: Add cookie Modified Paths: -------------- csw/mgar/pkg/trafficserver/trunk/Makefile Modified: csw/mgar/pkg/trafficserver/trunk/Makefile =================================================================== --- csw/mgar/pkg/trafficserver/trunk/Makefile 2012-10-10 08:56:52 UTC (rev 19407) +++ csw/mgar/pkg/trafficserver/trunk/Makefile 2012-10-10 09:04:13 UTC (rev 19408) @@ -61,3 +61,4 @@ pre-configure-modulated: cd $(WORKSRC) && /opt/csw/gnu/sed -i -ne 's|TS_ADDTO(LDFLAGS, [-L/usr/local/lib])||' configure.ac cd $(WORKSRC) && /opt/csw/bin/autoreconf -if + @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From igalic at users.sourceforge.net Wed Oct 10 11:44:20 2012 From: igalic at users.sourceforge.net (igalic at users.sourceforge.net) Date: Wed, 10 Oct 2012 09:44:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[19409] csw/mgar/pkg/trafficserver/trunk/Makefile Message-ID: Revision: 19409 http://gar.svn.sourceforge.net/gar/?rev=19409&view=rev Author: igalic Date: 2012-10-10 09:44:20 +0000 (Wed, 10 Oct 2012) Log Message: ----------- trafficserver/trunk: perl, the better sed (at least one I can weild). Modified Paths: -------------- csw/mgar/pkg/trafficserver/trunk/Makefile Modified: csw/mgar/pkg/trafficserver/trunk/Makefile =================================================================== --- csw/mgar/pkg/trafficserver/trunk/Makefile 2012-10-10 09:04:13 UTC (rev 19408) +++ csw/mgar/pkg/trafficserver/trunk/Makefile 2012-10-10 09:44:20 UTC (rev 19409) @@ -59,6 +59,6 @@ PATH := /opt/csw/gnu:$(PATH) pre-configure-modulated: - cd $(WORKSRC) && /opt/csw/gnu/sed -i -ne 's|TS_ADDTO(LDFLAGS, [-L/usr/local/lib])||' configure.ac + cd $(WORKSRC) && /opt/csw/bin/perl -p -i -e 's|/usr/local/lib||' configure.ac cd $(WORKSRC) && /opt/csw/bin/autoreconf -if @$(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 Wed Oct 10 11:48:16 2012 From: pfelecan at users.sourceforge.net (pfelecan at users.sourceforge.net) Date: Wed, 10 Oct 2012 09:48:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[19410] csw/mgar/pkg/emacs/trunk/Makefile Message-ID: Revision: 19410 http://gar.svn.sourceforge.net/gar/?rev=19410&view=rev Author: pfelecan Date: 2012-10-10 09:48:16 +0000 (Wed, 10 Oct 2012) Log Message: ----------- emacs/trunk: overrides refinement Modified Paths: -------------- csw/mgar/pkg/emacs/trunk/Makefile Modified: csw/mgar/pkg/emacs/trunk/Makefile =================================================================== --- csw/mgar/pkg/emacs/trunk/Makefile 2012-10-10 09:44:20 UTC (rev 19409) +++ csw/mgar/pkg/emacs/trunk/Makefile 2012-10-10 09:48:16 UTC (rev 19410) @@ -130,6 +130,7 @@ CHECKPKG_OVERRIDES_CSWemacs-common += missing-dependency|CSWemacscommon CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/share|root/opt/csw/share/info/dbus CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/share|root/opt/csw/share/info/elisp-3 +CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/info/emacs-3 CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/share|root/opt/csw/share/info/emacs-6 CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/share|root/opt/csw/share/info/eintr-2 CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/share|root/opt/csw/share/info/efaq @@ -149,6 +150,7 @@ CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/share|root/opt/csw/share/emacs/$(VERSION)/lisp/gnus/gnus-art.elc CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/info/elisp-3 CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/info/elisp-9 +CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/info/elisp-10 CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/info/emacs-4 CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/info/eintr-3 CHECKPKG_OVERRIDES_CSWemacs-common += file-with-bad-content|/usr/local|root/opt/csw/share/info/emacs-5 @@ -362,7 +364,6 @@ RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWlibz1 RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWorbit2 RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWpango -RUNTIME_DEP_PKGS_CSWemacs-gtk += CSWxpm CHECKPKG_OVERRIDES_CSWemacs-gtk += file-with-bad-content|/usr/local|root/opt/csw/bin/emacs-gtk CHECKPKG_OVERRIDES_CSWemacs-gtk += file-with-bad-content|/usr/share|root/opt/csw/bin/emacs-gtk CHECKPKG_OVERRIDES_CSWemacs-gtk += file-with-bad-content|/usr/local|root/opt/csw/bin/emacs-$(VERSION)-gtk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From igalic at users.sourceforge.net Wed Oct 10 12:01:50 2012 From: igalic at users.sourceforge.net (igalic at users.sourceforge.net) Date: Wed, 10 Oct 2012 10:01:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[19411] csw/mgar/pkg/trafficserver/trunk/Makefile Message-ID: Revision: 19411 http://gar.svn.sourceforge.net/gar/?rev=19411&view=rev Author: igalic Date: 2012-10-10 10:01:50 +0000 (Wed, 10 Oct 2012) Log Message: ----------- trafficserver/trunk: the previous sed was failing Modified Paths: -------------- csw/mgar/pkg/trafficserver/trunk/Makefile Modified: csw/mgar/pkg/trafficserver/trunk/Makefile =================================================================== --- csw/mgar/pkg/trafficserver/trunk/Makefile 2012-10-10 09:48:16 UTC (rev 19410) +++ csw/mgar/pkg/trafficserver/trunk/Makefile 2012-10-10 10:01:50 UTC (rev 19411) @@ -59,6 +59,6 @@ PATH := /opt/csw/gnu:$(PATH) pre-configure-modulated: - cd $(WORKSRC) && /opt/csw/bin/perl -p -i -e 's|/usr/local/lib||' configure.ac + cd $(WORKSRC) && /opt/csw/bin/perl -p -i -e 's|.*/usr/local/lib.*||' configure.ac cd $(WORKSRC) && /opt/csw/bin/autoreconf -if @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From igalic at users.sourceforge.net Wed Oct 10 13:03:12 2012 From: igalic at users.sourceforge.net (igalic at users.sourceforge.net) Date: Wed, 10 Oct 2012 11:03:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[19412] csw/mgar/pkg/trafficserver/trunk/Makefile Message-ID: Revision: 19412 http://gar.svn.sourceforge.net/gar/?rev=19412&view=rev Author: igalic Date: 2012-10-10 11:03:11 +0000 (Wed, 10 Oct 2012) Log Message: ----------- trafficserver/trunk: address checkpkgs' concerns. Modified Paths: -------------- csw/mgar/pkg/trafficserver/trunk/Makefile Modified: csw/mgar/pkg/trafficserver/trunk/Makefile =================================================================== --- csw/mgar/pkg/trafficserver/trunk/Makefile 2012-10-10 10:01:50 UTC (rev 19411) +++ csw/mgar/pkg/trafficserver/trunk/Makefile 2012-10-10 11:03:11 UTC (rev 19412) @@ -54,6 +54,13 @@ RUNTIME_DEP_PKGS_CSWtrafficserver += CSWlibreadline6 RUNTIME_DEP_PKGS_CSWtrafficserver += CSWliblzma5 +EXTRA_LINKER_FLAGS += -norunpath + +REINPLACE_USRLOCAL += plugins/regex_remap/regex_remap.cc +CHECKPKG_OVERRIDES_CSWtrafficserver += file-with-bad-content|/usr/share|root/opt/csw/bin/amd64/traffic_shell + +LICENSE = LICENSE + 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 igalic at users.sourceforge.net Wed Oct 10 14:12:07 2012 From: igalic at users.sourceforge.net (igalic at users.sourceforge.net) Date: Wed, 10 Oct 2012 12:12:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[19413] csw/mgar/pkg/trafficserver/trunk/Makefile Message-ID: Revision: 19413 http://gar.svn.sourceforge.net/gar/?rev=19413&view=rev Author: igalic Date: 2012-10-10 12:12:07 +0000 (Wed, 10 Oct 2012) Log Message: ----------- trafficserver/trunk: add overrides, because we only want one package Modified Paths: -------------- csw/mgar/pkg/trafficserver/trunk/Makefile Modified: csw/mgar/pkg/trafficserver/trunk/Makefile =================================================================== --- csw/mgar/pkg/trafficserver/trunk/Makefile 2012-10-10 11:03:11 UTC (rev 19412) +++ csw/mgar/pkg/trafficserver/trunk/Makefile 2012-10-10 12:12:07 UTC (rev 19413) @@ -58,7 +58,17 @@ REINPLACE_USRLOCAL += plugins/regex_remap/regex_remap.cc CHECKPKG_OVERRIDES_CSWtrafficserver += file-with-bad-content|/usr/share|root/opt/csw/bin/amd64/traffic_shell +CHECKPKG_OVERRIDES_CSWtrafficserver += file-with-bad-content|/usr/local|root/opt/csw/bin/amd64/trafficserver +# We don't want to build any more packages, so we override these: +CHECKPKG_OVERRIDES_CSWtrafficserver += file-with-bad-content|/usr/local|root/opt/csw/bin/amd64/trafficserver +CHECKPKG_OVERRIDES_CSWtrafficserver += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/amd64/libtsmgmt.so +CHECKPKG_OVERRIDES_CSWtrafficserver += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/amd64/libtsutil.so +CHECKPKG_OVERRIDES_CSWtrafficserver += shared-lib-pkgname-mismatch|file=opt/csw/lib/amd64/libtsmgmt.so.3.2.3|soname=libtsmgmt.so.3|pkgname=CSWtrafficserver|expected=CSWlibtsmgmt3 +CHECKPKG_OVERRIDES_CSWtrafficserver += shared-lib-pkgname-mismatch|file=opt/csw/lib/amd64/libtsutil.so.3.2.3|soname=libtsutil.so.3|pkgname=CSWtrafficserver|expected=CSWlibtsutil3 +CHECKPKG_OVERRIDES_CSWtrafficserver += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/amd64/libtsmgmt.so +CHECKPKG_OVERRIDES_CSWtrafficserver += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/amd64/libtsutil.so + LICENSE = LICENSE 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 Wed Oct 10 15:52:36 2012 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 10 Oct 2012 13:52:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[19414] csw/mgar/pkg/bind/trunk Message-ID: Revision: 19414 http://gar.svn.sourceforge.net/gar/?rev=19414&view=rev Author: bonivart Date: 2012-10-10 13:52:35 +0000 (Wed, 10 Oct 2012) Log Message: ----------- bind/trunk: update to 9.8.3-P4 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-10-10 12:12:07 UTC (rev 19413) +++ csw/mgar/pkg/bind/trunk/Makefile 2012-10-10 13:52:35 UTC (rev 19414) @@ -9,7 +9,7 @@ # Enable these for Px-releases #RELEASE = rc1 -RELEASE = P3 +RELEASE = P4 DISTVERSION = $(VERSION)-$(RELEASE) SPKG_VERSION = $(VERSION)$(RELEASE) DISTNAME = $(NAME)-$(VERSION)-$(RELEASE) @@ -37,16 +37,14 @@ LICENSE = COPYRIGHT +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 + PACKAGES += CSWbind CATALOGNAME_CSWbind = bind SPKG_DESC_CSWbind = ISC BIND DNS main package RUNTIME_DEP_PKGS_CSWbind = CSWlibbind RUNTIME_DEP_PKGS_CSWbind += CSWbindutils -RUNTIME_DEP_PKGS_CSWbind += CSWlibz1 RUNTIME_DEP_PKGS_CSWbind += CSWlibxml2-2 -RUNTIME_DEP_PKGS_CSWbind += CSWlibiconv2 -RUNTIME_DEP_PKGS_CSWbind += CSWlibssl0-9-8 -RUNTIME_DEP_PKGS_CSWbind += CSWliblber2-4-2 RUNTIME_DEP_PKGS_CSWbind += CSWlibldap2-4-2 PACKAGES += CSWbind-dev @@ -61,16 +59,17 @@ RUNTIME_DEP_PKGS_CSWlibbind = CSWlibiconv2 RUNTIME_DEP_PKGS_CSWlibbind += CSWlibz1 RUNTIME_DEP_PKGS_CSWlibbind += CSWlibxml2-2 -RUNTIME_DEP_PKGS_CSWlibbind += CSWlibssl0-9-8 +RUNTIME_DEP_PKGS_CSWlibbind += CSWlibssl1-0-0 +RUNTIME_DEP_PKGS_CSWlibbind += CSWlibk5crypto3 +RUNTIME_DEP_PKGS_CSWlibbind += CSWlibkrb5-3 +RUNTIME_DEP_PKGS_CSWlibbind += CSWlibgssapi-krb5-2 +RUNTIME_DEP_PKGS_CSWlibbind += CSWlibcom-err3 PACKAGES += CSWbindutils CATALOGNAME_CSWbindutils = bind_utils SPKG_DESC_CSWbindutils = ISC BIND DNS utilities package RUNTIME_DEP_PKGS_CSWbindutils = CSWlibbind -RUNTIME_DEP_PKGS_CSWbindutils += CSWlibiconv2 -RUNTIME_DEP_PKGS_CSWbindutils += CSWlibz1 -RUNTIME_DEP_PKGS_CSWbindutils += CSWlibxml2-2 -RUNTIME_DEP_PKGS_CSWbindutils += CSWlibssl0-9-8 +RUNTIME_DEP_PKGS_CSWbindutils += CSWlibkrb5-3 PACKAGES += CSWbindchroot CATALOGNAME_CSWbindchroot = bind_chroot Modified: csw/mgar/pkg/bind/trunk/checksums =================================================================== --- csw/mgar/pkg/bind/trunk/checksums 2012-10-10 12:12:07 UTC (rev 19413) +++ csw/mgar/pkg/bind/trunk/checksums 2012-10-10 13:52:35 UTC (rev 19414) @@ -1 +1 @@ -86f72cf1a99c4d7d1978c201a92fb3f3 bind-9.8.3-P3.tar.gz +278509fea804084feb16d0776ad02538 bind-9.8.3-P4.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 Oct 11 00:04:57 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 10 Oct 2012 22:04:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[19415] csw/mgar/pkg/cswclassutils/trunk Message-ID: Revision: 19415 http://gar.svn.sourceforge.net/gar/?rev=19415&view=rev Author: bdwalton Date: 2012-10-10 22:04:57 +0000 (Wed, 10 Oct 2012) Log Message: ----------- cswclassutils/trunk: add the first cut at cas_sslcert; add the default cas-ssl.conf file Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswsslcert csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswsslcert csw/mgar/pkg/cswclassutils/trunk/files/cas-ssl.conf Modified: csw/mgar/pkg/cswclassutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/Makefile 2012-10-10 13:52:35 UTC (rev 19414) +++ csw/mgar/pkg/cswclassutils/trunk/Makefile 2012-10-10 22:04:57 UTC (rev 19415) @@ -59,7 +59,7 @@ DESCRIPTION = CSW class action utilities MASTER_SITES = -DISTFILES = COPYING CSWcas-initsmf.cswreleasenotes +DISTFILES = COPYING CSWcas-initsmf.cswreleasenotes cas-ssl.conf ARCHALL = 1 @@ -90,6 +90,8 @@ PROTOTYPE_USER_cas = bin PROTOTYPE_GROUP_cas = sys +PRESERVECONF = /etc/opt/csw/cas-ssl.conf + # set a unique description for each CAS $(foreach C,$(CSWCLASSES),$(call spkg_desc,$(C))) SPKG_DESC_CSWcswclassutils = $(DESCRIPTION) @@ -119,6 +121,8 @@ PKGFILES_CSWcas-inetd_SHARED += /var/opt/csw/cswclassutils PKGFILES_CSWcas-pycompile_SHARED += /var/opt/csw/cswclassutils +PKGFILES_CSWcas-sslcert += /etc/opt/csw/cas-ssl.conf.CSW + CHECKPKG_OVERRIDES_CSWcas-initsmf += init-file-missing-cswinitsmf-class CHECKPKG_OVERRIDES_CSWcas-initsmf += init-file-wrong-location CHECKPKG_OVERRIDES_CSWcas-initsmf += init-file-wrong-location|/opt/csw/etc/init.d/csw.smf.sample @@ -142,4 +146,5 @@ @ginstall -m 0755 $(FILEDIR)/CSW$(NAME).csw.smf.sample $(DESTDIR)/opt/csw/etc/init.d/csw.smf.sample @ginstall -m 0444 $(FILEDIR)/CSW$(NAME).README.CSW $(DESTDIR)$(docdir)/$(NAME)/README.CSW @$(foreach CAS,$(CASLIST),ginstall -m 0555 $(FILEDIR)/CSW$(NAME).$(CAS) $(DESTDIR)/usr/sadm/install/scripts/$(CAS);) + @ginstall -m 0644 $(FILEDIR)/cas-ssl.conf $(DESTDIR)/etc/opt/csw/ @$(MAKECOOKIE) Added: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswsslcert =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswsslcert (rev 0) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswsslcert 2012-10-10 22:04:57 UTC (rev 19415) @@ -0,0 +1,99 @@ +#!/bin/sh +# +# i.cswsslcert - Generate a self signed key/certificate or a key/csr +# +# $Id: CSWcswclassutils.i.cswsslcert 14492 2011-05-02 19:49:44Z bdwalton $ +# +# Written by Ben Walton +# +# 2012-10-10 Initial creation +# +# Documentation: http://wiki.opencsw.org/cswclassutils-package +# + +# Safety measure during coding, bail out on access of unset variables +set -u + +# Functions + +debug_echo() { + [ -n "$DEBUG" ] && echo "DEBUG: $*" >&2 +} + +# Set DEBUG to anything via environment to display debugging messages +DEBUG=${DEBUG:-} + +# Avoid unset errors for variables which are usually unset during CLI tests +PKGINST=${PKGINST:-} +PKG_INSTALL_ROOT=${PKG_INSTALL_ROOT:-/} + +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 + +CAS_SSL_CONFIG=$PKG_INSTALL_ROOT/etc/opt/csw/cas-ssl.conf +CAS_SSL_CONFIG=$PKG_INSTALL_ROOT/$PWD/cas-ssl.conf + +if [ -f "$CAS_SSL_CONFIG" ]; then + debug_echo "Sourcing $CAS_SSL_CONFIG" + . "$CAS_SSL_CONFIG" +fi + +# hopefully the cas-ssl.conf file exists and has usable data but cover +# the case where it doesn't exist or forgets to set some value. + +DN=`domainname` +if [ -z "$DN" ]; then + DN=theshire.net +fi + +SSL_COUNTRY=${SSL_COUNTRY:-TS} +SSL_STATE=${SSL_STATE:-Westfarthing} +SSL_CITY=${SSL_CITY:-Hobbiton} +SSL_ORG=${SSL_ORG:-"Thorin and Company"} +SSL_OU=${SSL_OU:-Burglars} +if [ -z "${SSL_HOST:-}" ]; then + SSL_HOST="`hostname`.$DN" +fi +if [ -z "${SSL_EMAIL:-}" ]; then + SSL_EMAIL="bilbo@$DN" +fi + +debug_echo "PACKAGE: $PKGINST" + +# Copy files +echo "Installing class ..." + +while read src dest; do + debug_echo "SRC: $src DEST: $dest" + + /usr/bin/cp $src $dest || exit 2 + + if [ -n "${cas_ssl_csr:-}" ]; then + args="req -out $dest.csr -new -newkey rsa:${cas_ssl_bits:-2048} -nodes -keyout $dest.key" + else + args="req -new -newkey rsa:${cas_ssl_bits:-2048} -days ${cas_ssl_days:-365} -nodes -x509 -keyout $dest.key -out $dest.crt" + fi + + + cat </dev/null 2>&1 +${SSL_COUNTRY} +${SSL_STATE} +${SSL_CITY} +${SSL_ORG} +${SSL_OU} +${SSL_HOST} +${SSL_EMAIL} +EOF + + # we could bail here on $? != 0 but in the event there are multiple files we + # should at least attempt to generate them all. + if [ $? -ne 0 ]; then + echo "ERROR: There was a problem generating $dest.key/$dest.crt" + fi +done + +exit 0 Property changes on: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswsslcert ___________________________________________________________________ Added: svn:executable + * Added: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswsslcert =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswsslcert (rev 0) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswsslcert 2012-10-10 22:04:57 UTC (rev 19415) @@ -0,0 +1,41 @@ +#!/bin/sh +# +# r.cswsslcert - The dummy half of i.cswsslcert - no real action taken +# +# $Id: CSWcswclassutils.r.cswsslcert 14492 2011-05-02 19:49:44Z bdwalton $ +# +# Written by Ben Walton +# +# 2012-10-10 Initial creation +# +# Documentation: http://wiki.opencsw.org/cswclassutils-package +# + +# Safety measure during coding, bail out on access of unset variables +set -u + +# Functions + +debug_echo() { + [ -n "$DEBUG" ] && echo "DEBUG: $*" >&2 +} + +# Set DEBUG to anything via environment to display debugging messages +DEBUG=${DEBUG:-} + +# Avoid unset errors for variables which are usually unset during CLI tests +PKGINST=${PKGINST:-} +PKG_INSTALL_ROOT=${PKG_INSTALL_ROOT:-/} + + + +# Copy files +echo "Removing class ..." + +while read dest; do + debug_echo "DEST: $dest" + + /usr/bin/rm $dest || exit 2 +done + +exit 0 Property changes on: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswsslcert ___________________________________________________________________ Added: svn:executable + * Added: csw/mgar/pkg/cswclassutils/trunk/files/cas-ssl.conf =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/cas-ssl.conf (rev 0) +++ csw/mgar/pkg/cswclassutils/trunk/files/cas-ssl.conf 2012-10-10 22:04:57 UTC (rev 19415) @@ -0,0 +1,23 @@ +# NOTE: This file is sourced by /bin/sh while running i.cswsslcert +# from the cas_sslcert package +# +# * Any valid (/bin/sh) shell commands may be used to set the variables. +# * Unset values will have defaults provided. +# * Invalid syntax will cause the class action script to abort. +# * Any values that OpenSSL rejects will also cause the script to abort. +# +# Changes to this file will be preserved across package updates. +# Please see /etc/opt/csw/cas-ssl.conf.CSW for current defaults + +DN=`domainname` +if [ -z "$DN" ]; then + DN=theshire.net +fi + +SSL_COUNTRY=TS +SSL_STATE=Westfarthing +SSL_CITY=Hobbiton +SSL_ORG="Thorin and Company" +SSL_OU=Burglars +SSL_HOST="`hostname`.$DN" +SSL_EMAIL="bilbo@$DN" 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 Oct 11 08:05:00 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Thu, 11 Oct 2012 06:05:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[19416] csw/mgar/pkg/libgegl/trunk/Makefile Message-ID: Revision: 19416 http://gar.svn.sourceforge.net/gar/?rev=19416&view=rev Author: cgrzemba Date: 2012-10-11 06:05:00 +0000 (Thu, 11 Oct 2012) Log Message: ----------- libgegl/trunk: add sub modules Modified Paths: -------------- csw/mgar/pkg/libgegl/trunk/Makefile Modified: csw/mgar/pkg/libgegl/trunk/Makefile =================================================================== --- csw/mgar/pkg/libgegl/trunk/Makefile 2012-10-10 22:04:57 UTC (rev 19415) +++ csw/mgar/pkg/libgegl/trunk/Makefile 2012-10-11 06:05:00 UTC (rev 19416) @@ -24,6 +24,13 @@ BUILD_DEP_PKGS += CSWlibsdl-dev BUILD_DEP_PKGS += CSWasciidoc BUILD_DEP_PKGS += CSWlua +BUILD_DEP_PKGS += CSWlibbabl-dev +BUILD_DEP_PKGS += CSWffmpeg-dev +# openexr do not build :-( +# BUILD_DEP_PKGS += CSWilmbase-dev +# BUILD_DEP_PKGS += CSWopenexrdevel +BUILD_DEP_PKGS += CSWjasper +BUILD_DEP_PKGS += CSWenscript PACKAGES += CSWlibgegl0-2-0 CATALOGNAME_CSWlibgegl0-2-0 = libgegl0_2_0 @@ -45,6 +52,8 @@ RUNTIME_DEP_PKGS_CSWlibgegl0-2-0 += CSWpango RUNTIME_DEP_PKGS_CSWlibgegl0-2-0 += CSWlibjpeg7 RUNTIME_DEP_PKGS_CSWlibgegl0-2-0 += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWlibgegl0-2-0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibgegl0-2-0 += CSWjasper # PACKAGES += CSWlibgegl0-1-0 # SPKG_DESC_CSWlibgegl0-1-0 = A graph based image processing framework library, libgegl-0.1.so.0 @@ -86,6 +95,7 @@ RUNTIME_DEP_PKGS_CSWgegl += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWgegl += CSWlibgio2-0-0 RUNTIME_DEP_PKGS_CSWgegl += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWgegl += CSWlibintl8 # There are zero-sized structs/unions used EXTRA_CXXFLAGS += -features=extensions @@ -106,6 +116,11 @@ CONFIGURE_ARGS += $(DIRPATHS) CONFIGURE_ARGS += --enable-mmx=no +# openexr do not build :-( +CONFIGURE_ARGS += --without-openexr +# no pc file for lua found +EXTRA_CONFIGURE_ENV += LUA_CFLAGS=-I/opt/csw/include +EXTRA_CONFIGURE_ENV += LUA_LIBS=-llua 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 Oct 11 09:26:16 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Thu, 11 Oct 2012 07:26:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[19417] csw/mgar/pkg/qt4-gcc/trunk Message-ID: Revision: 19417 http://gar.svn.sourceforge.net/gar/?rev=19417&view=rev Author: cgrzemba Date: 2012-10-11 07:26:15 +0000 (Thu, 11 Oct 2012) Log Message: ----------- qt4-gcc/trunk: rebuild because: - - ld.so.1: librecad: Schwerer Fehler: libgcc_s.so.1: Version 'GCC_4.0.0' not found - bump minor version 4.8.1 Modified Paths: -------------- csw/mgar/pkg/qt4-gcc/trunk/Makefile csw/mgar/pkg/qt4-gcc/trunk/checksums Added Paths: ----------- csw/mgar/pkg/qt4-gcc/trunk/files/no-xshape.patch csw/mgar/pkg/qt4-gcc/trunk/files/qt-dbus-const.diff Modified: csw/mgar/pkg/qt4-gcc/trunk/Makefile =================================================================== --- csw/mgar/pkg/qt4-gcc/trunk/Makefile 2012-10-11 06:05:00 UTC (rev 19416) +++ csw/mgar/pkg/qt4-gcc/trunk/Makefile 2012-10-11 07:26:15 UTC (rev 19417) @@ -1,7 +1,7 @@ # $Id$ NAME = qt -VERSION = 4.8.0 +VERSION = 4.8.1 GARTYPE = v2 CATEGORIES = lib @@ -23,7 +23,14 @@ PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 PATCHFILES += mkspec-csw.patch +# Solaris10 XShape is too old, has no ShapeInput and QTBUG-25281 +PATCHFILES += no-xshape.patch +REINPLACE_USRLOCAL += src/gui/kernel/qguiplatformplugin.cpp +REINPLACE_USRLOCAL += src/network/ssl/qsslsocket_openssl_symbols.cpp +# replace SSL cert location +REINPLACE_USRLOCAL += src/network/ssl/qsslsocket.cpp + # http://wiki.opencsw.org/porting-faq#toc9 EXTRA_CFLAGS = -DSUN_OGL_NO_VERTEX_MACROS EXTRA_CXXFLAGS = -DSUN_OGL_NO_VERTEX_MACROS @@ -37,6 +44,8 @@ CONFIGURE_ARGS += -qt-libjpeg -qt-libpng -qt-libmng -qt-zlib CONFIGURE_ARGS += -I/usr/include -I/usr/X11/include CONFIGURE_ARGS += -I/usr/X11/share/include +# Solaris10 XShape is too old, has no ShapeInput +CONFIGURE_ARGS += -no-xshape CONFIGURE_ARGS_sparc += -big-endian -host-big-endian # CONFIGURE_ARGS_i386 += -little-endian -host-big-endian CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARCH)) @@ -50,9 +59,9 @@ PACKAGES += CSWlibqtcore4-gxx PKGFILES_CSWlibqtcore4-gxx += $(call baseisadirs,$(libdir),libQtCore\.so\.4(\.\d+)*) SPKG_DESC_CSWlibqtcore4-gxx += $(DESCRIPTION), libQtCore.so.4 -RUNTIME_DEP_PKGS_CSWlibqtcore4-gxx += CSWlibgthread2-0-0 +# RUNTIME_DEP_PKGS_CSWlibqtcore4-gxx += CSWlibgthread2-0-0 RUNTIME_DEP_PKGS_CSWlibqtcore4-gxx += CSWlibiconv2 -RUNTIME_DEP_PKGS_CSWlibqtcore4-gxx += CSWlibintl8 +# RUNTIME_DEP_PKGS_CSWlibqtcore4-gxx += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibqtcore4-gxx += CSWlibstdc++6 RUNTIME_DEP_PKGS_CSWlibqtcore4-gxx += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWlibqtcore4-gxx += CSWlibgcc-s1 @@ -61,19 +70,18 @@ CATALOGNAME_CSWlibqtgui4-gxx = libqtgui4_gxx 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 += CSWlibintl8 +# RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx += CSWlibgthread2-0-0 +# RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx += CSWlibintl8 RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx += CSWlibxrender RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx += CSWlibstdc++6 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_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)) -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 +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 += $(RUNTIME_DEP_PKGS_CSWlibqtgui4-gxx_$(GARCH)) +CHECKPKG_OVERRIDES_CSWlibqtgui4-gxx += file-with-bad-content|/usr/share|root/opt/csw/gxx/lib/libQtGui.so.4.8.1 PACKAGES += CSWqt4-gxx-dev SPKG_DESC_CSWqt4-gxx-dev += $(DESCRIPTION), development files @@ -103,28 +111,29 @@ RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibqtsvg4-gxx RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibphonon4-gxx RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibqtsql4-gxx -RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibgthread2-0-0 -RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibgmodule2-0-0 -RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibintl8 +# RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibgthread2-0-0 +# RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibgmodule2-0-0 +# 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 += CSWlibxrender 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 += CSWlibxml2-2 RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWgstplugins RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibgcc-s1 -RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibsybdb5 +# RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibsybdb5 RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWsqlite -RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibpq5 -RUNTIME_DEP_PKGS_CSWqt4-gxx-dev += CSWlibodbc2 +# 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_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! CHECKPKG_OVERRIDES_CSWqt4-gxx-dev += file-with-bad-content CHECKPKG_OVERRIDES_CSWqt4-gxx-dev += discouraged-path-in-pkgmap @@ -156,8 +165,8 @@ RUNTIME_DEP_PKGS_CSWlibqtnetwork4-gxx += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibqtnetwork4-gxx += CSWlibstdc++6 RUNTIME_DEP_PKGS_CSWlibqtnetwork4-gxx += CSWlibqtcore4-gxx -CHECKPKG_OVERRIDES_CSWlibqtnetwork4-gxx += file-with-bad-content|/usr/local|root/opt/csw/gxx/lib/libQtNetwork.so.4.8.0 -CHECKPKG_OVERRIDES_CSWlibqtnetwork4-gxx += file-with-bad-content|/usr/share|root/opt/csw/gxx/lib/libQtNetwork.so.4.8.0 +# /usr/share is useless but ok +CHECKPKG_OVERRIDES_CSWlibqtnetwork4-gxx += file-with-bad-content|/usr/share|root/opt/csw/gxx/lib/libQtNetwork.so.4.8.1 PACKAGES += CSWlibqtopengl4-gxx PKGFILES_CSWlibqtopengl4-gxx += $(call baseisadirs,$(libdir),libQtOpenGL\.so\.4(\.\d+)*) @@ -227,6 +236,7 @@ RUNTIME_DEP_PKGS_CSWlibqtclucene4-gxx += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibqtclucene4-gxx += CSWlibstdc++6 RUNTIME_DEP_PKGS_CSWlibqtclucene4-gxx += CSWlibqtcore4-gxx +RUNTIME_DEP_PKGS_CSWlibqtclucene4-gxx += CSWlibqtdbus4-gxx PACKAGES += CSWlibqtdbus4-gxx PKGFILES_CSWlibqtdbus4-gxx += $(call baseisadirs,$(libdir),libQtDBus\.so\.4(\.\d+)*) @@ -283,3 +293,9 @@ CHECKPKG_OVERRIDES_CSWqt4-gxx-doc += file-with-bad-content include gar/category.mk + +# pre-reconfigure-modulated: +# cd $(WORKSRC) && gmake confclean +# @$(MAKECOOKIE) + +PATH:=$(PATH):/opt/csw/gcc4/bin Modified: csw/mgar/pkg/qt4-gcc/trunk/checksums =================================================================== --- csw/mgar/pkg/qt4-gcc/trunk/checksums 2012-10-11 06:05:00 UTC (rev 19416) +++ csw/mgar/pkg/qt4-gcc/trunk/checksums 2012-10-11 07:26:15 UTC (rev 19417) @@ -1 +1 @@ -e8a5fdbeba2927c948d9f477a6abe904 qt-everywhere-opensource-src-4.8.0.tar.gz +7960ba8e18ca31f0c6e4895a312f92ff qt-everywhere-opensource-src-4.8.1.tar.gz Added: csw/mgar/pkg/qt4-gcc/trunk/files/no-xshape.patch =================================================================== --- csw/mgar/pkg/qt4-gcc/trunk/files/no-xshape.patch (rev 0) +++ csw/mgar/pkg/qt4-gcc/trunk/files/no-xshape.patch 2012-10-11 07:26:15 UTC (rev 19417) @@ -0,0 +1,48 @@ +--- a/src/gui/kernel/qdnd_x11.cpp ++++ b/src/gui/kernel/qdnd_x11.cpp +@@ -1422,6 +1422,7 @@ void QDragManager::cancel(bool deleteSource) + global_accepted_action = Qt::IgnoreAction; + } + ++#ifndef QT_NO_SHAPE + static + bool windowInteractsWithPosition(const QPoint & pos, Window w, int shapeType) + { +@@ -1436,6 +1437,7 @@ bool windowInteractsWithPosition(const QPoint & pos, Window w, int shapeType) + } + return interacts; + } ++#endif + + static + Window findRealWindow(const QPoint & pos, Window w, int md) +@@ -1462,6 +1464,7 @@ Window findRealWindow(const QPoint & pos, Window w, int md) + XGetWindowProperty(X11->display, w, ATOM(XdndAware), 0, 0, False, + AnyPropertyType, &type, &f,&n,&a,&data); + if (data) XFree(data); ++#ifndef QT_NO_SHAPE + if (type) { + // When ShapeInput and ShapeBounding are not set they return a single rectangle with the geometry of the window, this is why we + // need an && here so that in the case one is set and the other is not we still get the correct result. +@@ -1469,6 +1472,9 @@ Window findRealWindow(const QPoint & pos, Window w, int md) + if (windowContainsMouse) + return w; + } ++#else ++ return w; ++#endif + } + + Window r, p; +@@ -1489,9 +1495,11 @@ Window findRealWindow(const QPoint & pos, Window w, int md) + } + + // No children! ++#ifndef QT_NO_SHAPE + if (!windowContainsMouse) + return 0; + else ++#endif + return w; + } + } Added: csw/mgar/pkg/qt4-gcc/trunk/files/qt-dbus-const.diff =================================================================== --- csw/mgar/pkg/qt4-gcc/trunk/files/qt-dbus-const.diff (rev 0) +++ csw/mgar/pkg/qt4-gcc/trunk/files/qt-dbus-const.diff 2012-10-11 07:26:15 UTC (rev 19417) @@ -0,0 +1,11 @@ +--- src/dbus/qdbusintegrator.cpp.orig 2011-03-12 02:11:32.313467991 +0100 ++++ src/dbus/qdbusintegrator.cpp 2011-03-12 02:11:03.795809176 +0100 +@@ -71,7 +71,7 @@ + static bool isDebugging; + #define qDBusDebug if (!::isDebugging); else qDebug + +-Q_GLOBAL_STATIC_WITH_ARGS(const QString, orgFreedesktopDBusString, (QLatin1String(DBUS_SERVICE_DBUS))) ++Q_GLOBAL_STATIC_WITH_ARGS(QString, orgFreedesktopDBusString, (QLatin1String(DBUS_SERVICE_DBUS))) + + static inline QString dbusServiceString() + { return *orgFreedesktopDBusString(); } 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 Oct 11 10:26:19 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 11 Oct 2012 08:26:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[19418] csw/mgar/pkg/apache2/branches/apache24/Makefile Message-ID: Revision: 19418 http://gar.svn.sourceforge.net/gar/?rev=19418&view=rev Author: bdwalton Date: 2012-10-11 08:26:19 +0000 (Thu, 11 Oct 2012) Log Message: ----------- apache2/branches/apache24: add some experimental handling for ssl cert generation Modified Paths: -------------- csw/mgar/pkg/apache2/branches/apache24/Makefile Modified: csw/mgar/pkg/apache2/branches/apache24/Makefile =================================================================== --- csw/mgar/pkg/apache2/branches/apache24/Makefile 2012-10-11 07:26:15 UTC (rev 19417) +++ csw/mgar/pkg/apache2/branches/apache24/Makefile 2012-10-11 08:26:19 UTC (rev 19418) @@ -75,6 +75,8 @@ PRESERVECONF += $(sysconfdir)/apache24/magic PRESERVECONF += $(sysconfdir)/apache24/httpd.conf +SSLCERT = /etc/opt/csw/apache24/server + # We need this to get bdb48/lib into the runpath EXTRA_LIB = $(prefix)/bdb48/lib @@ -115,4 +117,7 @@ mv $$f $(PKGROOT)/$(sysconfdir)/apache24/; \ ln -s $(sysconfdir)/apache24/$$f $$f; \ done ) + + @(cd $(PKGROOT)/$(sysconfdir)/apache24; \ + echo "# create server.(crt|csr)/server.key" > server ) @$(MAKECOOKIE) 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 Oct 11 10:46:38 2012 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Thu, 11 Oct 2012 08:46:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[19419] csw/mgar/gar/v2/lib/map.solaris10 Message-ID: Revision: 19419 http://gar.svn.sourceforge.net/gar/?rev=19419&view=rev Author: janholzh Date: 2012-10-11 08:46:38 +0000 (Thu, 11 Oct 2012) Log Message: ----------- change default map file for Solaris 10 to use older version of libnsl (1.9) Modified Paths: -------------- csw/mgar/gar/v2/lib/map.solaris10 Modified: csw/mgar/gar/v2/lib/map.solaris10 =================================================================== --- csw/mgar/gar/v2/lib/map.solaris10 2012-10-11 08:26:19 UTC (rev 19418) +++ csw/mgar/gar/v2/lib/map.solaris10 2012-10-11 08:46:38 UTC (rev 19419) @@ -1,7 +1,7 @@ # Solaris 10 mapfile with libc Version 1.22.2 which is Update?? Kernel Version # http://src.opensolaris.org/source/xref/onnv/onnv-gate/usr/src/lib/libc/port/mapfile-vers#301 -libc.so - SUNW_1.22.5 SUNWprivate_1.1 $ADDVERS=SUNW_1.22.2; +libc.so - SUNW_1.22.2 SUNWprivate_1.1 $ADDVERS=SUNW_1.22.2; # http://src.opensolaris.org/source/xref/onnv/onnv-gate/usr/src/lib/libresolv2/common/mapfile-vers libresolv.so - SUNW_2.2 SUNWprivate_2.1 $ADDVERS=SUNW_2.2; # http://src.opensolaris.org/source/xref/onnv/onnv-gate/usr/src/lib/libnsl/common/mapfile-vers -libnsl.so - SUNW_1.9.1 SUNWprivate_1.5 $ADDVERS=SUNW_1.9.1; +libnsl.so - SUNW_1.9 SUNWprivate_1.5 $ADDVERS=SUNW_1.9; 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 Oct 11 13:15:39 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Thu, 11 Oct 2012 11:15:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[19420] csw/mgar/pkg/gdk-pixbuf/trunk/Makefile Message-ID: Revision: 19420 http://gar.svn.sourceforge.net/gar/?rev=19420&view=rev Author: cgrzemba Date: 2012-10-11 11:15:39 +0000 (Thu, 11 Oct 2012) Log Message: ----------- gdk-pixbuf/trunk: rebuild for sparc Modified Paths: -------------- csw/mgar/pkg/gdk-pixbuf/trunk/Makefile Modified: csw/mgar/pkg/gdk-pixbuf/trunk/Makefile =================================================================== --- csw/mgar/pkg/gdk-pixbuf/trunk/Makefile 2012-10-11 08:46:38 UTC (rev 19419) +++ csw/mgar/pkg/gdk-pixbuf/trunk/Makefile 2012-10-11 11:15:39 UTC (rev 19420) @@ -26,13 +26,17 @@ SPKG_DESC_CSWgdkpixbuf = $(DESCRIPTION) PKGFILES_CSWlibgdk-pixbuf2-0-0 += $(call pkgfiles_lib,gdk-pixbuf-2.0/.*) RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibgdk-pixbuf2-0-0 -RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibgdk-pixbuf-xlib2-0-0 +# RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibgdk-pixbuf-xlib2-0-0 RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibgmodule2-0-0 RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibgobject2-0-0 RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibpng12-0 RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibjpeg7 RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibtiff3 +RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWgdkpixbuf += CSWlibgio2-0-0 + # I assume if one installs CSWgdkpixbuf, one wants all the stuff # except -dev CHECKPKG_OVERRIDES_CSWgdkpixbuf += surplus-dependency|CSWlibgdk-pixbuf-xlib2-0-0 @@ -54,18 +58,20 @@ RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf2-0-0 += CSWlibgmodule2-0-0 RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf2-0-0 += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf2-0-0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf2-0-0 += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf2-0-0 += CSWlibpng12-0 PACKAGES += CSWlibgdk-pixbuf-xlib2-0-0 SPKG_DESC_CSWlibgdk-pixbuf-xlib2-0-0 = $(DESCRIPTION), libgdk_pixbuf_xlib-2.0.so.0 PKGFILES_CSWlibgdk-pixbuf-xlib2-0-0 = $(call pkgfiles_lib,libgdk_pixbuf_xlib-2.0.so.0) RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf-xlib2-0-0 = CSWlibgdk-pixbuf2-0-0 -# RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf-xlib2-0-0 += CSWlibgio2-0-0 +RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf-xlib2-0-0 += CSWlibgthread2-0-0 +RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf-xlib2-0-0 += CSWlibgmodule2-0-0 +RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf-xlib2-0-0 += CSWlibpng12-0 +RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf-xlib2-0-0 += CSWlibintl8 +RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf-xlib2-0-0 += CSWlibgobject2-0-0 +RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf-xlib2-0-0 += CSWlibgio2-0-0 RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf-xlib2-0-0 += CSWlibglib2-0-0 -# RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf-xlib2-0-0 += CSWlibgmodule2-0-0 -# RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf-xlib2-0-0 += CSWlibgobject2-0-0 -# RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf-xlib2-0-0 += CSWlibgthread2-0-0 -# RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf-xlib2-0-0 += CSWlibintl8 -# RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf-xlib2-0-0 += CSWlibpng12-0 PACKAGES += CSWlibgdk-pixbuf-dev SPKG_DESC_CSWlibgdk-pixbuf-dev = Developtment files $(DESCRIPTION) @@ -74,8 +80,6 @@ RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf-dev += CSWlibgdk-pixbuf2-0-0 RUNTIME_DEP_PKGS_CSWlibgdk-pixbuf-dev += CSWlibgdk-pixbuf-xlib2-0-0 - - BUILD_DEP_PKGS = CSWggettext-dev BUILD_DEP_PKGS += CSWjbigkit BUILD_DEP_PKGS += CSWlibglib2-dev 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 Oct 11 14:37:49 2012 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Thu, 11 Oct 2012 12:37:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[19421] csw/mgar/pkg/sudo/trunk/Makefile Message-ID: Revision: 19421 http://gar.svn.sourceforge.net/gar/?rev=19421&view=rev Author: janholzh Date: 2012-10-11 12:37:48 +0000 (Thu, 11 Oct 2012) Log Message: ----------- sudo/trunk: chgrp on sudoers to root Modified Paths: -------------- csw/mgar/pkg/sudo/trunk/Makefile Modified: csw/mgar/pkg/sudo/trunk/Makefile =================================================================== --- csw/mgar/pkg/sudo/trunk/Makefile 2012-10-11 11:15:39 UTC (rev 19420) +++ csw/mgar/pkg/sudo/trunk/Makefile 2012-10-11 12:37:48 UTC (rev 19421) @@ -121,6 +121,7 @@ PROTOTYPE_MODIFIERS += sudoers PROTOTYPE_FILES_sudoers = /etc/opt/csw/sudoers.CSW PROTOTYPE_PERMS_sudoers = 0440 +PROTOTYPE_GROUP_sudoers = root # Just copy the stuff together, the ldap modulations contains some more file, # apart from that they are the same. 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 Oct 11 15:19:56 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Thu, 11 Oct 2012 13:19:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[19422] csw/mgar/pkg/librecad/trunk/Makefile Message-ID: Revision: 19422 http://gar.svn.sourceforge.net/gar/?rev=19422&view=rev Author: cgrzemba Date: 2012-10-11 13:19:56 +0000 (Thu, 11 Oct 2012) Log Message: ----------- librecad/trunk: change resources location Modified Paths: -------------- csw/mgar/pkg/librecad/trunk/Makefile Modified: csw/mgar/pkg/librecad/trunk/Makefile =================================================================== --- csw/mgar/pkg/librecad/trunk/Makefile 2012-10-11 12:37:48 UTC (rev 19421) +++ csw/mgar/pkg/librecad/trunk/Makefile 2012-10-11 13:19:56 UTC (rev 19422) @@ -51,8 +51,11 @@ RUNTIME_DEP_PKGS_CSWlibreCAD += CSWlibgcc-s1 RUNTIME_DEP_PKGS_CSWlibreCAD += CSWlibfreetype6 RUNTIME_DEP_PKGS_CSWlibreCAD += CSWlibmuparser2-gxx -RUNTIME_DEP_PKGS_CSWlibreCAD += CSWlibqtsql4-gxx +# RUNTIME_DEP_PKGS_CSWlibreCAD += CSWlibqtsql4-gxx +CHECKPKG_OVERRIDES_CSWlibreCAD += file-with-bad-content|/usr/share|root/opt/csw/gxx/bin/librecad +CHECKPKG_OVERRIDES_CSWlibreCAD += catalogname-not-lowercase + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_SCRIPTS = custom @@ -66,13 +69,13 @@ ginstall -d $(DESTDIR)$(bindir) ginstall -m 755 $(WORKSRC)/unix/librecad $(DESTDIR)$(bindir) ginstall -m 755 $(WORKSRC)/unix/ttf2lff $(DESTDIR)$(bindir) - ginstall -d $(DESTDIR)$(datadir)/$(call tolower, $(NAME))/resources + ginstall -d $(DESTDIR)$(libdir)/$(call tolower, $(NAME))/resources gcp -rfp $(WORKSRC)/unix/resources/* \ - $(DESTDIR)$(datadir)/$(call tolower, $(NAME))/resources + $(DESTDIR)$(libdir)/$(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 -PATH := /opt/csw/gnu:$(PATH):/opt/csw/gxx/bin +PATH := /opt/csw/gnu:$(PATH):/opt/csw/gcc4/bin:/opt/csw/gxx/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 Thu Oct 11 21:27:33 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 11 Oct 2012 19:27:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[19423] csw/mgar/pkg/apache2/branches/apache24/Makefile Message-ID: Revision: 19423 http://gar.svn.sourceforge.net/gar/?rev=19423&view=rev Author: bdwalton Date: 2012-10-11 19:27:33 +0000 (Thu, 11 Oct 2012) Log Message: ----------- apache2/branches/apache24: correct the autoconf handling of libxml2 discovery Modified Paths: -------------- csw/mgar/pkg/apache2/branches/apache24/Makefile Modified: csw/mgar/pkg/apache2/branches/apache24/Makefile =================================================================== --- csw/mgar/pkg/apache2/branches/apache24/Makefile 2012-10-11 13:19:56 UTC (rev 19422) +++ csw/mgar/pkg/apache2/branches/apache24/Makefile 2012-10-11 19:27:33 UTC (rev 19423) @@ -83,7 +83,7 @@ # Build Configuration CONFIGURE_ARGS = --with-apr=$(prefix) CONFIGURE_ARGS += --with-pcre=$(prefix) -CONFIGURE_ARGS += --with-libxml2=$(prefix) +CONFIGURE_ARGS += --with-libxml2=$(includedir)/libxml2 CONFIGURE_ARGS += --with-lua=$(prefix) CONFIGURE_ARGS += --enable-mpms-shared=all CONFIGURE_ARGS += --enable-layout=OpenCSW 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 Oct 11 23:32:04 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 11 Oct 2012 21:32:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[19424] csw/mgar/pkg/apache2/branches/apache24/Makefile Message-ID: Revision: 19424 http://gar.svn.sourceforge.net/gar/?rev=19424&view=rev Author: bdwalton Date: 2012-10-11 21:32:04 +0000 (Thu, 11 Oct 2012) Log Message: ----------- apache2/branches/apache24: depend on libxml2 now that the configure args are fixed Modified Paths: -------------- csw/mgar/pkg/apache2/branches/apache24/Makefile Modified: csw/mgar/pkg/apache2/branches/apache24/Makefile =================================================================== --- csw/mgar/pkg/apache2/branches/apache24/Makefile 2012-10-11 19:27:33 UTC (rev 19423) +++ csw/mgar/pkg/apache2/branches/apache24/Makefile 2012-10-11 21:32:04 UTC (rev 19424) @@ -38,6 +38,7 @@ RUNTIME_DEP_PKGS_CSWapache24 += CSWliblua5-2 RUNTIME_DEP_PKGS_CSWapache24 += CSWlibapr1-0 RUNTIME_DEP_PKGS_CSWapache24 += CSWlibldap2-4-2 +RUNTIME_DEP_PKGS_CSWapache24 += CSWlibxml2-2 PACKAGES += CSWapache24-manual ARCHALL_CSWapache24-manual = 1 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 Oct 12 09:21:49 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Fri, 12 Oct 2012 07:21:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[19425] csw/mgar/pkg/pango/trunk/Makefile Message-ID: Revision: 19425 http://gar.svn.sourceforge.net/gar/?rev=19425&view=rev Author: cgrzemba Date: 2012-10-12 07:21:49 +0000 (Fri, 12 Oct 2012) Log Message: ----------- pango/trunk: add runtime and build dependency Modified Paths: -------------- csw/mgar/pkg/pango/trunk/Makefile Modified: csw/mgar/pkg/pango/trunk/Makefile =================================================================== --- csw/mgar/pkg/pango/trunk/Makefile 2012-10-11 21:32:04 UTC (rev 19424) +++ csw/mgar/pkg/pango/trunk/Makefile 2012-10-12 07:21:49 UTC (rev 19425) @@ -36,6 +36,7 @@ RUNTIME_DEP_PKGS_CSWpango += CSWlibfreetype6 RUNTIME_DEP_PKGS_CSWpango += CSWlibglib2-0-0 RUNTIME_DEP_PKGS_CSWpango += CSWlibfontconfig1 +RUNTIME_DEP_PKGS_CSWpango += CSWlibintl8 # No split for now as it is unclear how the plugins depend on each one CHECKPKG_OVERRIDES_CSWpango += shared-lib-pkgname-mismatch @@ -92,6 +93,7 @@ BUILD_DEP_PKGS += CSWlibxslt BUILD_DEP_PKGS += CSWglib2devel # BUILD_DEP_PKGS += CSWlibxft2devel +BUILD_DEP_PKGS += CSWvim # for generating docs BUILD64 = 1 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 Oct 12 09:34:55 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Fri, 12 Oct 2012 07:34:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[19426] csw/mgar/pkg/librecad/trunk/files/ 0001-adjust-rs_system-forcsw.patch Message-ID: Revision: 19426 http://gar.svn.sourceforge.net/gar/?rev=19426&view=rev Author: cgrzemba Date: 2012-10-12 07:34:55 +0000 (Fri, 12 Oct 2012) Log Message: ----------- librecad/trunk: commit only why svn revert Makefile; svn up; mgar remerge repackage; has not helped 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-10-12 07:21:49 UTC (rev 19425) +++ csw/mgar/pkg/librecad/trunk/files/0001-adjust-rs_system-forcsw.patch 2012-10-12 07:34:55 UTC (rev 19426) @@ -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/gxx/share/"+ appDirName + "/resources/" + subDirectory); ++ dirList.append("/opt/csw/gxx/lib/"+ 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 bdwalton at users.sourceforge.net Fri Oct 12 10:05:15 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 12 Oct 2012 08:05:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[19427] csw/mgar/pkg/apache2/branches/apache24/Makefile Message-ID: Revision: 19427 http://gar.svn.sourceforge.net/gar/?rev=19427&view=rev Author: bdwalton Date: 2012-10-12 08:05:15 +0000 (Fri, 12 Oct 2012) Log Message: ----------- apache2/branches/apache24: drop three deps that were indirect as discovered by new linking flags Modified Paths: -------------- csw/mgar/pkg/apache2/branches/apache24/Makefile Modified: csw/mgar/pkg/apache2/branches/apache24/Makefile =================================================================== --- csw/mgar/pkg/apache2/branches/apache24/Makefile 2012-10-12 07:34:55 UTC (rev 19426) +++ csw/mgar/pkg/apache2/branches/apache24/Makefile 2012-10-12 08:05:15 UTC (rev 19427) @@ -30,11 +30,8 @@ RUNTIME_DEP_PKGS_CSWapache24 += CSWliblber2-4-2 RUNTIME_DEP_PKGS_CSWapache24 += CSWlibaprutil1-0 RUNTIME_DEP_PKGS_CSWapache24 += CSWlibssl1-0-0 -RUNTIME_DEP_PKGS_CSWapache24 += CSWlibexpat1 RUNTIME_DEP_PKGS_CSWapache24 += CSWlibz1 RUNTIME_DEP_PKGS_CSWapache24 += CSWlibpcre1 -RUNTIME_DEP_PKGS_CSWapache24 += CSWlibiconv2 -RUNTIME_DEP_PKGS_CSWapache24 += CSWbdb48 RUNTIME_DEP_PKGS_CSWapache24 += CSWliblua5-2 RUNTIME_DEP_PKGS_CSWapache24 += CSWlibapr1-0 RUNTIME_DEP_PKGS_CSWapache24 += CSWlibldap2-4-2 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 Oct 12 10:15:37 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 12 Oct 2012 08:15:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[19428] csw/mgar/pkg/apache2/branches/apache24/Makefile Message-ID: Revision: 19428 http://gar.svn.sourceforge.net/gar/?rev=19428&view=rev Author: bdwalton Date: 2012-10-12 08:15:37 +0000 (Fri, 12 Oct 2012) Log Message: ----------- apache2/branches/apache24: the envvars moving needs to happen post install so the files can be preserveconf-ed Modified Paths: -------------- csw/mgar/pkg/apache2/branches/apache24/Makefile Modified: csw/mgar/pkg/apache2/branches/apache24/Makefile =================================================================== --- csw/mgar/pkg/apache2/branches/apache24/Makefile 2012-10-12 08:05:15 UTC (rev 19427) +++ csw/mgar/pkg/apache2/branches/apache24/Makefile 2012-10-12 08:15:37 UTC (rev 19428) @@ -101,6 +101,13 @@ CFLAGS := -DSSL_EXPERIMENTAL -DSSL_ENGINE $(CFLAGS) +post-install-modulated: + @(cd $(DESTDIR)/$(sbindir); \ + for f in envvars*; do \ + mv $$f $(DESTDIR)/$(sysconfdir)/apache24/; \ + ln -s $(sysconfdir)/apache24/$$f $$f; \ + done ) + post-merge: @(cd $(PKGROOT)/$(sysconfdir)/apache24; \ rm -rf original; \ @@ -110,11 +117,6 @@ perl -pi -e 's|/usr/local/apache2|/etc/opt/csw/apache2|g' man8/* ) @( ginstall -d $(PKGROOT)/etc/opt/csw/init.d; \ ginstall $(WORKSRC_FIRSTMOD)/../cswapache24 $(PKGROOT)/etc/opt/csw/init.d ) - @(cd $(PKGROOT)/$(sbindir); \ - for f in envvars*; do \ - mv $$f $(PKGROOT)/$(sysconfdir)/apache24/; \ - ln -s $(sysconfdir)/apache24/$$f $$f; \ - done ) @(cd $(PKGROOT)/$(sysconfdir)/apache24; \ echo "# create server.(crt|csr)/server.key" > server ) 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 Oct 12 12:17:37 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 12 Oct 2012 10:17:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[19429] csw/mgar/pkg/apache2/branches/apache24 Message-ID: Revision: 19429 http://gar.svn.sourceforge.net/gar/?rev=19429&view=rev Author: bdwalton Date: 2012-10-12 10:17:37 +0000 (Fri, 12 Oct 2012) Log Message: ----------- apache2/branches/apache24: use apache2 instead of apache24 for directory naming layout (should be better forward compatibility) Modified Paths: -------------- csw/mgar/pkg/apache2/branches/apache24/Makefile csw/mgar/pkg/apache2/branches/apache24/files/0001-Add-an-OpenCSW-option-to-config.layout.patch Modified: csw/mgar/pkg/apache2/branches/apache24/Makefile =================================================================== --- csw/mgar/pkg/apache2/branches/apache24/Makefile 2012-10-12 08:15:37 UTC (rev 19428) +++ csw/mgar/pkg/apache2/branches/apache24/Makefile 2012-10-12 10:17:37 UTC (rev 19429) @@ -55,25 +55,25 @@ INITSMF = /etc/opt/csw/init.d/cswapache24 -PRESERVECONF += $(sysconfdir)/apache24/envvars -PRESERVECONF += $(sysconfdir)/apache24/mime.types -PRESERVECONF += $(sysconfdir)/apache24/extra/httpd-manual.conf -PRESERVECONF += $(sysconfdir)/apache24/extra/httpd-userdir.conf -PRESERVECONF += $(sysconfdir)/apache24/extra/httpd-languages.conf -PRESERVECONF += $(sysconfdir)/apache24/extra/httpd-vhosts.conf -PRESERVECONF += $(sysconfdir)/apache24/extra/httpd-info.conf -PRESERVECONF += $(sysconfdir)/apache24/extra/proxy-html.conf -PRESERVECONF += $(sysconfdir)/apache24/extra/httpd-dav.conf -PRESERVECONF += $(sysconfdir)/apache24/extra/httpd-multilang-errordoc.conf -PRESERVECONF += $(sysconfdir)/apache24/extra/httpd-autoindex.conf -PRESERVECONF += $(sysconfdir)/apache24/extra/httpd-mpm.conf -PRESERVECONF += $(sysconfdir)/apache24/extra/httpd-default.conf -PRESERVECONF += $(sysconfdir)/apache24/extra/httpd-ssl.conf -PRESERVECONF += $(sysconfdir)/apache24/envvars-std -PRESERVECONF += $(sysconfdir)/apache24/magic -PRESERVECONF += $(sysconfdir)/apache24/httpd.conf +PRESERVECONF += $(sysconfdir)/apache2/envvars +PRESERVECONF += $(sysconfdir)/apache2/mime.types +PRESERVECONF += $(sysconfdir)/apache2/extra/httpd-manual.conf +PRESERVECONF += $(sysconfdir)/apache2/extra/httpd-userdir.conf +PRESERVECONF += $(sysconfdir)/apache2/extra/httpd-languages.conf +PRESERVECONF += $(sysconfdir)/apache2/extra/httpd-vhosts.conf +PRESERVECONF += $(sysconfdir)/apache2/extra/httpd-info.conf +PRESERVECONF += $(sysconfdir)/apache2/extra/proxy-html.conf +PRESERVECONF += $(sysconfdir)/apache2/extra/httpd-dav.conf +PRESERVECONF += $(sysconfdir)/apache2/extra/httpd-multilang-errordoc.conf +PRESERVECONF += $(sysconfdir)/apache2/extra/httpd-autoindex.conf +PRESERVECONF += $(sysconfdir)/apache2/extra/httpd-mpm.conf +PRESERVECONF += $(sysconfdir)/apache2/extra/httpd-default.conf +PRESERVECONF += $(sysconfdir)/apache2/extra/httpd-ssl.conf +PRESERVECONF += $(sysconfdir)/apache2/envvars-std +PRESERVECONF += $(sysconfdir)/apache2/magic +PRESERVECONF += $(sysconfdir)/apache2/httpd.conf -SSLCERT = /etc/opt/csw/apache24/server +SSLCERT = /etc/opt/csw/apache2/server # We need this to get bdb48/lib into the runpath EXTRA_LIB = $(prefix)/bdb48/lib @@ -104,20 +104,20 @@ post-install-modulated: @(cd $(DESTDIR)/$(sbindir); \ for f in envvars*; do \ - mv $$f $(DESTDIR)/$(sysconfdir)/apache24/; \ - ln -s $(sysconfdir)/apache24/$$f $$f; \ + mv $$f $(DESTDIR)/$(sysconfdir)/apache2/; \ + ln -s $(sysconfdir)/apache2/$$f $$f; \ done ) post-merge: - @(cd $(PKGROOT)/$(sysconfdir)/apache24; \ + @(cd $(PKGROOT)/$(sysconfdir)/apache2; \ rm -rf original; \ - perl -pi -e 's|/usr/local/apache2|/etc/opt/csw/apache24|g' httpd.conf.CSW ; \ + perl -pi -e 's|/usr/local/apache2|/etc/opt/csw/apache2|g' httpd.conf.CSW ; \ cd $(PKGROOT)/$(mandir); \ - perl -pi -e 's|usr/local/etc/apache|etc/opt/csw/apache24|g' man1/*; \ + perl -pi -e 's|usr/local/etc/apache|etc/opt/csw/apache2|g' man1/*; \ perl -pi -e 's|/usr/local/apache2|/etc/opt/csw/apache2|g' man8/* ) @( ginstall -d $(PKGROOT)/etc/opt/csw/init.d; \ ginstall $(WORKSRC_FIRSTMOD)/../cswapache24 $(PKGROOT)/etc/opt/csw/init.d ) - @(cd $(PKGROOT)/$(sysconfdir)/apache24; \ + @(cd $(PKGROOT)/$(sysconfdir)/apache2; \ echo "# create server.(crt|csr)/server.key" > server ) @$(MAKECOOKIE) Modified: csw/mgar/pkg/apache2/branches/apache24/files/0001-Add-an-OpenCSW-option-to-config.layout.patch =================================================================== --- csw/mgar/pkg/apache2/branches/apache24/files/0001-Add-an-OpenCSW-option-to-config.layout.patch 2012-10-12 08:15:37 UTC (rev 19428) +++ csw/mgar/pkg/apache2/branches/apache24/files/0001-Add-an-OpenCSW-option-to-config.layout.patch 2012-10-12 10:17:37 UTC (rev 19429) @@ -1,4 +1,4 @@ -From 6625eb4c5833cbee96ccb143f6d4e3d4f367b4b3 Mon Sep 17 00:00:00 2001 +From ecd25ab11aa44a21fae227740ac8fb58c0892e69 Mon Sep 17 00:00:00 2001 From: Ben Walton Date: Tue, 2 Oct 2012 11:08:04 +0200 Subject: [PATCH] Add an OpenCSW option to config.layout @@ -9,7 +9,7 @@ 1 file changed, 24 insertions(+) diff --git a/config.layout b/config.layout -index 35a325a..b21a3d4 100644 +index 35a325a..acf6efb 100644 --- a/config.layout +++ b/config.layout @@ -370,3 +370,27 @@ @@ -23,22 +23,22 @@ + exec_prefix: ${prefix} + bindir: ${prefix}/bin + sbindir: ${prefix}/sbin -+ libdir: ${prefix}/lib/apache24 ++ libdir: ${prefix}/lib/apache2 + libexecdir: ${libdir}/modules + installbuilddir: ${libdir}/build -+ sysconfdir: /etc/${prefix}/apache24 ++ sysconfdir: /etc/${prefix}/apache2 + mandir: ${prefix}/share/man -+ datadir: /var/${prefix}/apache24 ++ datadir: /var/${prefix}/apache2 + errordir: ${datadir}/error + iconsdir: ${datadir}/icons + htdocsdir: ${datadir}/htdocs + manualdir: ${datadir}/manual + cgidir: ${datadir}/cgi-bin -+ includedir: ${prefix}/include/apache24 ++ includedir: ${prefix}/include/apache2 + localstatedir: /var/${prefix} + runtimedir: /var/run -+ logfiledir: ${localstatedir}/log/apache24 -+ proxycachedir: ${localstatedir}/apache24/proxy ++ logfiledir: ${localstatedir}/log/apache2 ++ proxycachedir: ${localstatedir}/apache2/proxy + -- 1.7.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 Fri Oct 12 18:17:23 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 12 Oct 2012 16:17:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[19430] csw/mgar/pkg/apache2/branches/apache24/Makefile Message-ID: Revision: 19430 http://gar.svn.sourceforge.net/gar/?rev=19430&view=rev Author: bdwalton Date: 2012-10-12 16:17:22 +0000 (Fri, 12 Oct 2012) Log Message: ----------- apache2/branches/apache24: correct pkgfiles split for the manual package after altering the layout Modified Paths: -------------- csw/mgar/pkg/apache2/branches/apache24/Makefile Modified: csw/mgar/pkg/apache2/branches/apache24/Makefile =================================================================== --- csw/mgar/pkg/apache2/branches/apache24/Makefile 2012-10-12 10:17:37 UTC (rev 19429) +++ csw/mgar/pkg/apache2/branches/apache24/Makefile 2012-10-12 16:17:22 UTC (rev 19430) @@ -40,7 +40,7 @@ PACKAGES += CSWapache24-manual ARCHALL_CSWapache24-manual = 1 SPKG_DESC_CSWapache24-manual = The Apache 2.4 Manual -PKGFILES_CSWapache24-manual = /var/opt/csw/apache24/manual.* +PKGFILES_CSWapache24-manual = /var/opt/csw/apache2/manual.* RUNTIME_DEPS_CSWapache24-manual = CSWapache24 CHECKPKG_OVERRIDES_CSWapache24-manual += 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 Fri Oct 12 21:16:17 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 12 Oct 2012 19:16:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[19431] csw/mgar/pkg/cswclassutils/trunk/files/ CSWcswclassutils.i.cswsslcert Message-ID: Revision: 19431 http://gar.svn.sourceforge.net/gar/?rev=19431&view=rev Author: bdwalton Date: 2012-10-12 19:16:17 +0000 (Fri, 12 Oct 2012) Log Message: ----------- cswsslcert: remove a stray debug line, ensure we only generate new files if the .key file does not exist Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswsslcert Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswsslcert =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswsslcert 2012-10-12 16:17:22 UTC (rev 19430) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswsslcert 2012-10-12 19:16:17 UTC (rev 19431) @@ -35,7 +35,6 @@ fi CAS_SSL_CONFIG=$PKG_INSTALL_ROOT/etc/opt/csw/cas-ssl.conf -CAS_SSL_CONFIG=$PKG_INSTALL_ROOT/$PWD/cas-ssl.conf if [ -f "$CAS_SSL_CONFIG" ]; then debug_echo "Sourcing $CAS_SSL_CONFIG" @@ -79,7 +78,10 @@ fi - cat </dev/null 2>&1 + if [ -f $dest.key ]; then + echo "Skipping key and cert/csr generation due to existing files." + else + cat </dev/null 2>&1 ${SSL_COUNTRY} ${SSL_STATE} ${SSL_CITY} @@ -89,10 +91,11 @@ ${SSL_EMAIL} EOF - # we could bail here on $? != 0 but in the event there are multiple files we - # should at least attempt to generate them all. - if [ $? -ne 0 ]; then - echo "ERROR: There was a problem generating $dest.key/$dest.crt" + # we could bail here on $? != 0 but in the event there are + # multiple files we should at least attempt to generate them all. + if [ $? -ne 0 ]; then + echo "ERROR: There was a problem generating $dest.key/$dest.crt" + fi fi done 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 Oct 12 22:20:48 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 12 Oct 2012 20:20:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[19432] csw/mgar/pkg/cswclassutils/trunk/Makefile Message-ID: Revision: 19432 http://gar.svn.sourceforge.net/gar/?rev=19432&view=rev Author: bdwalton Date: 2012-10-12 20:20:48 +0000 (Fri, 12 Oct 2012) Log Message: ----------- cswclassutils/trunk: the cas_sslcert package needs the openssl binary, add the dep Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/Makefile Modified: csw/mgar/pkg/cswclassutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/Makefile 2012-10-12 19:16:17 UTC (rev 19431) +++ csw/mgar/pkg/cswclassutils/trunk/Makefile 2012-10-12 20:20:48 UTC (rev 19432) @@ -122,6 +122,8 @@ PKGFILES_CSWcas-pycompile_SHARED += /var/opt/csw/cswclassutils PKGFILES_CSWcas-sslcert += /etc/opt/csw/cas-ssl.conf.CSW +# we need this to run the key/cert/csr commands +RUNTIME_DEP_PKGS_CSWcas-sslcert += CSWopenssl-utils CHECKPKG_OVERRIDES_CSWcas-initsmf += init-file-missing-cswinitsmf-class CHECKPKG_OVERRIDES_CSWcas-initsmf += init-file-wrong-location 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 Oct 12 22:25:12 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 12 Oct 2012 20:25:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[19433] csw/mgar/pkg/cswclassutils/trunk/files/ CSWcswclassutils.i.cswsslcert Message-ID: Revision: 19433 http://gar.svn.sourceforge.net/gar/?rev=19433&view=rev Author: bdwalton Date: 2012-10-12 20:25:12 +0000 (Fri, 12 Oct 2012) Log Message: ----------- cswclassutils/trunk: set a strict umask prior to generating key/cert/csr files Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswsslcert Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswsslcert =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswsslcert 2012-10-12 20:20:48 UTC (rev 19432) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswsslcert 2012-10-12 20:25:12 UTC (rev 19433) @@ -81,6 +81,7 @@ if [ -f $dest.key ]; then echo "Skipping key and cert/csr generation due to existing files." else + umask 077 cat </dev/null 2>&1 ${SSL_COUNTRY} ${SSL_STATE} 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 Oct 12 22:31:08 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 12 Oct 2012 20:31:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[19434] csw/mgar/pkg/cswclassutils/trunk/files Message-ID: Revision: 19434 http://gar.svn.sourceforge.net/gar/?rev=19434&view=rev Author: bdwalton Date: 2012-10-12 20:31:07 +0000 (Fri, 12 Oct 2012) Log Message: ----------- cswclassutils/trunk: display file name during sslcert cas install/remove Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswsslcert csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswsslcert Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswsslcert =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswsslcert 2012-10-12 20:25:12 UTC (rev 19433) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswsslcert 2012-10-12 20:31:07 UTC (rev 19434) @@ -69,6 +69,7 @@ while read src dest; do debug_echo "SRC: $src DEST: $dest" + echo $dest /usr/bin/cp $src $dest || exit 2 if [ -n "${cas_ssl_csr:-}" ]; then Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswsslcert =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswsslcert 2012-10-12 20:25:12 UTC (rev 19433) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswsslcert 2012-10-12 20:31:07 UTC (rev 19434) @@ -35,6 +35,7 @@ while read dest; do debug_echo "DEST: $dest" + echo $dest /usr/bin/rm $dest || exit 2 done 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 Oct 12 23:08:01 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 12 Oct 2012 21:08:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[19435] csw/mgar/pkg/cswclassutils/trunk/Makefile Message-ID: Revision: 19435 http://gar.svn.sourceforge.net/gar/?rev=19435&view=rev Author: bdwalton Date: 2012-10-12 21:08:01 +0000 (Fri, 12 Oct 2012) Log Message: ----------- cswclassutils/trunk: override checkpkg re: surplus dep for sslcert -> openssl_utils Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/Makefile Modified: csw/mgar/pkg/cswclassutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/Makefile 2012-10-12 20:31:07 UTC (rev 19434) +++ csw/mgar/pkg/cswclassutils/trunk/Makefile 2012-10-12 21:08:01 UTC (rev 19435) @@ -122,8 +122,9 @@ PKGFILES_CSWcas-pycompile_SHARED += /var/opt/csw/cswclassutils PKGFILES_CSWcas-sslcert += /etc/opt/csw/cas-ssl.conf.CSW -# we need this to run the key/cert/csr commands +# we need this to run the key/cert/csr commands; override the surplus dep RUNTIME_DEP_PKGS_CSWcas-sslcert += CSWopenssl-utils +CHECKPKG_OVERRIDES_CSWcas-sslcert += surplus-dependency|CSWopenssl-utils CHECKPKG_OVERRIDES_CSWcas-initsmf += init-file-missing-cswinitsmf-class CHECKPKG_OVERRIDES_CSWcas-initsmf += init-file-wrong-location 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 Oct 12 23:50:25 2012 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 12 Oct 2012 21:50:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[19436] csw/mgar/pkg/memconf/trunk Message-ID: Revision: 19436 http://gar.svn.sourceforge.net/gar/?rev=19436&view=rev Author: bonivart Date: 2012-10-12 21:50:24 +0000 (Fri, 12 Oct 2012) Log Message: ----------- memconf/trunk: update to 3.02 Modified Paths: -------------- csw/mgar/pkg/memconf/trunk/Makefile csw/mgar/pkg/memconf/trunk/checksums Modified: csw/mgar/pkg/memconf/trunk/Makefile =================================================================== --- csw/mgar/pkg/memconf/trunk/Makefile 2012-10-12 21:08:01 UTC (rev 19435) +++ csw/mgar/pkg/memconf/trunk/Makefile 2012-10-12 21:50:24 UTC (rev 19436) @@ -1,5 +1,5 @@ NAME = memconf -VERSION = 3.00 +VERSION = 3.02 CATEGORIES = utils GARTYPE = v2 Modified: csw/mgar/pkg/memconf/trunk/checksums =================================================================== --- csw/mgar/pkg/memconf/trunk/checksums 2012-10-12 21:08:01 UTC (rev 19435) +++ csw/mgar/pkg/memconf/trunk/checksums 2012-10-12 21:50:24 UTC (rev 19436) @@ -1,2 +1,2 @@ -c8eaeecdcaa24264c6436e4ea193e5ad memconf.gz -4c40cc7485f6e1efaf37261dca883d9d memconf.man +11245b2536eeddf681003ca973421e4e memconf.gz +3e3e6b964502d00227b381704d0d5b72 memconf.man 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 Oct 13 00:27:41 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 12 Oct 2012 22:27:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[19437] csw/mgar/pkg/apache2/branches/apache24/Makefile Message-ID: Revision: 19437 http://gar.svn.sourceforge.net/gar/?rev=19437&view=rev Author: bdwalton Date: 2012-10-12 22:27:40 +0000 (Fri, 12 Oct 2012) Log Message: ----------- apache2/branches/apache24: add MAKECOOKIE to the post-install-modulated hook Modified Paths: -------------- csw/mgar/pkg/apache2/branches/apache24/Makefile Modified: csw/mgar/pkg/apache2/branches/apache24/Makefile =================================================================== --- csw/mgar/pkg/apache2/branches/apache24/Makefile 2012-10-12 21:50:24 UTC (rev 19436) +++ csw/mgar/pkg/apache2/branches/apache24/Makefile 2012-10-12 22:27:40 UTC (rev 19437) @@ -107,6 +107,7 @@ mv $$f $(DESTDIR)/$(sysconfdir)/apache2/; \ ln -s $(sysconfdir)/apache2/$$f $$f; \ done ) + @$(MAKECOOKIE) post-merge: @(cd $(PKGROOT)/$(sysconfdir)/apache2; \ 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 Oct 14 10:27:16 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Sun, 14 Oct 2012 08:27:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[19438] csw/mgar/pkg/mod_jk/trunk/Makefile Message-ID: Revision: 19438 http://gar.svn.sourceforge.net/gar/?rev=19438&view=rev Author: wilbury Date: 2012-10-14 08:27:16 +0000 (Sun, 14 Oct 2012) Log Message: ----------- mod_jk/trunk: Update to 1.2.37 Modified Paths: -------------- csw/mgar/pkg/mod_jk/trunk/Makefile Modified: csw/mgar/pkg/mod_jk/trunk/Makefile =================================================================== --- csw/mgar/pkg/mod_jk/trunk/Makefile 2012-10-12 22:27:40 UTC (rev 19437) +++ csw/mgar/pkg/mod_jk/trunk/Makefile 2012-10-14 08:27:16 UTC (rev 19438) @@ -1,5 +1,5 @@ NAME = tomcat-connectors -VERSION = 1.2.30 +VERSION = 1.2.37 CATEGORIES = server GARTYPE = v2 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 Oct 14 10:30:40 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Sun, 14 Oct 2012 08:30:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[19439] csw/mgar/pkg/mod_jk/trunk/Makefile Message-ID: Revision: 19439 http://gar.svn.sourceforge.net/gar/?rev=19439&view=rev Author: wilbury Date: 2012-10-14 08:30:40 +0000 (Sun, 14 Oct 2012) Log Message: ----------- mod_jk/trunk: Do not use admfiles call Modified Paths: -------------- csw/mgar/pkg/mod_jk/trunk/Makefile Modified: csw/mgar/pkg/mod_jk/trunk/Makefile =================================================================== --- csw/mgar/pkg/mod_jk/trunk/Makefile 2012-10-14 08:27:16 UTC (rev 19438) +++ csw/mgar/pkg/mod_jk/trunk/Makefile 2012-10-14 08:30:40 UTC (rev 19439) @@ -23,8 +23,7 @@ MASTER_SITES = http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-$(VERSION)/ DISTFILES = $(NAME)-$(VERSION)-src.tar.gz -ADMINFILES = depend prototype postinstall preremove space -DISTFILES += $(call admfiles,CSWap2modjk,$(ADMINFILES)) +DISTFILES += depend prototype postinstall preremove space DISTFILES += httpd-jk.conf.CSW # 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 wilbury at users.sourceforge.net Sun Oct 14 10:32:31 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Sun, 14 Oct 2012 08:32:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[19440] csw/mgar/pkg/mod_jk/trunk/Makefile Message-ID: Revision: 19440 http://gar.svn.sourceforge.net/gar/?rev=19440&view=rev Author: wilbury Date: 2012-10-14 08:32:31 +0000 (Sun, 14 Oct 2012) Log Message: ----------- mod_jk/trunk: Do not use admfiles call Modified Paths: -------------- csw/mgar/pkg/mod_jk/trunk/Makefile Modified: csw/mgar/pkg/mod_jk/trunk/Makefile =================================================================== --- csw/mgar/pkg/mod_jk/trunk/Makefile 2012-10-14 08:30:40 UTC (rev 19439) +++ csw/mgar/pkg/mod_jk/trunk/Makefile 2012-10-14 08:32:31 UTC (rev 19440) @@ -23,7 +23,6 @@ MASTER_SITES = http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-$(VERSION)/ DISTFILES = $(NAME)-$(VERSION)-src.tar.gz -DISTFILES += depend prototype postinstall preremove space DISTFILES += httpd-jk.conf.CSW # 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 wilbury at users.sourceforge.net Sun Oct 14 10:33:54 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Sun, 14 Oct 2012 08:33:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[19441] csw/mgar/pkg/mod_jk/trunk/Makefile Message-ID: Revision: 19441 http://gar.svn.sourceforge.net/gar/?rev=19441&view=rev Author: wilbury Date: 2012-10-14 08:33:53 +0000 (Sun, 14 Oct 2012) Log Message: ----------- mod_jk/trunk: Correct download location Modified Paths: -------------- csw/mgar/pkg/mod_jk/trunk/Makefile Modified: csw/mgar/pkg/mod_jk/trunk/Makefile =================================================================== --- csw/mgar/pkg/mod_jk/trunk/Makefile 2012-10-14 08:32:31 UTC (rev 19440) +++ csw/mgar/pkg/mod_jk/trunk/Makefile 2012-10-14 08:33:53 UTC (rev 19441) @@ -21,7 +21,7 @@ been ported to JK. endef -MASTER_SITES = http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-$(VERSION)/ +MASTER_SITES = http://www.apache.org/dist/tomcat/tomcat-connectors/jk/ DISTFILES = $(NAME)-$(VERSION)-src.tar.gz DISTFILES += httpd-jk.conf.CSW 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 Oct 14 15:50:31 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Sun, 14 Oct 2012 13:50:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[19442] csw/mgar/pkg/mod_jk/trunk Message-ID: Revision: 19442 http://gar.svn.sourceforge.net/gar/?rev=19442&view=rev Author: wilbury Date: 2012-10-14 13:50:30 +0000 (Sun, 14 Oct 2012) Log Message: ----------- mod_jk/trunk: Correct build variables, rework patches. Modified Paths: -------------- csw/mgar/pkg/mod_jk/trunk/Makefile csw/mgar/pkg/mod_jk/trunk/checksums Added Paths: ----------- csw/mgar/pkg/mod_jk/trunk/files/0001-Use-correct-paths-for-install-and-logging.patch Removed Paths: ------------- csw/mgar/pkg/mod_jk/trunk/files/CSWap2modjk.depend csw/mgar/pkg/mod_jk/trunk/files/CSWap2modjk.gspec csw/mgar/pkg/mod_jk/trunk/files/CSWap2modjk.postinstall csw/mgar/pkg/mod_jk/trunk/files/CSWap2modjk.preremove csw/mgar/pkg/mod_jk/trunk/files/CSWap2modjk.prototype csw/mgar/pkg/mod_jk/trunk/files/CSWap2modjk.space csw/mgar/pkg/mod_jk/trunk/files/install.diff csw/mgar/pkg/mod_jk/trunk/files/logging.diff Modified: csw/mgar/pkg/mod_jk/trunk/Makefile =================================================================== --- csw/mgar/pkg/mod_jk/trunk/Makefile 2012-10-14 08:33:53 UTC (rev 19441) +++ csw/mgar/pkg/mod_jk/trunk/Makefile 2012-10-14 13:50:30 UTC (rev 19442) @@ -1,6 +1,6 @@ NAME = tomcat-connectors VERSION = 1.2.37 -CATEGORIES = server +CATEGORIES = lib GARTYPE = v2 DESCRIPTION = AJP connector module for Apache 2 @@ -24,7 +24,17 @@ MASTER_SITES = http://www.apache.org/dist/tomcat/tomcat-connectors/jk/ DISTFILES = $(NAME)-$(VERSION)-src.tar.gz DISTFILES += httpd-jk.conf.CSW +PACKAGING_PLATFORMS = solaris10-i386 +WORKSRC = $(WORKDIR)/$(DISTNAME)-src/native +PATCHDIR = $(WORKDIR)/$(DISTNAME)-src +# Apache paths +AP2_ROOT = $(prefix)/apache2 +AP2_LIBEXEC = $(DESTDIR)$(AP2_ROOT)/libexec +AP2_APXS = $(AP2_ROOT)/sbin/apxs +AP2_MODS = 1 +AP2_MODFILES += mod_jk.so + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*)-src.tar.gz @@ -33,14 +43,8 @@ AUXCONFIG += uriworkermap.properties DISTFILES += $(AUXCONFIG) -WORKSRC = $(WORKDIR)/$(NAME)-$(VERSION)-src/native +PATCHFILES += 0001-Use-correct-paths-for-install-and-logging.patch -# Make apxs install to the temp dir -PATCHFILES += install.diff - -# Fix bad embedded paths in mod_jk.c -PATCHFILES += logging.diff - CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-apxs=$(prefix)/apache2/sbin/apxs CONFIGURE_ARGS += --enable-jni @@ -54,11 +58,17 @@ include gar/category.mk +post-extract-modulated: + echo $(WORKDIR) + echo $(WORKSRC) + @$(MAKECOOKIE) + pre-install: install -d $(DESTDIR)$(prefix)/apache2/libexec install -d $(DESTDIR)$(prefix)/apache2/etc/extra install -d $(DESTDIR)$(datadir)/ap2modjk install -d $(DESTDIR)$(docdir)/ap2modjk + @$(MAKECOOKIE) post-install: ginstall -m 0644 \ Modified: csw/mgar/pkg/mod_jk/trunk/checksums =================================================================== --- csw/mgar/pkg/mod_jk/trunk/checksums 2012-10-14 08:33:53 UTC (rev 19441) +++ csw/mgar/pkg/mod_jk/trunk/checksums 2012-10-14 13:50:30 UTC (rev 19442) @@ -1,13 +1 @@ -1815c09dc59d4a769e20c0f2361c4656 CSWap2modjk.depend -da3c0df06571efa952998e637ca10cde CSWap2modjk.gspec -f4781a01cc678a752a800198918e5687 CSWap2modjk.postinstall -5eb4612d15fdf4fd8498d97c79ed8e4b CSWap2modjk.preremove -a0994b400fb225bffa325b5cd53a08a2 CSWap2modjk.prototype -0dd379f20ceb32fc77bb3a9bf045097f CSWap2modjk.space -43136ccdd67533557a2e4953249f755f httpd-jk.conf.CSW -25c3855d2af69021dfc63e9d4b1ed78a install.diff -7c6ff5425f542ec5eb80954f8a470519 logging.diff -e6504ce44628ca18deaa503cbc77f545 tomcat-connectors-1.2.30-src.tar.gz -594aca8f50b11134fd3396e348bd2f12 uriworkermap.properties -7824a6e972faae3d9ec7b06a47b70105 workers.properties -b69613899d749ba2a40d1acbbbe13ba9 workers.properties.minimal +64c3803477b47c5b7ef7f0e4a416e45e tomcat-connectors-1.2.37-src.tar.gz Added: csw/mgar/pkg/mod_jk/trunk/files/0001-Use-correct-paths-for-install-and-logging.patch =================================================================== --- csw/mgar/pkg/mod_jk/trunk/files/0001-Use-correct-paths-for-install-and-logging.patch (rev 0) +++ csw/mgar/pkg/mod_jk/trunk/files/0001-Use-correct-paths-for-install-and-logging.patch 2012-10-14 13:50:30 UTC (rev 19442) @@ -0,0 +1,55 @@ +From be896c015d432de308f998a80b0eb94863f872ac Mon Sep 17 00:00:00 2001 +From: Juraj Lutter +Date: Sun, 14 Oct 2012 15:20:23 +0200 +Subject: [PATCH] Use correct paths for install and logging. + +--- + native/apache-2.0/Makefile.apxs.in | 2 +- + native/apache-2.0/Makefile.in | 2 +- + native/apache-2.0/mod_jk.c | 4 ++-- + 3 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/native/apache-2.0/Makefile.apxs.in b/native/apache-2.0/Makefile.apxs.in +index a313654..b9c44df 100644 +--- a/native/apache-2.0/Makefile.apxs.in ++++ b/native/apache-2.0/Makefile.apxs.in +@@ -32,7 +32,7 @@ mod_jk.la: + $(APXS) -c -o $@ -Wc,"${APXSCFLAGS} ${JK_INCL}" ${APXSLDFLAGS} mod_jk.c ${APACHE_OBJECTS} + + install: mod_jk.la +- $(APXS) -i mod_jk.la ++ $(APXS) -S LIBEXECDIR=$(DESTDIR)$(APACHE_DIR)/libexec -i mod_jk.la + + clean: + rm -f *.o *.lo *.a *.la *.so *.so.* *.slo +diff --git a/native/apache-2.0/Makefile.in b/native/apache-2.0/Makefile.in +index 35c778e..0da5997 100644 +--- a/native/apache-2.0/Makefile.in ++++ b/native/apache-2.0/Makefile.in +@@ -83,7 +83,7 @@ mod_jk.so: mod_jk.la + install_dynamic: + @echo "" + @echo "Installing files to Apache Modules Directory..." +- $(APXS) -i mod_jk.la ++ $(APXS) -S LIBEXECDIR=$(DESTDIR)$(APACHE_DIR)/libexec -i mod_jk.la + @echo "" + @echo "Please be sure to arrange ${APACHE_DIR}/conf/httpd.conf..." + @echo "" +diff --git a/native/apache-2.0/mod_jk.c b/native/apache-2.0/mod_jk.c +index 3a31fe2..e8b17d4 100644 +--- a/native/apache-2.0/mod_jk.c ++++ b/native/apache-2.0/mod_jk.c +@@ -98,8 +98,8 @@ + #include "jk_shm.h" + #include "jk_url.h" + +-#define JK_LOG_DEF_FILE ("logs/mod_jk.log") +-#define JK_SHM_DEF_FILE ("logs/jk-runtime-status") ++#define JK_LOG_DEF_FILE ("var/log/mod_jk.log") ++#define JK_SHM_DEF_FILE ("var/log/jk-runtime-status") + #define JK_ENV_REMOTE_ADDR ("JK_REMOTE_ADDR") + #define JK_ENV_REMOTE_PORT ("JK_REMOTE_PORT") + #define JK_ENV_REMOTE_HOST ("JK_REMOTE_HOST") +-- +1.7.12 + Deleted: csw/mgar/pkg/mod_jk/trunk/files/CSWap2modjk.depend =================================================================== --- csw/mgar/pkg/mod_jk/trunk/files/CSWap2modjk.depend 2012-10-14 08:33:53 UTC (rev 19441) +++ csw/mgar/pkg/mod_jk/trunk/files/CSWap2modjk.depend 2012-10-14 13:50:30 UTC (rev 19442) @@ -1 +0,0 @@ -P CSWap2prefork ap2_prefork - Apache 2.2 prefork MPM Deleted: csw/mgar/pkg/mod_jk/trunk/files/CSWap2modjk.gspec =================================================================== --- csw/mgar/pkg/mod_jk/trunk/files/CSWap2modjk.gspec 2012-10-14 08:33:53 UTC (rev 19441) +++ csw/mgar/pkg/mod_jk/trunk/files/CSWap2modjk.gspec 2012-10-14 13:50:30 UTC (rev 19442) @@ -1,4 +0,0 @@ -%var bitname ap2_mod_jk -%var pkgname CSWap2modjk -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/../LICENSE Deleted: csw/mgar/pkg/mod_jk/trunk/files/CSWap2modjk.postinstall =================================================================== --- csw/mgar/pkg/mod_jk/trunk/files/CSWap2modjk.postinstall 2012-10-14 08:33:53 UTC (rev 19441) +++ csw/mgar/pkg/mod_jk/trunk/files/CSWap2modjk.postinstall 2012-10-14 13:50:30 UTC (rev 19442) @@ -1,55 +0,0 @@ -#!/bin/sh - -CSW_PREFIX=${PKG_INSTALL_ROOT}/opt/csw -AP2_PREFIX=$CSW_PREFIX/apache2 -AP2_BINDIR=$AP2_PREFIX/sbin -AP2_LIBEXEC=$AP2_PREFIX/libexec -AP2_CONFDIR=$AP2_PREFIX/etc -AP2_EXTRADIR=$AP2_CONFDIR/extra -AP2_CONFIG=$AP2_CONFDIR/httpd.conf - -# Enable the jk module -PKG_INSTALL_ROOT=${PKG_INSTALL_ROOT:-'/'} -chroot $PKG_INSTALL_ROOT \ - $AP2_BINDIR/apxs -S LIBEXECDIR=$AP2_LIBEXEC -e -a -n jk mod_jk.so - -# Configure mod_jk in httpd.conf -if [ -n "`egrep 'IfModule (mod_jk|jk_module)' $AP2_CONFIG`" ] -then - echo "Existing mod_jk configuration detected" -elif [ -n "`egrep '#Include etc/extra/httpd-jk.conf' $AP2_CONFIG`" ]; then - echo "Re-enabling existing config" - perl -i -plne 's,^#(Include etc/extra/httpd-jk.conf),$1,' $AP2_CONFIG -else - echo "Adding Include for extra/http-jk.conf to httpd.conf" - cat << END >> $AP2_CONFIG - -Include etc/extra/httpd-jk.conf -END -fi - -# Copy templates -for file in $AP2_EXTRADIR/httpd-jk.conf -do - if [ ! -f $file ]; then - echo "Creating $file" - cp $file.CSW $file - else - echo "Preserving existing $file" - fi -done - -# Finito -cat << END - -NOTICE: mod_jk is enabled in httpd.conf, but the server was not restarted. -Please examine your mod_jk configuration and restart apache. - -NOTICE: mod_proxy_ajp, included with Apache 2.1 and later, replaces the -functionality of mod_jk. Please consider migrating your configuration from -mod_jk to mod_proxy_ajp. A configuration sample is provided in -httpd-jk.conf. - -END - -exit 0 Deleted: csw/mgar/pkg/mod_jk/trunk/files/CSWap2modjk.preremove =================================================================== --- csw/mgar/pkg/mod_jk/trunk/files/CSWap2modjk.preremove 2012-10-14 08:33:53 UTC (rev 19441) +++ csw/mgar/pkg/mod_jk/trunk/files/CSWap2modjk.preremove 2012-10-14 13:50:30 UTC (rev 19442) @@ -1,26 +0,0 @@ -#!/bin/sh - -CSW_PREFIX=${PKG_INSTALL_ROOT}/opt/csw -AP2_PREFIX=$CSW_PREFIX/apache2 -AP2_BINDIR=$AP2_PREFIX/sbin -AP2_LIBEXEC=$AP2_PREFIX/libexec -AP2_CONFDIR=$AP2_PREFIX/etc -AP2_EXTRADIR=$AP2_CONFDIR/extra -AP2_CONFIG=$AP2_CONFDIR/httpd.conf - -# Disable the jk module -PKG_INSTALL_ROOT=${PKG_INSTALL_ROOT:-'/'} -chroot $PKG_INSTALL_ROOT \ - $AP2_BINDIR/apxs -S LIBEXECDIR=$AP2_LIBEXEC -e -A -n jk mod_jk.so - -echo "Disabling extra/httpd-jk.conf in httpd.conf" -perl -i -plne 's,(? Revision: 19443 http://gar.svn.sourceforge.net/gar/?rev=19443&view=rev Author: bdwalton Date: 2012-10-14 20:43:00 +0000 (Sun, 14 Oct 2012) Log Message: ----------- apache2/branches/apache24: default to prefork (event is apache default) until event problems sorted out Modified Paths: -------------- csw/mgar/pkg/apache2/branches/apache24/Makefile Modified: csw/mgar/pkg/apache2/branches/apache24/Makefile =================================================================== --- csw/mgar/pkg/apache2/branches/apache24/Makefile 2012-10-14 13:50:30 UTC (rev 19442) +++ csw/mgar/pkg/apache2/branches/apache24/Makefile 2012-10-14 20:43:00 UTC (rev 19443) @@ -84,6 +84,7 @@ CONFIGURE_ARGS += --with-libxml2=$(includedir)/libxml2 CONFIGURE_ARGS += --with-lua=$(prefix) CONFIGURE_ARGS += --enable-mpms-shared=all +CONFIGURE_ARGS += --with-mpm=prefork CONFIGURE_ARGS += --enable-layout=OpenCSW CONFIGURE_ARGS += --enable-mods-shared=all CONFIGURE_ARGS += --enable-privileges This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Sun Oct 14 22:46:26 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Sun, 14 Oct 2012 20:46:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[19444] csw/mgar/pkg/lang-python Message-ID: Revision: 19444 http://gar.svn.sourceforge.net/gar/?rev=19444&view=rev Author: dmichelsen Date: 2012-10-14 20:46:26 +0000 (Sun, 14 Oct 2012) Log Message: ----------- lang-python/uniconvertor: Initial commit Added Paths: ----------- csw/mgar/pkg/lang-python/uniconvertor/ csw/mgar/pkg/lang-python/uniconvertor/Makefile csw/mgar/pkg/lang-python/uniconvertor/branches/ csw/mgar/pkg/lang-python/uniconvertor/tags/ csw/mgar/pkg/lang-python/uniconvertor/trunk/ csw/mgar/pkg/lang-python/uniconvertor/trunk/Makefile csw/mgar/pkg/lang-python/uniconvertor/trunk/checksums csw/mgar/pkg/lang-python/uniconvertor/trunk/files/ Added: csw/mgar/pkg/lang-python/uniconvertor/Makefile =================================================================== --- csw/mgar/pkg/lang-python/uniconvertor/Makefile (rev 0) +++ csw/mgar/pkg/lang-python/uniconvertor/Makefile 2012-10-14 20:46:26 UTC (rev 19444) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/lang-python/uniconvertor/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/lang-python/uniconvertor/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/uniconvertor/trunk/Makefile (rev 0) +++ csw/mgar/pkg/lang-python/uniconvertor/trunk/Makefile 2012-10-14 20:46:26 UTC (rev 19444) @@ -0,0 +1,30 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = uniconvertor +VERSION = 1.1.5 +GARTYPE = v2 +CATEGORIES = python + +DESCRIPTION = UniConvertor is a universal vector graphics translator + +MASTER_SITES = http://uniconvertor.googlecode.com/files/ +DISTFILES = $(DISTNAME).tar.gz + +PACKAGES += CSWuniconvertor +SPKG_DESC_CSWuniconvertor = UniConvertor is a universal vector graphics translator +RUNTIME_DEP_PKGS_CSWuniconvertor += CSWlibpython2-6-1-0 + +# This is intentional as it is a program, not a module +CHECKPKG_OVERRIDES_CSWuniconvertor += pkgname-does-not-start-with-CSWpy- +CHECKPKG_OVERRIDES_CSWuniconvertor += catalogname-does-not-start-with-py_ + +# This is the default font location, I guess Solaris does not ship suitable fonts, +# leave for now until we have something better to depend on +CHECKPKG_OVERRIDES_CSWuniconvertor += file-with-bad-content|/usr/share|root/opt/csw/lib/python/site-packages/uniconvertor/app/conf/configurator.py + +# There is no testsuite +TEST_SCRIPTS = + +include gar/category.mk + Property changes on: csw/mgar/pkg/lang-python/uniconvertor/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/lang-python/uniconvertor/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/uniconvertor/trunk/checksums (rev 0) +++ csw/mgar/pkg/lang-python/uniconvertor/trunk/checksums 2012-10-14 20:46:26 UTC (rev 19444) @@ -0,0 +1 @@ +d1272315a58304ece2ff588834e23f72 uniconvertor-1.1.5.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 Sun Oct 14 23:46:23 2012 From: wilbury at users.sourceforge.net (wilbury at users.sourceforge.net) Date: Sun, 14 Oct 2012 21:46:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[19445] csw/mgar/pkg/mod_jk/trunk Message-ID: Revision: 19445 http://gar.svn.sourceforge.net/gar/?rev=19445&view=rev Author: wilbury Date: 2012-10-14 21:46:23 +0000 (Sun, 14 Oct 2012) Log Message: ----------- mod_jk/trunk: Finish recipe, fix paths and install steps. Modified Paths: -------------- csw/mgar/pkg/mod_jk/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/mod_jk/trunk/files/0002-Do-not-prefix-APXSLDFLAGS-with-Wl-to-make-SUNWspro-h.patch Modified: csw/mgar/pkg/mod_jk/trunk/Makefile =================================================================== --- csw/mgar/pkg/mod_jk/trunk/Makefile 2012-10-14 20:46:26 UTC (rev 19444) +++ csw/mgar/pkg/mod_jk/trunk/Makefile 2012-10-14 21:46:23 UTC (rev 19445) @@ -21,10 +21,11 @@ been ported to JK. endef +PACKAGES = CSWap2modjk + MASTER_SITES = http://www.apache.org/dist/tomcat/tomcat-connectors/jk/ DISTFILES = $(NAME)-$(VERSION)-src.tar.gz DISTFILES += httpd-jk.conf.CSW -PACKAGING_PLATFORMS = solaris10-i386 WORKSRC = $(WORKDIR)/$(DISTNAME)-src/native PATCHDIR = $(WORKDIR)/$(DISTNAME)-src @@ -44,32 +45,34 @@ DISTFILES += $(AUXCONFIG) PATCHFILES += 0001-Use-correct-paths-for-install-and-logging.patch +PATCHFILES += 0002-Do-not-prefix-APXSLDFLAGS-with-Wl-to-make-SUNWspro-h.patch CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --with-apxs=$(prefix)/apache2/sbin/apxs +CONFIGURE_ARGS += --libexecdir=$(AP2_ROOT)/libexec +CONFIGURE_ARGS += --with-apxs=$(AP2_ROOT)/sbin/apxs CONFIGURE_ARGS += --enable-jni CONFIGURE_ARGS += --enable-prefork CONFIGURE_ARGS += --disable-static CONFIGURE_ARGS += --with-java-home=/usr/jdk/latest CONFIGURE_ARGS += --with-java-platform=2 +BUILD_DEP_PKGS_CSWap2modjk += CSWapache2-dev +RUNTIME_DEP_PKGS_CSWap2modjk += CSWapache2 + +LICENSE_TEXT = Apache + # No test suite available TEST_SCRIPTS = include gar/category.mk -post-extract-modulated: - echo $(WORKDIR) - echo $(WORKSRC) +pre-install-modulated: + ginstall -d $(AP2_LIBEXEC) + ginstall -d $(DESTDIR)$(AP2_ROOT)/etc/extra + ginstall -d $(DESTDIR)$(datadir)/ap2modjk + ginstall -d $(DESTDIR)$(docdir)/ap2modjk @$(MAKECOOKIE) -pre-install: - install -d $(DESTDIR)$(prefix)/apache2/libexec - install -d $(DESTDIR)$(prefix)/apache2/etc/extra - install -d $(DESTDIR)$(datadir)/ap2modjk - install -d $(DESTDIR)$(docdir)/ap2modjk - @$(MAKECOOKIE) - post-install: ginstall -m 0644 \ $(WORKDIR)/httpd-jk.conf.CSW $(DESTDIR)$(prefix)/apache2/etc/extra Added: csw/mgar/pkg/mod_jk/trunk/files/0002-Do-not-prefix-APXSLDFLAGS-with-Wl-to-make-SUNWspro-h.patch =================================================================== --- csw/mgar/pkg/mod_jk/trunk/files/0002-Do-not-prefix-APXSLDFLAGS-with-Wl-to-make-SUNWspro-h.patch (rev 0) +++ csw/mgar/pkg/mod_jk/trunk/files/0002-Do-not-prefix-APXSLDFLAGS-with-Wl-to-make-SUNWspro-h.patch 2012-10-14 21:46:23 UTC (rev 19445) @@ -0,0 +1,45 @@ +From 879c3c18b8f8a9e8be828be3d33e8023d6c65848 Mon Sep 17 00:00:00 2001 +From: Juraj Lutter +Date: Sun, 14 Oct 2012 23:14:54 +0200 +Subject: [PATCH] Do not prefix APXSLDFLAGS with -Wl to make SUNWspro happy. + +--- + native/configure | 22 ---------------------- + 1 file changed, 22 deletions(-) + +diff --git a/native/configure b/native/configure +index 0dea941..f48faf4 100755 +--- a/native/configure ++++ b/native/configure +@@ -24042,28 +24042,6 @@ if ${TEST} -n "${LDFLAGS}" ; then + fi + + +- jk_new_val="" +- jk_val_changed=0 +- for i in $APXSLDFLAGS; do +- case $i in +- -Wl,*) +- jk_new_val="$jk_new_val $i" +- ;; +- *) +- jk_new_val="$jk_new_val -Wl,$i" +- jk_val_changed=1 +- ;; +- esac +- done +- if test $jk_val_changed = "1"; then +- { echo "$as_me:$LINENO: tokens in APXSLDFLAGS have been prefixed with '-Wl,'" >&5 +-echo "$as_me: tokens in APXSLDFLAGS have been prefixed with '-Wl,'" >&6;} +- APXSLDFLAGS=$jk_new_val +- fi +- +- +- +- + if ${TEST} -z "$WEBSERVER" ; then + { { echo "$as_me:$LINENO: error: Cannot find the WebServer" >&5 + echo "$as_me: error: Cannot find the WebServer" >&2;} +-- +1.7.12 + 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 Oct 15 11:27:49 2012 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Mon, 15 Oct 2012 09:27:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[19446] csw/mgar/pkg/tomcat5/trunk Message-ID: Revision: 19446 http://gar.svn.sourceforge.net/gar/?rev=19446&view=rev Author: janholzh Date: 2012-10-15 09:27:48 +0000 (Mon, 15 Oct 2012) Log Message: ----------- tomcat5/trunk: update to 5.5.36 Modified Paths: -------------- csw/mgar/pkg/tomcat5/trunk/Makefile csw/mgar/pkg/tomcat5/trunk/checksums Modified: csw/mgar/pkg/tomcat5/trunk/Makefile =================================================================== --- csw/mgar/pkg/tomcat5/trunk/Makefile 2012-10-14 21:46:23 UTC (rev 19445) +++ csw/mgar/pkg/tomcat5/trunk/Makefile 2012-10-15 09:27:48 UTC (rev 19446) @@ -1,5 +1,5 @@ NAME = tomcat5 -VERSION = 5.5.35 +VERSION = 5.5.36 CATEGORIES = server GARTYPE = v2 Modified: csw/mgar/pkg/tomcat5/trunk/checksums =================================================================== --- csw/mgar/pkg/tomcat5/trunk/checksums 2012-10-14 21:46:23 UTC (rev 19445) +++ csw/mgar/pkg/tomcat5/trunk/checksums 2012-10-15 09:27:48 UTC (rev 19446) @@ -1 +1 @@ -1791951e1f2e03be9911e28c6145e177 apache-tomcat-5.5.35.tar.gz +71493c665c3695e7049619e2c4ed7b6a apache-tomcat-5.5.36.tar.gz 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 Oct 15 11:28:48 2012 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Mon, 15 Oct 2012 09:28:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[19447] csw/mgar/pkg/tomcat7/trunk Message-ID: Revision: 19447 http://gar.svn.sourceforge.net/gar/?rev=19447&view=rev Author: janholzh Date: 2012-10-15 09:28:48 +0000 (Mon, 15 Oct 2012) Log Message: ----------- tomcat7/trunk: update to 7.0.32 Modified Paths: -------------- csw/mgar/pkg/tomcat7/trunk/Makefile csw/mgar/pkg/tomcat7/trunk/checksums Modified: csw/mgar/pkg/tomcat7/trunk/Makefile =================================================================== --- csw/mgar/pkg/tomcat7/trunk/Makefile 2012-10-15 09:27:48 UTC (rev 19446) +++ csw/mgar/pkg/tomcat7/trunk/Makefile 2012-10-15 09:28:48 UTC (rev 19447) @@ -1,5 +1,5 @@ NAME = tomcat7 -VERSION = 7.0.29 +VERSION = 7.0.32 CATEGORIES = server GARTYPE = v2 Modified: csw/mgar/pkg/tomcat7/trunk/checksums =================================================================== --- csw/mgar/pkg/tomcat7/trunk/checksums 2012-10-15 09:27:48 UTC (rev 19446) +++ csw/mgar/pkg/tomcat7/trunk/checksums 2012-10-15 09:28:48 UTC (rev 19447) @@ -1 +1 @@ -307076fa3827e19fa9b03f3ef7cf1f3f apache-tomcat-7.0.29.tar.gz +5c2576600ceb3c93a712820c7c16fa70 apache-tomcat-7.0.32.tar.gz 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 Oct 15 11:34:24 2012 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Mon, 15 Oct 2012 09:34:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[19448] csw/mgar/pkg/tomcat5/trunk Message-ID: Revision: 19448 http://gar.svn.sourceforge.net/gar/?rev=19448&view=rev Author: janholzh Date: 2012-10-15 09:34:23 +0000 (Mon, 15 Oct 2012) Log Message: ----------- tomcat5/trunk: update mirror and checksum Modified Paths: -------------- csw/mgar/pkg/tomcat5/trunk/Makefile csw/mgar/pkg/tomcat5/trunk/checksums Modified: csw/mgar/pkg/tomcat5/trunk/Makefile =================================================================== --- csw/mgar/pkg/tomcat5/trunk/Makefile 2012-10-15 09:28:48 UTC (rev 19447) +++ csw/mgar/pkg/tomcat5/trunk/Makefile 2012-10-15 09:34:23 UTC (rev 19448) @@ -9,7 +9,7 @@ endef VENDOR_URL = http://tomcat.apache.org/ -MASTER_SITES = http://mir2.ovh.net/ftp.apache.org/dist/jakarta/tomcat-5/v$(VERSION)/bin/ +MASTER_SITES = http://apache.mirror.digionline.de/tomcat/tomcat-5/v$(VERSION)/bin/ UPSTREAM_MASTER_SITES = http://mir2.ovh.net/ftp.apache.org/dist/jakarta/tomcat-5/v$(VERSION)/bin/ DISTFILES = apache-tomcat-$(VERSION).tar.gz PKGDIST = apache-tomcat-$(VERSION).tar.gz Modified: csw/mgar/pkg/tomcat5/trunk/checksums =================================================================== --- csw/mgar/pkg/tomcat5/trunk/checksums 2012-10-15 09:28:48 UTC (rev 19447) +++ csw/mgar/pkg/tomcat5/trunk/checksums 2012-10-15 09:34:23 UTC (rev 19448) @@ -1 +1 @@ -71493c665c3695e7049619e2c4ed7b6a apache-tomcat-5.5.36.tar.gz +d5ba57cd0b21520d8322a77127405d50 apache-tomcat-5.5.36.tar.gz 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 Oct 15 11:43:36 2012 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Mon, 15 Oct 2012 09:43:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[19449] csw/mgar/pkg/tomcat5/trunk/Makefile Message-ID: Revision: 19449 http://gar.svn.sourceforge.net/gar/?rev=19449&view=rev Author: janholzh Date: 2012-10-15 09:43:36 +0000 (Mon, 15 Oct 2012) Log Message: ----------- tomcat5/trunk: add new overrides Modified Paths: -------------- csw/mgar/pkg/tomcat5/trunk/Makefile Modified: csw/mgar/pkg/tomcat5/trunk/Makefile =================================================================== --- csw/mgar/pkg/tomcat5/trunk/Makefile 2012-10-15 09:34:23 UTC (rev 19448) +++ csw/mgar/pkg/tomcat5/trunk/Makefile 2012-10-15 09:43:36 UTC (rev 19449) @@ -83,8 +83,12 @@ CHECKPKG_OVERRIDES_CSWtomcat5 += file-with-bad-content|/usr/local|root/opt/csw/share/tomcat5/webapps/tomcat-docs/appdev/printer/processes.html CHECKPKG_OVERRIDES_CSWtomcat5 += file-with-bad-content|/usr/share|root/opt/csw/share/tomcat5/webapps/tomcat-docs/building.html CHECKPKG_OVERRIDES_CSWtomcat5 += file-with-bad-content|/usr/share|root/opt/csw/share/tomcat5/webapps/tomcat-docs/printer/building.html +CHECKPKG_OVERRIDES_CSWtomcat5 += file-with-bad-content|/usr/local|root/opt/csw/share/tomcat5/bin/tcnative-1.dll +CHECKPKG_OVERRIDES_CSWtomcat5 += file-with-bad-content|/usr/local|root/opt/csw/share/tomcat5/bin/x64/tcnative-1.dll +CHECKPKG_OVERRIDES_CSWtomcat5 += file-with-bad-content|/usr/local|root/opt/csw/share/tomcat5/bin/i64/tcnative-1.dll + include gar/category.mk configure-none: 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 Oct 15 15:51:31 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Mon, 15 Oct 2012 13:51:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[19450] csw/mgar/pkg/poppler/trunk/Makefile Message-ID: Revision: 19450 http://gar.svn.sourceforge.net/gar/?rev=19450&view=rev Author: cgrzemba Date: 2012-10-15 13:51:31 +0000 (Mon, 15 Oct 2012) Log Message: ----------- poppler/trunk: build 64bit Modified Paths: -------------- csw/mgar/pkg/poppler/trunk/Makefile Modified: csw/mgar/pkg/poppler/trunk/Makefile =================================================================== --- csw/mgar/pkg/poppler/trunk/Makefile 2012-10-15 09:43:36 UTC (rev 19449) +++ csw/mgar/pkg/poppler/trunk/Makefile 2012-10-15 13:51:31 UTC (rev 19450) @@ -25,6 +25,7 @@ UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz # BUILD64_LIBS_ONLY = 1 +BUILD64 = 1 PACKAGES += CSWlibpoppler-cpp0 CATALOGNAME_CSWlibpoppler-cpp0 = libpoppler_cpp0 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 Oct 15 16:01:13 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 15 Oct 2012 14:01:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[19451] csw/mgar/pkg/memcached/trunk Message-ID: Revision: 19451 http://gar.svn.sourceforge.net/gar/?rev=19451&view=rev Author: dmichelsen Date: 2012-10-15 14:01:13 +0000 (Mon, 15 Oct 2012) Log Message: ----------- memcached/trunk: Update to 1.4.15, enable ISAEXEC, remove extra restriction to Solaris 10 Modified Paths: -------------- csw/mgar/pkg/memcached/trunk/Makefile csw/mgar/pkg/memcached/trunk/checksums Modified: csw/mgar/pkg/memcached/trunk/Makefile =================================================================== --- csw/mgar/pkg/memcached/trunk/Makefile 2012-10-15 13:51:31 UTC (rev 19450) +++ csw/mgar/pkg/memcached/trunk/Makefile 2012-10-15 14:01:13 UTC (rev 19451) @@ -1,7 +1,7 @@ # $Id$ NAME = memcached -VERSION = 1.4.13 +VERSION = 1.4.15 CATEGORIES = net GARTYPE = v2 @@ -17,17 +17,17 @@ ## Use patches until this is applied: ## https://github.com/memcached/memcached/pull/3 -PATCHFILES += 0001-Fix-alignment-check-as-84148994-0x05040302.patch -PATCHFILES += 0002-Take-endianness-into-account-on-alignment-check.patch +#PATCHFILES += 0001-Fix-alignment-check-as-84148994-0x05040302.patch +#PATCHFILES += 0002-Take-endianness-into-account-on-alignment-check.patch # ## The addition of more status field made the data arrive in multiple packets ## leading to broken tests when it is not waited for more packages. # PATCHFILES += 0003-Make-sure-to-wait-for-data.patch # ## Looks like the data structure is not clean on sparcv9 (only!) -PATCHFILES += 0004-Make-sure-to-clean-ai_flags-in-testsuite-or-test-fai.patch +#PATCHFILES += 0004-Make-sure-to-clean-ai_flags-in-testsuite-or-test-fai.patch -PATCHFILES += 0001-Fix-memcached_dtrace.d-and-add-touch-command.patch +#PATCHFILES += 0001-Fix-memcached_dtrace.d-and-add-touch-command.patch # If we enable GIT patching this makes a .git repo in $WORKSRC. # Unfortunatly this triggers maintainer mode for t/whitespace.t which @@ -44,19 +44,17 @@ # Make special version for Solaris 10 with enabled DTrace PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 -BUILD64_LIBS_ONLY = 1 +BUILD64 = 1 +ISAEXEC = 1 + CONFIGURE_ARGS = $(DIRPATHS) -# SASL is not 64 bit yet! -CONFIGURE_ARGS_32 += --enable-sasl -CONFIGURE_ARGS_32 += --enable-sasl-pwdb -CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(MEMORY_MODEL)) +#CONFIGURE_ARGS += --enable-sasl +#CONFIGURE_ARGS += --enable-sasl-pwdb CONFIGURE_ARGS-sol5.10 += --enable-dtrace CONFIGURE_ARGS += $(CONFIGURE_ARGS-sol$(GAROSREL)) TEST_TARGET = test -PACKAGING_PLATFORMS = solaris10-i386 solaris10-sparc - include gar/category.mk Modified: csw/mgar/pkg/memcached/trunk/checksums =================================================================== --- csw/mgar/pkg/memcached/trunk/checksums 2012-10-15 13:51:31 UTC (rev 19450) +++ csw/mgar/pkg/memcached/trunk/checksums 2012-10-15 14:01:13 UTC (rev 19451) @@ -1 +1 @@ -6d18c6d25da945442fcc1187b3b63b7f memcached-1.4.13.tar.gz +36ea966f5a29655be1746bf4949f7f69 memcached-1.4.15.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Oct 15 16:25:26 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 15 Oct 2012 14:25:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[19452] csw/mgar/pkg/memcached/trunk/Makefile Message-ID: Revision: 19452 http://gar.svn.sourceforge.net/gar/?rev=19452&view=rev Author: dmichelsen Date: 2012-10-15 14:25:26 +0000 (Mon, 15 Oct 2012) Log Message: ----------- memcached/trunk: Restrict to Solaris 10 due to atomics Modified Paths: -------------- csw/mgar/pkg/memcached/trunk/Makefile Modified: csw/mgar/pkg/memcached/trunk/Makefile =================================================================== --- csw/mgar/pkg/memcached/trunk/Makefile 2012-10-15 14:01:13 UTC (rev 19451) +++ csw/mgar/pkg/memcached/trunk/Makefile 2012-10-15 14:25:26 UTC (rev 19452) @@ -40,9 +40,8 @@ BUILD_DEP_PKGS = CSWlibevent-dev RUNTIME_DEP_PKGS = CSWlibevent2-0-5 -PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 -# Make special version for Solaris 10 with enabled DTrace -PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 +# Solaris 9 does not have atomic_inc_ushort_nv +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 BUILD64 = 1 ISAEXEC = 1 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 Oct 16 08:18:01 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Tue, 16 Oct 2012 06:18:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[19453] csw/mgar/pkg/poppler/trunk/Makefile Message-ID: Revision: 19453 http://gar.svn.sourceforge.net/gar/?rev=19453&view=rev Author: cgrzemba Date: 2012-10-16 06:18:00 +0000 (Tue, 16 Oct 2012) Log Message: ----------- poppler/trunk: add checkpkg override Modified Paths: -------------- csw/mgar/pkg/poppler/trunk/Makefile Modified: csw/mgar/pkg/poppler/trunk/Makefile =================================================================== --- csw/mgar/pkg/poppler/trunk/Makefile 2012-10-15 14:25:26 UTC (rev 19452) +++ csw/mgar/pkg/poppler/trunk/Makefile 2012-10-16 06:18:00 UTC (rev 19453) @@ -6,7 +6,7 @@ GARTYPE = v2 DESCRIPTION = Poppler is a PDF rendering library based on the xpdf-3.0 code base -define BLURB + define BLURB endef SPKG_SOURCEURL = http://poppler.freedesktop.org/ @@ -80,6 +80,7 @@ # CSWxpdf provides the same tools, but should use this package instead # interims solution until rework xpdf INCOMPATIBLE_PKGS_CSWpoppler = CSWxpdf +# in future packages these are already excluded 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 @@ -93,6 +94,7 @@ 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 +CHECKPKG_OVERRIDES_CSWpoppler += file-collision|/opt/csw/share/man/man1/pdftohtml.1|CSWpdftohtml|CSWpoppler 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 rthurner at users.sourceforge.net Tue Oct 16 08:34:26 2012 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Tue, 16 Oct 2012 06:34:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[19454] csw/mgar/pkg/mercurial/trunk Message-ID: Revision: 19454 http://gar.svn.sourceforge.net/gar/?rev=19454&view=rev Author: rthurner Date: 2012-10-16 06:34:25 +0000 (Tue, 16 Oct 2012) Log Message: ----------- mercurial: update to hg-2.3.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-10-16 06:18:00 UTC (rev 19453) +++ csw/mgar/pkg/mercurial/trunk/Makefile 2012-10-16 06:34:25 UTC (rev 19454) @@ -1,5 +1,5 @@ NAME = mercurial -VERSION = 2.3.1 +VERSION = 2.3.2 CATEGORIES = python GARTYPE = v2 Modified: csw/mgar/pkg/mercurial/trunk/checksums =================================================================== --- csw/mgar/pkg/mercurial/trunk/checksums 2012-10-16 06:18:00 UTC (rev 19453) +++ csw/mgar/pkg/mercurial/trunk/checksums 2012-10-16 06:34:25 UTC (rev 19454) @@ -1 +1 @@ -22a46a3ae64a5d625f068e588b4d6ec2 mercurial-2.3.1.tar.gz +6e90450ab3886bc650031e0d9aef367a mercurial-2.3.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 Tue Oct 16 10:35:14 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 16 Oct 2012 08:35:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[19455] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 19455 http://gar.svn.sourceforge.net/gar/?rev=19455&view=rev Author: bdwalton Date: 2012-10-16 08:35:14 +0000 (Tue, 16 Oct 2012) Log Message: ----------- mgar/v2: add support for new cswsslcert CAS Modified Paths: -------------- csw/mgar/gar/v2/gar.pkg.mk Modified: csw/mgar/gar/v2/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2/gar.pkg.mk 2012-10-16 06:34:25 UTC (rev 19454) +++ csw/mgar/gar/v2/gar.pkg.mk 2012-10-16 08:35:14 UTC (rev 19455) @@ -254,6 +254,7 @@ $(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)$$) );)\ + $(foreach FILE,$(SSLCERT),$$F[1] = "cswsslcert" 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" ); \ @@ -275,12 +276,16 @@ # per the above note. (See bacula for an example of where this is # required.) +# NOTE: ensure sslcert must run before initsmf/inetd. certs should be +# in place before services are started. + _CSWCLASSES = cswusergroup ugfiles _CSWCLASSES += cswmigrateconf cswcpsampleconf cswpreserveconf cswcptemplates _CSWCLASSES += cswetcservices _CSWCLASSES += cswetcshells _CSWCLASSES += cswcrontab _CSWCLASSES += cswpycompile +_CSWCLASSES += cswsslcert _CSWCLASSES += cswinetd _CSWCLASSES += cswinitsmf _CSWCLASSES += cswtexinfo 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 Oct 17 10:08:55 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Wed, 17 Oct 2012 08:08:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[19456] csw/mgar/pkg Message-ID: Revision: 19456 http://gar.svn.sourceforge.net/gar/?rev=19456&view=rev Author: cgrzemba Date: 2012-10-17 08:08:54 +0000 (Wed, 17 Oct 2012) Log Message: ----------- virtualbricks/trunk: Initial commit - its only interessting for illumos based distributions Added Paths: ----------- csw/mgar/pkg/virtualbricks/ csw/mgar/pkg/virtualbricks/Makefile csw/mgar/pkg/virtualbricks/branches/ csw/mgar/pkg/virtualbricks/tags/ csw/mgar/pkg/virtualbricks/trunk/ csw/mgar/pkg/virtualbricks/trunk/Makefile csw/mgar/pkg/virtualbricks/trunk/checksums csw/mgar/pkg/virtualbricks/trunk/files/ csw/mgar/pkg/virtualbricks/trunk/files/LICENSE Added: csw/mgar/pkg/virtualbricks/Makefile =================================================================== --- csw/mgar/pkg/virtualbricks/Makefile (rev 0) +++ csw/mgar/pkg/virtualbricks/Makefile 2012-10-17 08:08:54 UTC (rev 19456) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/virtualbricks/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/virtualbricks/trunk/Makefile =================================================================== --- csw/mgar/pkg/virtualbricks/trunk/Makefile (rev 0) +++ csw/mgar/pkg/virtualbricks/trunk/Makefile 2012-10-17 08:08:54 UTC (rev 19456) @@ -0,0 +1,52 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = virtualbricks +VERSION = 0.6.352 +GARTYPE = v2 +CATEGORIES = apps + +DESCRIPTION = GUI for qemu +define BLURB + It is a GTK frontend for VDE and QEMU/KVM. +endef + +MASTER_SITES = http://launchpad.net/virtualbrick/0.5-maintainance/0.6/+download/ +DISTFILES = $(DISTNAME).tar.bz2 +DISTFILES = LICENSE +LICENSE = LICENSE + +# PACKAGING_PLATFORMS = Solaris11-i386 # only Illumos has KVM :-o + +REINPLACE_USRLOCAL += virtualbricks/gui/graphics.py +REINPLACE_USRLOCAL += setup.py + +PACKAGES = CSWpy-virtualbricks +CATALOGNAME = py_virtualbricks +ARCHALL_CSWpy-virtualbricks = 1 +RUNTIME_DEP_PKGS_CSWpy-virtualbricks += CSWpython + +EXTRA_MERGE_EXCLUDE_FILES = .*\.py[oc] + +CHECKPKG_OVERRIDES_CSWpy-virtualbricks += file-with-bad-content|/usr/share|root/opt/csw/lib/python/site-packages/virtualbricks/__init__.py +CHECKPKG_OVERRIDES_CSWpy-virtualbricks += file-with-bad-content|/usr/share|root/opt/csw/lib/python/site-packages/virtualbricks/gui/graphics.py +CHECKPKG_OVERRIDES_CSWpy-virtualbricks += file-with-bad-content|/usr/share|root/opt/csw/lib/python/site-packages/virtualbricks/gui/gui.py + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = py +TEST_SCRIPTS = +INSTALL_SCRIPTS = py + +build-py: + (cd $(WORKSRC); python setup.py build) + @$(MAKECOOKIE) + +install-py: + (cd $(WORKDIR)/$(NAME); python setup.py install --root=$(DESTDIR) --record .filesinstalled) + @$(MAKECOOKIE) + + +include gar/category.mk + +WORKSRC := $(WORKDIR)/$(NAME) +PATH := /opt/csw/gnu:$(PATH) Property changes on: csw/mgar/pkg/virtualbricks/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/virtualbricks/trunk/checksums =================================================================== --- csw/mgar/pkg/virtualbricks/trunk/checksums (rev 0) +++ csw/mgar/pkg/virtualbricks/trunk/checksums 2012-10-17 08:08:54 UTC (rev 19456) @@ -0,0 +1 @@ +a91b8d0dbc9f403e10cc072ea18c5ba9 virtualbricks-0.6.352.tar.bz2 Added: csw/mgar/pkg/virtualbricks/trunk/files/LICENSE =================================================================== --- csw/mgar/pkg/virtualbricks/trunk/files/LICENSE (rev 0) +++ csw/mgar/pkg/virtualbricks/trunk/files/LICENSE 2012-10-17 08:08:54 UTC (rev 19456) @@ -0,0 +1,94 @@ +GNU GENERAL PUBLIC LICENSE + +Version 2, June 1991 + +Copyright (C) 1989, 1991 Free Software Foundation, Inc. +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + +Everyone is permitted to copy and distribute verbatim copies +of this license document, but changing it is not allowed. + +Preamble + +The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation`s software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Lesser General Public License instead.) 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 this service 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 make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it. + +For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. 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. + +We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software. + +Also, for each author`s protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors` reputations. + +Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone`s free use or not licensed at all. + +The precise terms and conditions for copying, distribution and modification follow. +TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + +0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. + +1. You may copy and distribute 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 and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program. + +You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. + +2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: + + + a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. + + c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. + +3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following: + + + a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. + +If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. + +4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. + +5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it. + +6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients` exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License. + +7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), 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 distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. + +This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. + +8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. + +9. The Free Software Foundation may publish revised and/or new versions of the 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 a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation. + +10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. + +NO WARRANTY + +11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, 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. + +12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE 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. + +END OF TERMS AND CONDITIONS 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 Oct 17 22:58:04 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 17 Oct 2012 20:58:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[19457] csw/mgar/pkg/cswclassutils/trunk/files/ CSWcswclassutils.i.cswsslcert Message-ID: Revision: 19457 http://gar.svn.sourceforge.net/gar/?rev=19457&view=rev Author: bdwalton Date: 2012-10-17 20:58:04 +0000 (Wed, 17 Oct 2012) Log Message: ----------- cswsslcert: remove the need for $sysconfig/cas-ssl.conf; put everything in csw.conf instead Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswsslcert Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswsslcert =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswsslcert 2012-10-17 08:08:54 UTC (rev 19456) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswsslcert 2012-10-17 20:58:04 UTC (rev 19457) @@ -34,31 +34,24 @@ . $PKG_INSTALL_ROOT/etc/opt/csw/csw.conf fi -CAS_SSL_CONFIG=$PKG_INSTALL_ROOT/etc/opt/csw/cas-ssl.conf +# We hope that the admin set these values in csw.conf but provide defaults +# for everything just in case. -if [ -f "$CAS_SSL_CONFIG" ]; then - debug_echo "Sourcing $CAS_SSL_CONFIG" - . "$CAS_SSL_CONFIG" -fi - -# hopefully the cas-ssl.conf file exists and has usable data but cover -# the case where it doesn't exist or forgets to set some value. - DN=`domainname` if [ -z "$DN" ]; then DN=theshire.net fi -SSL_COUNTRY=${SSL_COUNTRY:-TS} -SSL_STATE=${SSL_STATE:-Westfarthing} -SSL_CITY=${SSL_CITY:-Hobbiton} -SSL_ORG=${SSL_ORG:-"Thorin and Company"} -SSL_OU=${SSL_OU:-Burglars} -if [ -z "${SSL_HOST:-}" ]; then - SSL_HOST="`hostname`.$DN" +CAS_SSL_COUNTRY=${CAS_SSL_COUNTRY:-TS} +CAS_SSL_STATE=${CAS_SSL_STATE:-Westfarthing} +CAS_SSL_CITY=${CAS_SSL_CITY:-Hobbiton} +CAS_SSL_ORG=${CAS_SSL_ORG:-"Thorin and Company"} +CAS_SSL_OU=${CAS_SSL_OU:-Burglars} +if [ -z "${CAS_SSL_HOST:-}" ]; then + CAS_SSL_HOST="`hostname`.$DN" fi -if [ -z "${SSL_EMAIL:-}" ]; then - SSL_EMAIL="bilbo@$DN" +if [ -z "${CAS_SSL_EMAIL:-}" ]; then + CAS_SSL_EMAIL="bilbo@$DN" fi debug_echo "PACKAGE: $PKGINST" @@ -78,19 +71,18 @@ args="req -new -newkey rsa:${cas_ssl_bits:-2048} -days ${cas_ssl_days:-365} -nodes -x509 -keyout $dest.key -out $dest.crt" fi - - if [ -f $dest.key ]; then + if [ -f "$dest.key" ]; then echo "Skipping key and cert/csr generation due to existing files." else umask 077 cat </dev/null 2>&1 -${SSL_COUNTRY} -${SSL_STATE} -${SSL_CITY} -${SSL_ORG} -${SSL_OU} -${SSL_HOST} -${SSL_EMAIL} +${CAS_SSL_COUNTRY} +${CAS_SSL_STATE} +${CAS_SSL_CITY} +${CAS_SSL_ORG} +${CAS_SSL_OU} +${CAS_SSL_HOST} +${CAS_SSL_EMAIL} EOF # we could bail here on $? != 0 but in the event there are 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 Oct 18 08:13:57 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Thu, 18 Oct 2012 06:13:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[19458] csw/mgar/pkg/lang-python Message-ID: Revision: 19458 http://gar.svn.sourceforge.net/gar/?rev=19458&view=rev Author: cgrzemba Date: 2012-10-18 06:13:57 +0000 (Thu, 18 Oct 2012) Log Message: ----------- lang-python/pygraphviz/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/lang-python/pygraphviz/ csw/mgar/pkg/lang-python/pygraphviz/Makefile csw/mgar/pkg/lang-python/pygraphviz/branches/ csw/mgar/pkg/lang-python/pygraphviz/tags/ csw/mgar/pkg/lang-python/pygraphviz/trunk/ csw/mgar/pkg/lang-python/pygraphviz/trunk/Makefile csw/mgar/pkg/lang-python/pygraphviz/trunk/checksums csw/mgar/pkg/lang-python/pygraphviz/trunk/files/ Added: csw/mgar/pkg/lang-python/pygraphviz/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pygraphviz/Makefile (rev 0) +++ csw/mgar/pkg/lang-python/pygraphviz/Makefile 2012-10-18 06:13:57 UTC (rev 19458) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/lang-python/pygraphviz/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/lang-python/pygraphviz/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pygraphviz/trunk/Makefile (rev 0) +++ csw/mgar/pkg/lang-python/pygraphviz/trunk/Makefile 2012-10-18 06:13:57 UTC (rev 19458) @@ -0,0 +1,37 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = pygraphviz +VERSION = 1.1 +GARTYPE = v2 +CATEGORIES = lang + +DESCRIPTION = Python interface to the Graphviz graph layout and visualization +define BLURB + PyGraphviz is a Python interface to the Graphviz graph layout and visualization package. With PyGraphviz you can create, edit, read, write, and draw graphs using Python to access the Graphviz graph data structure and layout algorithms. PyGraphviz is independent from NetworkX but provides a similar programming interface. +endef + +MASTER_SITES = http://pypi.python.org/packages/source/p/pygraphviz/ +DISTFILES = $(DISTNAME).tar.gz +LICENSE = README.txt + +GARCOMPILER = SOS12U3 + +BUILD_DEP_PKGS += CSWgraphvizdevel + +PACKAGES = CSWpy-pygraphviz +RUNTIME_DEP_PKGS_CSWpy-pygraphviz += CSWpython +RUNTIME_DEP_PKGS_CSWpy-pygraphviz += CSWlibpython2-6-1-0 +RUNTIME_DEP_PKGS_CSWpy-pygraphviz += CSWlibcgraph6 + +EXTRA_MERGE_EXCLUDE_FILES = .*\.pyo .*\.pyc + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = $(WORKSRC)/setup.py +TEST_SCRIPTS = +INSTALL_SCRIPTS = $(WORKSRC)/setup.py +INSTALL_ARGS = --root=$(DESTDIR) + + +include gar/category.mk + Property changes on: csw/mgar/pkg/lang-python/pygraphviz/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/lang-python/pygraphviz/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/pygraphviz/trunk/checksums (rev 0) +++ csw/mgar/pkg/lang-python/pygraphviz/trunk/checksums 2012-10-18 06:13:57 UTC (rev 19458) @@ -0,0 +1 @@ +5c206838ce81180557e29135e93b2461 pygraphviz-1.1.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 Oct 18 09:56:54 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Thu, 18 Oct 2012 07:56:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[19459] csw/mgar/pkg/bazaar/trunk Message-ID: Revision: 19459 http://gar.svn.sourceforge.net/gar/?rev=19459&view=rev Author: cgrzemba Date: 2012-10-18 07:56:53 +0000 (Thu, 18 Oct 2012) Log Message: ----------- bazaar/trunk: version 2.6; update build recipe Modified Paths: -------------- csw/mgar/pkg/bazaar/trunk/Makefile csw/mgar/pkg/bazaar/trunk/checksums Modified: csw/mgar/pkg/bazaar/trunk/Makefile =================================================================== --- csw/mgar/pkg/bazaar/trunk/Makefile 2012-10-18 06:13:57 UTC (rev 19458) +++ csw/mgar/pkg/bazaar/trunk/Makefile 2012-10-18 07:56:53 UTC (rev 19459) @@ -1,6 +1,7 @@ NAME = bzr -VERSION = 1.17 -#PATCHREV = .1 +MAJORVERSION = 2.6 +PATCHREV = b2 +VERSION = $(MAJORVERSION)$(PATCHREV) CATEGORIES = devel GARTYPE = v2 @@ -12,14 +13,23 @@ to work, and you can try it out in five minutes. endef -MASTER_SITES = http://launchpad.net/bzr/$(VERSION)/$(VERSION)$(PATHREV)/+download/ -DISTFILES = $(NAME)-$(VERSION)$(PATHREV).tar.gz +MASTER_SITES = https://launchpad.net/bzr/$(MAJORVERSION)/$(VERSION)/+download/ +# MASTER_SITES = https://launchpad.net/bzr/2.6/2.6b2/+download/bzr-2.6b2.tar.gz +DISTFILES = $(NAME)-$(VERSION).tar.gz +LICENSE = COPYING.txt -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)$(PATHREV)-(\d+(?:\.\d+)*).tar.gz +GARCOMPILER = SOS12U3 -RUNTIME_DEP_PKGS += CSWcswclassutils +REINPLACE_USRLOCAL += bzrlib/transport/http/_urllib2_wrappers.py +REINPLACE_MATCH = man/man1 +REINPLACE_WITH = share/man/man1 +REINPLACE_FILES += setup.py +EXTRA_MERGE_EXCLUDE_FILES += .*\.py[oc] +PACKAGES += CSWpy-bzr +RUNTIME_DEP_PKGS += CSWpython +RUNTIME_DEP_PKGS += CSWlibpython2-6-1-0 + CONFIGURE_SCRIPTS = BUILD_SCRIPTS = $(WORKSRC)/setup.py TEST_SCRIPTS = Modified: csw/mgar/pkg/bazaar/trunk/checksums =================================================================== --- csw/mgar/pkg/bazaar/trunk/checksums 2012-10-18 06:13:57 UTC (rev 19458) +++ csw/mgar/pkg/bazaar/trunk/checksums 2012-10-18 07:56:53 UTC (rev 19459) @@ -1 +1 @@ -d772508e60b47a1641fa487c5cf7e08e download/bzr-1.17.tar.gz +b6bff437799b19daf7e557d4864be431 bzr-2.6b2.tar.gz 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 Oct 18 11:43:00 2012 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Thu, 18 Oct 2012 09:43:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[19460] csw/mgar/pkg/mysql5/branches/mysql-5.5.x Message-ID: Revision: 19460 http://gar.svn.sourceforge.net/gar/?rev=19460&view=rev Author: janholzh Date: 2012-10-18 09:43:00 +0000 (Thu, 18 Oct 2012) Log Message: ----------- mysql5/branches/mysql-5.5.x: update to 5.5.28, add custom map file Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile csw/mgar/pkg/mysql5/branches/mysql-5.5.x/checksums Added Paths: ----------- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/map.mysql Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2012-10-18 07:56:53 UTC (rev 19459) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2012-10-18 09:43:00 UTC (rev 19460) @@ -13,7 +13,7 @@ PROJ_NAME = mysql NAME = $(PROJ_NAME)5 BASE_VERSION = 5.5 -PATCHLEVEL = 27 +PATCHLEVEL = 28 ALTS_PRIO = 55 VERSION = $(BASE_VERSION).$(PATCHLEVEL) CATEGORIES = server @@ -28,6 +28,9 @@ # an easy way to switch it off. ISA_DEFAULT_sparc-5.9 = sparcv8plus +# Solaris 10 needs a special map file since we need libnsl Version 1.9.1 and libc 1.22.5 +LINKER_MAPS = -M "$(abspath $(WORKDIR)/map.mysql)" + DISTNAME = mysql-$(VERSION) SPKG_SOURCEURL = http://www.mysql.com/ @@ -158,6 +161,7 @@ DISTFILES += CSW$(NAME).preinstall DISTFILES += CSW$(NAME).postinstall DISTFILES += cswusergroup +DISTFILES += map.mysql # TODO: Do the proper prerequsite pkgs. BUILD_DEP_PKGS += $(RUNTIME_DEP_PKGS) Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/checksums =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/checksums 2012-10-18 07:56:53 UTC (rev 19459) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/checksums 2012-10-18 09:43:00 UTC (rev 19460) @@ -1 +1 @@ -82baf46acfced6eef072e9d8a479c86e mysql-5.5.27.tar.gz +da8ddb3d00e6e159153d2444360f52a8 mysql-5.5.28.tar.gz Added: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/map.mysql =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/map.mysql (rev 0) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/files/map.mysql 2012-10-18 09:43:00 UTC (rev 19460) @@ -0,0 +1,7 @@ +# Solaris 10 mapfile with libc Version 1.22.2 which is Update?? Kernel Version +# http://src.opensolaris.org/source/xref/onnv/onnv-gate/usr/src/lib/libc/port/mapfile-vers#301 +libc.so - SUNW_1.22.5 SUNWprivate_1.1 $ADDVERS=SUNW_1.22.5; +# http://src.opensolaris.org/source/xref/onnv/onnv-gate/usr/src/lib/libresolv2/common/mapfile-vers +libresolv.so - SUNW_2.2 SUNWprivate_2.1 $ADDVERS=SUNW_2.2; +# http://src.opensolaris.org/source/xref/onnv/onnv-gate/usr/src/lib/libnsl/common/mapfile-vers +libnsl.so - SUNW_1.9.1 SUNWprivate_1.5 $ADDVERS=SUNW_1.9.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 Oct 18 12:59:56 2012 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Thu, 18 Oct 2012 10:59:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[19461] csw/mgar/pkg/glib2/trunk Message-ID: Revision: 19461 http://gar.svn.sourceforge.net/gar/?rev=19461&view=rev Author: guengel Date: 2012-10-18 10:59:55 +0000 (Thu, 18 Oct 2012) Log Message: ----------- glib2/trunk: Tests enabled again. Modified Paths: -------------- csw/mgar/pkg/glib2/trunk/Makefile csw/mgar/pkg/glib2/trunk/files/changelog.CSW Modified: csw/mgar/pkg/glib2/trunk/Makefile =================================================================== --- csw/mgar/pkg/glib2/trunk/Makefile 2012-10-18 09:43:00 UTC (rev 19460) +++ csw/mgar/pkg/glib2/trunk/Makefile 2012-10-18 10:59:55 UTC (rev 19461) @@ -314,7 +314,7 @@ # DTrace compilation fails, disable for now CONFIGURE_ARGS += --disable-dtrace -SKIPTEST = 1 +#SKIPTEST = 1 # Those are to make the checks work EXTRA_COMMON_EXPORTS = TZ Modified: csw/mgar/pkg/glib2/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/glib2/trunk/files/changelog.CSW 2012-10-18 09:43:00 UTC (rev 19460) +++ csw/mgar/pkg/glib2/trunk/files/changelog.CSW 2012-10-18 10:59:55 UTC (rev 19461) @@ -1,4 +1,4 @@ -glib (2.32.4,REV=2012.08.28) +glib (2.32.4,REV=2012.10.18) * New upstream release. 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 Oct 18 13:37:08 2012 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Thu, 18 Oct 2012 11:37:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[19462] csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile Message-ID: Revision: 19462 http://gar.svn.sourceforge.net/gar/?rev=19462&view=rev Author: janholzh Date: 2012-10-18 11:37:08 +0000 (Thu, 18 Oct 2012) Log Message: ----------- mysql5/branches/mysql-5.5.x: use map file only on Solaris 10 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-10-18 10:59:55 UTC (rev 19461) +++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile 2012-10-18 11:37:08 UTC (rev 19462) @@ -29,8 +29,13 @@ ISA_DEFAULT_sparc-5.9 = sparcv8plus # Solaris 10 needs a special map file since we need libnsl Version 1.9.1 and libc 1.22.5 -LINKER_MAPS = -M "$(abspath $(WORKDIR)/map.mysql)" +ifneq ($(shell /usr/bin/uname -r),5.9) + LINKER_MAPS ?= -M "$(abspath $(WORKDIR)/map.mysql)" +endif + + + DISTNAME = mysql-$(VERSION) SPKG_SOURCEURL = http://www.mysql.com/ 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 Oct 18 16:13:21 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Thu, 18 Oct 2012 14:13:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[19463] csw/mgar/pkg Message-ID: Revision: 19463 http://gar.svn.sourceforge.net/gar/?rev=19463&view=rev Author: cgrzemba Date: 2012-10-18 14:13:20 +0000 (Thu, 18 Oct 2012) Log Message: ----------- virt-manager/trunk: Initial commit an other KVM GUI Added Paths: ----------- csw/mgar/pkg/virt-manager/ csw/mgar/pkg/virt-manager/Makefile csw/mgar/pkg/virt-manager/branches/ csw/mgar/pkg/virt-manager/tags/ csw/mgar/pkg/virt-manager/trunk/ csw/mgar/pkg/virt-manager/trunk/Makefile csw/mgar/pkg/virt-manager/trunk/checksums csw/mgar/pkg/virt-manager/trunk/files/ Added: csw/mgar/pkg/virt-manager/Makefile =================================================================== --- csw/mgar/pkg/virt-manager/Makefile (rev 0) +++ csw/mgar/pkg/virt-manager/Makefile 2012-10-18 14:13:20 UTC (rev 19463) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/virt-manager/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/virt-manager/trunk/Makefile =================================================================== --- csw/mgar/pkg/virt-manager/trunk/Makefile (rev 0) +++ csw/mgar/pkg/virt-manager/trunk/Makefile 2012-10-18 14:13:20 UTC (rev 19463) @@ -0,0 +1,34 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = virt-manager +VERSION = 0.9.3 +GARTYPE = v2 +CATEGORIES = apps + +DESCRIPTION = Brief description +define BLURB + Long description +endef + +MASTER_SITES = http://virt-manager.org/download/sources/virt-manager/ +DISTFILES = $(DISTNAME).tar.gz + +GARCOMPILER = SOS12U3 + +EXTRA_MERGE_EXCLUDE_FILES = .*\.py[oc] + +ARCHALL_CSWvirt-manager = 1 +RUNTIME_DEP_PKGS_CSWvirt-manager += CSWpython + +# CONFIGURE_SCRIPTS = +# BUILD_SCRIPTS = $(WORKSRC)/setup.py +# TEST_SCRIPTS = +# INSTALL_SCRIPTS = $(WORKSRC)/setup.py +# INSTALL_ARGS = --root=$(DESTDIR) + +CONFIGURE_ARGS += $(DIRPATHS) + +include gar/category.mk + +PATH := /opt/csw/gnu:$(PATH) Property changes on: csw/mgar/pkg/virt-manager/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/virt-manager/trunk/checksums =================================================================== --- csw/mgar/pkg/virt-manager/trunk/checksums (rev 0) +++ csw/mgar/pkg/virt-manager/trunk/checksums 2012-10-18 14:13:20 UTC (rev 19463) @@ -0,0 +1 @@ +4c03f1628c76a891f45c0375bf5590da virt-manager-0.9.3.tar.gz 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 Oct 18 17:11:37 2012 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Thu, 18 Oct 2012 15:11:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[19464] csw/mgar/gar/v2/lib/map.solaris10 Message-ID: Revision: 19464 http://gar.svn.sourceforge.net/gar/?rev=19464&view=rev Author: janholzh Date: 2012-10-18 15:11:37 +0000 (Thu, 18 Oct 2012) Log Message: ----------- change default map back to libnsl version 1.9.1 since libresolv crossdepends on it Modified Paths: -------------- csw/mgar/gar/v2/lib/map.solaris10 Modified: csw/mgar/gar/v2/lib/map.solaris10 =================================================================== --- csw/mgar/gar/v2/lib/map.solaris10 2012-10-18 14:13:20 UTC (rev 19463) +++ csw/mgar/gar/v2/lib/map.solaris10 2012-10-18 15:11:37 UTC (rev 19464) @@ -4,4 +4,4 @@ # http://src.opensolaris.org/source/xref/onnv/onnv-gate/usr/src/lib/libresolv2/common/mapfile-vers libresolv.so - SUNW_2.2 SUNWprivate_2.1 $ADDVERS=SUNW_2.2; # http://src.opensolaris.org/source/xref/onnv/onnv-gate/usr/src/lib/libnsl/common/mapfile-vers -libnsl.so - SUNW_1.9 SUNWprivate_1.5 $ADDVERS=SUNW_1.9; +libnsl.so - SUNW_1.9.1 SUNWprivate_1.5 $ADDVERS=SUNW_1.9.1; 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 Oct 18 17:18:22 2012 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Thu, 18 Oct 2012 15:18:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[19465] csw/mgar/pkg/sudo/trunk Message-ID: Revision: 19465 http://gar.svn.sourceforge.net/gar/?rev=19465&view=rev Author: janholzh Date: 2012-10-18 15:18:22 +0000 (Thu, 18 Oct 2012) Log Message: ----------- sudo/trunk: add custom map file Modified Paths: -------------- csw/mgar/pkg/sudo/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/sudo/trunk/files/map.sudo Modified: csw/mgar/pkg/sudo/trunk/Makefile =================================================================== --- csw/mgar/pkg/sudo/trunk/Makefile 2012-10-18 15:11:37 UTC (rev 19464) +++ csw/mgar/pkg/sudo/trunk/Makefile 2012-10-18 15:18:22 UTC (rev 19465) @@ -20,6 +20,7 @@ MASTER_SITES = ftp://ftp.sudo.ws/pub/sudo/ DISTFILES += $(DISTNAME).tar.gz DISTFILES += sudo.conf.CSW +DISTFILES += map.sudo LICENSE = doc/LICENSE @@ -28,6 +29,13 @@ # To have least Priv Support for Solaris 10 build on all Platforms PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 solaris10-sparc solaris10-i386 +#Use custom map for solaris 10 + +ifneq ($(shell /usr/bin/uname -r),5.9) + LINKER_MAPS ?= -M "$(abspath $(WORKDIR)/map.sudo)" +endif + + PACKAGES += CSWsudo SPKG_DESC_CSWsudo = Provides limited super user privileges # PKGFILES is catchall Added: csw/mgar/pkg/sudo/trunk/files/map.sudo =================================================================== --- csw/mgar/pkg/sudo/trunk/files/map.sudo (rev 0) +++ csw/mgar/pkg/sudo/trunk/files/map.sudo 2012-10-18 15:18:22 UTC (rev 19465) @@ -0,0 +1,7 @@ +# Solaris 10 mapfile with libc Version 1.22.2 which is Update?? Kernel Version +# http://src.opensolaris.org/source/xref/onnv/onnv-gate/usr/src/lib/libc/port/mapfile-vers#301 +libc.so - SUNW_1.22.2 SUNWprivate_1.1 $ADDVERS=SUNW_1.22.2; +# http://src.opensolaris.org/source/xref/onnv/onnv-gate/usr/src/lib/libresolv2/common/mapfile-vers +libresolv.so - SUNW_2.2 SUNWprivate_2.1 $ADDVERS=SUNW_2.2; +# http://src.opensolaris.org/source/xref/onnv/onnv-gate/usr/src/lib/libnsl/common/mapfile-vers +libnsl.so - SUNW_1.9 SUNWprivate_1.5 $ADDVERS=SUNW_1.9; 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 Oct 19 08:32:19 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Fri, 19 Oct 2012 06:32:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[19466] csw/mgar/pkg Message-ID: Revision: 19466 http://gar.svn.sourceforge.net/gar/?rev=19466&view=rev Author: cgrzemba Date: 2012-10-19 06:32:19 +0000 (Fri, 19 Oct 2012) Log Message: ----------- virtinst/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/virtinst/ csw/mgar/pkg/virtinst/Makefile csw/mgar/pkg/virtinst/branches/ csw/mgar/pkg/virtinst/tags/ csw/mgar/pkg/virtinst/trunk/ csw/mgar/pkg/virtinst/trunk/Makefile csw/mgar/pkg/virtinst/trunk/checksums csw/mgar/pkg/virtinst/trunk/files/ Added: csw/mgar/pkg/virtinst/Makefile =================================================================== --- csw/mgar/pkg/virtinst/Makefile (rev 0) +++ csw/mgar/pkg/virtinst/Makefile 2012-10-19 06:32:19 UTC (rev 19466) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/virtinst/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/virtinst/trunk/Makefile =================================================================== --- csw/mgar/pkg/virtinst/trunk/Makefile (rev 0) +++ csw/mgar/pkg/virtinst/trunk/Makefile 2012-10-19 06:32:19 UTC (rev 19466) @@ -0,0 +1,47 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = virtinst +VERSION = 0.600.3 +GARTYPE = v2 +CATEGORIES = lib + +DESCRIPTION = Interface for managing virtual machines +define BLURB + virtinst is a module that helps build and install libvirt based virtual + machines. Currently supports KVM, QEmu and Xen virtual machines. Package + includes several command line utilities, including virt-install (build + and install new VMs) and virt-clone (clone an existing virtual machine). +endef + +MASTER_SITES = http://virt-manager.org/download/sources/virtinst/ +DISTFILES = $(DISTNAME).tar.gz + +GARCOMPILER = SOS12U3 + +EXTRA_MERGE_EXCLUDE_FILES = .*\.py[oc] + +# from RPM spec +# Requires: libvirt-python >= 0.2.0 +# Requires: urlgrabber +# Requires: libxml2-python +# Requires: python-urlgrabber + +# BuildRequires: gettext +# BuildRequires: python +BUILD_DEP_PKGS += CSWgettext +DEP_PKGS += CSWpython + +PACKAGES += CSWpy-virtinst + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = $(WORKSRC)/setup.py +TEST_SCRIPTS = +INSTALL_SCRIPTS = $(WORKSRC)/setup.py +INSTALL_ARGS = --root=$(DESTDIR) + +# CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + +PATH := /opt/csw/gnu:$(PATH) Property changes on: csw/mgar/pkg/virtinst/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/virtinst/trunk/checksums =================================================================== --- csw/mgar/pkg/virtinst/trunk/checksums (rev 0) +++ csw/mgar/pkg/virtinst/trunk/checksums 2012-10-19 06:32:19 UTC (rev 19466) @@ -0,0 +1 @@ +13c06b16c0f9fa23e7cb2534950b4575 virtinst-0.600.3.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 Fri Oct 19 08:34:02 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Fri, 19 Oct 2012 06:34:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[19467] csw/mgar/pkg/virtinst/trunk/Makefile Message-ID: Revision: 19467 http://gar.svn.sourceforge.net/gar/?rev=19467&view=rev Author: cgrzemba Date: 2012-10-19 06:34:02 +0000 (Fri, 19 Oct 2012) Log Message: ----------- virtinst/trunk: add overrride Modified Paths: -------------- csw/mgar/pkg/virtinst/trunk/Makefile Modified: csw/mgar/pkg/virtinst/trunk/Makefile =================================================================== --- csw/mgar/pkg/virtinst/trunk/Makefile 2012-10-19 06:32:19 UTC (rev 19466) +++ csw/mgar/pkg/virtinst/trunk/Makefile 2012-10-19 06:34:02 UTC (rev 19467) @@ -33,7 +33,10 @@ DEP_PKGS += CSWpython PACKAGES += CSWpy-virtinst +# no file cpu_map.xml available at the moment +CHECKPKG_OVERRIDES_CSWpy-virtinst += file-with-bad-content|/usr/share|root/opt/csw/lib/python/site-packages/virtinst/CapabilitiesParser.py + CONFIGURE_SCRIPTS = BUILD_SCRIPTS = $(WORKSRC)/setup.py TEST_SCRIPTS = This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Fri Oct 19 08:36:49 2012 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Fri, 19 Oct 2012 06:36:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[19468] csw/mgar/pkg/memcached/trunk Message-ID: Revision: 19468 http://gar.svn.sourceforge.net/gar/?rev=19468&view=rev Author: janholzh Date: 2012-10-19 06:36:49 +0000 (Fri, 19 Oct 2012) Log Message: ----------- memcached/trunk: work around getpagesizes2 with old Solaris header Modified Paths: -------------- csw/mgar/pkg/memcached/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/memcached/trunk/files/mman.h Modified: csw/mgar/pkg/memcached/trunk/Makefile =================================================================== --- csw/mgar/pkg/memcached/trunk/Makefile 2012-10-19 06:34:02 UTC (rev 19467) +++ csw/mgar/pkg/memcached/trunk/Makefile 2012-10-19 06:36:49 UTC (rev 19468) @@ -14,6 +14,7 @@ MASTER_SITES = http://memcached.googlecode.com/files/ DISTFILES = $(NAME)-$(VERSION).tar.gz +DISTFILES += mman.h ## Use patches until this is applied: ## https://github.com/memcached/memcached/pull/3 @@ -43,9 +44,12 @@ # Solaris 9 does not have atomic_inc_ushort_nv PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 +EXTRA_CFLAGS = -I "$(abspath $(WORKDIR))" + BUILD64 = 1 ISAEXEC = 1 + CONFIGURE_ARGS = $(DIRPATHS) #CONFIGURE_ARGS += --enable-sasl #CONFIGURE_ARGS += --enable-sasl-pwdb @@ -57,3 +61,7 @@ include gar/category.mk +post-extract-modulated: + mkdir $(WORKDIR)/sys + mv $(WORKDIR)/mman.h $(WORKDIR)/sys + @$(MAKECOOKIE) Added: csw/mgar/pkg/memcached/trunk/files/mman.h =================================================================== --- csw/mgar/pkg/memcached/trunk/files/mman.h (rev 0) +++ csw/mgar/pkg/memcached/trunk/files/mman.h 2012-10-19 06:36:49 UTC (rev 19468) @@ -0,0 +1,351 @@ +/* + * CDDL HEADER START + * + * The contents of this file are subject to the terms of the + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. + * + * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE + * or http://www.opensolaris.org/os/licensing. + * See the License for the specific language governing permissions + * and limitations under the License. + * + * When distributing Covered Code, include this CDDL HEADER in each + * file and include the License file at usr/src/OPENSOLARIS.LICENSE. + * If applicable, add the following below this CDDL HEADER, with the + * fields enclosed by brackets "[]" replaced with your own identifying + * information: Portions Copyright [yyyy] [name of copyright owner] + * + * CDDL HEADER END + */ +/* + * Copyright 2007 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. + */ + +/* Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T */ +/* All Rights Reserved */ + +/* + * University Copyright- Copyright (c) 1982, 1986, 1988 + * The Regents of the University of California + * All Rights Reserved + * + * University Acknowledgment- Portions of this document are derived from + * software developed by the University of California, Berkeley, and its + * contributors. + */ + +#ifndef _SYS_MMAN_H +#define _SYS_MMAN_H + +#pragma ident "%Z%%M% %I% %E% SMI" + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +/* + * Protections are chosen from these bits, or-ed together. + * Note - not all implementations literally provide all possible + * combinations. PROT_WRITE is often implemented as (PROT_READ | + * PROT_WRITE) and (PROT_EXECUTE as PROT_READ | PROT_EXECUTE). + * However, no implementation will permit a write to succeed + * where PROT_WRITE has not been set. Also, no implementation will + * allow any access to succeed where prot is specified as PROT_NONE. + */ +#define PROT_READ 0x1 /* pages can be read */ +#define PROT_WRITE 0x2 /* pages can be written */ +#define PROT_EXEC 0x4 /* pages can be executed */ + +#ifdef _KERNEL +#define PROT_USER 0x8 /* pages are user accessable */ +#define PROT_ZFOD (PROT_READ | PROT_WRITE | PROT_EXEC | PROT_USER) +#define PROT_ALL (PROT_READ | PROT_WRITE | PROT_EXEC | PROT_USER) +#endif /* _KERNEL */ + +#define PROT_NONE 0x0 /* pages cannot be accessed */ + +/* sharing types: must choose either SHARED or PRIVATE */ +#define MAP_SHARED 1 /* share changes */ +#define MAP_PRIVATE 2 /* changes are private */ +#define MAP_TYPE 0xf /* mask for share type */ + +/* other flags to mmap (or-ed in to MAP_SHARED or MAP_PRIVATE) */ +#define MAP_FIXED 0x10 /* user assigns address */ +#define MAP_NORESERVE 0x40 /* don't reserve needed swap area */ +#define MAP_ANON 0x100 /* map anonymous pages directly */ +#define MAP_ANONYMOUS MAP_ANON /* (source compatibility) */ +#define MAP_ALIGN 0x200 /* addr specifies alignment */ +#define MAP_TEXT 0x400 /* map code segment */ +#define MAP_INITDATA 0x800 /* map data segment */ + +#ifdef _KERNEL +#define _MAP_TEXTREPL 0x1000 +#endif /* _KERNEL */ + +/* these flags not yet implemented */ +#define MAP_RENAME 0x20 /* rename private pages to file */ + +#if (_POSIX_C_SOURCE <= 2) && !defined(_XPG4_2) +/* these flags are used by memcntl */ +#define PROC_TEXT (PROT_EXEC | PROT_READ) +#define PROC_DATA (PROT_READ | PROT_WRITE | PROT_EXEC) +#define SHARED 0x10 +#define PRIVATE 0x20 +#define VALID_ATTR (PROT_READ|PROT_WRITE|PROT_EXEC|SHARED|PRIVATE) +#endif /* (_POSIX_C_SOURCE <= 2) && !defined(_XPG4_2) */ + +#if (_POSIX_C_SOURCE <= 2) || defined(_XPG4_2) +#ifdef _KERNEL +#define PROT_EXCL 0x20 +#define _MAP_LOW32 0x80 /* force mapping in lower 4G of address space */ +#endif /* _KERNEL */ + +/* + * For the sake of backward object compatibility, we use the _MAP_NEW flag. + * This flag will be automatically or'ed in by the C library for all + * new mmap calls. Previous binaries with old mmap calls will continue + * to get 0 or -1 for return values. New mmap calls will get the mapped + * address as the return value if successful and -1 on errors. By default, + * new mmap calls automatically have the kernel assign the map address + * unless the MAP_FIXED flag is given. + */ +#define _MAP_NEW 0x80000000 /* users should not need to use this */ +#endif /* (_POSIX_C_SOURCE <= 2) */ + +#if !defined(_ASM) && !defined(_KERNEL) + +#include + +/* + * large file compilation environment setup + * + * In the LP64 compilation environment, map large file interfaces + * back to native versions where possible. + */ + +#if !defined(_LP64) && _FILE_OFFSET_BITS == 64 +#ifdef __PRAGMA_REDEFINE_EXTNAME +#pragma redefine_extname mmap mmap64 +#else +#define mmap mmap64 +#endif +#endif /* !_LP64 && _FILE_OFFSET_BITS == 64 */ + +#if defined(_LP64) && defined(_LARGEFILE64_SOURCE) +#ifdef __PRAGMA_REDEFINE_EXTNAME +#pragma redefine_extname mmap64 mmap +#else +#define mmap64 mmap +#endif +#endif /* _LP64 && _LARGEFILE64_SOURCE */ + +/* + * Except for old binaries mmap() will return the resultant + * address of mapping on success and (caddr_t)-1 on error. + */ +#ifdef __STDC__ +#if (_POSIX_C_SOURCE > 2) || defined(_XPG4_2) +extern void *mmap(void *, size_t, int, int, int, off_t); +extern int munmap(void *, size_t); +extern int mprotect(void *, size_t, int); +extern int msync(void *, size_t, int); +#if (!defined(_XPG4_2) || (_POSIX_C_SOURCE > 2)) || defined(__EXTENSIONS__) +extern int mlock(const void *, size_t); +extern int munlock(const void *, size_t); +#endif /* (!defined(_XPG4_2) || (_POSIX_C_SOURCE > 2))... */ +/* transitional large file interface version */ +#if defined(_LARGEFILE64_SOURCE) && !((_FILE_OFFSET_BITS == 64) && \ + !defined(__PRAGMA_REDEFINE_EXTNAME)) +extern void *mmap64(void *, size_t, int, int, int, off64_t); +#endif /* _LARGEFILE64_SOURCE... */ +#else /* (_POSIX_C_SOURCE > 2) || defined(_XPG4_2) */ +extern caddr_t mmap(caddr_t, size_t, int, int, int, off_t); +extern int munmap(caddr_t, size_t); +extern int mprotect(caddr_t, size_t, int); +extern int msync(caddr_t, size_t, int); +extern int mlock(caddr_t, size_t); +extern int munlock(caddr_t, size_t); +extern int mincore(caddr_t, size_t, char *); +extern int memcntl(caddr_t, size_t, int, caddr_t, int, int); +extern int madvise(caddr_t, size_t, int); +#if !defined(__XOPEN_OR_POSIX) || defined(__EXTENSIONS__) +extern int getpagesizes(size_t *, int); +/* guard visibility of uint64_t */ +#if defined(_INT64_TYPE) +extern int meminfo(const uint64_t *, int, const uint_t *, int, uint64_t *, + uint_t *); +#endif /* defined(_INT64_TYPE) */ +#endif /* !defined(__XOPEN_OR_POSIX) || defined(__EXTENSIONS__) */ +/* transitional large file interface version */ +#ifdef _LARGEFILE64_SOURCE +extern caddr_t mmap64(caddr_t, size_t, int, int, int, off64_t); +#endif +#endif /* (_POSIX_C_SOURCE > 2) || defined(_XPG4_2) */ + +#if (!defined(_XPG4_2) || (_POSIX_C_SOURCE > 2)) || defined(__EXTENSIONS__) +extern int mlockall(int); +extern int munlockall(void); +extern int shm_open(const char *, int, mode_t); +extern int shm_unlink(const char *); +#endif + +/* mmap failure value */ +#define MAP_FAILED ((void *) -1) + +#else /* __STDC__ */ +extern caddr_t mmap(); +extern int munmap(); +extern int mprotect(); +extern int mincore(); +extern int memcntl(); +extern int msync(); +extern int madvise(); +extern int getpagesizes(); +extern int mlock(); +extern int mlockall(); +extern int munlock(); +extern int munlockall(); +extern int meminfo(); +extern int shm_open(); +extern int shm_unlink(); + +/* transitional large file interface version */ +#if defined(_LARGEFILE64_SOURCE) && !((_FILE_OFFSET_BITS == 64) && \ + !defined(__PRAGMA_REDEFINE_EXTNAME)) +extern caddr_t mmap64(); +#endif /* _LARGEFILE64_SOURCE... */ +#endif /* __STDC__ */ + + +#endif /* !_ASM && !_KERNEL */ + +#if !defined(__XOPEN_OR_POSIX) || defined(__EXTENSIONS__) +#if !defined(_ASM) +/* + * structure for memcntl hat advise operations. + */ +struct memcntl_mha { + uint_t mha_cmd; /* command(s) */ + uint_t mha_flags; + size_t mha_pagesize; +}; + +#if defined(_SYSCALL32) +struct memcntl_mha32 { + uint_t mha_cmd; /* command(s) */ + uint_t mha_flags; + size32_t mha_pagesize; +}; +#endif /* _SYSCALL32 */ +#endif /* !defined(_ASM) */ +#endif /* !defined(__XOPEN_OR_POSIX) || defined(__EXTENSIONS__) */ + +#if (_POSIX_C_SOURCE <= 2) && !defined(_XPG4_2) || defined(__EXTENSIONS__) +/* advice to madvise */ +#define MADV_NORMAL 0 /* no further special treatment */ +#define MADV_RANDOM 1 /* expect random page references */ +#define MADV_SEQUENTIAL 2 /* expect sequential page references */ +#define MADV_WILLNEED 3 /* will need these pages */ +#define MADV_DONTNEED 4 /* don't need these pages */ +#define MADV_FREE 5 /* contents can be freed */ +#define MADV_ACCESS_DEFAULT 6 /* default access */ +#define MADV_ACCESS_LWP 7 /* next LWP to access heavily */ +#define MADV_ACCESS_MANY 8 /* many processes to access heavily */ +#endif /* (_POSIX_C_SOURCE <= 2) && !defined(_XPG4_2) ... */ + +/* flags to msync */ +#define MS_OLDSYNC 0x0 /* old value of MS_SYNC */ + /* modified for UNIX98 compliance */ +#define MS_SYNC 0x4 /* wait for msync */ +#define MS_ASYNC 0x1 /* return immediately */ +#define MS_INVALIDATE 0x2 /* invalidate caches */ + +#if (_POSIX_C_SOURCE <= 2) && !defined(_XPG4_2) || defined(__EXTENSIONS__) +/* functions to mctl */ +#define MC_SYNC 1 /* sync with backing store */ +#define MC_LOCK 2 /* lock pages in memory */ +#define MC_UNLOCK 3 /* unlock pages from memory */ +#define MC_ADVISE 4 /* give advice to management */ +#define MC_LOCKAS 5 /* lock address space in memory */ +#define MC_UNLOCKAS 6 /* unlock address space from memory */ +#define MC_HAT_ADVISE 7 /* advise hat map size */ + +/* sub-commands for MC_HAT_ADVISE */ +#define MHA_MAPSIZE_VA 0x1 /* set preferred page size */ +#define MHA_MAPSIZE_BSSBRK 0x2 /* set preferred page size */ + /* for last bss adjacent to */ + /* brk area and brk area itself */ +#define MHA_MAPSIZE_STACK 0x4 /* set preferred page size */ + /* processes main stack */ + +#endif /* (_POSIX_C_SOURCE <= 2) && !defined(_XPG4_2) ... */ + +#if (!defined(_XPG4_2) || (_POSIX_C_SOURCE > 2)) || defined(__EXTENSIONS__) +/* flags to mlockall */ +#define MCL_CURRENT 0x1 /* lock current mappings */ +#define MCL_FUTURE 0x2 /* lock future mappings */ +#endif /* (!defined(_XPG4_2) || (_POSIX_C_SOURCE)) || defined(__EXTENSIONS__) */ + +#if !defined(__XOPEN_OR_POSIX) || defined(__EXTENSIONS__) + +/* definitions for meminfosys syscall */ +#define MISYS_MEMINFO 0x0 + +#if !defined(_ASM) && defined(__STDC__) + +#if defined(_INT64_TYPE) +/* private structure for meminfo */ +typedef struct meminfo { + const uint64_t *mi_inaddr; /* array of input addresses */ + const uint_t *mi_info_req; /* array of types of info requested */ + uint64_t *mi_outdata; /* array of results are placed */ + uint_t *mi_validity; /* array of bitwise result codes */ + int mi_info_count; /* number of pieces of info requested */ +} meminfo_t; +#endif /* defined(_INT64_TYPE) */ + +#if defined(_SYSCALL32) +typedef struct meminfo32 { + caddr32_t mi_inaddr; /* array of input addresses */ + caddr32_t mi_info_req; /* array of types of information requested */ + caddr32_t mi_outdata; /* array of results are placed */ + caddr32_t mi_validity; /* array of bitwise result codes */ + int32_t mi_info_count; /* number of pieces of information requested */ +} meminfo32_t; +#endif /* defined(_SYSCALL32) */ + +#endif /* !defined(_ASM) && defined(__STDC__) */ + +/* + * info_req request type definitions for meminfo + * request types starting with MEMINFO_V are used for Virtual addresses + * and should not be mixed with MEMINFO_PLGRP which is targeted for Physical + * addresses + */ +#define MEMINFO_SHIFT 16 +#define MEMINFO_MASK (0xFF << MEMINFO_SHIFT) +#define MEMINFO_VPHYSICAL (0x01 << MEMINFO_SHIFT) /* get physical addr */ +#define MEMINFO_VLGRP (0x02 << MEMINFO_SHIFT) /* get lgroup */ +#define MEMINFO_VPAGESIZE (0x03 << MEMINFO_SHIFT) /* size of phys page */ +#define MEMINFO_VREPLCNT (0x04 << MEMINFO_SHIFT) /* no. of replica */ +#define MEMINFO_VREPL (0x05 << MEMINFO_SHIFT) /* physical replica */ +#define MEMINFO_VREPL_LGRP (0x06 << MEMINFO_SHIFT) /* lgrp of replica */ +#define MEMINFO_PLGRP (0x07 << MEMINFO_SHIFT) /* lgroup for paddr */ + +/* maximum number of addresses meminfo() can process at a time */ +#define MAX_MEMINFO_CNT 256 + +/* maximum number of request types */ +#define MAX_MEMINFO_REQ 31 + +#endif /* !defined(__XOPEN_OR_POSIX) || defined(__EXTENSIONS__) */ + +#ifdef __cplusplus +} +#endif + +#endif /* _SYS_MMAN_H */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at opencsw.org Fri Oct 19 09:41:05 2012 From: wilbury at opencsw.org (Juraj Lutter) Date: Fri, 19 Oct 2012 09:41:05 +0200 Subject: [csw-devel] SF.net SVN: gar:[19467] csw/mgar/pkg/virtinst/trunk/Makefile In-Reply-To: References: Message-ID: <50810411.1090200@opencsw.org> On 10/19/2012 08:34 AM, cgrzemba at users.sourceforge.net wrote: > Revision: 19467 > http://gar.svn.sourceforge.net/gar/?rev=19467&view=rev > Author: cgrzemba > Date: 2012-10-19 06:34:02 +0000 (Fri, 19 Oct 2012) > Log Message: > ----------- > virtinst/trunk: add overrride > > Modified Paths: > -------------- > csw/mgar/pkg/virtinst/trunk/Makefile > > Modified: csw/mgar/pkg/virtinst/trunk/Makefile > =================================================================== > --- csw/mgar/pkg/virtinst/trunk/Makefile 2012-10-19 06:32:19 UTC (rev 19466) > +++ csw/mgar/pkg/virtinst/trunk/Makefile 2012-10-19 06:34:02 UTC (rev 19467) > @@ -33,7 +33,10 @@ > DEP_PKGS += CSWpython > > PACKAGES += CSWpy-virtinst > +# no file cpu_map.xml available at the moment > +CHECKPKG_OVERRIDES_CSWpy-virtinst += file-with-bad-content|/usr/share|root/opt/csw/lib/python/site-packages/virtinst/CapabilitiesParser.py Please use REINPLACE to modify /usr/share -> /opt/csw/share in order to avoid this override :-) -- Juraj Lutter From janholzh at users.sourceforge.net Fri Oct 19 12:40:40 2012 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Fri, 19 Oct 2012 10:40:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[19469] csw/mgar/gar/v2/lib/map.solaris10 Message-ID: Revision: 19469 http://gar.svn.sourceforge.net/gar/?rev=19469&view=rev Author: janholzh Date: 2012-10-19 10:40:40 +0000 (Fri, 19 Oct 2012) Log Message: ----------- change libresolv to 2.2.2 to match the libnsl setting Modified Paths: -------------- csw/mgar/gar/v2/lib/map.solaris10 Modified: csw/mgar/gar/v2/lib/map.solaris10 =================================================================== --- csw/mgar/gar/v2/lib/map.solaris10 2012-10-19 06:36:49 UTC (rev 19468) +++ csw/mgar/gar/v2/lib/map.solaris10 2012-10-19 10:40:40 UTC (rev 19469) @@ -2,6 +2,6 @@ # http://src.opensolaris.org/source/xref/onnv/onnv-gate/usr/src/lib/libc/port/mapfile-vers#301 libc.so - SUNW_1.22.2 SUNWprivate_1.1 $ADDVERS=SUNW_1.22.2; # http://src.opensolaris.org/source/xref/onnv/onnv-gate/usr/src/lib/libresolv2/common/mapfile-vers -libresolv.so - SUNW_2.2 SUNWprivate_2.1 $ADDVERS=SUNW_2.2; +libresolv.so - SUNW_2.2.2 SUNWprivate_2.1 $ADDVERS=SUNW_2.2.2; # http://src.opensolaris.org/source/xref/onnv/onnv-gate/usr/src/lib/libnsl/common/mapfile-vers libnsl.so - SUNW_1.9.1 SUNWprivate_1.5 $ADDVERS=SUNW_1.9.1; 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 Oct 19 15:02:08 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Fri, 19 Oct 2012 13:02:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[19470] csw/mgar/pkg/lang-python Message-ID: Revision: 19470 http://gar.svn.sourceforge.net/gar/?rev=19470&view=rev Author: cgrzemba Date: 2012-10-19 13:02:08 +0000 (Fri, 19 Oct 2012) Log Message: ----------- lang-python/urlgrabber/trunk: Initial commit Added Paths: ----------- csw/mgar/pkg/lang-python/urlgrabber/ csw/mgar/pkg/lang-python/urlgrabber/Makefile csw/mgar/pkg/lang-python/urlgrabber/branches/ csw/mgar/pkg/lang-python/urlgrabber/tags/ csw/mgar/pkg/lang-python/urlgrabber/trunk/ csw/mgar/pkg/lang-python/urlgrabber/trunk/Makefile csw/mgar/pkg/lang-python/urlgrabber/trunk/checksums csw/mgar/pkg/lang-python/urlgrabber/trunk/files/ Added: csw/mgar/pkg/lang-python/urlgrabber/Makefile =================================================================== --- csw/mgar/pkg/lang-python/urlgrabber/Makefile (rev 0) +++ csw/mgar/pkg/lang-python/urlgrabber/Makefile 2012-10-19 13:02:08 UTC (rev 19470) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/lang-python/urlgrabber/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/lang-python/urlgrabber/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/urlgrabber/trunk/Makefile (rev 0) +++ csw/mgar/pkg/lang-python/urlgrabber/trunk/Makefile 2012-10-19 13:02:08 UTC (rev 19470) @@ -0,0 +1,34 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = urlgrabber +VERSION = 3.9.1 +GARTYPE = v2 +CATEGORIES = lib + +DESCRIPTION = Protocol-independant file-access +define BLURB + urlgrabber is a pure python package that drastically simplifies the fetching of files. It is designed to be used in programs that need common (but not necessarily simple) url-fetching features. It is extremely simple to drop into an existing program and provides a clean interface to protocol-independant file-access. Best of all, urlgrabber takes care of all those pesky file-fetching details, and lets you focus on whatever it is that your program is written to do! +endef + +MASTER_SITES = http://urlgrabber.baseurl.org/download/ +DISTFILES = $(DISTNAME).tar.gz +LICENSE = LICENSE + +DEP_PKGS += CSWpython + +PACKAGES += CSWpy-urlgrabber +ARCHALL_CSWpy-urlgrabber = 1 + +EXTRA_MERGE_EXCLUDE_FILES = .*\.pyo .*\.pyc + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = $(WORKSRC)/setup.py +TEST_SCRIPTS = +INSTALL_SCRIPTS = $(WORKSRC)/setup.py +INSTALL_ARGS = --root=$(DESTDIR) + +# CONFIGURE_ARGS = $(DIRPATHS) + +include gar/category.mk + Property changes on: csw/mgar/pkg/lang-python/urlgrabber/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/lang-python/urlgrabber/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/urlgrabber/trunk/checksums (rev 0) +++ csw/mgar/pkg/lang-python/urlgrabber/trunk/checksums 2012-10-19 13:02:08 UTC (rev 19470) @@ -0,0 +1 @@ +00c8359bf71062d0946bacea521f80b4 urlgrabber-3.9.1.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 Fri Oct 19 15:34:48 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Fri, 19 Oct 2012 13:34:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[19471] csw/mgar/pkg/virt-manager/trunk Message-ID: Revision: 19471 http://gar.svn.sourceforge.net/gar/?rev=19471&view=rev Author: cgrzemba Date: 2012-10-19 13:34:48 +0000 (Fri, 19 Oct 2012) Log Message: ----------- virt-manager/trunk: add dependencies, patch dbudpython is too old Modified Paths: -------------- csw/mgar/pkg/virt-manager/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/virt-manager/trunk/files/0001-interpreter-path.patch Modified: csw/mgar/pkg/virt-manager/trunk/Makefile =================================================================== --- csw/mgar/pkg/virt-manager/trunk/Makefile 2012-10-19 13:02:08 UTC (rev 19470) +++ csw/mgar/pkg/virt-manager/trunk/Makefile 2012-10-19 13:34:48 UTC (rev 19471) @@ -15,11 +15,14 @@ DISTFILES = $(DISTNAME).tar.gz GARCOMPILER = SOS12U3 +DEP_PKGS += CSWpython EXTRA_MERGE_EXCLUDE_FILES = .*\.py[oc] ARCHALL_CSWvirt-manager = 1 -RUNTIME_DEP_PKGS_CSWvirt-manager += CSWpython +RUNTIME_DEP_PKGS_CSWvirt-manager += CSWpy-virtinst +RUNTIME_DEP_PKGS_CSWvirt-manager += CSWpy-curl +RUNTIME_DEP_PKGS_CSWvirt-manager += CSWpy-dbus # CONFIGURE_SCRIPTS = # BUILD_SCRIPTS = $(WORKSRC)/setup.py Added: csw/mgar/pkg/virt-manager/trunk/files/0001-interpreter-path.patch =================================================================== --- csw/mgar/pkg/virt-manager/trunk/files/0001-interpreter-path.patch (rev 0) +++ csw/mgar/pkg/virt-manager/trunk/files/0001-interpreter-path.patch 2012-10-19 13:34:48 UTC (rev 19471) @@ -0,0 +1,7 @@ +--- a/src/virt-manager.in ++++ b/src/virt-manager.in +@@ -1,3 +1,3 @@ + #!/bin/sh + +-exec /usr/bin/python "::PYTHONDIR::/::PACKAGE::.py" "$@" ++exec /opt/csw/bin/python "::PYTHONDIR::/::PACKAGE::.py" "$@" 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 Oct 19 15:42:56 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Fri, 19 Oct 2012 13:42:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[19472] csw/mgar/pkg/lang-python/dbus-python/trunk Message-ID: Revision: 19472 http://gar.svn.sourceforge.net/gar/?rev=19472&view=rev Author: cgrzemba Date: 2012-10-19 13:42:56 +0000 (Fri, 19 Oct 2012) Log Message: ----------- lang-python/dbus-python/trunk: Bump version, problem in test with gobject, should be fixed Modified Paths: -------------- csw/mgar/pkg/lang-python/dbus-python/trunk/Makefile csw/mgar/pkg/lang-python/dbus-python/trunk/checksums Modified: csw/mgar/pkg/lang-python/dbus-python/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/dbus-python/trunk/Makefile 2012-10-19 13:34:48 UTC (rev 19471) +++ csw/mgar/pkg/lang-python/dbus-python/trunk/Makefile 2012-10-19 13:42:56 UTC (rev 19472) @@ -1,5 +1,5 @@ NAME = dbus-python -VERSION = 0.83.0 +VERSION = 1.1.1 CATEGORIES = lib GARTYPE = v2 @@ -16,28 +16,26 @@ MASTER_SITES = http://dbus.freedesktop.org/releases/dbus-python/ DISTFILES = $(NAME)-$(VERSION).tar.gz +GARCOMPILER = SOS12U3 + SPKG_SOURCEURL = http://www.freedesktop.org/wiki/Software/DBusBindings -PACKAGES = CSWdbuspython -CATALOGNAME_CSWdbuspython = dbus_python -SPKG_DESC_CSWdbuspython = $(DESCRIPTION) -RUNTIME_DEP_PKGS_CSWdbuspython = CSWdbusglib CSWggettextrt CSWglib2 CSWlibdbus +PACKAGES = CSWpy-dbus +RUNTIME_DEP_PKGS_CSWpy-dbus += CSWlibglib2-0-0 +RUNTIME_DEP_PKGS_CSWpy-dbus += CSWlibdbus1-3 +RUNTIME_DEP_PKGS_CSWpy-dbus += CSWlibdbus-glib1-2 +RUNTIME_DEP_PKGS_CSWpy-dbus += CSWpython +OBSOLTED_PKGS_CSWpy-dbus = CSWdbuspython EXTRA_MERGE_EXCLUDE_FILES = .*\.pyo .*\.pyc -PROTOTYPE_FILTER = awk '$$$$3 ~ /.*\.py$$$$/ { $$$$2 = "cswpycompile" } { print }' -SPKG_CLASSES = none cswpycompile -RUNTIME_DEP_PKGS += CSWcswclassutils -# We define upstream file regex so we can be notifed of -# new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2 - PATCHFILES = no-stdint.diff -CPPFLAGS += -I$(DESTDIR)/opt/csw/include/dbus-1.0 -CPPFLAGS += -I$(DESTDIR)/opt/csw/lib/dbus-1.0/include +# CPPFLAGS += -I$(DESTDIR)/opt/csw/include/dbus-1.0 +# CPPFLAGS += -I$(DESTDIR)/opt/csw/lib/dbus-1.0/include CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS += --disable-tests +# CONFIGURE_ARGS += --disable-tests +SKIPTEST = 1 include gar/category.mk Modified: csw/mgar/pkg/lang-python/dbus-python/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/dbus-python/trunk/checksums 2012-10-19 13:34:48 UTC (rev 19471) +++ csw/mgar/pkg/lang-python/dbus-python/trunk/checksums 2012-10-19 13:42:56 UTC (rev 19472) @@ -1,2 +1 @@ -562c78876219bf458d79a041af18293d download/dbus-python-0.83.0.tar.gz -c42304c930b301e5041a809db73dcbe6 download/no-stdint.diff +742c7432ad0f7c3f98291d58fa2e35dc dbus-python-1.1.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wilbury at opencsw.org Fri Oct 19 15:43:51 2012 From: wilbury at opencsw.org (Juraj Lutter) Date: Fri, 19 Oct 2012 15:43:51 +0200 Subject: [csw-devel] SF.net SVN: gar:[19472] csw/mgar/pkg/lang-python/dbus-python/trunk In-Reply-To: References: Message-ID: <50815917.90407@opencsw.org> On 10/19/2012 03:42 PM, cgrzemba at users.sourceforge.net wrote: > +OBSOLTED_PKGS_CSWpy-dbus = CSWdbuspython Small typo. -- Juraj Lutter From grzemba at contac-dt.de Fri Oct 19 15:48:06 2012 From: grzemba at contac-dt.de (Carsten Grzemba) Date: Fri, 19 Oct 2012 15:48:06 +0200 Subject: [csw-devel] SF.net SVN: gar:[19472] csw/mgar/pkg/lang-python/dbus-python/trunk In-Reply-To: <50815917.90407@opencsw.org> References: <50815917.90407@opencsw.org> Message-ID: <7420e760709f.50817636@contac-dt.de> Thanks! Am 19.10.12, schrieb Juraj Lutter : > On 10/19/2012 03:42 PM, cgrzemba at users.sourceforge.net wrote: > > +OBSOLTED_PKGS_CSWpy-dbus = CSWdbuspython > > Small typo. > > > -- > Juraj Lutter > _______________________________________________ > devel mailing list > devel at lists.opencsw.org > https://lists.opencsw.org/mailman/listinfo/devel > > -- Carsten Grzemba Tel.:?? +49 3677 64740 Mobil: +49 171 9749479 Fax:?? +49 3677 6474111 Email: carsten.grzemba at contac-dt.de contac Datentechnik GmbH -------------- next part -------------- An HTML attachment was scrubbed... URL: From cgrzemba at users.sourceforge.net Fri Oct 19 15:50:13 2012 From: cgrzemba at users.sourceforge.net (cgrzemba at users.sourceforge.net) Date: Fri, 19 Oct 2012 13:50:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[19473] csw/mgar/pkg/lang-python/dbus-python/trunk/Makefile Message-ID: Revision: 19473 http://gar.svn.sourceforge.net/gar/?rev=19473&view=rev Author: cgrzemba Date: 2012-10-19 13:50:12 +0000 (Fri, 19 Oct 2012) Log Message: ----------- lang-python/dbus-python/trunk: fix build recipe varname Modified Paths: -------------- csw/mgar/pkg/lang-python/dbus-python/trunk/Makefile Modified: csw/mgar/pkg/lang-python/dbus-python/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/dbus-python/trunk/Makefile 2012-10-19 13:42:56 UTC (rev 19472) +++ csw/mgar/pkg/lang-python/dbus-python/trunk/Makefile 2012-10-19 13:50:12 UTC (rev 19473) @@ -24,7 +24,7 @@ RUNTIME_DEP_PKGS_CSWpy-dbus += CSWlibdbus1-3 RUNTIME_DEP_PKGS_CSWpy-dbus += CSWlibdbus-glib1-2 RUNTIME_DEP_PKGS_CSWpy-dbus += CSWpython -OBSOLTED_PKGS_CSWpy-dbus = CSWdbuspython +OBSOLETED_BY_CSWpy-dbus = CSWdbuspython EXTRA_MERGE_EXCLUDE_FILES = .*\.pyo .*\.pyc 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 Oct 19 23:00:53 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 19 Oct 2012 21:00:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[19474] csw/mgar/pkg/exim/trunk/files/ 0003-Set-OpenCSW-build-options.patch Message-ID: Revision: 19474 http://gar.svn.sourceforge.net/gar/?rev=19474&view=rev Author: bdwalton Date: 2012-10-19 21:00:52 +0000 (Fri, 19 Oct 2012) Log Message: ----------- exim/trunk: enable embedded perl (on request) Modified Paths: -------------- csw/mgar/pkg/exim/trunk/files/0003-Set-OpenCSW-build-options.patch Modified: csw/mgar/pkg/exim/trunk/files/0003-Set-OpenCSW-build-options.patch =================================================================== --- csw/mgar/pkg/exim/trunk/files/0003-Set-OpenCSW-build-options.patch 2012-10-19 13:50:12 UTC (rev 19473) +++ csw/mgar/pkg/exim/trunk/files/0003-Set-OpenCSW-build-options.patch 2012-10-19 21:00:52 UTC (rev 19474) @@ -1,4 +1,4 @@ -From 3de7065322e0a5fd8afb1932e5473b77581b8460 Mon Sep 17 00:00:00 2001 +From ecd51aef8d36f7e49290d5fc5e463123199785c9 Mon Sep 17 00:00:00 2001 From: Ben Walton Date: Sat, 4 Aug 2012 15:05:15 +0200 Subject: [PATCH] Set OpenCSW build options @@ -8,11 +8,11 @@ Signed-off-by: Ben Walton --- - Local/Makefile | 105 ++++++++++++++++++++++++++++++-------------------------- - 1 file changed, 57 insertions(+), 48 deletions(-) + Local/Makefile | 109 +++++++++++++++++++++++++++++++-------------------------- + 1 file changed, 59 insertions(+), 50 deletions(-) diff --git a/Local/Makefile b/Local/Makefile -index 95857c7..650b8ae 100644 +index 95857c7..83f4616 100644 --- a/Local/Makefile +++ b/Local/Makefile @@ -78,6 +78,17 @@ @@ -295,6 +295,15 @@ #------------------------------------------------------------------------------ +@@ -830,7 +839,7 @@ ZCAT_COMMAND=/usr/bin/zcat + # (version 5.004 or later) installed, set EXIM_PERL to perl.o. Using embedded + # Perl costs quite a lot of resources. Only do this if you really need it. + +-# EXIM_PERL=perl.o ++EXIM_PERL=perl.o + + + #------------------------------------------------------------------------------ @@ -850,7 +859,7 @@ ZCAT_COMMAND=/usr/bin/zcat # support, which is intended for use in conjunction with the SMTP AUTH # facilities, is included only when requested by the following setting: @@ -331,6 +340,15 @@ ############################################################################### # THINGS YOU ALMOST NEVER NEED TO MENTION # +@@ -1022,7 +1031,7 @@ SYSTEM_ALIASES_FILE=/etc/aliases + # MV_COMMAND=/bin/mv + # RM_COMMAND=/bin/rm + # TOUCH_COMMAND=/usr/bin/touch +-# PERL_COMMAND=/usr/bin/perl ++PERL_COMMAND=/opt/csw/bin/perl + + + #------------------------------------------------------------------------------ @@ -1222,7 +1231,7 @@ TMPDIR="/tmp" # (process id) to a file so that it can easily be identified. The path of the # file can be specified here. Some installations may want something like this: @@ -341,5 +359,5 @@ # If PID_FILE_PATH is not defined, Exim writes a file in its spool directory # using the name "exim-daemon.pid". -- -1.7.10.3 +1.7.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 Fri Oct 19 23:11:28 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Fri, 19 Oct 2012 21:11:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[19475] csw/mgar/pkg/exim/trunk/Makefile Message-ID: Revision: 19475 http://gar.svn.sourceforge.net/gar/?rev=19475&view=rev Author: bdwalton Date: 2012-10-19 21:11:28 +0000 (Fri, 19 Oct 2012) Log Message: ----------- exim/trunk: depend on perl now that libperl.so is used Modified Paths: -------------- csw/mgar/pkg/exim/trunk/Makefile Modified: csw/mgar/pkg/exim/trunk/Makefile =================================================================== --- csw/mgar/pkg/exim/trunk/Makefile 2012-10-19 21:00:52 UTC (rev 19474) +++ csw/mgar/pkg/exim/trunk/Makefile 2012-10-19 21:11:28 UTC (rev 19475) @@ -42,6 +42,7 @@ RUNTIME_DEP_PKGS_CSWexim += CSWlibsasl2-2 RUNTIME_DEP_PKGS_CSWexim += CSWlibspf2-2 RUNTIME_DEP_PKGS_CSWexim += CSWlibpq5 +RUNTIME_DEP_PKGS_CSWexim += CSWperl # They supply the GPL in a non-standard file. LICENSE = LICENCE 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 Oct 20 20:06:57 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sat, 20 Oct 2012 18:06:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[19476] csw/mgar/pkg/lang-python/python/branches/ bw-libdir-fix-2.6/ Message-ID: Revision: 19476 http://gar.svn.sourceforge.net/gar/?rev=19476&view=rev Author: bdwalton Date: 2012-10-20 18:06:57 +0000 (Sat, 20 Oct 2012) Log Message: ----------- lang-python/python/branches/bw-libdir-fix-2.6: branching to work on the library directory fixup Added Paths: ----------- csw/mgar/pkg/lang-python/python/branches/bw-libdir-fix-2.6/ 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 Oct 21 13:47:43 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 21 Oct 2012 11:47:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[19477] csw/mgar/pkg/lang-python/python/branches/ bw-libdir-fix-2.6 Message-ID: Revision: 19477 http://gar.svn.sourceforge.net/gar/?rev=19477&view=rev Author: bdwalton Date: 2012-10-21 11:47:43 +0000 (Sun, 21 Oct 2012) Log Message: ----------- lang-python/python/branches/bw-libdir-fix-2.6: update legacy patch stack: legacy sol8 stuff dropped, library path not munged, a few other legacy things dropped Modified Paths: -------------- csw/mgar/pkg/lang-python/python/branches/bw-libdir-fix-2.6/Makefile Added Paths: ----------- csw/mgar/pkg/lang-python/python/branches/bw-libdir-fix-2.6/files/0001-patch-a-usr-local-reference-to-opt-csw-in-Tools-faqw.patch csw/mgar/pkg/lang-python/python/branches/bw-libdir-fix-2.6/files/0002-handle-special-options-for-bsddb-in-Modules-makesetu.patch csw/mgar/pkg/lang-python/python/branches/bw-libdir-fix-2.6/files/0003-bash-in-some-linker-options-for-the-curses-module.-m.patch csw/mgar/pkg/lang-python/python/branches/bw-libdir-fix-2.6/files/0004-hack-some-solaris-requirements-into-setup.py.patch csw/mgar/pkg/lang-python/python/branches/bw-libdir-fix-2.6/files/0005-ensure-the-_socket-module-links-with-the-socket-libr.patch csw/mgar/pkg/lang-python/python/branches/bw-libdir-fix-2.6/files/0006-ensure-the-_multiprocessing-module-links-with-the-so.patch Modified: csw/mgar/pkg/lang-python/python/branches/bw-libdir-fix-2.6/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python/branches/bw-libdir-fix-2.6/Makefile 2012-10-20 18:06:57 UTC (rev 19476) +++ csw/mgar/pkg/lang-python/python/branches/bw-libdir-fix-2.6/Makefile 2012-10-21 11:47:43 UTC (rev 19477) @@ -50,14 +50,13 @@ PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 # Patches -PATCHFILES += faqwiz.diff -PATCHFILES += makesetup.diff -PATCHFILES += modules.diff -PATCHFILES += multiprocess.diff -PATCHFILES += pyport.diff -PATCHFILES += site.diff -PATCHFILES += python-config-in.diff -PATCHFILES += setup.diff +PATCHFILES += 0001-patch-a-usr-local-reference-to-opt-csw-in-Tools-faqw.patch +PATCHFILES += 0002-handle-special-options-for-bsddb-in-Modules-makesetu.patch +PATCHFILES += 0003-bash-in-some-linker-options-for-the-curses-module.-m.patch +PATCHFILES += 0004-hack-some-solaris-requirements-into-setup.py.patch +PATCHFILES += 0005-ensure-the-_socket-module-links-with-the-socket-libr.patch +PATCHFILES += 0006-ensure-the-_multiprocessing-module-links-with-the-so.patch + PATCHFILES += 0001-FFI_DEFAULT_ABI-to-use-__i386.patch # PATCHFILES += 0010-Hardcoding-the-use-of-libffi.patch # PATCHFILES += 0011-OpenCSW-specific-libffi-include-dir.patch Added: csw/mgar/pkg/lang-python/python/branches/bw-libdir-fix-2.6/files/0001-patch-a-usr-local-reference-to-opt-csw-in-Tools-faqw.patch =================================================================== --- csw/mgar/pkg/lang-python/python/branches/bw-libdir-fix-2.6/files/0001-patch-a-usr-local-reference-to-opt-csw-in-Tools-faqw.patch (rev 0) +++ csw/mgar/pkg/lang-python/python/branches/bw-libdir-fix-2.6/files/0001-patch-a-usr-local-reference-to-opt-csw-in-Tools-faqw.patch 2012-10-21 11:47:43 UTC (rev 19477) @@ -0,0 +1,26 @@ +From 1095f75f9f11f41bf24e391bb755abaaea0afbec Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Sat, 20 Oct 2012 20:20:50 +0200 +Subject: [PATCH 1/4] patch a usr/local reference to opt/csw in Tools/faqwiz + +Signed-off-by: Ben Walton +--- + Tools/faqwiz/faqconf.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Tools/faqwiz/faqconf.py b/Tools/faqwiz/faqconf.py +index d1acd80..05d060a 100644 +--- a/Tools/faqwiz/faqconf.py ++++ b/Tools/faqwiz/faqconf.py +@@ -21,7 +21,7 @@ OWNERNAME = "FAQ owner" # Name for feedback + OWNEREMAIL = "nobody at anywhere.org" # Email for feedback + HOMEURL = "http://www.python.org" # Related home page + HOMENAME = "Python home" # Name of related home page +-RCSBINDIR = "/usr/local/bin/" # Directory containing RCS commands ++RCSBINDIR = "/opt/csw/bin/" # Directory containing RCS commands + # (must end in a slash) + + # Parameters you can normally leave alone +-- +1.7.12 + Added: csw/mgar/pkg/lang-python/python/branches/bw-libdir-fix-2.6/files/0002-handle-special-options-for-bsddb-in-Modules-makesetu.patch =================================================================== --- csw/mgar/pkg/lang-python/python/branches/bw-libdir-fix-2.6/files/0002-handle-special-options-for-bsddb-in-Modules-makesetu.patch (rev 0) +++ csw/mgar/pkg/lang-python/python/branches/bw-libdir-fix-2.6/files/0002-handle-special-options-for-bsddb-in-Modules-makesetu.patch 2012-10-21 11:47:43 UTC (rev 19477) @@ -0,0 +1,31 @@ +From 78113a4bbf99d0ca8c9d19721aeeb3a1f187489e Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Sat, 20 Oct 2012 20:24:36 +0200 +Subject: [PATCH 2/4] handle special options for bsddb in Modules/makesetup + +Signed-off-by: Ben Walton +--- + Modules/makesetup | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/Modules/makesetup b/Modules/makesetup +index 8862c36..6883bca 100755 +--- a/Modules/makesetup ++++ b/Modules/makesetup +@@ -217,7 +217,12 @@ sed -e 's/[ ]*#.*//' -e '/^[ ]*$/d' | + *) src='$(srcdir)/'"$srcdir/$src";; + esac + case $doconfig in +- no) cc="$cc \$(CCSHARED) \$(CFLAGS) \$(CPPFLAGS)";; ++ no) case $src in ++ *bsddb.*) ++ cc="$cc -I\$(DBINC) \$(CCSHARED) \$(CFLAGS) \$(CPPFLAGS)";; ++ *) ++ cc="$cc \$(CCSHARED) \$(CFLAGS) \$(CPPFLAGS)";; ++ esac;; + *) + cc="$cc \$(PY_CFLAGS)";; + esac +-- +1.7.12 + Added: csw/mgar/pkg/lang-python/python/branches/bw-libdir-fix-2.6/files/0003-bash-in-some-linker-options-for-the-curses-module.-m.patch =================================================================== --- csw/mgar/pkg/lang-python/python/branches/bw-libdir-fix-2.6/files/0003-bash-in-some-linker-options-for-the-curses-module.-m.patch (rev 0) +++ csw/mgar/pkg/lang-python/python/branches/bw-libdir-fix-2.6/files/0003-bash-in-some-linker-options-for-the-curses-module.-m.patch 2012-10-21 11:47:43 UTC (rev 19477) @@ -0,0 +1,31 @@ +From b27a1f6efaf775a01067fbe4a9bf572b90b7fad9 Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Sat, 20 Oct 2012 20:26:14 +0200 +Subject: [PATCH 3/4] bash in some linker options for the curses module. (may + not be necessary now?) + +Signed-off-by: Ben Walton +--- + Modules/Setup.dist | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/Modules/Setup.dist b/Modules/Setup.dist +index 5e69a60..d95669b 100644 +--- a/Modules/Setup.dist ++++ b/Modules/Setup.dist +@@ -363,9 +363,10 @@ GLHACK=-Dclear=__GLclear + # + # First, look at Setup.config; configure may have set this for you. + +-#_curses _cursesmodule.c -lcurses -ltermcap ++*shared* ++_curses _cursesmodule.c -R/opt/csw/lib -L/opt/csw/lib -lcurses -lncursesw -lxtermcap + # Wrapper for the panel library that's part of ncurses and SYSV curses. +-#_curses_panel _curses_panel.c -lpanel -lncurses ++_curses_panel _curses_panel.c -R/opt/csw/lib -L/opt/csw/lib -lcurses -lpanel -lncursesw -lxtermcap + + + # Generic (SunOS / SVR4) dynamic loading module. +-- +1.7.12 + Added: csw/mgar/pkg/lang-python/python/branches/bw-libdir-fix-2.6/files/0004-hack-some-solaris-requirements-into-setup.py.patch =================================================================== --- csw/mgar/pkg/lang-python/python/branches/bw-libdir-fix-2.6/files/0004-hack-some-solaris-requirements-into-setup.py.patch (rev 0) +++ csw/mgar/pkg/lang-python/python/branches/bw-libdir-fix-2.6/files/0004-hack-some-solaris-requirements-into-setup.py.patch 2012-10-21 11:47:43 UTC (rev 19477) @@ -0,0 +1,45 @@ +From aeb403c7a7b33c3fd6a63dcbfa24b3d314885c29 Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Sat, 20 Oct 2012 22:01:07 +0200 +Subject: [PATCH 4/4] hack some solaris requirements into setup.py + +Signed-off-by: Ben Walton +--- + setup.py | 14 +++++++++++--- + 1 file changed, 11 insertions(+), 3 deletions(-) + +diff --git a/setup.py b/setup.py +index 4fe1f45..d7b6b07 100644 +--- a/setup.py ++++ b/setup.py +@@ -355,9 +355,9 @@ class PyBuildExt(build_ext): + return sys.platform + + def detect_modules(self): +- # Ensure that /usr/local is always used +- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') +- add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') ++ # Ensure that /opt/csw is always used ++ add_dir_to_list(self.compiler.library_dirs, '/opt/csw/lib') ++ add_dir_to_list(self.compiler.include_dirs, '/opt/csw/include') + + # Add paths specified in the environment variables LDFLAGS and + # CPPFLAGS for header and library files. +@@ -1408,6 +1408,14 @@ class PyBuildExt(build_ext): + ) + libraries = [] + ++ elif platform == 'sunos5': ++ macros = dict( # Solaris ++ HAVE_SEM_OPEN=0, # Not Implemented ++ HAVE_SEM_TIMEDWAIT=0, # Not Implemented ++ HAVE_FD_TRANSFER=1, ++ ) ++ libraries = ['rt'] ++ + else: # Linux and other unices + macros = dict( + HAVE_SEM_OPEN=1, +-- +1.7.12 + Added: csw/mgar/pkg/lang-python/python/branches/bw-libdir-fix-2.6/files/0005-ensure-the-_socket-module-links-with-the-socket-libr.patch =================================================================== --- csw/mgar/pkg/lang-python/python/branches/bw-libdir-fix-2.6/files/0005-ensure-the-_socket-module-links-with-the-socket-libr.patch (rev 0) +++ csw/mgar/pkg/lang-python/python/branches/bw-libdir-fix-2.6/files/0005-ensure-the-_socket-module-links-with-the-socket-libr.patch 2012-10-21 11:47:43 UTC (rev 19477) @@ -0,0 +1,25 @@ +From f13b4bdaf5352bf57a6f265b2efea648ae3dba26 Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Sun, 21 Oct 2012 13:19:32 +0200 +Subject: [PATCH] ensure the _socket module links with the socket library + +Signed-off-by: Ben Walton +--- + setup.py | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/setup.py b/setup.py +index 3d7ce83..b292a0e 100644 +--- a/setup.py ++++ b/setup.py +@@ -688,6 +688,7 @@ class PyBuildExt(build_ext): + + # socket(2) + exts.append( Extension('_socket', ['socketmodule.c'], ++ libraries = ['socket'], + depends = ['socketmodule.h']) ) + # Detect SSL support for the socket module (via _ssl) + search_for_ssl_incs_in = [ +-- +1.7.12 + Added: csw/mgar/pkg/lang-python/python/branches/bw-libdir-fix-2.6/files/0006-ensure-the-_multiprocessing-module-links-with-the-so.patch =================================================================== --- csw/mgar/pkg/lang-python/python/branches/bw-libdir-fix-2.6/files/0006-ensure-the-_multiprocessing-module-links-with-the-so.patch (rev 0) +++ csw/mgar/pkg/lang-python/python/branches/bw-libdir-fix-2.6/files/0006-ensure-the-_multiprocessing-module-links-with-the-so.patch 2012-10-21 11:47:43 UTC (rev 19477) @@ -0,0 +1,26 @@ +From 16328d74227516e110c459ad3eb54c813176fb37 Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Sun, 21 Oct 2012 13:24:14 +0200 +Subject: [PATCH] ensure the _multiprocessing module links with the socket + library + +Signed-off-by: Ben Walton +--- + setup.py | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/setup.py b/setup.py +index b292a0e..eb4b354 100644 +--- a/setup.py ++++ b/setup.py +@@ -1444,6 +1444,7 @@ class PyBuildExt(build_ext): + if sysconfig.get_config_var('WITH_THREAD'): + exts.append ( Extension('_multiprocessing', multiprocessing_srcs, + define_macros=macros.items(), ++ libraries = ['socket'], + include_dirs=["Modules/_multiprocessing"])) + else: + missing.append('_multiprocessing') +-- +1.7.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 Sun Oct 21 13:50:09 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 21 Oct 2012 11:50:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[19478] csw/mgar/pkg/lang-python/python/branches/ bw-libdir-fix-2.6/Makefile Message-ID: Revision: 19478 http://gar.svn.sourceforge.net/gar/?rev=19478&view=rev Author: bdwalton Date: 2012-10-21 11:50:09 +0000 (Sun, 21 Oct 2012) Log Message: ----------- lang-python/python/branches/bw-libdir-fix-2.6: modernize tcl, tk and ssl dependencies Modified Paths: -------------- csw/mgar/pkg/lang-python/python/branches/bw-libdir-fix-2.6/Makefile Modified: csw/mgar/pkg/lang-python/python/branches/bw-libdir-fix-2.6/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python/branches/bw-libdir-fix-2.6/Makefile 2012-10-21 11:47:43 UTC (rev 19477) +++ csw/mgar/pkg/lang-python/python/branches/bw-libdir-fix-2.6/Makefile 2012-10-21 11:50:09 UTC (rev 19478) @@ -150,7 +150,7 @@ RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibpython$(DVER)-1-0 RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibncursesw5 RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibpanel5 -RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibssl0-9-8 +RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibreadline6 RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibsqlite3-0 RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibz1 @@ -159,8 +159,8 @@ RUNTIME_DEP_PKGS_CSWpython$(CVER)-test += CSWpython$(CVER) RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk += CSWlibpython$(DVER)-1-0 RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk += CSWpython$(CVER) -RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk += CSWtcl -RUNTIME_DEP_PKGS_CSWpython$(CVER)-tk += CSWtk +RUNTIME_DEP_PKGS_CSWpython-tk += CSWlibtcl8-5 +RUNTIME_DEP_PKGS_CSWpython-tk += CSWlibtk8-5 BUILD_DEP_PKGS += CSWlibffi-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 Oct 21 14:22:51 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 21 Oct 2012 12:22:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[19479] csw/mgar/pkg/lang-python/python/branches/ bw-libdir-fix-2.6/Makefile Message-ID: Revision: 19479 http://gar.svn.sourceforge.net/gar/?rev=19479&view=rev Author: bdwalton Date: 2012-10-21 12:22:51 +0000 (Sun, 21 Oct 2012) Log Message: ----------- lang-python/python/branches/bw-libdir-fix-2.6: drop a legacy dep helper; break things with the wrong dependency Modified Paths: -------------- csw/mgar/pkg/lang-python/python/branches/bw-libdir-fix-2.6/Makefile Modified: csw/mgar/pkg/lang-python/python/branches/bw-libdir-fix-2.6/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python/branches/bw-libdir-fix-2.6/Makefile 2012-10-21 11:50:09 UTC (rev 19478) +++ csw/mgar/pkg/lang-python/python/branches/bw-libdir-fix-2.6/Makefile 2012-10-21 12:22:51 UTC (rev 19479) @@ -164,11 +164,6 @@ BUILD_DEP_PKGS += CSWlibffi-dev -# There are packages depending on libpython2.5, and listing CSWpython as the -# dependency. -RUNTIME_DEP_PKGS_CSWpython += CSWlibpython2-5-1-0 -CHECKPKG_OVERRIDES_CSWpython += surplus-dependency|CSWlibpython2-5-1-0 - # This could be handled by automatic dependency detection CHECKPKG_OVERRIDES_CSWidle$(CVER) += surplus-dependency|CSWpython$(CVER)-tk 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 Oct 21 15:34:53 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 21 Oct 2012 13:34:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[19480] csw/mgar/pkg/lang-python/python/branches/ bw-libdir-fix-2.6/Makefile Message-ID: Revision: 19480 http://gar.svn.sourceforge.net/gar/?rev=19480&view=rev Author: bdwalton Date: 2012-10-21 13:34:51 +0000 (Sun, 21 Oct 2012) Log Message: ----------- lang-python/python/branches/bw-libdir-fix-2.6: update the pkgfiles split to reflect the modified library directory Modified Paths: -------------- csw/mgar/pkg/lang-python/python/branches/bw-libdir-fix-2.6/Makefile Modified: csw/mgar/pkg/lang-python/python/branches/bw-libdir-fix-2.6/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python/branches/bw-libdir-fix-2.6/Makefile 2012-10-21 12:22:51 UTC (rev 19479) +++ csw/mgar/pkg/lang-python/python/branches/bw-libdir-fix-2.6/Makefile 2012-10-21 13:34:51 UTC (rev 19480) @@ -128,14 +128,14 @@ PKGFILES_CSWpython$(CVER)-tk = $(libdir)/.*/lib-tk/.* PKGFILES_CSWpython$(CVER)-tk += $(libdir)/.*/lib-dynload/_tkinter.so.* -PKGFILES_CSWpython$(CVER)-test = $(libdir)/python/test/.* -PKGFILES_CSWpython$(CVER)-test += $(libdir)/python/bsddb/test.* -PKGFILES_CSWpython$(CVER)-test += $(libdir)/python/ctypes/test.* -PKGFILES_CSWpython$(CVER)-test += $(libdir)/python/email/test.* -PKGFILES_CSWpython$(CVER)-test += $(libdir)/python/distutils/tests.* -PKGFILES_CSWpython$(CVER)-test += $(libdir)/python/json/tests.* -PKGFILES_CSWpython$(CVER)-test += $(libdir)/python/lib2to3/tests.* -PKGFILES_CSWpython$(CVER)-test += $(libdir)/python/sqlite3/test.* +PKGFILES_CSWpython$(CVER)-test = $(libdir)/python$(VER)/test/.* +PKGFILES_CSWpython$(CVER)-test += $(libdir)/python$(VER)/bsddb/test.* +PKGFILES_CSWpython$(CVER)-test += $(libdir)/python$(VER)/ctypes/test.* +PKGFILES_CSWpython$(CVER)-test += $(libdir)/python$(VER)/email/test.* +PKGFILES_CSWpython$(CVER)-test += $(libdir)/python$(VER)/distutils/tests.* +PKGFILES_CSWpython$(CVER)-test += $(libdir)/python$(VER)/json/tests.* +PKGFILES_CSWpython$(CVER)-test += $(libdir)/python$(VER)/lib2to3/tests.* +PKGFILES_CSWpython$(CVER)-test += $(libdir)/python$(VER)/sqlite3/test.* ARCHALL_CSWpython$(CVER)-test = 1 ARCHALL_CSWidle$(CVER) = 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sun Oct 21 16:01:54 2012 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sun, 21 Oct 2012 14:01:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[19481] csw/mgar/pkg/miltergreylist/trunk Message-ID: Revision: 19481 http://gar.svn.sourceforge.net/gar/?rev=19481&view=rev Author: bonivart Date: 2012-10-21 14:01:54 +0000 (Sun, 21 Oct 2012) Log Message: ----------- miltergreylist/trunk: update to 4.4.1 Modified Paths: -------------- csw/mgar/pkg/miltergreylist/trunk/Makefile csw/mgar/pkg/miltergreylist/trunk/checksums Modified: csw/mgar/pkg/miltergreylist/trunk/Makefile =================================================================== --- csw/mgar/pkg/miltergreylist/trunk/Makefile 2012-10-21 13:34:51 UTC (rev 19480) +++ csw/mgar/pkg/miltergreylist/trunk/Makefile 2012-10-21 14:01:54 UTC (rev 19481) @@ -1,10 +1,10 @@ NAME = miltergreylist -VERSION = 4.4 -RELEASE = a1 -DISTVERSION = $(VERSION)$(RELEASE) -#DISTVERSION = $(VERSION) +VERSION = 4.4.1 +#RELEASE = a1 +#DISTVERSION = $(VERSION)$(RELEASE) +DISTVERSION = $(VERSION) DISTNAME = milter-greylist-$(DISTVERSION) -WORKSRC = $(WORKDIR)/$(DISTNAME) +#WORKSRC = $(WORKDIR)/$(DISTNAME) CATEGORIES = net GARTYPE = v2 @@ -18,20 +18,20 @@ DISTFILES += COPYING BUILD_DEP_PKGS = CSWlibspf2-dev + GARCOMPILER = GNU -RUNTIME_DEP_PKGS = CSWgeoip RUNTIME_DEP_PKGS += CSWlibcurl4 RUNTIME_DEP_PKGS += CSWlibspf2-2 +RUNTIME_DEP_PKGS += CSWlibgeoip1 -PACKAGING_PLATFORMS += solaris9-sparc solaris9-i386 -PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 CHECKPKG_OVERRIDES += file-with-bad-content PATCHFILES += 0001-Path-and-user-changes-in-conf-file.patch PATCHFILES += 0002-change-socket-path.patch -PATCHFILES += 0003-upstream-bug-fixes.patch +#PATCHFILES += 0003-upstream-bug-fixes.patch CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS = --prefix=/opt/csw @@ -46,6 +46,15 @@ CONFIGURE_ARGS += --mandir=/opt/csw/share/man CONFIGURE_ARGS += --with-libcurl=/opt/csw/lib +# To build with DRAC support, enable this block +RUNTIME_DEP_PKGS += CSWbdb48 +CONFIGURE_ARGS += --enable-drac +EXTRA_LIB = /opt/csw/bdb48/lib +EXTRA_INC = /opt/csw/bdb48/include +#EXTRA_CFLAGS = -DUSE_DB185_EMULATION -D__EXTENSIONS__ +EXTRA_CFLAGS = -DUSE_DB185_EMULATION +EXTRA_LDFLAGS = -ldb + # milter-greylist has no tests TEST_SCRIPTS = Modified: csw/mgar/pkg/miltergreylist/trunk/checksums =================================================================== --- csw/mgar/pkg/miltergreylist/trunk/checksums 2012-10-21 13:34:51 UTC (rev 19480) +++ csw/mgar/pkg/miltergreylist/trunk/checksums 2012-10-21 14:01:54 UTC (rev 19481) @@ -1 +1 @@ -17a8d280f31d0441a1bb9efaa03aa157 milter-greylist-4.4a1.tgz +56cfd2aa25d4eb88bb94cd0ee5026508 milter-greylist-4.4.1.tgz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sun Oct 21 16:37:36 2012 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sun, 21 Oct 2012 14:37:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[19482] csw/mgar/pkg/miltergreylist/trunk/Makefile Message-ID: Revision: 19482 http://gar.svn.sourceforge.net/gar/?rev=19482&view=rev Author: bonivart Date: 2012-10-21 14:37:36 +0000 (Sun, 21 Oct 2012) Log Message: ----------- miltergreylist/trunk: fix path Modified Paths: -------------- csw/mgar/pkg/miltergreylist/trunk/Makefile Modified: csw/mgar/pkg/miltergreylist/trunk/Makefile =================================================================== --- csw/mgar/pkg/miltergreylist/trunk/Makefile 2012-10-21 14:01:54 UTC (rev 19481) +++ csw/mgar/pkg/miltergreylist/trunk/Makefile 2012-10-21 14:37:36 UTC (rev 19482) @@ -34,7 +34,7 @@ #PATCHFILES += 0003-upstream-bug-fixes.patch CONFIGURE_ARGS = $(DIRPATHS) -CONFIGURE_ARGS = --prefix=/opt/csw +CONFIGURE_ARGS += --prefix=/opt/csw CONFIGURE_ARGS += --sysconfdir=/etc/opt/csw CONFIGURE_ARGS += --with-user=`/usr/xpg4/bin/id -u` CONFIGURE_ARGS += --with-conffile=/etc/opt/csw/greylist.conf @@ -70,7 +70,7 @@ MIGRATE_DEST_DIR = /etc/opt/csw PROTOTYPE_MODIFIERS = 1 -PROTOTYPE_FILES_1 = /var/opt/csw/milter-greylist +PROTOTYPE_FILES_1 = /var/opt/csw/miltergreylist PROTOTYPE_CLASS_1 = ugfiles PROTOTYPE_PERMS_1 = 0700 PROTOTYPE_USER_1 = greylist This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sun Oct 21 16:51:30 2012 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sun, 21 Oct 2012 14:51:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[19483] csw/mgar/pkg/miltergreylist/trunk Message-ID: Revision: 19483 http://gar.svn.sourceforge.net/gar/?rev=19483&view=rev Author: bonivart Date: 2012-10-21 14:51:30 +0000 (Sun, 21 Oct 2012) Log Message: ----------- miltergreylist/trunk: fix path 2 Modified Paths: -------------- csw/mgar/pkg/miltergreylist/trunk/Makefile csw/mgar/pkg/miltergreylist/trunk/files/0001-Path-and-user-changes-in-conf-file.patch csw/mgar/pkg/miltergreylist/trunk/files/0002-change-socket-path.patch Modified: csw/mgar/pkg/miltergreylist/trunk/Makefile =================================================================== --- csw/mgar/pkg/miltergreylist/trunk/Makefile 2012-10-21 14:37:36 UTC (rev 19482) +++ csw/mgar/pkg/miltergreylist/trunk/Makefile 2012-10-21 14:51:30 UTC (rev 19483) @@ -70,7 +70,7 @@ MIGRATE_DEST_DIR = /etc/opt/csw PROTOTYPE_MODIFIERS = 1 -PROTOTYPE_FILES_1 = /var/opt/csw/miltergreylist +PROTOTYPE_FILES_1 = /var/opt/csw/milter-greylist PROTOTYPE_CLASS_1 = ugfiles PROTOTYPE_PERMS_1 = 0700 PROTOTYPE_USER_1 = greylist Modified: csw/mgar/pkg/miltergreylist/trunk/files/0001-Path-and-user-changes-in-conf-file.patch =================================================================== --- csw/mgar/pkg/miltergreylist/trunk/files/0001-Path-and-user-changes-in-conf-file.patch 2012-10-21 14:37:36 UTC (rev 19482) +++ csw/mgar/pkg/miltergreylist/trunk/files/0001-Path-and-user-changes-in-conf-file.patch 2012-10-21 14:51:30 UTC (rev 19483) @@ -18,9 +18,9 @@ -pidfile "/var/run/milter-greylist.pid" -socket "/var/milter-greylist/milter-greylist.sock" -dumpfile "/var/milter-greylist/greylist.db" 600 -+pidfile "/var/opt/csw/miltergreylist/milter-greylist.pid" -+socket "/var/opt/csw/miltergreylist/milter-greylist.sock" -+dumpfile "/var/opt/csw/miltergreylist/greylist.db" 600 ++pidfile "/var/opt/csw/milter-greylist/milter-greylist.pid" ++socket "/var/opt/csw/milter-greylist/milter-greylist.sock" ++dumpfile "/var/opt/csw/milter-greylist/greylist.db" 600 dumpfreq 1 -user "smmsp" +user "greylist" Modified: csw/mgar/pkg/miltergreylist/trunk/files/0002-change-socket-path.patch =================================================================== --- csw/mgar/pkg/miltergreylist/trunk/files/0002-change-socket-path.patch 2012-10-21 14:37:36 UTC (rev 19482) +++ csw/mgar/pkg/miltergreylist/trunk/files/0002-change-socket-path.patch 2012-10-21 14:51:30 UTC (rev 19483) @@ -16,7 +16,7 @@ dnl socket to communicate with milter dnl default value : -dnl local:/var/milter-greylist/milter-greylist.sock -+dnl local:/var/opt/csw/miltergreylist/milter-greylist.sock ++dnl local:/var/opt/csw/milter-greylist/milter-greylist.sock dnl dnl confGREYLIST_OPTIONS dnl extra parameters to be used in INPUT_MAIL_FILTER @@ -25,7 +25,7 @@ define(`confGREYLIST_ARGS',`S=confGREYLIST_SOCKET')dnl dnl',`dnl -define(`confGREYLIST_ARGS',`S=local:/var/milter-greylist/milter-greylist.sock')dnl -+define(`confGREYLIST_ARGS',`S=local:/var/opt/csw/miltergreylist/milter-greylist.sock')dnl ++define(`confGREYLIST_ARGS',`S=local:/var/opt/csw/milter-greylist/milter-greylist.sock')dnl dnl')dnl ifdef(`confGREYLIST_OPTIONS',`dnl define(`confGREYLIST_ARGS',confGREYLIST_ARGS`, confGREYLIST_OPTIONS')dnl 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 Oct 21 20:42:28 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 21 Oct 2012 18:42:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[19484] csw/mgar/pkg/lang-python/python/branches/ bw-libdir-fix-2.6/Makefile Message-ID: Revision: 19484 http://gar.svn.sourceforge.net/gar/?rev=19484&view=rev Author: bdwalton Date: 2012-10-21 18:42:28 +0000 (Sun, 21 Oct 2012) Log Message: ----------- lang-python/python/branches/bw-libdir-fix-2.6: drop all solaris 9 support Modified Paths: -------------- csw/mgar/pkg/lang-python/python/branches/bw-libdir-fix-2.6/Makefile Modified: csw/mgar/pkg/lang-python/python/branches/bw-libdir-fix-2.6/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python/branches/bw-libdir-fix-2.6/Makefile 2012-10-21 14:51:30 UTC (rev 19483) +++ csw/mgar/pkg/lang-python/python/branches/bw-libdir-fix-2.6/Makefile 2012-10-21 18:42:28 UTC (rev 19484) @@ -36,19 +36,8 @@ DISTFILES = $(DISTNAME).tar.bz2 -PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 -# Some features are missing on Solaris 9, e.g. functionality required for the -# multiprocessing support. -# http://osdir.com/ml/opensolaris-discuss/2009-07/msg00865.html -# http://bugs.python.org/issue3770 -# However, this bug is about better detection of SEM_VALUE_MAX in Solaris -# http://bugs.python.org/issue3110 +PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 -# There are header differences between Solaris 9 and 10. Programs that include -# pyconfig.h from Solaris 9 installed on Solaris 10 can get wrong settings, -# e.g. wrt _X_OPEN_SOURCE. -PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 - # Patches PATCHFILES += 0001-patch-a-usr-local-reference-to-opt-csw-in-Tools-faqw.patch PATCHFILES += 0002-handle-special-options-for-bsddb-in-Modules-makesetu.patch This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Mon Oct 22 10:17:41 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 22 Oct 2012 08:17:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[19485] csw/mgar/pkg/git/trunk Message-ID: Revision: 19485 http://gar.svn.sourceforge.net/gar/?rev=19485&view=rev Author: bdwalton Date: 2012-10-22 08:17:40 +0000 (Mon, 22 Oct 2012) Log Message: ----------- git/trunk: version bump for new 1.8.0 release 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-10-21 18:42:28 UTC (rev 19484) +++ csw/mgar/pkg/git/trunk/Makefile 2012-10-22 08:17:40 UTC (rev 19485) @@ -1,5 +1,5 @@ NAME = git -VERSION = 1.7.12.3 +VERSION = 1.8.0 #PATCHLEVEL = rc4 DISTNAME = $(NAME)-$(VERSION) CATEGORIES = devel Modified: csw/mgar/pkg/git/trunk/checksums =================================================================== --- csw/mgar/pkg/git/trunk/checksums 2012-10-21 18:42:28 UTC (rev 19484) +++ csw/mgar/pkg/git/trunk/checksums 2012-10-22 08:17:40 UTC (rev 19485) @@ -1 +1 @@ -c3c1e2d56794fcc46e31fd8cb0e71252 git-1.7.12.3.tar.gz +12f4d20f34ae37086d86dd3b9d037bba git-1.8.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 Oct 22 10:26:28 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 22 Oct 2012 08:26:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[19486] csw/mgar/pkg/git/trunk Message-ID: Revision: 19486 http://gar.svn.sourceforge.net/gar/?rev=19486&view=rev Author: bdwalton Date: 2012-10-22 08:26:28 +0000 (Mon, 22 Oct 2012) Log Message: ----------- git/trunk: drop a merged patch Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/git/trunk/files/0007-t-t5400-send-pack-Use-POSIX-options-to-cp-for-portab.patch Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2012-10-22 08:17:40 UTC (rev 19485) +++ csw/mgar/pkg/git/trunk/Makefile 2012-10-22 08:26:28 UTC (rev 19486) @@ -118,7 +118,6 @@ # to the selection of available utf8 locales. PATCHFILES_isa-sparcv8 += 0005-Force-en_US.UTF-8-for-a-git-svn-test.patch PATCHFILES += 0006-Patch-out-a-few-usr-share-references.patch -PATCHFILES += 0007-t-t5400-send-pack-Use-POSIX-options-to-cp-for-portab.patch fdirs = $(bindir_install) $(mandir) $(libexecdir_install) define _git_files Deleted: csw/mgar/pkg/git/trunk/files/0007-t-t5400-send-pack-Use-POSIX-options-to-cp-for-portab.patch =================================================================== --- csw/mgar/pkg/git/trunk/files/0007-t-t5400-send-pack-Use-POSIX-options-to-cp-for-portab.patch 2012-10-22 08:17:40 UTC (rev 19485) +++ csw/mgar/pkg/git/trunk/files/0007-t-t5400-send-pack-Use-POSIX-options-to-cp-for-portab.patch 2012-10-22 08:26:28 UTC (rev 19486) @@ -1,29 +0,0 @@ -From 3ed782c5e1a154271147391f93766f3e3836a30c Mon Sep 17 00:00:00 2001 -From: Ben Walton -Date: Mon, 8 Oct 2012 09:28:47 +0200 -Subject: [PATCH] t/t5400-send-pack: Use POSIX options to cp for portability - -Avoid a GNU-ism in the cp options used by t5400-send-pack for -portability. Use -pR instead of -a. - -Signed-off-by: Ben Walton ---- - t/t5400-send-pack.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/t/t5400-send-pack.sh b/t/t5400-send-pack.sh -index 250c720..65b3b0f 100755 ---- a/t/t5400-send-pack.sh -+++ b/t/t5400-send-pack.sh -@@ -159,7 +159,7 @@ test_expect_success 'receive-pack runs auto-gc in remote repo' ' - git commit -a -m "Second commit" && - git repack - ) && -- cp -a parent child && -+ cp -pR parent child && - ( - # Set the child to auto-pack if more than one pack exists - cd child && --- -1.7.12 - 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 Oct 22 23:17:50 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 22 Oct 2012 21:17:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[19487] csw/mgar/pkg/di/trunk Message-ID: Revision: 19487 http://gar.svn.sourceforge.net/gar/?rev=19487&view=rev Author: dmichelsen Date: 2012-10-22 21:17:49 +0000 (Mon, 22 Oct 2012) Log Message: ----------- di/trunk: Update to 4.32 Modified Paths: -------------- csw/mgar/pkg/di/trunk/Makefile csw/mgar/pkg/di/trunk/checksums Modified: csw/mgar/pkg/di/trunk/Makefile =================================================================== --- csw/mgar/pkg/di/trunk/Makefile 2012-10-22 08:26:28 UTC (rev 19486) +++ csw/mgar/pkg/di/trunk/Makefile 2012-10-22 21:17:49 UTC (rev 19487) @@ -1,5 +1,5 @@ NAME = di -VERSION = 4.31 +VERSION = 4.32 CATEGORIES = utils GARTYPE = v2 Modified: csw/mgar/pkg/di/trunk/checksums =================================================================== --- csw/mgar/pkg/di/trunk/checksums 2012-10-22 08:26:28 UTC (rev 19486) +++ csw/mgar/pkg/di/trunk/checksums 2012-10-22 21:17:49 UTC (rev 19487) @@ -1 +1 @@ -f324ec49888c6c642c998ee8c3a8ce21 di-4.31.tar.gz +6c5406b71b2eb10484da1be78851b7ee di-4.32.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Oct 22 23:19:14 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 22 Oct 2012 21:19:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[19488] csw/mgar/pkg/msmtp/trunk Message-ID: Revision: 19488 http://gar.svn.sourceforge.net/gar/?rev=19488&view=rev Author: dmichelsen Date: 2012-10-22 21:19:13 +0000 (Mon, 22 Oct 2012) Log Message: ----------- msmtp/trunk: Update to 1.4.30 Modified Paths: -------------- csw/mgar/pkg/msmtp/trunk/Makefile csw/mgar/pkg/msmtp/trunk/checksums Modified: csw/mgar/pkg/msmtp/trunk/Makefile =================================================================== --- csw/mgar/pkg/msmtp/trunk/Makefile 2012-10-22 21:17:49 UTC (rev 19487) +++ csw/mgar/pkg/msmtp/trunk/Makefile 2012-10-22 21:19:13 UTC (rev 19488) @@ -1,5 +1,5 @@ NAME = msmtp -VERSION = 1.4.29 +VERSION = 1.4.30 CATEGORIES = net GARTYPE = v2 Modified: csw/mgar/pkg/msmtp/trunk/checksums =================================================================== --- csw/mgar/pkg/msmtp/trunk/checksums 2012-10-22 21:17:49 UTC (rev 19487) +++ csw/mgar/pkg/msmtp/trunk/checksums 2012-10-22 21:19:13 UTC (rev 19488) @@ -1 +1 @@ -87cc6f37cb7a163ceb89382932e41535 msmtp-1.4.29.tar.bz2 +4d32724a2b03f07aa6d4ea9d49367ad3 msmtp-1.4.30.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 Oct 24 00:13:46 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 23 Oct 2012 22:13:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[19489] csw/mgar/pkg/lang-python/pysetuptools/trunk/ Makefile Message-ID: Revision: 19489 http://gar.svn.sourceforge.net/gar/?rev=19489&view=rev Author: bdwalton Date: 2012-10-23 22:13:45 +0000 (Tue, 23 Oct 2012) Log Message: ----------- lang-python/pysetuptools/trunk: standardize the name for the setuptools module Modified Paths: -------------- csw/mgar/pkg/lang-python/pysetuptools/trunk/Makefile Modified: csw/mgar/pkg/lang-python/pysetuptools/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pysetuptools/trunk/Makefile 2012-10-22 21:19:13 UTC (rev 19488) +++ csw/mgar/pkg/lang-python/pysetuptools/trunk/Makefile 2012-10-23 22:13:45 UTC (rev 19489) @@ -14,14 +14,15 @@ Distribution Utilities for Python endef -ARCHALL_CSWpysetuptools = 1 +ARCHALL_CSWpy-setuptools = 1 MASTER_SITES = http://cheeseshop.python.org/packages/source/s/setuptools/ UFILES_REGEX = $(NAME)(\d+(?:\.\d+)*) DISTFILES = $(NAME)-$(VERSION).tar.gz DISTFILES += LICENSE -PACKAGES = CSWpysetuptools -CATALOGNAME_CSWpysetuptools = pysetuptools -SPKG_DESC_CSWpysetuptools = Distribution Utiltiies for Python +PACKAGES = CSWpy-setuptools +CATALOG_NAME_CSWpy-setuptools = py_setuptools +OBSOLETED_BY_CSWpy-setuptools = CSWpysetuptools +SPKG_DESC_CSWpy-setuptools = Distribution Utiltiies for Python TEST_SCRIPTS = LICENSE = LICENSE 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 Oct 24 00:41:18 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 23 Oct 2012 22:41:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[19490] csw/mgar/pkg/lang-python/cheetah/ Message-ID: Revision: 19490 http://gar.svn.sourceforge.net/gar/?rev=19490&view=rev Author: bdwalton Date: 2012-10-23 22:41:18 +0000 (Tue, 23 Oct 2012) Log Message: ----------- moved cheetah module into lang-python Added Paths: ----------- csw/mgar/pkg/lang-python/cheetah/ 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 Oct 24 00:42:19 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 23 Oct 2012 22:42:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[19491] csw/mgar/pkg/cheetah/ Message-ID: Revision: 19491 http://gar.svn.sourceforge.net/gar/?rev=19491&view=rev Author: bdwalton Date: 2012-10-23 22:42:19 +0000 (Tue, 23 Oct 2012) Log Message: ----------- removed cheetah from top level Removed Paths: ------------- csw/mgar/pkg/cheetah/ 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 Oct 24 07:35:21 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 24 Oct 2012 05:35:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[19492] csw/mgar/pkg/tmux/trunk Message-ID: Revision: 19492 http://gar.svn.sourceforge.net/gar/?rev=19492&view=rev Author: dmichelsen Date: 2012-10-24 05:35:20 +0000 (Wed, 24 Oct 2012) Log Message: ----------- tmux: Update to 1.7 and patches Modified Paths: -------------- csw/mgar/pkg/tmux/trunk/Makefile csw/mgar/pkg/tmux/trunk/checksums Added Paths: ----------- csw/mgar/pkg/tmux/trunk/files/tmux-01-include-netdb.h.diff csw/mgar/pkg/tmux/trunk/files/tmux-02-u-for-process-group.patch Removed Paths: ------------- csw/mgar/pkg/tmux/trunk/files/0001-Use-inttypes.h-if-stdint.h-is-not-available.patch Modified: csw/mgar/pkg/tmux/trunk/Makefile =================================================================== --- csw/mgar/pkg/tmux/trunk/Makefile 2012-10-23 22:42:19 UTC (rev 19491) +++ csw/mgar/pkg/tmux/trunk/Makefile 2012-10-24 05:35:20 UTC (rev 19492) @@ -1,5 +1,5 @@ NAME = tmux -VERSION = 1.5 +VERSION = 1.7 CATEGORIES = apps GARTYPE = v2 @@ -8,23 +8,33 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(DISTNAME).tar.gz +# From http://pkgbuild.svn.sourceforge.net/viewvc/pkgbuild/spec-files-extra/trunk/patches/ +PATCHFILES += tmux-01-include-netdb.h.diff +#PATCHFILES += tmux-02-u-for-process-group.patch + RUNTIME_DEP_PKGS = CSWlibevent2-0-5 -BUILD_DEP_PKGS = CSWlibevent-devel +BUILD_DEP_PKGS = CSWlibevent-dev LICENSE = NOTES VENDOR_URL = http://tmux.sourceforge.net -EXTRA_CPPFLAGS += -I/opt/csw/include/ncursesw -EXTRA_CPPFLAGS += -D__inline=inline +# EXTRA_CPPFLAGS += -I/opt/csw/include/ncursesw +#EXTRA_CPPFLAGS += -D__inline=inline # Grabbed from Solaris 10 /usr/include/iso/math_c99.h -EXTRA_CPPFLAGS += -DINFINITY=__builtin_infinity +#EXTRA_CPPFLAGS += -DINFINITY=__builtin_infinity -include gar/category.mk +# Make sure tmux.conf is found in /etc/opt/csw as reported in #4696 +REINPLACEMENTS += tmuxconf +REINPLACE_MATCH_tmuxconf = /etc/tmux\.conf +REINPLACE_WITH_tmuxconf = $(sysconfdir)/tmux.conf +REINPLACE_FILES_tmuxconf += tmux.h +REINPLACE_FILES_tmuxconf += tmux.1 -PATH := /opt/csw/gnu:$(PATH) +# For LOCK_EX +EXTRA_CPPFLAGS += -I/usr/ucbinclude -post-extract-modulated: - @# Make sure tmux.conf is found in /etc/opt/csw as reported in #4696 - perl -pi -e 's,/etc/tmux\.conf,$(sysconfdir)/tmux.conf,g' \ - $(WORKSRC)/tmux.h \ - $(WORKSRC)/tmux.1 +CONFIGURE_ENV_PATH = /opt/csw/gnu:$(PATH) + +PRESERVECONF += $(sysconfdir)/tmux.conf + +include gar/category.mk Modified: csw/mgar/pkg/tmux/trunk/checksums =================================================================== --- csw/mgar/pkg/tmux/trunk/checksums 2012-10-23 22:42:19 UTC (rev 19491) +++ csw/mgar/pkg/tmux/trunk/checksums 2012-10-24 05:35:20 UTC (rev 19492) @@ -1 +1 @@ -3d4b683572af34e83bc8b183a8285263 tmux-1.5.tar.gz +2c48fb9beb22eedba7a5de3b78dd0c03 tmux-1.7.tar.gz Deleted: csw/mgar/pkg/tmux/trunk/files/0001-Use-inttypes.h-if-stdint.h-is-not-available.patch =================================================================== --- csw/mgar/pkg/tmux/trunk/files/0001-Use-inttypes.h-if-stdint.h-is-not-available.patch 2012-10-23 22:42:19 UTC (rev 19491) +++ csw/mgar/pkg/tmux/trunk/files/0001-Use-inttypes.h-if-stdint.h-is-not-available.patch 2012-10-24 05:35:20 UTC (rev 19492) @@ -1,28 +0,0 @@ -From d8dfa3860ec279f387c66e9c994bac7518e13ab0 Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Thu, 6 Jan 2011 13:18:50 +0100 -Subject: [PATCH] Use inttypes.h if stdint.h is not available - ---- - compat/asprintf.c | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -diff --git a/compat/asprintf.c b/compat/asprintf.c -index cb5282b..ab45110 100644 ---- a/compat/asprintf.c -+++ b/compat/asprintf.c -@@ -18,7 +18,11 @@ - - #include - #include -+#ifdef HAVE_STDINT_H - #include -+#else -+#include -+#endif - #include - - #include "tmux.h" --- -1.7.3.2 - Added: csw/mgar/pkg/tmux/trunk/files/tmux-01-include-netdb.h.diff =================================================================== --- csw/mgar/pkg/tmux/trunk/files/tmux-01-include-netdb.h.diff (rev 0) +++ csw/mgar/pkg/tmux/trunk/files/tmux-01-include-netdb.h.diff 2012-10-24 05:35:20 UTC (rev 19492) @@ -0,0 +1,13 @@ +diff -ur tmux-1.3.orig/screen.c tmux-1.3/screen.c +--- tmux-1.3.orig/screen.c 2010-04-07 00:01:32.000000000 +0200 ++++ tmux-1.3/screen.c 2010-10-21 21:39:15.000000000 +0200 +@@ -21,6 +21,9 @@ + #include + #include + #include ++#ifdef __sun ++#include ++#endif + + #include "tmux.h" + Added: csw/mgar/pkg/tmux/trunk/files/tmux-02-u-for-process-group.patch =================================================================== --- csw/mgar/pkg/tmux/trunk/files/tmux-02-u-for-process-group.patch (rev 0) +++ csw/mgar/pkg/tmux/trunk/files/tmux-02-u-for-process-group.patch 2012-10-24 05:35:20 UTC (rev 19492) @@ -0,0 +1,20 @@ +http://tmux.svn.sourceforge.net/viewvc/tmux?view=revision&revision=2589 +--- trunk/osdep-sunos.c 2011/07/09 09:42:33 2553 ++++ trunk/osdep-sunos.c 2011/09/11 23:54:32 2589 +@@ -41,14 +41,13 @@ + if ((f = open(tty, O_RDONLY)) < 0) + return (NULL); + +- if ((fstat(f, &st) != 0) || +- (ioctl(f, TIOCGPGRP, &pgrp) != 0)) { ++ if (fstat(f, &st) != 0 || ioctl(f, TIOCGPGRP, &pgrp) != 0) { + close(f); + return (NULL); + } + close(f); + +- xasprintf(&path, "/proc/%hu/psinfo", pgrp); ++ xasprintf(&path, "/proc/%u/psinfo", (u_int) pgrp); + f = open(path, O_RDONLY); + xfree(path); + if (f < 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 Oct 24 10:04:05 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 24 Oct 2012 08:04:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[19493] csw/mgar/pkg/lang-python/mysql-python/trunk Message-ID: Revision: 19493 http://gar.svn.sourceforge.net/gar/?rev=19493&view=rev Author: bdwalton Date: 2012-10-24 08:04:05 +0000 (Wed, 24 Oct 2012) Log Message: ----------- lang-python/mysql-python/trunk: version bump to support mysql 5.5 Modified Paths: -------------- csw/mgar/pkg/lang-python/mysql-python/trunk/Makefile csw/mgar/pkg/lang-python/mysql-python/trunk/checksums Modified: csw/mgar/pkg/lang-python/mysql-python/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/mysql-python/trunk/Makefile 2012-10-24 05:35:20 UTC (rev 19492) +++ csw/mgar/pkg/lang-python/mysql-python/trunk/Makefile 2012-10-24 08:04:05 UTC (rev 19493) @@ -1,7 +1,7 @@ # $Id$ NAME = MySQL-python -VERSION = 1.2.3 +VERSION = 1.2.4b4 CATEGORIES = python GARTYPE = v2 Modified: csw/mgar/pkg/lang-python/mysql-python/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/mysql-python/trunk/checksums 2012-10-24 05:35:20 UTC (rev 19492) +++ csw/mgar/pkg/lang-python/mysql-python/trunk/checksums 2012-10-24 08:04:05 UTC (rev 19493) @@ -1 +1 @@ -215eddb6d853f6f4be5b4afc4154292f MySQL-python-1.2.3.tar.gz +0958cb9c23d5a656caac031c4886b1cf MySQL-python-1.2.4b4.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 Oct 24 11:02:59 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 24 Oct 2012 09:02:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[19494] csw/mgar/pkg/lang-python/mysql-python/trunk/ Makefile Message-ID: Revision: 19494 http://gar.svn.sourceforge.net/gar/?rev=19494&view=rev Author: bdwalton Date: 2012-10-24 09:02:59 +0000 (Wed, 24 Oct 2012) Log Message: ----------- lang-python/mysql-python/trunk: use SOS12U3 to handle a cflags issue from mysql_config Modified Paths: -------------- csw/mgar/pkg/lang-python/mysql-python/trunk/Makefile Modified: csw/mgar/pkg/lang-python/mysql-python/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/mysql-python/trunk/Makefile 2012-10-24 08:04:05 UTC (rev 19493) +++ csw/mgar/pkg/lang-python/mysql-python/trunk/Makefile 2012-10-24 09:02:59 UTC (rev 19494) @@ -13,6 +13,8 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(NAME)-$(VERSION).tar.gz +GARCOMPILER = SOS12U3 + PACKAGES = CSWpy-mysql CATALOGNAME_CSWpy-mysql = py_mysql RUNTIME_DEP_PKGS_CSWpy-mysql += CSWlibpython2-6-1-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 Oct 24 11:18:11 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 24 Oct 2012 09:18:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[19495] csw/mgar/pkg/gitosis/trunk/Makefile Message-ID: Revision: 19495 http://gar.svn.sourceforge.net/gar/?rev=19495&view=rev Author: bdwalton Date: 2012-10-24 09:18:11 +0000 (Wed, 24 Oct 2012) Log Message: ----------- gitosis/trunk: update the git repo that hosts the project Modified Paths: -------------- csw/mgar/pkg/gitosis/trunk/Makefile Modified: csw/mgar/pkg/gitosis/trunk/Makefile =================================================================== --- csw/mgar/pkg/gitosis/trunk/Makefile 2012-10-24 09:02:59 UTC (rev 19494) +++ csw/mgar/pkg/gitosis/trunk/Makefile 2012-10-24 09:18:11 UTC (rev 19495) @@ -36,7 +36,7 @@ RUNTIME_DEP_PKGS_CSWgitosis = CSWgit CSWpysetuptools CSWbash -GIT_REPOS = git://eagain.net/gitosis.git +GIT_REPOS = git://github.com/tv42/gitosis.git GIT_USE_PROXY = 1 # We don't use a specific release tag as we want to get some fixes to # support git 1.6+. We'll simply package the tip of the public branch 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 Oct 24 11:21:02 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 24 Oct 2012 09:21:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[19496] csw/mgar/pkg/gitosis/trunk/Makefile Message-ID: Revision: 19496 http://gar.svn.sourceforge.net/gar/?rev=19496&view=rev Author: bdwalton Date: 2012-10-24 09:21:02 +0000 (Wed, 24 Oct 2012) Log Message: ----------- gitosis/trunk: note the license file for gitosis Modified Paths: -------------- csw/mgar/pkg/gitosis/trunk/Makefile Modified: csw/mgar/pkg/gitosis/trunk/Makefile =================================================================== --- csw/mgar/pkg/gitosis/trunk/Makefile 2012-10-24 09:18:11 UTC (rev 19495) +++ csw/mgar/pkg/gitosis/trunk/Makefile 2012-10-24 09:21:02 UTC (rev 19496) @@ -73,6 +73,8 @@ CHECKPKG_OVERRIDES_CSWgitosis += surplus-dependency|CSWpysetuptools CHECKPKG_OVERRIDES_CSWgitosis += surplus-dependency|CSWgit +LICENSE = COPYING + include gar/category.mk # override the category exclusion 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 Oct 24 12:02:34 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 24 Oct 2012 10:02:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[19497] csw/mgar/gar/v2/gar.mk Message-ID: Revision: 19497 http://gar.svn.sourceforge.net/gar/?rev=19497&view=rev Author: bdwalton Date: 2012-10-24 10:02:33 +0000 (Wed, 24 Oct 2012) Log Message: ----------- genericize the PYCOMPILE_FILES handling to work with old and new python layout Modified Paths: -------------- csw/mgar/gar/v2/gar.mk Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2012-10-24 09:21:02 UTC (rev 19496) +++ csw/mgar/gar/v2/gar.mk 2012-10-24 10:02:33 UTC (rev 19497) @@ -811,7 +811,7 @@ # Support for cswpycompile, skip pre-compiled python files (.pyc, .pyo) # during the merge phase. -_PYCOMPILE_FILES = /opt/csw/lib/python/site-packages/.*\.py +_PYCOMPILE_FILES = /opt/csw/lib/python.*/site-packages/.*\.py MERGE_EXCLUDE_PYCOMPILE ?= $(if $(PYCOMPILE), $(addsuffix c,$(_PYCOMPILE_FILES)) $(addsuffix o,$(_PYCOMPILE_FILES))) MERGE_EXCLUDE_INFODIR ?= $(sharedstatedir)/info/dir 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 Oct 24 12:04:55 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 24 Oct 2012 10:04:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[19498] csw/mgar/pkg/gitosis/trunk/Makefile Message-ID: Revision: 19498 http://gar.svn.sourceforge.net/gar/?rev=19498&view=rev Author: bdwalton Date: 2012-10-24 10:04:55 +0000 (Wed, 24 Oct 2012) Log Message: ----------- gitosis/trunk: enable pycompile support; split out test/ to a package that will not be released Modified Paths: -------------- csw/mgar/pkg/gitosis/trunk/Makefile Modified: csw/mgar/pkg/gitosis/trunk/Makefile =================================================================== --- csw/mgar/pkg/gitosis/trunk/Makefile 2012-10-24 10:02:33 UTC (rev 19497) +++ csw/mgar/pkg/gitosis/trunk/Makefile 2012-10-24 10:04:55 UTC (rev 19498) @@ -30,12 +30,19 @@ PACKAGES = CSWgitosis CATALOGNAME_CSWgitosis = $(NAME) +SPKG_DESC_CSWgitosis = $(DESCRIPTION) ARCHALL_CSWgitosis = 1 - BUILD_DEP_PKGS_CSWgitosis = CSWpython CSWpysetuptools - RUNTIME_DEP_PKGS_CSWgitosis = CSWgit CSWpysetuptools CSWbash +# this is not for release. +PACKAGES += CSWgitosis-test +SPKG_DESC_CSWgitosis-test = The test suite for gitosis +PKGFILES_CSWgitosis-test = .*/test/.* +ARCHALL_CSWgitosis-test = 1 +CHECKPKG_OVERRIDES_CSWgitosis-test += pkgname-does-not-start-with-CSWpy- +CHECKPKG_OVERRIDES_CSWgitosis-test += catalogname-does-not-start-with-py_ + GIT_REPOS = git://github.com/tv42/gitosis.git GIT_USE_PROXY = 1 # We don't use a specific release tag as we want to get some fixes to @@ -75,6 +82,8 @@ LICENSE = COPYING +PYCOMPILE = 1 + include gar/category.mk # override the category exclusion 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 Oct 24 12:18:44 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 24 Oct 2012 10:18:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[19499] csw/mgar/pkg/lang-python/cheetah/trunk/Makefile Message-ID: Revision: 19499 http://gar.svn.sourceforge.net/gar/?rev=19499&view=rev Author: bdwalton Date: 2012-10-24 10:18:44 +0000 (Wed, 24 Oct 2012) Log Message: ----------- lang-python/cheetah/trunk: add the libpython dep Modified Paths: -------------- csw/mgar/pkg/lang-python/cheetah/trunk/Makefile Modified: csw/mgar/pkg/lang-python/cheetah/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/cheetah/trunk/Makefile 2012-10-24 10:04:55 UTC (rev 19498) +++ csw/mgar/pkg/lang-python/cheetah/trunk/Makefile 2012-10-24 10:18:44 UTC (rev 19499) @@ -22,4 +22,5 @@ UFILES_REGEX = $(DL_NAME)-(\d+(?:\.\d+)*).tar.gz CATALOGNAME = py_cheetah PACKAGES = CSWpy-cheetah +RUNTIME_DEP_PKGS_CSWpy-cheetah += CSWlibpython2-6-1-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 Wed Oct 24 13:09:43 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 24 Oct 2012 11:09:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[19500] csw/mgar/pkg/lang-python/pysetuptools/trunk/ Makefile Message-ID: Revision: 19500 http://gar.svn.sourceforge.net/gar/?rev=19500&view=rev Author: bdwalton Date: 2012-10-24 11:09:42 +0000 (Wed, 24 Oct 2012) Log Message: ----------- lang-python/pysetuptools/trunk: nuke the test files and override the category dep for the transition package Modified Paths: -------------- csw/mgar/pkg/lang-python/pysetuptools/trunk/Makefile Modified: csw/mgar/pkg/lang-python/pysetuptools/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pysetuptools/trunk/Makefile 2012-10-24 10:18:44 UTC (rev 19499) +++ csw/mgar/pkg/lang-python/pysetuptools/trunk/Makefile 2012-10-24 11:09:42 UTC (rev 19500) @@ -25,4 +25,12 @@ SPKG_DESC_CSWpy-setuptools = Distribution Utiltiies for Python TEST_SCRIPTS = LICENSE = LICENSE + +CHECKPKG_OVERRIDES_CSWpysetuptools += surplus-dependency|CSWpython + include gar/category.mk + +post-merge: + @(cd $(PKGROOT)/$(libdir)/python2.6/site-packages/setuptools/; \ + rm -rf tests ) + @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Wed Oct 24 18:20:34 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 24 Oct 2012 16:20:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[19501] csw/mgar/pkg Message-ID: Revision: 19501 http://gar.svn.sourceforge.net/gar/?rev=19501&view=rev Author: bdwalton Date: 2012-10-24 16:20:33 +0000 (Wed, 24 Oct 2012) Log Message: ----------- move formencode into the python directory Added Paths: ----------- csw/mgar/pkg/lang-python/formencode/ Removed Paths: ------------- csw/mgar/pkg/formencode/ 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 Oct 24 21:22:19 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 24 Oct 2012 19:22:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[19502] csw/mgar/pkg/exim/branches/dublin/ Message-ID: Revision: 19502 http://gar.svn.sourceforge.net/gar/?rev=19502&view=rev Author: bdwalton Date: 2012-10-24 19:22:19 +0000 (Wed, 24 Oct 2012) Log Message: ----------- exim/branches/dublin: branch exim to build against the dublin catalog Added Paths: ----------- csw/mgar/pkg/exim/branches/dublin/ 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 Oct 24 21:24:27 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 24 Oct 2012 19:24:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[19503] csw/mgar/pkg/lang-python/formencode/trunk/Makefile Message-ID: Revision: 19503 http://gar.svn.sourceforge.net/gar/?rev=19503&view=rev Author: bdwalton Date: 2012-10-24 19:24:26 +0000 (Wed, 24 Oct 2012) Log Message: ----------- lang-python/formencode/trunk: fix a usr/share reference Modified Paths: -------------- csw/mgar/pkg/lang-python/formencode/trunk/Makefile Modified: csw/mgar/pkg/lang-python/formencode/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/formencode/trunk/Makefile 2012-10-24 19:22:19 UTC (rev 19502) +++ csw/mgar/pkg/lang-python/formencode/trunk/Makefile 2012-10-24 19:24:26 UTC (rev 19503) @@ -19,4 +19,8 @@ UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz LICENSE = PKG-INFO ARCHALL_CSWpy-formencode = 1 + +REINPLACE_USRSHARE = $(libdir)/python2.6/site-packages/formencode/api.py +REINPLACE_WHEN_USRSHARE = postinstall + 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 Oct 24 21:40:13 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 24 Oct 2012 19:40:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[19504] csw/mgar/pkg/exim/branches/dublin/Makefile Message-ID: Revision: 19504 http://gar.svn.sourceforge.net/gar/?rev=19504&view=rev Author: bdwalton Date: 2012-10-24 19:40:13 +0000 (Wed, 24 Oct 2012) Log Message: ----------- exim/branches/dublin: note sasl_dev as a build dep Modified Paths: -------------- csw/mgar/pkg/exim/branches/dublin/Makefile Modified: csw/mgar/pkg/exim/branches/dublin/Makefile =================================================================== --- csw/mgar/pkg/exim/branches/dublin/Makefile 2012-10-24 19:24:26 UTC (rev 19503) +++ csw/mgar/pkg/exim/branches/dublin/Makefile 2012-10-24 19:40:13 UTC (rev 19504) @@ -29,7 +29,7 @@ # commits in pre-patch below. PATCHFILES += 0003-Set-OpenCSW-build-options.patch -BUILD_DEP_PKGS = CSWlibspf2-dev +BUILD_DEP_PKGS = CSWlibspf2-dev CSWsasl-dev RUNTIME_DEP_PKGS_CSWexim += CSWgzip RUNTIME_DEP_PKGS_CSWexim += CSWgzipextras 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 Oct 24 21:41:10 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 24 Oct 2012 19:41:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[19505] csw/mgar/pkg/exim/trunk/Makefile Message-ID: Revision: 19505 http://gar.svn.sourceforge.net/gar/?rev=19505&view=rev Author: bdwalton Date: 2012-10-24 19:41:10 +0000 (Wed, 24 Oct 2012) Log Message: ----------- exim/trunk: note sasl_dev as a build dep Modified Paths: -------------- csw/mgar/pkg/exim/trunk/Makefile Modified: csw/mgar/pkg/exim/trunk/Makefile =================================================================== --- csw/mgar/pkg/exim/trunk/Makefile 2012-10-24 19:40:13 UTC (rev 19504) +++ csw/mgar/pkg/exim/trunk/Makefile 2012-10-24 19:41:10 UTC (rev 19505) @@ -29,7 +29,7 @@ # commits in pre-patch below. PATCHFILES += 0003-Set-OpenCSW-build-options.patch -BUILD_DEP_PKGS = CSWlibspf2-dev +BUILD_DEP_PKGS = CSWlibspf2-dev CSWsasl-dev RUNTIME_DEP_PKGS_CSWexim += CSWgzip RUNTIME_DEP_PKGS_CSWexim += CSWgzipextras 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 Oct 24 21:59:01 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 24 Oct 2012 19:59:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[19506] csw/mgar/pkg/lang-python/mysql-python/trunk/ Makefile Message-ID: Revision: 19506 http://gar.svn.sourceforge.net/gar/?rev=19506&view=rev Author: bdwalton Date: 2012-10-24 19:59:00 +0000 (Wed, 24 Oct 2012) Log Message: ----------- lang-python/mysql-python/trunk: update dependencies; no longer run tests by default as they require special setup Modified Paths: -------------- csw/mgar/pkg/lang-python/mysql-python/trunk/Makefile Modified: csw/mgar/pkg/lang-python/mysql-python/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/mysql-python/trunk/Makefile 2012-10-24 19:41:10 UTC (rev 19505) +++ csw/mgar/pkg/lang-python/mysql-python/trunk/Makefile 2012-10-24 19:59:00 UTC (rev 19506) @@ -18,8 +18,7 @@ PACKAGES = CSWpy-mysql CATALOGNAME_CSWpy-mysql = py_mysql RUNTIME_DEP_PKGS_CSWpy-mysql += CSWlibpython2-6-1-0 -RUNTIME_DEP_PKGS_CSWpy-mysql += CSWzlib -RUNTIME_DEP_PKGS_CSWpy-mysql += CSWlibmysqlclient-r15 +RUNTIME_DEP_PKGS_CSWpy-mysql += CSWlibmysqlclient18 SPKG_DESC_CSWpy-mysql = MySQL Support for Python @@ -31,6 +30,8 @@ CHECKPKG_OVERRIDES_CSWpymysql += surplus-dependency|CSWpython +SKIPTEST = 1 + include gar/category.mk PATH := $(mysql_bindir):$(PATH) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Wed Oct 24 22:05:08 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 24 Oct 2012 20:05:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[19507] csw/mgar/pkg/exim/branches/dublin/Makefile Message-ID: Revision: 19507 http://gar.svn.sourceforge.net/gar/?rev=19507&view=rev Author: bdwalton Date: 2012-10-24 20:05:08 +0000 (Wed, 24 Oct 2012) Log Message: ----------- exim/branches/dublin: back-date deps for the dublin catalog Modified Paths: -------------- csw/mgar/pkg/exim/branches/dublin/Makefile Modified: csw/mgar/pkg/exim/branches/dublin/Makefile =================================================================== --- csw/mgar/pkg/exim/branches/dublin/Makefile 2012-10-24 19:59:00 UTC (rev 19506) +++ csw/mgar/pkg/exim/branches/dublin/Makefile 2012-10-24 20:05:08 UTC (rev 19507) @@ -35,14 +35,14 @@ RUNTIME_DEP_PKGS_CSWexim += CSWgzipextras RUNTIME_DEP_PKGS_CSWexim += CSWliblber2-4-2 RUNTIME_DEP_PKGS_CSWexim += CSWlibldap2-4-2 -RUNTIME_DEP_PKGS_CSWexim += CSWlibmysqlclient18 RUNTIME_DEP_PKGS_CSWexim += CSWlibiconv2 -RUNTIME_DEP_PKGS_CSWexim += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWexim += CSWlibpcre1 RUNTIME_DEP_PKGS_CSWexim += CSWlibsasl2-2 RUNTIME_DEP_PKGS_CSWexim += CSWlibspf2-2 RUNTIME_DEP_PKGS_CSWexim += CSWlibpq5 RUNTIME_DEP_PKGS_CSWexim += CSWperl +RUNTIME_DEP_PKGS_CSWexim += CSWlibssl0-9-8 +RUNTIME_DEP_PKGS_CSWexim += CSWlibmysqlclient15 # They supply the GPL in a non-standard file. LICENSE = LICENCE 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 Oct 24 22:35:48 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 24 Oct 2012 20:35:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[19508] csw/mgar/pkg/file/trunk/Makefile Message-ID: Revision: 19508 http://gar.svn.sourceforge.net/gar/?rev=19508&view=rev Author: bdwalton Date: 2012-10-24 20:35:48 +0000 (Wed, 24 Oct 2012) Log Message: ----------- file/trunk: override dep warning for the python subpackage Modified Paths: -------------- csw/mgar/pkg/file/trunk/Makefile Modified: csw/mgar/pkg/file/trunk/Makefile =================================================================== --- csw/mgar/pkg/file/trunk/Makefile 2012-10-24 20:05:08 UTC (rev 19507) +++ csw/mgar/pkg/file/trunk/Makefile 2012-10-24 20:35:48 UTC (rev 19508) @@ -35,6 +35,8 @@ ARCHALL_CSWpy-libmagic = 1 RUNTIME_DEP_PKGS_CSWpy-libmagic += CSWpython RUNTIME_DEP_PKGS_CSWpy-libmagic += CSWlibmagic1 +# libmagic1 is dlopened +CHECKPKG_OVERRIDES_CSWpy-libmagic += surplus-dependency|CSWlibmagic1 PACKAGES += CSWlibmagic-data SPKG_DESC_CSWlibmagic-data = Database for libmagic 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 Oct 24 22:36:31 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 24 Oct 2012 20:36:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[19509] csw/mgar/pkg/file/trunk/Makefile Message-ID: Revision: 19509 http://gar.svn.sourceforge.net/gar/?rev=19509&view=rev Author: bdwalton Date: 2012-10-24 20:36:31 +0000 (Wed, 24 Oct 2012) Log Message: ----------- file/trunk: drop extra dep detected by new linker flags Modified Paths: -------------- csw/mgar/pkg/file/trunk/Makefile Modified: csw/mgar/pkg/file/trunk/Makefile =================================================================== --- csw/mgar/pkg/file/trunk/Makefile 2012-10-24 20:35:48 UTC (rev 19508) +++ csw/mgar/pkg/file/trunk/Makefile 2012-10-24 20:36:31 UTC (rev 19509) @@ -25,7 +25,6 @@ PKGFILES_CSWgfile += $(call baseisadirs,$(bindir),gfile) PKGFILES_CSWgfile += $(mandir)/man1/gfile\.1 PKGFILES_CSWgfile += $(prefix)/gnu/file -RUNTIME_DEP_PKGS_CSWgfile += CSWlibz1 RUNTIME_DEP_PKGS_CSWgfile += CSWlibmagic1 # EXTRA_MERGE_EXCLUDE_FILES = .*\.py[oc] 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 Oct 24 23:10:49 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 24 Oct 2012 21:10:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[19510] csw/mgar/pkg/denyhosts/trunk/Makefile Message-ID: Revision: 19510 http://gar.svn.sourceforge.net/gar/?rev=19510&view=rev Author: bdwalton Date: 2012-10-24 21:10:49 +0000 (Wed, 24 Oct 2012) Log Message: ----------- denyhosts/trunk: update for python libdir change; force non py- pkgname Modified Paths: -------------- csw/mgar/pkg/denyhosts/trunk/Makefile Modified: csw/mgar/pkg/denyhosts/trunk/Makefile =================================================================== --- csw/mgar/pkg/denyhosts/trunk/Makefile 2012-10-24 20:36:31 UTC (rev 19509) +++ csw/mgar/pkg/denyhosts/trunk/Makefile 2012-10-24 21:10:49 UTC (rev 19510) @@ -26,6 +26,11 @@ ARCHALL = 1 INITSMF = /etc/opt/csw/init.d/cswdenyhosts +PACKAGES = CSWdenyhosts + +CHECKPKG_OVERRIDES_CSWdenyhosts += pkgname-does-not-start-with-CSWpy- +CHECKPKG_OVERRIDES_CSWdenyhosts += catalogname-does-not-start-with-py_ + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz @@ -70,7 +75,7 @@ gsed -i \ -e 's,denyhosts.cfg,$(sysconfdir)/denyhosts.cfg,' \ - $(DESTDIR)/opt/csw/lib/python/site-packages/DenyHosts/constants.py + $(DESTDIR)/opt/csw/lib/python2.6/site-packages/DenyHosts/constants.py #Adjust daemon-control-dist wrapper script to match our package paths gsed -i \ 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 Oct 24 23:23:55 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 24 Oct 2012 21:23:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[19511] csw/mgar/pkg/lang-python/GeoIP-Python/trunk Message-ID: Revision: 19511 http://gar.svn.sourceforge.net/gar/?rev=19511&view=rev Author: bdwalton Date: 2012-10-24 21:23:54 +0000 (Wed, 24 Oct 2012) Log Message: ----------- lang-python/GeoIP-Python/trunk: correct a usr/local reference in the generated .so Modified Paths: -------------- csw/mgar/pkg/lang-python/GeoIP-Python/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/lang-python/GeoIP-Python/trunk/files/0001-Remove-usr-local-references-from-setup.py-to-fix-emb.patch Modified: csw/mgar/pkg/lang-python/GeoIP-Python/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/GeoIP-Python/trunk/Makefile 2012-10-24 21:10:49 UTC (rev 19510) +++ csw/mgar/pkg/lang-python/GeoIP-Python/trunk/Makefile 2012-10-24 21:23:54 UTC (rev 19511) @@ -8,6 +8,8 @@ MASTER_SITES = http://www.maxmind.com/download/geoip/api/python/ DISTFILES = $(DISTNAME).tar.gz +PATCHFILES += 0001-Remove-usr-local-references-from-setup.py-to-fix-emb.patch + VENDOR_URL = http://www.maxmind.com/app/python LICENSE = LICENSE Added: csw/mgar/pkg/lang-python/GeoIP-Python/trunk/files/0001-Remove-usr-local-references-from-setup.py-to-fix-emb.patch =================================================================== --- csw/mgar/pkg/lang-python/GeoIP-Python/trunk/files/0001-Remove-usr-local-references-from-setup.py-to-fix-emb.patch (rev 0) +++ csw/mgar/pkg/lang-python/GeoIP-Python/trunk/files/0001-Remove-usr-local-references-from-setup.py-to-fix-emb.patch 2012-10-24 21:23:54 UTC (rev 19511) @@ -0,0 +1,29 @@ +From 1ceb448faad576ec565052759f4e44d1fc0fabc1 Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Wed, 24 Oct 2012 23:19:36 +0200 +Subject: [PATCH] Remove usr/local references from setup.py to fix embedded + refs later + +Signed-off-by: Ben Walton +--- + setup.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/setup.py b/setup.py +index c34324a..eed12ab 100644 +--- a/setup.py ++++ b/setup.py +@@ -3,8 +3,8 @@ from distutils.core import setup, Extension + module1 = Extension('GeoIP', + libraries = ['GeoIP'], + sources = ['py_GeoIP.c'], +- library_dirs = ['/usr/local/lib'], +- include_dirs = ['/usr/local/include']) ++ library_dirs = ['/opt/csw/lib'], ++ include_dirs = ['/opt/csw/include']) + + setup (name = 'GeoIP-Python', + version = '1.2.7', +-- +1.8.0 + 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 Oct 25 09:19:25 2012 From: romeotheriault at users.sourceforge.net (romeotheriault at users.sourceforge.net) Date: Thu, 25 Oct 2012 07:19:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[19512] csw/mgar/pkg/lang-python/salt/trunk Message-ID: Revision: 19512 http://gar.svn.sourceforge.net/gar/?rev=19512&view=rev Author: romeotheriault Date: 2012-10-25 07:19:23 +0000 (Thu, 25 Oct 2012) Log Message: ----------- lang-python/salt/trunk: upgrade to version 0.10.4 Modified Paths: -------------- csw/mgar/pkg/lang-python/salt/trunk/Makefile csw/mgar/pkg/lang-python/salt/trunk/checksums Modified: csw/mgar/pkg/lang-python/salt/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/salt/trunk/Makefile 2012-10-24 21:23:54 UTC (rev 19511) +++ csw/mgar/pkg/lang-python/salt/trunk/Makefile 2012-10-25 07:19:23 UTC (rev 19512) @@ -1,5 +1,5 @@ NAME = salt -VERSION = 0.10.3 +VERSION = 0.10.4 GARTYPE = v2 CATEGORIES = python Modified: csw/mgar/pkg/lang-python/salt/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/salt/trunk/checksums 2012-10-24 21:23:54 UTC (rev 19511) +++ csw/mgar/pkg/lang-python/salt/trunk/checksums 2012-10-25 07:19:23 UTC (rev 19512) @@ -1 +1 @@ -f62f22838d5978b1f7457aa7db4e3277 salt-0.10.3.tar.gz +18022f153f9071d605483d3c92862e48 salt-0.10.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 Thu Oct 25 09:23:30 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 25 Oct 2012 07:23:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[19513] csw/mgar/pkg/lang-python/M2Crypto/trunk/Makefile Message-ID: Revision: 19513 http://gar.svn.sourceforge.net/gar/?rev=19513&view=rev Author: bdwalton Date: 2012-10-25 07:23:30 +0000 (Thu, 25 Oct 2012) Log Message: ----------- lang-python/M2Crypto/trunk: update the ssl dependency Modified Paths: -------------- csw/mgar/pkg/lang-python/M2Crypto/trunk/Makefile Modified: csw/mgar/pkg/lang-python/M2Crypto/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/M2Crypto/trunk/Makefile 2012-10-25 07:19:23 UTC (rev 19512) +++ csw/mgar/pkg/lang-python/M2Crypto/trunk/Makefile 2012-10-25 07:23:30 UTC (rev 19513) @@ -18,12 +18,13 @@ PACKAGES = CSWpy-m2crypto SPKG_DESC_CSWpy-m2crypto = The most complete Python wrapper for OpenSSL -RUNTIME_DEP_PKGS_CSWpy-m2crypto += CSWosslrt +RUNTIME_DEP_PKGS_CSWpy-m2crypto += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWpy-m2crypto += CSWlibpython2-6-1-0 PYBUILD_CMD = build build_ext BUILD_ARGS += --openssl=$(prefix) + # Skip testsuite until this is fixed: # https://bugzilla.osafoundation.org/show_bug.cgi?id=13039 SKIPTEST ?= 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Thu Oct 25 09:28:31 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 25 Oct 2012 07:28:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[19514] csw/mgar/pkg/lang-python/M2Crypto/trunk/Makefile Message-ID: Revision: 19514 http://gar.svn.sourceforge.net/gar/?rev=19514&view=rev Author: bdwalton Date: 2012-10-25 07:28:30 +0000 (Thu, 25 Oct 2012) Log Message: ----------- lang-python/M2Crypto/trunk: note the build dep: swig Modified Paths: -------------- csw/mgar/pkg/lang-python/M2Crypto/trunk/Makefile Modified: csw/mgar/pkg/lang-python/M2Crypto/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/M2Crypto/trunk/Makefile 2012-10-25 07:23:30 UTC (rev 19513) +++ csw/mgar/pkg/lang-python/M2Crypto/trunk/Makefile 2012-10-25 07:28:30 UTC (rev 19514) @@ -16,6 +16,8 @@ VENDOR_URL = http://chandlerproject.org/Projects/MeTooCrypto +BUILD_DEP_PKGS += CSWswig + PACKAGES = CSWpy-m2crypto SPKG_DESC_CSWpy-m2crypto = The most complete Python wrapper for OpenSSL RUNTIME_DEP_PKGS_CSWpy-m2crypto += CSWlibssl1-0-0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Thu Oct 25 10:21:11 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 25 Oct 2012 08:21:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[19515] csw/mgar/pkg/lang-python/amara/trunk/Makefile Message-ID: Revision: 19515 http://gar.svn.sourceforge.net/gar/?rev=19515&view=rev Author: bdwalton Date: 2012-10-25 08:21:10 +0000 (Thu, 25 Oct 2012) Log Message: ----------- lang-python/amara/trunk: nuke the test directory from the package (avoids a /usr reference too) Modified Paths: -------------- csw/mgar/pkg/lang-python/amara/trunk/Makefile Modified: csw/mgar/pkg/lang-python/amara/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/amara/trunk/Makefile 2012-10-25 07:28:30 UTC (rev 19514) +++ csw/mgar/pkg/lang-python/amara/trunk/Makefile 2012-10-25 08:21:10 UTC (rev 19515) @@ -21,3 +21,7 @@ RUNTIME_DEP_PKGS_CSWpy-amara += CSWlibpython2-6-1-0 EXTRA_MERGE_EXCLUDE_FILES = $(libdir)/python/site-packages/amara/test.* include gar/category.mk + +post-merge: + @(cd $(PKGROOT)$(libdir)/python2.6/site-packages/amara/; rm -rf test) + @$(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 Oct 25 10:43:22 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 25 Oct 2012 08:43:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[19516] csw/mgar/pkg/lang-python/django/trunk/Makefile Message-ID: Revision: 19516 http://gar.svn.sourceforge.net/gar/?rev=19516&view=rev Author: bdwalton Date: 2012-10-25 08:43:21 +0000 (Thu, 25 Oct 2012) Log Message: ----------- lang-python/django/trunk: build depend on python_dev (update from old naming convention) Modified Paths: -------------- csw/mgar/pkg/lang-python/django/trunk/Makefile Modified: csw/mgar/pkg/lang-python/django/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/django/trunk/Makefile 2012-10-25 08:21:10 UTC (rev 19515) +++ csw/mgar/pkg/lang-python/django/trunk/Makefile 2012-10-25 08:43:21 UTC (rev 19516) @@ -31,7 +31,7 @@ UFILES_REGEX = Django-(\d+(?:\.\d+)*).tar.gz DISTNAME = Django-$(VERSION) RUNTIME_DEP_PKGS = -BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) CSWpython-devel +BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) CSWpython-dev CONFIGURE_SCRIPTS = TEST_SCRIPTS = LICENSE = LICENSE 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 Oct 25 11:01:45 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 25 Oct 2012 09:01:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[19517] csw/mgar/pkg/lang-python/django-auth-ldap/trunk Message-ID: Revision: 19517 http://gar.svn.sourceforge.net/gar/?rev=19517&view=rev Author: bdwalton Date: 2012-10-25 09:01:45 +0000 (Thu, 25 Oct 2012) Log Message: ----------- lang-python/django-auth-ldap/trunk: version bump as previous version no longer at download site Modified Paths: -------------- csw/mgar/pkg/lang-python/django-auth-ldap/trunk/Makefile csw/mgar/pkg/lang-python/django-auth-ldap/trunk/checksums Modified: csw/mgar/pkg/lang-python/django-auth-ldap/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/django-auth-ldap/trunk/Makefile 2012-10-25 08:43:21 UTC (rev 19516) +++ csw/mgar/pkg/lang-python/django-auth-ldap/trunk/Makefile 2012-10-25 09:01:45 UTC (rev 19517) @@ -1,6 +1,6 @@ # $Id$ NAME = django-auth-ldap -VERSION = 1.0.6 +VERSION = 1.1.2 CATEGORIES = python GARTYPE = v2 PACKAGES = CSWpy-django-auth-ldap Modified: csw/mgar/pkg/lang-python/django-auth-ldap/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/django-auth-ldap/trunk/checksums 2012-10-25 08:43:21 UTC (rev 19516) +++ csw/mgar/pkg/lang-python/django-auth-ldap/trunk/checksums 2012-10-25 09:01:45 UTC (rev 19517) @@ -1 +1 @@ -d8a732728bf820942c05f57bb564ff78 django-auth-ldap-1.0.6.tar.gz +db7bca44f58cd252635245515cefca7b django-auth-ldap-1.1.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 Oct 25 13:08:23 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 25 Oct 2012 11:08:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[19518] csw/mgar/pkg/lang-python/python-ldap/trunk/Makefile Message-ID: Revision: 19518 http://gar.svn.sourceforge.net/gar/?rev=19518&view=rev Author: bdwalton Date: 2012-10-25 11:08:23 +0000 (Thu, 25 Oct 2012) Log Message: ----------- lang-python/python-ldap/trunk: note that sasl_dev is a build dep Modified Paths: -------------- csw/mgar/pkg/lang-python/python-ldap/trunk/Makefile Modified: csw/mgar/pkg/lang-python/python-ldap/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python-ldap/trunk/Makefile 2012-10-25 09:01:45 UTC (rev 19517) +++ csw/mgar/pkg/lang-python/python-ldap/trunk/Makefile 2012-10-25 11:08:23 UTC (rev 19518) @@ -16,7 +16,7 @@ PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 -BUILD_DEP_PKGS = CSWpython-dev CSWopenldap-dev +BUILD_DEP_PKGS = CSWpython-dev CSWopenldap-dev CSWsasl-dev RUNTIME_DEP_PKGS_CSWpy-ldap += CSWliblber2-4-2 RUNTIME_DEP_PKGS_CSWpy-ldap += CSWlibldap-r2-4-2 RUNTIME_DEP_PKGS_CSWpy-ldap += CSWlibpython2-6-1-0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Thu Oct 25 18:04:59 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 25 Oct 2012 16:04:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[19519] csw/mgar/gar/v2/categories/python/category.mk Message-ID: Revision: 19519 http://gar.svn.sourceforge.net/gar/?rev=19519&view=rev Author: bdwalton Date: 2012-10-25 16:04:58 +0000 (Thu, 25 Oct 2012) Log Message: ----------- gar/v2: add SITE_PACKAGES for use by python recipes Modified Paths: -------------- csw/mgar/gar/v2/categories/python/category.mk Modified: csw/mgar/gar/v2/categories/python/category.mk =================================================================== --- csw/mgar/gar/v2/categories/python/category.mk 2012-10-25 11:08:23 UTC (rev 19518) +++ csw/mgar/gar/v2/categories/python/category.mk 2012-10-25 16:04:58 UTC (rev 19519) @@ -30,4 +30,9 @@ MASTER_SITES ?= $(PYPI_MIRROR) PACKAGES ?= CSWpy-$(DASHED_NAME) +# for use in any references by specific recipes so it can be replaced easily +# across the tree. this could later be parameterized for use by multiple +# versions of python too. +SITE_PACKAGES = $(libdir)/python2.6/site-packages + include gar/gar.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 Oct 25 18:07:38 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 25 Oct 2012 16:07:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[19520] csw/mgar/pkg/lang-python/docutils/trunk/Makefile Message-ID: Revision: 19520 http://gar.svn.sourceforge.net/gar/?rev=19520&view=rev Author: bdwalton Date: 2012-10-25 16:07:38 +0000 (Thu, 25 Oct 2012) Log Message: ----------- lang-python/docutils/trunk: use new SITE_PACKAGES variable to reference site-packages generically Modified Paths: -------------- csw/mgar/pkg/lang-python/docutils/trunk/Makefile Modified: csw/mgar/pkg/lang-python/docutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/docutils/trunk/Makefile 2012-10-25 16:04:58 UTC (rev 19519) +++ csw/mgar/pkg/lang-python/docutils/trunk/Makefile 2012-10-25 16:07:38 UTC (rev 19520) @@ -27,7 +27,7 @@ post-install-modulated: ginstall -m 644 \ $(WORKSRC)/extras/roman.py \ - $(DESTDIR)$(libdir)/python/site-packages + $(DESTDIR)$(SITE_PACKAGES) ginstall -d $(DESTDIR)$(docdir) gcp -Rv $(WORKSRC)/docs $(DESTDIR)$(docdir)/pydocutils gcp -Rv $(WORKSRC)/extras $(DESTDIR)$(docdir)/pydocutils 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 Oct 25 18:21:23 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 25 Oct 2012 16:21:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[19521] csw/mgar/pkg/lang-python/amara/trunk/Makefile Message-ID: Revision: 19521 http://gar.svn.sourceforge.net/gar/?rev=19521&view=rev Author: bdwalton Date: 2012-10-25 16:21:23 +0000 (Thu, 25 Oct 2012) Log Message: ----------- lang-python/amara/trunk: use SITE_PACKAGES to reference files for future maintainability Modified Paths: -------------- csw/mgar/pkg/lang-python/amara/trunk/Makefile Modified: csw/mgar/pkg/lang-python/amara/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/amara/trunk/Makefile 2012-10-25 16:07:38 UTC (rev 19520) +++ csw/mgar/pkg/lang-python/amara/trunk/Makefile 2012-10-25 16:21:23 UTC (rev 19521) @@ -19,9 +19,5 @@ TEST_SCRIPTS = CONFIGURE_ARGS = $(DIRPATHS) RUNTIME_DEP_PKGS_CSWpy-amara += CSWlibpython2-6-1-0 -EXTRA_MERGE_EXCLUDE_FILES = $(libdir)/python/site-packages/amara/test.* +EXTRA_MERGE_EXCLUDE_FILES = $(SITE_PACKAGES)/amara/test.* include gar/category.mk - -post-merge: - @(cd $(PKGROOT)$(libdir)/python2.6/site-packages/amara/; rm -rf test) - @$(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 Oct 25 18:21:36 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 25 Oct 2012 16:21:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[19522] csw/mgar/pkg/lang-python/pysetuptools/trunk/ Makefile Message-ID: Revision: 19522 http://gar.svn.sourceforge.net/gar/?rev=19522&view=rev Author: bdwalton Date: 2012-10-25 16:21:35 +0000 (Thu, 25 Oct 2012) Log Message: ----------- lang-python/pysetuptools/trunk: use SITE_PACKAGES to reference files for future maintainability Modified Paths: -------------- csw/mgar/pkg/lang-python/pysetuptools/trunk/Makefile Modified: csw/mgar/pkg/lang-python/pysetuptools/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pysetuptools/trunk/Makefile 2012-10-25 16:21:23 UTC (rev 19521) +++ csw/mgar/pkg/lang-python/pysetuptools/trunk/Makefile 2012-10-25 16:21:35 UTC (rev 19522) @@ -31,6 +31,6 @@ include gar/category.mk post-merge: - @(cd $(PKGROOT)/$(libdir)/python2.6/site-packages/setuptools/; \ + @(cd $(PKGROOT)/$(SITE_PACKAGES/setuptools/; \ rm -rf tests ) @$(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 Oct 25 18:21:48 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 25 Oct 2012 16:21:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[19523] csw/mgar/pkg/lang-python/formencode/trunk/Makefile Message-ID: Revision: 19523 http://gar.svn.sourceforge.net/gar/?rev=19523&view=rev Author: bdwalton Date: 2012-10-25 16:21:47 +0000 (Thu, 25 Oct 2012) Log Message: ----------- lang-python/formencode/trunk: use SITE_PACKAGES to reference files for future maintainability Modified Paths: -------------- csw/mgar/pkg/lang-python/formencode/trunk/Makefile Modified: csw/mgar/pkg/lang-python/formencode/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/formencode/trunk/Makefile 2012-10-25 16:21:35 UTC (rev 19522) +++ csw/mgar/pkg/lang-python/formencode/trunk/Makefile 2012-10-25 16:21:47 UTC (rev 19523) @@ -20,7 +20,7 @@ LICENSE = PKG-INFO ARCHALL_CSWpy-formencode = 1 -REINPLACE_USRSHARE = $(libdir)/python2.6/site-packages/formencode/api.py +REINPLACE_USRSHARE = $(SITE_PACKAGES)/formencode/api.py REINPLACE_WHEN_USRSHARE = postinstall 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 Oct 25 18:22:00 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 25 Oct 2012 16:22:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[19524] csw/mgar/pkg/lang-python/xpra/trunk/Makefile Message-ID: Revision: 19524 http://gar.svn.sourceforge.net/gar/?rev=19524&view=rev Author: bdwalton Date: 2012-10-25 16:22:00 +0000 (Thu, 25 Oct 2012) Log Message: ----------- lang-python/xpra/trunk: use SITE_PACKAGES to reference files for future maintainability Modified Paths: -------------- csw/mgar/pkg/lang-python/xpra/trunk/Makefile Modified: csw/mgar/pkg/lang-python/xpra/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/xpra/trunk/Makefile 2012-10-25 16:21:47 UTC (rev 19523) +++ csw/mgar/pkg/lang-python/xpra/trunk/Makefile 2012-10-25 16:22:00 UTC (rev 19524) @@ -36,10 +36,10 @@ BUILD_DEP_PKGS += CSWlibx264-dev BUILD_DEP_PKGS += CSWffmpeg-dev -REINPLACE_USRSHARE += $(libdir)/python/site-packages/xpra/xposix/gui.py -REINPLACE_USRSHARE += $(libdir)/python/site-packages/xpra/platform/client_extras_base.py +REINPLACE_USRSHARE += $(SITE_PACKAGES)/xpra/xposix/gui.py +REINPLACE_USRSHARE += $(SITE_PACKAGES)/xpra/platform/client_extras_base.py REINPLACE_WHEN_USRSHARE = postinstall -REINPLACE_USRLOCAL += $(libdir)/python/site-packages/xpra/xposix/gui.py +REINPLACE_USRLOCAL += $(SITE_PACKAGES)/xpra/xposix/gui.py REINPLACE_WHEN_USRLOCAL = postinstall PACKAGE += CSWxpra 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 Oct 25 22:06:11 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Thu, 25 Oct 2012 20:06:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[19525] csw/mgar/pkg/lang-python/paramiko/trunk/Makefile Message-ID: Revision: 19525 http://gar.svn.sourceforge.net/gar/?rev=19525&view=rev Author: bdwalton Date: 2012-10-25 20:06:11 +0000 (Thu, 25 Oct 2012) Log Message: ----------- lang-python/paramiko/trunk: use SITE_PACKAGES variable for easier future maintenance Modified Paths: -------------- csw/mgar/pkg/lang-python/paramiko/trunk/Makefile Modified: csw/mgar/pkg/lang-python/paramiko/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/paramiko/trunk/Makefile 2012-10-25 16:22:00 UTC (rev 19524) +++ csw/mgar/pkg/lang-python/paramiko/trunk/Makefile 2012-10-25 20:06:11 UTC (rev 19525) @@ -27,5 +27,5 @@ post-merge-modulated: gsed -i 's,/usr/local/etc/moduli,/opt/csw/etc/ssh/moduli,' \ - $(PKGROOT)$(libdir)/python/site-packages/paramiko/transport.py + $(PKGROOT)$(SITE_PACKAGES)/paramiko/transport.py @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From janholzh at users.sourceforge.net Fri Oct 26 10:58:04 2012 From: janholzh at users.sourceforge.net (janholzh at users.sourceforge.net) Date: Fri, 26 Oct 2012 08:58:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[19526] csw/mgar/pkg/spidermonkey/branches/js-1.7/Makefile Message-ID: Revision: 19526 http://gar.svn.sourceforge.net/gar/?rev=19526&view=rev Author: janholzh Date: 2012-10-26 08:58:03 +0000 (Fri, 26 Oct 2012) Log Message: ----------- spidermonkey/branches/js-1.7: add CSWspidermonkey package Modified Paths: -------------- csw/mgar/pkg/spidermonkey/branches/js-1.7/Makefile Modified: csw/mgar/pkg/spidermonkey/branches/js-1.7/Makefile =================================================================== --- csw/mgar/pkg/spidermonkey/branches/js-1.7/Makefile 2012-10-25 20:06:11 UTC (rev 19525) +++ csw/mgar/pkg/spidermonkey/branches/js-1.7/Makefile 2012-10-26 08:58:03 UTC (rev 19526) @@ -56,9 +56,15 @@ PACKAGES += CSWlibjs1-7-0 PKGFILES_CSWlibjs1-7-0 += $(call baseisadirs,$(libdir),libjs\.so\.1\.7\.0) SPKG_DESC_CSWlibjs1-7-0 += $(DESCRIPTION), libjs.so.1.7.0 + +PACKAGES += CSWspidermonkey +SPKG_DESC_CSWspidermonkey += $(DESCRIPTION) RUNTIME_DEP_PKGS_CSWspidermonkey += CSWlibjs1-7-0 CHECKPKG_OVERRIDES_CSWlibjs1-7-0 += binary-architecture-does-not-match-placement|file=opt/csw/lib/libjs.so.1.7.0|arch_id=18|arch_name=sparcv8+ +CHECKPKG_OVERRIDES_CSWspidermonkey += binary-architecture-does-not-match-placement|file=opt/csw/bin/js|arch_id=18|arch_name=sparcv8+ +CHECKPKG_OVERRIDES_CSWspidermonkey += binary-architecture-does-not-match-placement|file=opt/csw/bin/jscpucfg|arch_id=18|arch_name=sparcv8+ +CHECKPKG_OVERRIDES_CSWspidermonkey += surplus-dependency|CSWlibjs1-7-0 BUILD_OPT = 1 EXTRA_BUILD_EXPORTS = BUILD_OPT CC CXX This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Oct 28 00:07:34 2012 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 27 Oct 2012 22:07:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[19527] csw/mgar/pkg/vsftpd/trunk/files Message-ID: Revision: 19527 http://gar.svn.sourceforge.net/gar/?rev=19527&view=rev Author: chninkel Date: 2012-10-27 22:07:33 +0000 (Sat, 27 Oct 2012) Log Message: ----------- vsftpd/trunk: fixed references in previous configuration file directory Modified Paths: -------------- csw/mgar/pkg/vsftpd/trunk/files/cswvsftpd csw/mgar/pkg/vsftpd/trunk/files/vsftpd.smf_wrapper Modified: csw/mgar/pkg/vsftpd/trunk/files/cswvsftpd =================================================================== --- csw/mgar/pkg/vsftpd/trunk/files/cswvsftpd 2012-10-26 08:58:03 UTC (rev 19526) +++ csw/mgar/pkg/vsftpd/trunk/files/cswvsftpd 2012-10-27 22:07:33 UTC (rev 19527) @@ -19,7 +19,7 @@ BINPATH=/opt/csw/sbin PIDFILE=/var/run/vsftpd.pid INIT_FILE=/etc/init.d/vsftpd -CONF_DIR=/opt/csw/etc/vsftpd +CONF_DIR=/etc/opt/csw/vsftpd CONF_FILE=$CONF_DIR/vsftpd.conf OPTIONS="" Modified: csw/mgar/pkg/vsftpd/trunk/files/vsftpd.smf_wrapper =================================================================== --- csw/mgar/pkg/vsftpd/trunk/files/vsftpd.smf_wrapper 2012-10-26 08:58:03 UTC (rev 19526) +++ csw/mgar/pkg/vsftpd/trunk/files/vsftpd.smf_wrapper 2012-10-27 22:07:33 UTC (rev 19527) @@ -16,7 +16,7 @@ # software causes damage. ##################################################################### -CONF_DIR=/opt/csw/etc/vsftpd +CONF_DIR=/etc/opt/csw/vsftpd CONF_FILE=$CONF_DIR/vsftpd.conf if /usr/bin/egrep -i "^ *background *= *yes" ${CONF_FILE} > /dev/null; then This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Oct 28 00:08:45 2012 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 27 Oct 2012 22:08:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[19528] csw/mgar/pkg/vsftpd/trunk Message-ID: Revision: 19528 http://gar.svn.sourceforge.net/gar/?rev=19528&view=rev Author: chninkel Date: 2012-10-27 22:08:45 +0000 (Sat, 27 Oct 2012) Log Message: ----------- vsftpd/trunk: updated to vsftpd 3.0.2 Modified Paths: -------------- csw/mgar/pkg/vsftpd/trunk/Makefile csw/mgar/pkg/vsftpd/trunk/checksums Modified: csw/mgar/pkg/vsftpd/trunk/Makefile =================================================================== --- csw/mgar/pkg/vsftpd/trunk/Makefile 2012-10-27 22:07:33 UTC (rev 19527) +++ csw/mgar/pkg/vsftpd/trunk/Makefile 2012-10-27 22:08:45 UTC (rev 19528) @@ -13,7 +13,7 @@ ###### Package information ####### NAME = vsftpd -VERSION = 3.0.0 +VERSION = 3.0.2 CATEGORIES = server GARTYPE = v2 Modified: csw/mgar/pkg/vsftpd/trunk/checksums =================================================================== --- csw/mgar/pkg/vsftpd/trunk/checksums 2012-10-27 22:07:33 UTC (rev 19527) +++ csw/mgar/pkg/vsftpd/trunk/checksums 2012-10-27 22:08:45 UTC (rev 19528) @@ -1 +1 @@ -ad9fa952558c2c5b0426ccaccff0f972 vsftpd-3.0.0.tar.gz +8b00c749719089401315bd3c44dddbb2 vsftpd-3.0.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From chninkel at users.sourceforge.net Sun Oct 28 00:09:10 2012 From: chninkel at users.sourceforge.net (chninkel at users.sourceforge.net) Date: Sat, 27 Oct 2012 22:09:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[19529] csw/mgar/pkg/vsftpd/trunk/files/changelog.CSW Message-ID: Revision: 19529 http://gar.svn.sourceforge.net/gar/?rev=19529&view=rev Author: chninkel Date: 2012-10-27 22:09:10 +0000 (Sat, 27 Oct 2012) Log Message: ----------- vsftpd/trunk: updated changelog Modified Paths: -------------- csw/mgar/pkg/vsftpd/trunk/files/changelog.CSW Modified: csw/mgar/pkg/vsftpd/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/vsftpd/trunk/files/changelog.CSW 2012-10-27 22:08:45 UTC (rev 19528) +++ csw/mgar/pkg/vsftpd/trunk/files/changelog.CSW 2012-10-27 22:09:10 UTC (rev 19529) @@ -1,3 +1,9 @@ +vsftpd (3.0.2,REV=2012.10.28) unstable + + * New upstream release. + * Fixed reference to previous configuration file location in + init scripts. + vsftpd (3.0.0,REV=2012.08.24) unstable * Enabled direct binding during build (ld -Bdirect option) 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 Oct 28 14:59:15 2012 From: guengel at users.sourceforge.net (guengel at users.sourceforge.net) Date: Sun, 28 Oct 2012 13:59:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[19530] csw/mgar/pkg/cfengine3/trunk Message-ID: Revision: 19530 http://gar.svn.sourceforge.net/gar/?rev=19530&view=rev Author: guengel Date: 2012-10-28 13:59:15 +0000 (Sun, 28 Oct 2012) Log Message: ----------- cfengine3/trunk: New upstream release 3.3.9 Modified Paths: -------------- csw/mgar/pkg/cfengine3/trunk/Makefile csw/mgar/pkg/cfengine3/trunk/checksums csw/mgar/pkg/cfengine3/trunk/files/changelog.CSW Modified: csw/mgar/pkg/cfengine3/trunk/Makefile =================================================================== --- csw/mgar/pkg/cfengine3/trunk/Makefile 2012-10-27 22:09:10 UTC (rev 19529) +++ csw/mgar/pkg/cfengine3/trunk/Makefile 2012-10-28 13:59:15 UTC (rev 19530) @@ -1,7 +1,7 @@ # $Id$ # NAME = cfengine3 -VERSION = 3.3.7 +VERSION = 3.3.9 CATEGORIES = utils GARTYPE = v2 GARCOMPILER = SOS12U1 Modified: csw/mgar/pkg/cfengine3/trunk/checksums =================================================================== --- csw/mgar/pkg/cfengine3/trunk/checksums 2012-10-27 22:09:10 UTC (rev 19529) +++ csw/mgar/pkg/cfengine3/trunk/checksums 2012-10-28 13:59:15 UTC (rev 19530) @@ -1 +1 @@ -26c28a86c7385b7ace51fb2ce6b10dba cfengine-3.3.7.tar.gz +1df1365264a88770a84e18df3e688dbe cfengine-3.3.9.tar.gz Modified: csw/mgar/pkg/cfengine3/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/cfengine3/trunk/files/changelog.CSW 2012-10-27 22:09:10 UTC (rev 19529) +++ csw/mgar/pkg/cfengine3/trunk/files/changelog.CSW 2012-10-28 13:59:15 UTC (rev 19530) @@ -1,3 +1,9 @@ +cfengine3 (3.3.9,REV=2012.10.28) + + * New upstream release 3.3.9. + + -- Rafael Ostertag Sun, 28 Oct 2012 14:56:36 +0100 + cfengine3 (3.3.7,REV=2012.10.09) * New upstream release 3.3.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 Oct 28 17:19:42 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 28 Oct 2012 16:19:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[19531] csw/mgar/pkg/lang-python/pycrypto/trunk/Makefile Message-ID: Revision: 19531 http://gar.svn.sourceforge.net/gar/?rev=19531&view=rev Author: bdwalton Date: 2012-10-28 16:19:42 +0000 (Sun, 28 Oct 2012) Log Message: ----------- lang-python/pycrypto/trunk: add the build time dependency on libgmp_dev Modified Paths: -------------- csw/mgar/pkg/lang-python/pycrypto/trunk/Makefile Modified: csw/mgar/pkg/lang-python/pycrypto/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pycrypto/trunk/Makefile 2012-10-28 13:59:15 UTC (rev 19530) +++ csw/mgar/pkg/lang-python/pycrypto/trunk/Makefile 2012-10-28 16:19:42 UTC (rev 19531) @@ -26,6 +26,8 @@ LICENSE = COPYRIGHT PACKAGES = CSWpy-crypto +BUILD_DEP_PACKAGES += CSWlibgmp-dev + RUNTIME_DEP_PKGS = CSWlibgmp10 RUNTIME_DEP_PKGS += CSWlibpython2-6-1-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 Mon Oct 29 11:15:18 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 29 Oct 2012 10:15:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[19532] csw/mgar/pkg/lang-python/numpy/trunk/Makefile Message-ID: Revision: 19532 http://gar.svn.sourceforge.net/gar/?rev=19532&view=rev Author: bdwalton Date: 2012-10-29 10:15:17 +0000 (Mon, 29 Oct 2012) Log Message: ----------- lang-python/numpy/trunk: fix up some usr/local references Modified Paths: -------------- csw/mgar/pkg/lang-python/numpy/trunk/Makefile Modified: csw/mgar/pkg/lang-python/numpy/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/numpy/trunk/Makefile 2012-10-28 16:19:42 UTC (rev 19531) +++ csw/mgar/pkg/lang-python/numpy/trunk/Makefile 2012-10-29 10:15:17 UTC (rev 19532) @@ -36,4 +36,8 @@ TEST_SCRIPTS = INSTALL_ARGS += --root=$(DESTDIR) +REINPLACE_USRLOCAL += $(SITE_PACKAGES)/numpy/site.cfg.example +REINPLACE_USRLOCAL += $(SITE_PACKAGES)/numpy/distutils/system_info.py +REINPLACE_WHEN_USRLOCAL = postinstall + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Oct 29 12:08:28 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 29 Oct 2012 11:08:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[19533] csw/mgar/pkg/libtasn1/trunk Message-ID: Revision: 19533 http://gar.svn.sourceforge.net/gar/?rev=19533&view=rev Author: dmichelsen Date: 2012-10-29 11:08:28 +0000 (Mon, 29 Oct 2012) Log Message: ----------- libtasn1/trunk: Update to 3.0 Modified Paths: -------------- csw/mgar/pkg/libtasn1/trunk/Makefile csw/mgar/pkg/libtasn1/trunk/checksums Modified: csw/mgar/pkg/libtasn1/trunk/Makefile =================================================================== --- csw/mgar/pkg/libtasn1/trunk/Makefile 2012-10-29 10:15:17 UTC (rev 19532) +++ csw/mgar/pkg/libtasn1/trunk/Makefile 2012-10-29 11:08:28 UTC (rev 19533) @@ -1,5 +1,5 @@ NAME = libtasn1 -VERSION = 2.12 +VERSION = 3.0 CATEGORIES = lib GARTYPE = v2 @@ -12,35 +12,28 @@ MASTER_SITES = $(GNU_MIRROR) MASTER_SITES += http://daily.josefsson.org/libtasn1/ +MASTER_SITES += ftp://ftp.hellug.gr/pub/gnutls/libtasn1/ DISTFILES = $(DISTNAME).tar.gz VENDOR_URL = http://www.gnu.org/software/gnutls/ -PACKAGES += CSWlibtasn1-3 -SPKG_DESC_CSWlibtasn1-3 = GNU ASN 1 library, libtasn1.so.3 -PKGFILES_CSWlibtasn1-3 = $(call pkgfiles_lib,libtasn1.so.3) +PACKAGES += CSWlibtasn1-6 +SPKG_DESC_CSWlibtasn1-6 = GNU ASN 1 library, libtasn1.so.6 +PKGFILES_CSWlibtasn1-6 = $(call pkgfiles_lib,libtasn1.so.6) PACKAGES += CSWlibtasn1-dev -SPKG_DESC_CSWlibtasn1-dev = Development files for libtasn1.so.3 +SPKG_DESC_CSWlibtasn1-dev = Development files for libtasn1.so.6 PKGFILES_CSWlibtasn1-dev = $(PKGFILES_DEVEL) -RUNTIME_DEP_PKGS_CSWlibtasn1-dev = CSWlibtasn1-3 +RUNTIME_DEP_PKGS_CSWlibtasn1-dev = CSWlibtasn1-6 OBSOLETED_BY_CSWlibtasn1-dev += CSWlibtasn1devel CATALOGNAME_CSWlibtasn1devel = libtasn1_devel_stub PACKAGES += CSWlibtasn1-utils SPKG_DESC_CSWlibtasn1-utils = GNU ASN1 utilities # PKGFILES is catchall -RUNTIME_DEP_PKGS_CSWlibtasn1-utils = CSWlibtasn1-3 +RUNTIME_DEP_PKGS_CSWlibtasn1-utils = CSWlibtasn1-6 OBSOLETED_BY_CSWlibtasn1-utils = CSWlibtasn1 -# We don't need it and if defined the test breaks -LD_OPTIONS = -EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS) - -# Trying to put $ISALIST in LINKER_FLAGS would require more quoting here and -# we don't really need it anyway, so disable for now. -NOISALIST = 1 - BUILD64_LIBS_ONLY = 1 include gar/category.mk Modified: csw/mgar/pkg/libtasn1/trunk/checksums =================================================================== --- csw/mgar/pkg/libtasn1/trunk/checksums 2012-10-29 10:15:17 UTC (rev 19532) +++ csw/mgar/pkg/libtasn1/trunk/checksums 2012-10-29 11:08:28 UTC (rev 19533) @@ -1 +1 @@ -4eba39fb962d6cf5a370267eae8ff52b libtasn1-2.12.tar.gz +fa74e931a148ec7c2b45afeeb8f86148 libtasn1-3.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 Mon Oct 29 13:20:22 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 29 Oct 2012 12:20:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[19534] csw/mgar/pkg/zutils/trunk Message-ID: Revision: 19534 http://gar.svn.sourceforge.net/gar/?rev=19534&view=rev Author: dmichelsen Date: 2012-10-29 12:20:21 +0000 (Mon, 29 Oct 2012) Log Message: ----------- zutils/trunk: Update to 1.0-rc3 Modified Paths: -------------- csw/mgar/pkg/zutils/trunk/Makefile csw/mgar/pkg/zutils/trunk/checksums csw/mgar/pkg/zutils/trunk/files/0001-Use-inttypes.h-instead-of-stdint.h-and-add-signal.h.patch Added Paths: ----------- csw/mgar/pkg/zutils/trunk/files/0004-Avoid-ambiguity-between-char-and-unsigned-long-on-sp.patch Removed Paths: ------------- csw/mgar/pkg/zutils/trunk/files/0002-Use-correct-path-on-testsuite.patch Modified: csw/mgar/pkg/zutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/zutils/trunk/Makefile 2012-10-29 11:08:28 UTC (rev 19533) +++ csw/mgar/pkg/zutils/trunk/Makefile 2012-10-29 12:20:21 UTC (rev 19534) @@ -1,5 +1,5 @@ NAME = zutils -VERSION = 0.9 +VERSION = 1.0-rc3 CATEGORIES = utils GARTYPE = v2 @@ -15,10 +15,10 @@ MASTER_SITES = http://download.savannah.gnu.org/releases/zutils/ -DISTFILES = $(DISTNAME).tar.gz +DISTFILES = $(DISTNAME).tar.lz PATCHFILES = 0001-Use-inttypes.h-instead-of-stdint.h-and-add-signal.h.patch -PATCHFILES += 0002-Use-correct-path-on-testsuite.patch PATCHFILES += 0003-Use-Zutils-instead-of-zutils.patch +PATCHFILES += 0004-Avoid-ambiguity-between-char-and-unsigned-long-on-sp.patch BUILD_DEP_PKGS += CSWhelp2man BUILD_DEP_PKGS += CSWlzip @@ -31,6 +31,9 @@ EXTRA_LINKER_FLAGS = -norunpath +BUILD64 = 1 +ISAEXEC = 1 + NODIRPATHS = --includedir CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += CXX="$(CXX)" @@ -43,6 +46,8 @@ EXTRA_PAX_ARGS = -s ",/z,/Z,p" +TEST_ENV_PATH = $(bindir):$(prefix)/gnu:$(PATH) + include gar/category.mk post-extract-modulated: Modified: csw/mgar/pkg/zutils/trunk/checksums =================================================================== --- csw/mgar/pkg/zutils/trunk/checksums 2012-10-29 11:08:28 UTC (rev 19533) +++ csw/mgar/pkg/zutils/trunk/checksums 2012-10-29 12:20:21 UTC (rev 19534) @@ -1 +1 @@ -487eb9549793be6ed7c2de324d4f12df zutils-0.9.tar.gz +2a1c6ea7a2f62bde43474d0e39d727c8 zutils-1.0-rc3.tar.lz Modified: csw/mgar/pkg/zutils/trunk/files/0001-Use-inttypes.h-instead-of-stdint.h-and-add-signal.h.patch =================================================================== --- csw/mgar/pkg/zutils/trunk/files/0001-Use-inttypes.h-instead-of-stdint.h-and-add-signal.h.patch 2012-10-29 11:08:28 UTC (rev 19533) +++ csw/mgar/pkg/zutils/trunk/files/0001-Use-inttypes.h-instead-of-stdint.h-and-add-signal.h.patch 2012-10-29 12:20:21 UTC (rev 19534) @@ -1,6 +1,6 @@ -From 112d2b1f1b25a4d1451465d9c546c5dc7797d1b5 Mon Sep 17 00:00:00 2001 +From eb0bb7a36ef4f6aaaf43c7aad9390f974d067cb1 Mon Sep 17 00:00:00 2001 From: Dagobert Michelsen -Date: Thu, 31 Mar 2011 16:00:44 +0200 +Date: Mon, 29 Oct 2012 12:33:21 +0100 Subject: [PATCH] Use inttypes.h instead of stdint.h and add signal.h --- @@ -11,7 +11,7 @@ 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/main.cc b/main.cc -index 5059ce3..5ac5587 100644 +index 38e6b13..7d5b52d 100644 --- a/main.cc +++ b/main.cc @@ -28,7 +28,8 @@ @@ -19,41 +19,41 @@ #include #include -#include ++#include +#include -+#include #include #include - #if defined(__MSVCRT__) || defined(__OS2__) + diff --git a/zcmp.cc b/zcmp.cc -index b00d40b..7e41ea5 100644 +index 3ebce0e..ec65d30 100644 --- a/zcmp.cc +++ b/zcmp.cc -@@ -27,7 +27,8 @@ +@@ -28,7 +28,8 @@ #include #include #include -#include ++#include +#include -+#include #include #include - #if defined(__MSVCRT__) || defined(__OS2__) + diff --git a/zdiff.cc b/zdiff.cc -index 28425a3..d57a0b0 100644 +index 1c329bd..cc8a0b7 100644 --- a/zdiff.cc +++ b/zdiff.cc -@@ -27,7 +27,8 @@ +@@ -28,7 +28,8 @@ #include #include #include -#include ++#include +#include -+#include #include #include - #if defined(__MSVCRT__) || defined(__OS2__) + diff --git a/zutils.cc b/zutils.cc -index 1324f89..559a977 100644 +index f65786f..c5abcbf 100644 --- a/zutils.cc +++ b/zutils.cc @@ -22,7 +22,7 @@ @@ -66,5 +66,5 @@ #include -- -1.7.3.2 +1.7.10.3 Deleted: csw/mgar/pkg/zutils/trunk/files/0002-Use-correct-path-on-testsuite.patch =================================================================== --- csw/mgar/pkg/zutils/trunk/files/0002-Use-correct-path-on-testsuite.patch 2012-10-29 11:08:28 UTC (rev 19533) +++ csw/mgar/pkg/zutils/trunk/files/0002-Use-correct-path-on-testsuite.patch 2012-10-29 12:20:21 UTC (rev 19534) @@ -1,27 +0,0 @@ -From bcb402f846f5eeb9d1a3cc4ac1c3c7f9aaf24cd9 Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Fri, 19 Feb 2010 16:44:26 +0100 -Subject: [PATCH 1/3] Use correct path on testsuite - ---- - testsuite/check.sh | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -diff --git a/testsuite/check.sh b/testsuite/check.sh -index 073843e..fa5727c 100755 ---- a/testsuite/check.sh -+++ b/testsuite/check.sh -@@ -5,6 +5,10 @@ - # This script is free software: you have unlimited permission - # to copy, distribute and modify it. - -+# Only ucb echo understands -n -+PATH=/opt/csw/bin:/opt/csw/gnu:/usr/ucb:$PATH -+export PATH -+ - LC_ALL=C - export LC_ALL - objdir=`pwd` --- -1.7.3 - Added: csw/mgar/pkg/zutils/trunk/files/0004-Avoid-ambiguity-between-char-and-unsigned-long-on-sp.patch =================================================================== --- csw/mgar/pkg/zutils/trunk/files/0004-Avoid-ambiguity-between-char-and-unsigned-long-on-sp.patch (rev 0) +++ csw/mgar/pkg/zutils/trunk/files/0004-Avoid-ambiguity-between-char-and-unsigned-long-on-sp.patch 2012-10-29 12:20:21 UTC (rev 19534) @@ -0,0 +1,25 @@ +From f28f9f56e929af03f88e89c8620269ac815a0e8c Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Mon, 29 Oct 2012 13:12:55 +0100 +Subject: [PATCH] Avoid ambiguity between char* and unsigned long on sparcv9 + +--- + zcat.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/zcat.cc b/zcat.cc +index 02ab766..0c2b46a 100644 +--- a/zcat.cc ++++ b/zcat.cc +@@ -45,7 +45,7 @@ public: + str[i] = '0'; + } + if( first_digit_pos > 0 ) str[--first_digit_pos] = '1'; +- else str.insert( 0U, 1, '1' ); ++ else str.insert( (char *) NULL, 1, '1' ); + } + + int sprint( uint8_t * const buf ) +-- +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 Mon Oct 29 13:26:42 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 29 Oct 2012 12:26:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[19535] csw/mgar/pkg/tesseract/trunk Message-ID: Revision: 19535 http://gar.svn.sourceforge.net/gar/?rev=19535&view=rev Author: dmichelsen Date: 2012-10-29 12:26:42 +0000 (Mon, 29 Oct 2012) Log Message: ----------- tesseract/trunk: Update to 3.02.02 Modified Paths: -------------- csw/mgar/pkg/tesseract/trunk/Makefile csw/mgar/pkg/tesseract/trunk/checksums Modified: csw/mgar/pkg/tesseract/trunk/Makefile =================================================================== --- csw/mgar/pkg/tesseract/trunk/Makefile 2012-10-29 12:20:21 UTC (rev 19534) +++ csw/mgar/pkg/tesseract/trunk/Makefile 2012-10-29 12:26:42 UTC (rev 19535) @@ -2,7 +2,7 @@ # TODO (release-critical prefixed with !, non release-critical with *) # NAME = tesseract -VERSION = 3.02 +VERSION = 3.02.02 GARTYPE = v2 CATEGORIES = apps @@ -10,8 +10,8 @@ GOOGLE_PROJECT = tesseract-ocr MASTER_SITES = $(GOOGLE_MIRROR) -#DISTFILES = $(DISTNAME).tar.gz -DISTFILES = $(DISTNAME)-dam.tar.gz +DISTFILES = $(DISTNAME).tar.gz +#DISTFILES = $(DISTNAME)-dam.tar.gz PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 Modified: csw/mgar/pkg/tesseract/trunk/checksums =================================================================== --- csw/mgar/pkg/tesseract/trunk/checksums 2012-10-29 12:20:21 UTC (rev 19534) +++ csw/mgar/pkg/tesseract/trunk/checksums 2012-10-29 12:26:42 UTC (rev 19535) @@ -1 +1 @@ -cf04c27e9e1e0e708e4cf45ac5380353 tesseract-3.02-dam.tar.gz +3d57ee5777fa998632ad0693c13a0e9e tesseract-3.02.02.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 Oct 30 11:09:07 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 30 Oct 2012 10:09:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[19536] csw/mgar/pkg Message-ID: Revision: 19536 http://gar.svn.sourceforge.net/gar/?rev=19536&view=rev Author: bdwalton Date: 2012-10-30 10:09:07 +0000 (Tue, 30 Oct 2012) Log Message: ----------- add stub for libsunperf Added Paths: ----------- csw/mgar/pkg/libsunperf/ csw/mgar/pkg/libsunperf/Makefile csw/mgar/pkg/libsunperf/branches/ csw/mgar/pkg/libsunperf/tags/ csw/mgar/pkg/libsunperf/trunk/ csw/mgar/pkg/libsunperf/trunk/files/ Copied: csw/mgar/pkg/libsunperf/Makefile (from rev 19488, csw/mgar/pkg/template/Makefile) =================================================================== --- csw/mgar/pkg/libsunperf/Makefile (rev 0) +++ csw/mgar/pkg/libsunperf/Makefile 2012-10-30 10:09:07 UTC (rev 19536) @@ -0,0 +1,15 @@ +# vim: ft=make ts=4 sw=4 noet + +default: + @echo "You are in the pkg/ directory." + +%: + $(MAKE) -C trunk $* + +paranoid-%: + $(MAKE) -C trunk $* || exit 2 + +export BUILDLOG ?= $(shell pwd)/buildlog.txt + +report-%: + $(MAKE) -C trunk $* || echo " *** make $* in $$i failed ***" >> $(BUILDLOG) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Tue Oct 30 11:58:21 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 30 Oct 2012 10:58:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[19537] csw/mgar/pkg/libsunperf/trunk Message-ID: Revision: 19537 http://gar.svn.sourceforge.net/gar/?rev=19537&view=rev Author: bdwalton Date: 2012-10-30 10:58:19 +0000 (Tue, 30 Oct 2012) Log Message: ----------- libsunperf/trunk: add a first whack at packaging libsunperf (different .so versions on i386/sparc) Added Paths: ----------- csw/mgar/pkg/libsunperf/trunk/Makefile csw/mgar/pkg/libsunperf/trunk/files/ss12u1-distributionreadme-429216.txt Property Changed: ---------------- csw/mgar/pkg/libsunperf/trunk/ Property changes on: csw/mgar/pkg/libsunperf/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/libsunperf/trunk/Makefile =================================================================== --- csw/mgar/pkg/libsunperf/trunk/Makefile (rev 0) +++ csw/mgar/pkg/libsunperf/trunk/Makefile 2012-10-30 10:58:19 UTC (rev 19537) @@ -0,0 +1,47 @@ +# $Id: Makefile 16916 2012-01-26 13:25:13Z dmichelsen $ +NAME = libsunperf +VERSION = 20121030 +CATEGORIES = lib +GARTYPE = v2 + +DESCRIPTION = Sun Studio U1 Performance Libraries +define BLURB +endef + +MASTER_SITES = http://www.oracle.com/technetwork/server-storage/solarisstudio/documentation/ss12u1-distributionreadme-429216.txt +DISTFILES = ss12u1-distributionreadme-429216.txt + +VENDOR_URL = http://www.oracle.com/technetwork/server-storage/solarisstudio/documentation/ss12u1-distributionreadme-429216.txt + +LICENSE = ss12u1-distributionreadme-429216.txt + +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = +TEST_SCRIPTS = +INSTALL_SCRIPTS = custom + +# the .so versions are different on the different architectures +PACKAGES_sparc = CSWlibsunperf7 +PACKAGES_i386 = CSWlibsunperf2 + +PACKAGES = $(PACKAGES_$(GARCH)) +SPKG_DESC_CSWlibsunperf7 = $(DESCRIPTION) - sparc +SPKG_DESC_CSWlibsunperf2 = $(DESCRIPTION) - i386 + +FLIBS-sparc = libsunperf.so.7 +FLIBS-i386 = libsunperf.so.2 + +RUNTIME_DEP_PKGS += CSWsunmath +RUNTIME_DEP_PKGS += CSWss12f95rt + +include gar/category.mk + +SRCDIR-sparcv9 = v9 +SRCDIR-amd64 = amd64 + +install-custom: + ginstall -d $(DESTDIR)$(libdir) + $(foreach L,$(FLIBS-$(GARCH)),ginstall $(SOS12_CC_HOME)/lib/$L $(DESTDIR)$(libdir)/$L;) + ginstall -d $(DESTDIR)$(libdir)/$(ISA_DEFAULT64) + $(foreach L,$(FLIBS-$(GARCH)),if [ -f $(SOS12_CC_HOME)/lib/$(SRCDIR-$(ISA_DEFAULT64))/$L ]; then ginstall $(SOS12_CC_HOME)/lib/$(SRCDIR-$(ISA_DEFAULT64))/$L $(DESTDIR)$(libdir)/$(ISA_DEFAULT64)/$L; fi;) + @$(MAKECOOKIE) Added: csw/mgar/pkg/libsunperf/trunk/files/ss12u1-distributionreadme-429216.txt =================================================================== --- csw/mgar/pkg/libsunperf/trunk/files/ss12u1-distributionreadme-429216.txt (rev 0) +++ csw/mgar/pkg/libsunperf/trunk/files/ss12u1-distributionreadme-429216.txt 2012-10-30 10:58:19 UTC (rev 19537) @@ -0,0 +1,262 @@ +DISTRIBUTION BY DEVELOPERS. Subject to the terms and conditions of +the Software License Agreement and the obligations, restrictions, and +exceptions set forth below, You may reproduce and distribute the portions +of Software identified below ("each a Redistributable"), provided that +you comply with the following (note that You may be entitled to reproduce +and distribute other portions of the Software not defined here as a +Redistributable under certain other licenses as described in the +THIRDPARTYLICENSEREADME, if applicable): + +(a) You distribute the Redistributable complete and unmodified and only +bundled as part of Your applets and applications ("Programs"), + +(b) Your Programs add significant and primary functionality to the Software, + +(c) You distribute Redistributable for the sole purpose of running your +Programs, + +(d) You do not distribute additional software intended to replace any +component(s) of the Redistributable, + +(e) You do not remove or alter any proprietary legends or notices contained +in or on the Redistributable. + +(f) You only distribute the Redistributable subject to a license agreement +that protects Sun's interests consistent with the terms contained in the +Software License Agreement, and + +(g) You agree to defend and indemnify Sun and its licensors from and against +any damages, costs, liabilities, settlement amounts and/or expenses +(including attorneys' fees) incurred in connection with any claim, lawsuit +or action by any third party that arises or results from the use or +distribution of any and all Programs and/or Redistributable. + +The following files are each a Redistributable: + +General Solaris[tm] on SPARC(R) and x86 Platforms: + + * bb_link.o + * CCrti.o + * CCrtn.o + * crt1.o + * crti.o + * crtn.o + * gcrt1.o + * mcrt1.o + * prof_func.o + * prof_lib.o + * prof_tsd.o + * values-xa.o + * values-xc.o + * values-xi.o + * values-xpg4.o + * values-xs.o + * values-xt.o + * libcomplex.so.5 + * libgc.so.1 + * libm9x.so.0 + * libsunmath.so.1 + * libscalapack.so.1 + * libblacs_openmpi.so.1 + * pagesize.o + * xprof_fini.o + +For Solaris SPARC Platform Only: + + * misalign.o + * wordalignI8.o + * libcx.so.1 + * libsunperf.so.8 + +For Solaris x86 Platform Only: + + * libsunperf.so.3 + * libsunperf.so.4 + +C++ for Solaris SPARC and Solaris x86 Platform Editions: + +The following are Redistributables in packages or as individual files: + + * SPROtll7: tools.h++ on Solaris SPARC and x86 Platforms + o librwtool.so.2 + + * SPROtll7x: tools.h++ for Solaris SPARC V9 Platforms Only + o librwtool.so.2 + + * SPROtll7x: tools.h++ on 64-bit Solaris x86 (amd64) Platforms Only. + o librwtool.so.2 + + * SPROstl4o: STLport on Solaris SPARC and x86 Platforms + o libstlport.so.1 + + * SPROstl4x: STLport for Solaris SPARC V9 Platforms Only + o libstlport.so.1 + + * SPROstl4x: STLport for 64-bit Solaris x86 (amd64) Platforms Only + o libstlport.so.1 + +Fortran 95 For Solaris SPARC and Solaris x86 Platform Editions: + +To reliably satisfy dependencies between your applications, Sun Studio +libraries, and intra-library dependencies, it is recommended that you +distribute the following libraries in packages rather than as individual +files. The following packages and individual files are Redistributables: + + * SPROl77s: Solaris 32-bit SPARC Fortran 77 legacy libraries, +comprising: + o libF77.so.2 + o libF77.so.3 + o libF77.so.4 + o libF77_mt.so.2 + o libF77_mt.so.3 + o libF77_mt.so.4 + o libFposix.so.1 + o libFposix_c.so.1 + o libM77.so.2 + o libV77.so.2 + o libV77.so.3 + + * SPROl77sx: Solaris 64-bit SPARC Fortran 77 legacy libraries, comprising: + o libF77.so.2 + o libF77.so.3 + o libF77.so.4 + o libF77_mt.so.2 + o libF77_mt.so.3 + o libF77_mt.so.4 + o libFposix.so.1 + o libFposix_c.so.1 + o libM77.so.2 + o libV77.so.2 + o libV77.so.3 + + * SPROl90s: Solaris 32-bit SPARC Fortran libraries, comprising: + o libf77compat.so.1 + o libfai.so.3 + o libfai.so.2 + o libfai.so.1 + o libfai2.so.3 + o libfai2.so.2 + o libfai2.so.1 + o libfmaxlai.so.1 + o libfmaxvai.so.1 + o libfminlai.so.1 + o libfminvai.so.1 + o libfprodai.so.1 + o libfsumai.so.1 + o libfsu.so.1 + o libfui.so.2 + o libfui.so.1 + o libfai_isa.so.1 + o libfai2_isa.so.1 + o libfmaxlai_isa.so.1 + o libfmaxvai_isa.so.1 + o libfminlai_isa.so.1 + o libfminvai_isa.so.1 + o libfprodai_isa.so.1 + o libfsumai_isa.so.1 + + * SPROl90s: Solaris 32-bit x86 Fortran libraries, comprising: + o libfsu.so.1 + o libfui.so.2 + o libfui.so.1 + + * SPROl90sx: Solaris 64-bit SPARC Fortran libraries, comprising: + o libf77compat.so.1 + o libfai.so.3 + o libfai.so.2 + o libfai.so.1 + o libfai2.so.3 + o libfai2.so.2 + o libfai2.so.1 + o libfmaxlai.so.1 + o libfmaxvai.so.1 + o libfminlai.so.1 + o libfminvai.so.1 + o libfprodai.so.1 + o libfsumai.so.1 + o libfsu.so.1 + o libfui.so.2 + o libfui.so.1 + o libfai_isa.so.1 + o libfai2_isa.so.1 + o libfmaxlai_isa.so.1 + o libfmaxvai_isa.so.1 + o libfminlai_isa.so.1 + o libfminvai_isa.so.1 + o libfprodai_isa.so.1 + o libfsumai_isa.so.1 + + * SPROl90sx: Solaris 64-bit x86 (x64) Fortran libraries, comprising: + o libfai.so.1 + o libfsu.so.1 + o libfui.so.2 + + * sun-l90s-12.0-1.i386.rpm: Linux 32-bit x86 (x64) Fortran libraries, comprising: + o libfai.so.1 + o libfsu.so.1 + o libfui.so.1 + + * sun-l90sx-12.0-1.x86_64.rpm: Linux 64-bit x86 (x64) Fortran libraries, comprising: + o libfai.so.1 + o libfsu.so.1 + o libfui.so.1 + +Link-time Libraries: + +The following libraries are redistributable with object files and libraries that +clients link into programs: + + * libCCexcept.so.1 + You would need to ship libCCexcept.so.1 with your product only when all of +these conditions are met: + o You supply libraries and .o files to be linked into a program by +your clients, and + o Your code contains binaries created by Sun C++, and + o Some binaries in the final program might have been created by a +version of Sun Studio earlier than Sun Studio 8, and + o Your clients are not expected to have Sun Studio, and + o You provide a script or makefile that does the linking using ld +directly instead of using CC. + + Beginning with Sun Studio 8, the Sun C++ compiler (C++ 5.5) changed the +way it emitted data about C++ exceptions in object files, putting data in +previously unused fields. If C++ object files created by earlier compilers +were linked directly with object files created by C++ 5.5 or later, C++ +exceptions might not work correctly. + + The Solaris linker (ld) has an interface whereby "helper libraries" +can be provided to perform extra processing on object files. The CC driver +tells the linker to use libCCexcept.so.1 to process object files, converting +old-style exception data to the new format in memory at program link time. +(The original object files are not modified.) + + Library libCCexcept.so.1 is used only by the Solaris linker when +creating an executable program or shared library. The library is never linked +to user programs. The library is included in Sun Studio, so ISVs do not +normally need to supply the library to their clients. + + * libldstab_ws.so.1 + You would need to ship libldstab_ws with your product only when all of +these conditions are met: + o You supply libraries and .o files to be linked into a program by +your clients, and + o Your libraries or .o files contain stab information, and + o You did NOT compile with option "-xs", which causes stabs to +be copied to the executable, and + o Your clients are not expected to have Sun Studio + + N_OBJ index stabs require processing by the linker to insert the +directory and file name of the object file being linked. + + The Solaris linker (ld) has an interface whereby "helper libraries" +can be provided to perform extra processing on object files. The CC driver +tells the linker to use libldstab_ws.so to process object files, filling in +the N_OBJ stabs at program link time. (The original object files are not +modified.) + + Library libldstab_ws.so.1 is used only by the Solaris linker when +creating an executable program or shared library. The library is never +linked to user programs. The library is included in Sun Studio, so ISVs +do not normally need to supply the library to their clients. + + 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 Oct 30 12:38:32 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 30 Oct 2012 11:38:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[19538] csw/mgar/pkg/libsunperf/trunk/Makefile Message-ID: Revision: 19538 http://gar.svn.sourceforge.net/gar/?rev=19538&view=rev Author: bdwalton Date: 2012-10-30 11:38:32 +0000 (Tue, 30 Oct 2012) Log Message: ----------- libsunperf/trunk: add overrides for things we do not control and package deps as a requirement of RPATH settings Modified Paths: -------------- csw/mgar/pkg/libsunperf/trunk/Makefile Modified: csw/mgar/pkg/libsunperf/trunk/Makefile =================================================================== --- csw/mgar/pkg/libsunperf/trunk/Makefile 2012-10-30 10:58:19 UTC (rev 19537) +++ csw/mgar/pkg/libsunperf/trunk/Makefile 2012-10-30 11:38:32 UTC (rev 19538) @@ -34,6 +34,11 @@ RUNTIME_DEP_PKGS += CSWsunmath RUNTIME_DEP_PKGS += CSWss12f95rt +CHECKPKG_OVERRIDES += bad-rpath-entry +CHECKPKG_OVERRIDES += soname-not-found +CHECKPKG_OVERRIDES += surplus-dependency|CSWss12f95rt +CHECKPKG_OVERRIDES += surplus-dependency|CSWsunmath + include gar/category.mk SRCDIR-sparcv9 = v9 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 Oct 30 14:25:23 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 30 Oct 2012 13:25:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[19539] csw/mgar/pkg/libsunperf/trunk/Makefile Message-ID: Revision: 19539 http://gar.svn.sourceforge.net/gar/?rev=19539&view=rev Author: bdwalton Date: 2012-10-30 13:25:22 +0000 (Tue, 30 Oct 2012) Log Message: ----------- libsunperf/trunk: the i386 lib for sunperf does not exist (only amd64) so modify the recipe to make it conditional Modified Paths: -------------- csw/mgar/pkg/libsunperf/trunk/Makefile Modified: csw/mgar/pkg/libsunperf/trunk/Makefile =================================================================== --- csw/mgar/pkg/libsunperf/trunk/Makefile 2012-10-30 11:38:32 UTC (rev 19538) +++ csw/mgar/pkg/libsunperf/trunk/Makefile 2012-10-30 13:25:22 UTC (rev 19539) @@ -46,7 +46,7 @@ install-custom: ginstall -d $(DESTDIR)$(libdir) - $(foreach L,$(FLIBS-$(GARCH)),ginstall $(SOS12_CC_HOME)/lib/$L $(DESTDIR)$(libdir)/$L;) + $(foreach L,$(FLIBS-$(GARCH)),if [ -f $(SOS12_CC_HOME)/lib/$L ]; then ginstall $(SOS12_CC_HOME)/lib/$L $(DESTDIR)$(libdir)/$L; fi) ginstall -d $(DESTDIR)$(libdir)/$(ISA_DEFAULT64) $(foreach L,$(FLIBS-$(GARCH)),if [ -f $(SOS12_CC_HOME)/lib/$(SRCDIR-$(ISA_DEFAULT64))/$L ]; then ginstall $(SOS12_CC_HOME)/lib/$(SRCDIR-$(ISA_DEFAULT64))/$L $(DESTDIR)$(libdir)/$(ISA_DEFAULT64)/$L; fi;) @$(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 Tue Oct 30 14:41:28 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 30 Oct 2012 13:41:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[19540] csw/mgar/pkg/git/trunk/Makefile Message-ID: Revision: 19540 http://gar.svn.sourceforge.net/gar/?rev=19540&view=rev Author: bdwalton Date: 2012-10-30 13:41:28 +0000 (Tue, 30 Oct 2012) Log Message: ----------- git/trunk: move the cas-etcservices file to the modern sysconfdir Modified Paths: -------------- csw/mgar/pkg/git/trunk/Makefile Modified: csw/mgar/pkg/git/trunk/Makefile =================================================================== --- csw/mgar/pkg/git/trunk/Makefile 2012-10-30 13:25:22 UTC (rev 19539) +++ csw/mgar/pkg/git/trunk/Makefile 2012-10-30 13:41:28 UTC (rev 19540) @@ -164,7 +164,7 @@ # We want static libs installed for our devel package MERGE_EXCLUDE_STATICLIBS = -ETCSERVICES = /opt/csw/etc/pkg/CSWgit/services +ETCSERVICES = /etc/opt/csw/pkg/CSWgit/services CHECKPKG_OVERRIDES_CSWgit-completion += surplus-dependency|CSWbash CHECKPKG_OVERRIDES_CSWgit-completion += surplus-dependency|CSWbashcmplt @@ -220,7 +220,7 @@ post-install-modulated: LD=$(DESTDIR)/$(libdir_install)/git post-install-modulated: @echo Installing /etc/services definitions file - @( ginstall -m 0755 -d $(DESTDIR)/opt/csw/etc/pkg/CSWgit/; \ + @( ginstall -m 0755 -d $(DESTDIR)/etc/opt/csw/pkg/CSWgit/; \ echo "git 9418/tcp" >> $(DESTDIR)/$(ETCSERVICES); \ echo "git 9418/udp" >> $(DESTDIR)/$(ETCSERVICES); ) @echo Cleaning up perl stuff 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 Oct 30 14:57:23 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 30 Oct 2012 13:57:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[19541] csw/mgar/pkg/libsunperf/trunk/Makefile Message-ID: Revision: 19541 http://gar.svn.sourceforge.net/gar/?rev=19541&view=rev Author: bdwalton Date: 2012-10-30 13:57:22 +0000 (Tue, 30 Oct 2012) Log Message: ----------- libsunperf/trunk: add overrides for the imbalanced version numbers Modified Paths: -------------- csw/mgar/pkg/libsunperf/trunk/Makefile Modified: csw/mgar/pkg/libsunperf/trunk/Makefile =================================================================== --- csw/mgar/pkg/libsunperf/trunk/Makefile 2012-10-30 13:41:28 UTC (rev 19540) +++ csw/mgar/pkg/libsunperf/trunk/Makefile 2012-10-30 13:57:22 UTC (rev 19541) @@ -39,6 +39,9 @@ CHECKPKG_OVERRIDES += surplus-dependency|CSWss12f95rt CHECKPKG_OVERRIDES += surplus-dependency|CSWsunmath +CHECKPKG_OVERRIDES += sparc-SunOS5.10-missing|libsunperf2 +CHECKPKG_OVERRIDES += i386-SunOS5.10-missing|libsunperf7 + include gar/category.mk SRCDIR-sparcv9 = v9 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 Oct 30 15:52:27 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 30 Oct 2012 14:52:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[19542] csw/mgar/pkg/lang-python/numpy/trunk/Makefile Message-ID: Revision: 19542 http://gar.svn.sourceforge.net/gar/?rev=19542&view=rev Author: bdwalton Date: 2012-10-30 14:52:27 +0000 (Tue, 30 Oct 2012) Log Message: ----------- lang-python/numpy/trunk: update deps, add platform-specific libsunperf dep Modified Paths: -------------- csw/mgar/pkg/lang-python/numpy/trunk/Makefile Modified: csw/mgar/pkg/lang-python/numpy/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/numpy/trunk/Makefile 2012-10-30 13:57:22 UTC (rev 19541) +++ csw/mgar/pkg/lang-python/numpy/trunk/Makefile 2012-10-30 14:52:27 UTC (rev 19542) @@ -23,9 +23,15 @@ PACKAGES = CSWpy-numpy CATALOGNAME = py_numpy +# the so version (and package names) for libsunperf differ depending +# on platform +SUNPERF_SO_sparc = 7 +SUNPERF_SO_i386 = 2 +SUNPERF_SO = $(SUNPERF_SO_$(GARCH)) + + RUNTIME_DEP_PKGS_CSWpy-numpy += CSWlibpython2-6-1-0 -RUNTIME_DEP_PKGS_CSWpy-numpy += CSWss12f95rt -RUNTIME_DEP_PKGS_CSWpy-numpy += CSWsunmath +RUNTIME_DEP_PKGS_CSWpy-numpy += CSWlibsunperf$(SUNPERF_SO) LICENSE = LICENSE.txt 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 Oct 30 17:55:14 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 30 Oct 2012 16:55:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[19543] csw/mgar/pkg/libsunperf/trunk/Makefile Message-ID: Revision: 19543 http://gar.svn.sourceforge.net/gar/?rev=19543&view=rev Author: bdwalton Date: 2012-10-30 16:55:14 +0000 (Tue, 30 Oct 2012) Log Message: ----------- libsunperf/trunk: we need the .so.3 package for i386 too. Modified Paths: -------------- csw/mgar/pkg/libsunperf/trunk/Makefile Modified: csw/mgar/pkg/libsunperf/trunk/Makefile =================================================================== --- csw/mgar/pkg/libsunperf/trunk/Makefile 2012-10-30 14:52:27 UTC (rev 19542) +++ csw/mgar/pkg/libsunperf/trunk/Makefile 2012-10-30 16:55:14 UTC (rev 19543) @@ -22,14 +22,17 @@ # the .so versions are different on the different architectures PACKAGES_sparc = CSWlibsunperf7 -PACKAGES_i386 = CSWlibsunperf2 +PACKAGES_i386 = CSWlibsunperf2 CSWlibsunperf3 PACKAGES = $(PACKAGES_$(GARCH)) SPKG_DESC_CSWlibsunperf7 = $(DESCRIPTION) - sparc -SPKG_DESC_CSWlibsunperf2 = $(DESCRIPTION) - i386 +SPKG_DESC_CSWlibsunperf2 = $(DESCRIPTION) v2 - i386 +PKGFILES_CSWlibsunperf2 = $(libdir)/.*2 +SPKG_DESC_CSWlibsunperf3 = $(DESCRIPTION) v3 - i386 +PKGFILES_CSWlibsunperf2 = $(libdir)/.*3 FLIBS-sparc = libsunperf.so.7 -FLIBS-i386 = libsunperf.so.2 +FLIBS-i386 = libsunperf.so.2 libsunperf.so.3 RUNTIME_DEP_PKGS += CSWsunmath RUNTIME_DEP_PKGS += CSWss12f95rt @@ -39,9 +42,6 @@ CHECKPKG_OVERRIDES += surplus-dependency|CSWss12f95rt CHECKPKG_OVERRIDES += surplus-dependency|CSWsunmath -CHECKPKG_OVERRIDES += sparc-SunOS5.10-missing|libsunperf2 -CHECKPKG_OVERRIDES += i386-SunOS5.10-missing|libsunperf7 - include gar/category.mk SRCDIR-sparcv9 = v9 @@ -49,7 +49,7 @@ install-custom: ginstall -d $(DESTDIR)$(libdir) - $(foreach L,$(FLIBS-$(GARCH)),if [ -f $(SOS12_CC_HOME)/lib/$L ]; then ginstall $(SOS12_CC_HOME)/lib/$L $(DESTDIR)$(libdir)/$L; fi) + $(foreach L,$(FLIBS-$(GARCH)),if [ -f $(SOS12_CC_HOME)/lib/$L ]; then ginstall $(SOS12_CC_HOME)/lib/$L $(DESTDIR)$(libdir)/$L; fi;) ginstall -d $(DESTDIR)$(libdir)/$(ISA_DEFAULT64) $(foreach L,$(FLIBS-$(GARCH)),if [ -f $(SOS12_CC_HOME)/lib/$(SRCDIR-$(ISA_DEFAULT64))/$L ]; then ginstall $(SOS12_CC_HOME)/lib/$(SRCDIR-$(ISA_DEFAULT64))/$L $(DESTDIR)$(libdir)/$(ISA_DEFAULT64)/$L; fi;) @$(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 Tue Oct 30 17:59:50 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 30 Oct 2012 16:59:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[19544] csw/mgar/pkg/libsunperf/trunk/Makefile Message-ID: Revision: 19544 http://gar.svn.sourceforge.net/gar/?rev=19544&view=rev Author: bdwalton Date: 2012-10-30 16:59:49 +0000 (Tue, 30 Oct 2012) Log Message: ----------- libsunperf/trunk: correct a copy/paste error in pkgfiles splitting Modified Paths: -------------- csw/mgar/pkg/libsunperf/trunk/Makefile Modified: csw/mgar/pkg/libsunperf/trunk/Makefile =================================================================== --- csw/mgar/pkg/libsunperf/trunk/Makefile 2012-10-30 16:55:14 UTC (rev 19543) +++ csw/mgar/pkg/libsunperf/trunk/Makefile 2012-10-30 16:59:49 UTC (rev 19544) @@ -29,7 +29,7 @@ SPKG_DESC_CSWlibsunperf2 = $(DESCRIPTION) v2 - i386 PKGFILES_CSWlibsunperf2 = $(libdir)/.*2 SPKG_DESC_CSWlibsunperf3 = $(DESCRIPTION) v3 - i386 -PKGFILES_CSWlibsunperf2 = $(libdir)/.*3 +PKGFILES_CSWlibsunperf3 = $(libdir)/.*3 FLIBS-sparc = libsunperf.so.7 FLIBS-i386 = libsunperf.so.2 libsunperf.so.3 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Tue Oct 30 21:34:21 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 30 Oct 2012 20:34:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[19545] csw/mgar/pkg/lang-python/numpy/trunk/Makefile Message-ID: Revision: 19545 http://gar.svn.sourceforge.net/gar/?rev=19545&view=rev Author: bdwalton Date: 2012-10-30 20:34:20 +0000 (Tue, 30 Oct 2012) Log Message: ----------- lang-python/numpy/trunk: we actually need v3 of libsunperf for i386 Modified Paths: -------------- csw/mgar/pkg/lang-python/numpy/trunk/Makefile Modified: csw/mgar/pkg/lang-python/numpy/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/numpy/trunk/Makefile 2012-10-30 16:59:49 UTC (rev 19544) +++ csw/mgar/pkg/lang-python/numpy/trunk/Makefile 2012-10-30 20:34:20 UTC (rev 19545) @@ -26,7 +26,7 @@ # the so version (and package names) for libsunperf differ depending # on platform SUNPERF_SO_sparc = 7 -SUNPERF_SO_i386 = 2 +SUNPERF_SO_i386 = 3 SUNPERF_SO = $(SUNPERF_SO_$(GARCH)) 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 Oct 30 22:23:41 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 30 Oct 2012 21:23:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[19546] csw/mgar/pkg/lang-python/numpy/trunk/Makefile Message-ID: Revision: 19546 http://gar.svn.sourceforge.net/gar/?rev=19546&view=rev Author: bdwalton Date: 2012-10-30 21:23:40 +0000 (Tue, 30 Oct 2012) Log Message: ----------- lang-python/numpy/trunk: use -xnorunpath and also override the RPATH warning Modified Paths: -------------- csw/mgar/pkg/lang-python/numpy/trunk/Makefile Modified: csw/mgar/pkg/lang-python/numpy/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/numpy/trunk/Makefile 2012-10-30 20:34:20 UTC (rev 19545) +++ csw/mgar/pkg/lang-python/numpy/trunk/Makefile 2012-10-30 21:23:40 UTC (rev 19546) @@ -29,12 +29,13 @@ SUNPERF_SO_i386 = 3 SUNPERF_SO = $(SUNPERF_SO_$(GARCH)) - RUNTIME_DEP_PKGS_CSWpy-numpy += CSWlibpython2-6-1-0 RUNTIME_DEP_PKGS_CSWpy-numpy += CSWlibsunperf$(SUNPERF_SO) LICENSE = LICENSE.txt +EXTRA_CFLAGS = -xnorunpath + export ATLAS = None export BLAS = $(CC_HOME)/lib/libsunperf.so export LAPACK = $(libdir)/libsunmath.so @@ -46,4 +47,9 @@ REINPLACE_USRLOCAL += $(SITE_PACKAGES)/numpy/distutils/system_info.py REINPLACE_WHEN_USRLOCAL = postinstall +# because we need to force the use of libsunperf from (initially) the +# studio install dir, the RPATH gets munged, regardless of +# -xnorunpath. Our library path takes precedence though so we do not relay on things from studio at runtime. +CHECKPKG_OVERRIDES_CSWpy-numpy += bad-rpath-entry|/opt/SUNWspro/lib + 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 Tue Oct 30 22:36:58 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 30 Oct 2012 21:36:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[19547] csw/mgar/pkg/lang-python/numpy/trunk/Makefile Message-ID: Revision: 19547 http://gar.svn.sourceforge.net/gar/?rev=19547&view=rev Author: bdwalton Date: 2012-10-30 21:36:57 +0000 (Tue, 30 Oct 2012) Log Message: ----------- lang-python/numpy/trunk: fully genericize the rpath checkpkg override Modified Paths: -------------- csw/mgar/pkg/lang-python/numpy/trunk/Makefile Modified: csw/mgar/pkg/lang-python/numpy/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/numpy/trunk/Makefile 2012-10-30 21:23:40 UTC (rev 19546) +++ csw/mgar/pkg/lang-python/numpy/trunk/Makefile 2012-10-30 21:36:57 UTC (rev 19547) @@ -50,6 +50,6 @@ # because we need to force the use of libsunperf from (initially) the # studio install dir, the RPATH gets munged, regardless of # -xnorunpath. Our library path takes precedence though so we do not relay on things from studio at runtime. -CHECKPKG_OVERRIDES_CSWpy-numpy += bad-rpath-entry|/opt/SUNWspro/lib +CHECKPKG_OVERRIDES_CSWpy-numpy += bad-rpath-entry 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 Tue Oct 30 23:08:40 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 30 Oct 2012 22:08:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[19548] csw/mgar/pkg/lang-python/logilab-common/trunk/ Makefile Message-ID: Revision: 19548 http://gar.svn.sourceforge.net/gar/?rev=19548&view=rev Author: bdwalton Date: 2012-10-30 22:08:40 +0000 (Tue, 30 Oct 2012) Log Message: ----------- lang-python/logilab-common/trunk: fix a usr/share reference Modified Paths: -------------- csw/mgar/pkg/lang-python/logilab-common/trunk/Makefile Modified: csw/mgar/pkg/lang-python/logilab-common/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/logilab-common/trunk/Makefile 2012-10-30 21:36:57 UTC (rev 19547) +++ csw/mgar/pkg/lang-python/logilab-common/trunk/Makefile 2012-10-30 22:08:40 UTC (rev 19548) @@ -17,4 +17,8 @@ UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz EXTRA_MERGE_EXCLUDE_FILES = .*\.pyc ARCHALL_CSWpy-logilab-common = 1 + +REINPLACE_USRSHARE += $(SITE_PACKAGES)/logilab/common/optik_ext.py +REINPLACE_WHEN_USRSHARE = postinstall + 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 Oct 31 09:29:32 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 31 Oct 2012 08:29:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[19549] csw/mgar/pkg/lang-python/logilab-astng/trunk/ Makefile Message-ID: Revision: 19549 http://gar.svn.sourceforge.net/gar/?rev=19549&view=rev Author: bdwalton Date: 2012-10-31 08:29:32 +0000 (Wed, 31 Oct 2012) Log Message: ----------- lang-python/logilab-astng/trunk: use the SITE_PACKAGES variable in the post-install step instead of the old, hard coded location Modified Paths: -------------- csw/mgar/pkg/lang-python/logilab-astng/trunk/Makefile Modified: csw/mgar/pkg/lang-python/logilab-astng/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/logilab-astng/trunk/Makefile 2012-10-30 22:08:40 UTC (rev 19548) +++ csw/mgar/pkg/lang-python/logilab-astng/trunk/Makefile 2012-10-31 08:29:32 UTC (rev 19549) @@ -21,5 +21,5 @@ CHECKPKG_OVERRIDES_CSWpy-logilab-astng += surplus-dependency|CSWpy-logilab-common include gar/category.mk post-install-modulated: - rm $(DESTDIR)/opt/csw/lib/python/site-packages/logilab/__init__.py + rm $(DESTDIR)$(SITE_PACKAGES)/logilab/__init__.py @$(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 Wed Oct 31 14:33:04 2012 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 31 Oct 2012 13:33:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[19550] csw/mgar/pkg/lang-python Message-ID: Revision: 19550 http://gar.svn.sourceforge.net/gar/?rev=19550&view=rev Author: dmichelsen Date: 2012-10-31 13:33:03 +0000 (Wed, 31 Oct 2012) Log Message: ----------- lang-python/pip: Initial commit Added Paths: ----------- csw/mgar/pkg/lang-python/pip/ csw/mgar/pkg/lang-python/pip/Makefile csw/mgar/pkg/lang-python/pip/branches/ csw/mgar/pkg/lang-python/pip/tags/ csw/mgar/pkg/lang-python/pip/trunk/ csw/mgar/pkg/lang-python/pip/trunk/Makefile csw/mgar/pkg/lang-python/pip/trunk/checksums csw/mgar/pkg/lang-python/pip/trunk/files/ Added: csw/mgar/pkg/lang-python/pip/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pip/Makefile (rev 0) +++ csw/mgar/pkg/lang-python/pip/Makefile 2012-10-31 13:33:03 UTC (rev 19550) @@ -0,0 +1,2 @@ +%: + $(MAKE) -C trunk $* Property changes on: csw/mgar/pkg/lang-python/pip/trunk ___________________________________________________________________ Added: svn:ignore + work Added: csw/mgar/pkg/lang-python/pip/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/pip/trunk/Makefile (rev 0) +++ csw/mgar/pkg/lang-python/pip/trunk/Makefile 2012-10-31 13:33:03 UTC (rev 19550) @@ -0,0 +1,23 @@ +# $Id$ +# TODO (release-critical prefixed with !, non release-critical with *) +# +NAME = pip +VERSION = 1.2.1 +GARTYPE = v2 +CATEGORIES = python + +DESCRIPTION = A Python easy_install replacement + +MASTER_SITES = $(PYPI_MIRROR) +DISTFILES = $(DISTNAME).tar.gz + +# These are hardcodes for Mac OS X +CHECKPKG_OVERRIDES_CSWpy-pip += file-with-bad-content|/usr/local|root/opt/csw/lib/python/site-packages/pip/locations.py +CHECKPKG_OVERRIDES_CSWpy-pip += file-with-bad-content|/usr/local|root/opt/csw/lib/python/site-packages/pip/commands/install.py +CHECKPKG_OVERRIDES_CSWpy-pip += file-with-bad-content|/usr/share|root/opt/csw/lib/python/site-packages/pip/util.py + +# Testsuite seeems to be broken +TEST_SCRIPTS ?= + +include gar/category.mk + Property changes on: csw/mgar/pkg/lang-python/pip/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/lang-python/pip/trunk/checksums =================================================================== --- csw/mgar/pkg/lang-python/pip/trunk/checksums (rev 0) +++ csw/mgar/pkg/lang-python/pip/trunk/checksums 2012-10-31 13:33:03 UTC (rev 19550) @@ -0,0 +1 @@ +db8a6d8a4564d3dc7f337ebed67b1a85 pip-1.2.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Wed Oct 31 15:25:21 2012 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 31 Oct 2012 14:25:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[19551] csw/mgar/pkg/lang-python/mock/trunk/Makefile Message-ID: Revision: 19551 http://gar.svn.sourceforge.net/gar/?rev=19551&view=rev Author: bdwalton Date: 2012-10-31 14:25:20 +0000 (Wed, 31 Oct 2012) Log Message: ----------- lang-python/mock/trunk: specify the site and download file explicitly Modified Paths: -------------- csw/mgar/pkg/lang-python/mock/trunk/Makefile Modified: csw/mgar/pkg/lang-python/mock/trunk/Makefile =================================================================== --- csw/mgar/pkg/lang-python/mock/trunk/Makefile 2012-10-31 13:33:03 UTC (rev 19550) +++ csw/mgar/pkg/lang-python/mock/trunk/Makefile 2012-10-31 14:25:20 UTC (rev 19551) @@ -10,4 +10,8 @@ define BLURB endef ARCHALL = 1 + +MASTER_SITES = http://pypi.python.org/packages/source/m/mock/ +DISTFILES += $(NAME)-$(VERSION).tar.gz + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From idogan23 at users.sourceforge.net Wed Oct 31 16:37:23 2012 From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net) Date: Wed, 31 Oct 2012 15:37:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[19552] csw/mgar/pkg/jdk6/trunk Message-ID: Revision: 19552 http://gar.svn.sourceforge.net/gar/?rev=19552&view=rev Author: idogan23 Date: 2012-10-31 15:37:22 +0000 (Wed, 31 Oct 2012) Log Message: ----------- jdk6: bump version to 1.6.0_37 Modified Paths: -------------- csw/mgar/pkg/jdk6/trunk/Makefile csw/mgar/pkg/jdk6/trunk/checksums Modified: csw/mgar/pkg/jdk6/trunk/Makefile =================================================================== --- csw/mgar/pkg/jdk6/trunk/Makefile 2012-10-31 14:25:20 UTC (rev 19551) +++ csw/mgar/pkg/jdk6/trunk/Makefile 2012-10-31 15:37:22 UTC (rev 19552) @@ -1,6 +1,6 @@ NAME = jdk6 -SPKG_VERSION = 1.6.0_22 -VERSION = 6u22 +SPKG_VERSION = 1.6.0_37 +VERSION = 6u37 CATEGORIES = lang GARTYPE = v2 Modified: csw/mgar/pkg/jdk6/trunk/checksums =================================================================== --- csw/mgar/pkg/jdk6/trunk/checksums 2012-10-31 14:25:20 UTC (rev 19551) +++ csw/mgar/pkg/jdk6/trunk/checksums 2012-10-31 15:37:22 UTC (rev 19552) @@ -1,4 +1,4 @@ -2b197573425005c3fa717753648d5dfc jdk-6u22-solaris-i586.sh -b0bfc1b660a820f4453b85a936b07a35 jdk-6u22-solaris-sparc.sh -e43d5c860c7e11e5cacecfe872612e0a jdk-6u22-solaris-sparcv9.sh -78d6943c090d23853ec11acddcc15409 jdk-6u22-solaris-x64.sh +5ae91311d0a2cfe4a346f65d3e5217c9 jdk-6u37-solaris-i586.sh +36cca90c79c69d20c688f7343e27f6f4 jdk-6u37-solaris-sparc.sh +1c6903a949748f5c48815035e7420118 jdk-6u37-solaris-sparcv9.sh +d86c20a851fafe2448261cddad86ed2f jdk-6u37-solaris-x64.sh This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.