From wahwah at users.sourceforge.net Sat Jan 1 19:18:23 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 01 Jan 2011 18:18:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[12142] csw/mgar/pkg/mysql5/branches/mysql-5.0.x Message-ID: Revision: 12142 http://gar.svn.sourceforge.net/gar/?rev=12142&view=rev Author: wahwah Date: 2011-01-01 18:18:23 +0000 (Sat, 01 Jan 2011) Log Message: ----------- mysql-5.0.x: Moving my.cnf to /etc/opt/csw Keeping the patchlevel at 87, since 90 does not build and 91 is not out yet. Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.postinstall csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5 Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2010-12-30 22:21:59 UTC (rev 12141) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2011-01-01 18:18:23 UTC (rev 12142) @@ -2,10 +2,14 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ +# 5.0.90 doesn't build: +# http://bugs.mysql.com/bug.php?id=50409 +# Let's wait for 5.0.91. + PROJ_NAME = mysql NAME = $(PROJ_NAME)5 BASE_VERSION = 5.0 -PATCHLEVEL = 90 +PATCHLEVEL = 87 VERSION = $(BASE_VERSION).$(PATCHLEVEL) CATEGORIES = server @@ -148,16 +152,21 @@ # Set ./configure options CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --disable-assembler +# Why not have a docs package? +# CONFIGURE_ARGS += --without-docs CONFIGURE_ARGS += --enable-local-infile -CONFIGURE_ARGS += --enable-thread-safe-client +CONFIGURE_ARGS += --with-charset=utf8 CONFIGURE_ARGS += --with-extra-charsets=all CONFIGURE_ARGS += --with-low-memory -CONFIGURE_ARGS += --with-plugins=max-no-ndb CONFIGURE_ARGS += --with-pthread CONFIGURE_ARGS += --with-readline +CONFIGURE_ARGS += --with-zlib-dir=/opt/csw CONFIGURE_ARGS += --with-ssl=/opt/csw -CONFIGURE_ARGS += --with-zlib-dir=/opt/csw -CONFIGURE_ARGS += --without-docs +CONFIGURE_ARGS += --with-plugins=max-no-ndb +CONFIGURE_ARGS += --with-comment +CONFIGURE_ARGS += --with-mysqld-libs=-lmtmalloc +CONFIGURE_ARGS += --with-big-tables +CONFIGURE_ARGS += --enable-thread-safe-client CONFIGURE_ARGS_DBG = --with-debug CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR)) @@ -174,13 +183,21 @@ PROTOTYPE_PERMS_dbdir = 0700 PROTOTYPE_CLASS_dbdir = ugfiles -# Until the dependency guessed gets better at guessing -CHECKPKG_OVERRIDES_CSWmysql5devel += missing-dependency|CSWmysql5 +CHECKPKG_OVERRIDES_CSWmysql5test += surplus-dependency|CSWmysql5 +CHECKPKG_OVERRIDES_CSWmysql5devel += surplus-dependency|CSWmysql5rt +CHECKPKG_OVERRIDES_CSWmysql5 += surplus-dependency|CSWmysql5client +CHECKPKG_OVERRIDES_CSWmysql5bench += surplus-dependency|CSWmysql5 include gar/category.mk CFLAGS := $(filter-out -I%,$(CFLAGS)) +test-custom: + alias sh=/usr/bin/bash; \ + cd $(WORKSRC)/mysql-test; \ + perl mysql-test-run.pl --mem --big-test --force \ + --skip-test=archive-big --skip-test=/gis/ + pre-configure-modulated: # To work around the following libtool version mismatch problem: # libtool: Version mismatch error. This is libtool 2.2.6, but the Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums 2010-12-30 22:21:59 UTC (rev 12141) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/checksums 2011-01-01 18:18:23 UTC (rev 12142) @@ -1,12 +1 @@ -a0b98a7320bce2da3e1f90da704d3c85 0001-Use-libc-not-libcrypt.patch -1414d06fab1530484a508927a0de4154 0002-cast-user_info-pw_gid-to-gid_t.patch -5415f365f1b0f7a179d1efc25f45bbee 0003-OpenCSW-perl-for-tests.patch -8ab232cd4d232b3cda3bbced93f80237 0004-basedir-and-datadir-in-the-cnf-files.patch -bd7647733a5cc2e6e3dd7e7d4b8d311f CSWmysql5.postinstall -60162ea667507a6a487027e7c389ca55 CSWmysql5.preinstall -e691b0cf00a3925ac55c1844045d6e30 ChangeLog -e42afb5ec1b1ab02d2ec3b46d0922636 README.CSW -aaca748fc044834e71ad544ab293c494 cswmysql5 -67228e1f096fe08a94f4267439a4ec36 cswusergroup -6d325f2b4a60539699558bc5e4452388 mysql-5.0.90.tar.gz -0d083f6dab0bc083fd302ef1375e3d59 quick_start-csw +65e6229cc98b6a8d4c5206d7fe16c7be mysql-5.0.87.tar.gz Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.postinstall =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.postinstall 2010-12-30 22:21:59 UTC (rev 12141) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.postinstall 2011-01-01 18:18:23 UTC (rev 12142) @@ -8,20 +8,22 @@ # This script creates a default database with the small-memory footprint. # Input may be provided for DATADIR and DEFAULTS_FILE # -BASEDIR=/opt/csw/mysql5 -MYSQL_VAR=/var/opt/csw/mysql5 -DEFAULTS_FILE=$BASEDIR/my.cnf -SAVE_DEFAULTS_FILE=$MYSQL_VAR/my.cnf -MYSQLD_USER=mysql +MYSQL_HOME="/opt/csw/mysql5" +MYSQL_VAR="/var/opt/csw/mysql5" +sysconfdir="/etc/opt/csw/mysql5" +# https://www.opencsw.org/mantis/view.php?id=4646 +WRONG_LOCATION_DEFAULTS_FILES="${MYSQL_VAR}/my.cnf" +DEFAULTS_FILE="${sysconfdir}/my.cnf" +MYSQLD_USER="mysql" # Provide the default data directory -MYSQLD_DATADIR=$MYSQL_VAR +MYSQLD_DATADIR="${MYSQL_VAR}" # http://bugs.mysql.com/bug.php?id=31164 # ERROR: 1004 Can't create file '/var/tmp//installRJaiQ3/#sql6fee_1_0.frm' (errno: 13) unset TMPDIR if [ ! -f "$DEFAULTS_FILE" ]; then - IN_DEFAULTS_FILE=$BASEDIR/share/mysql/my-small.cnf + IN_DEFAULTS_FILE=$MYSQL_HOME/share/mysql/my-small.cnf echo "Using $IN_DEFAULTS_FILE to create the options file." else IN_DEFAULTS_FILE=$DEFAULTS_FILE @@ -53,10 +55,10 @@ echo "Creating MySQL core database in $MYSQLD_DATADIR" echo echo "### The following messages are from mysql_install_db." -$BASEDIR/bin/mysql_install_db \ +$MYSQL_HOME/bin/mysql_install_db \ --defaults-extra-file="$DEFAULTS_FILE" \ --user="$MYSQLD_USER" \ - --basedir="$BASEDIR" \ + --basedir="$MYSQL_HOME" \ --datadir="$MYSQLD_DATADIR" # Fix permissions on the data directory, since mysql_install_db was run as Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5 =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5 2010-12-30 22:21:59 UTC (rev 12141) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5 2011-01-01 18:18:23 UTC (rev 12142) @@ -16,11 +16,12 @@ # RETVAL=0 -MYSQLHOME=/opt/csw/mysql5 -MYSQL_VAR=/var/opt/csw/mysql5 +MYSQL_HOME="/opt/csw/mysql5" +MYSQL_VAR="/var/opt/csw/mysql5" +sysconfdir="/etc/opt/csw/mysql5" MYSQLD_DATADIR=$MYSQL_VAR MYSQLD_PID_FILE=$MYSQL_VAR/mysql.pid -CONFFILE=$MYSQL_VAR/my.cnf +CONFFILE=${sysconfdir}/my.cnf # # Source configuration @@ -28,7 +29,7 @@ [ -r /etc/opt/csw/mysql5rc ] && . /etc/opt/csw/mysql5rc # To get started quickly, copy a sample configuration file from -# $MYSQLHOME/share/mysql +# $MYSQL_HOME/share/mysql # For example, # cp /opt/csw/mysql5/share/mysql/my-medium.cnf /opt/csw/mysql5/var/my.cnf # @@ -73,15 +74,15 @@ # 2006-03-11 # This script no longer creates the default database. You may create the # default database manually or use /opt/csw/mysql5/share/mysql/quick_start-csw -# if [ ! -d "$MYSQLHOME/var/mysql" ] ; then +# if [ ! -d "$MYSQL_HOME/var/mysql" ] ; then # echo MySQL core database has not been created. # echo Creating it now... -# $MYSQLHOME/bin/mysql_install_db -# chown -R mysql:mysql $MYSQLHOME/var +# $MYSQL_HOME/bin/mysql_install_db +# chown -R mysql:mysql $MYSQL_HOME/var # fi # 2006-04-16 --defaults-file is changed to --defaults-extra-file - $MYSQLHOME/bin/mysqld_safe \ + $MYSQL_HOME/bin/mysqld_safe \ `[ -n "$CONFFILE" ] && echo "--defaults-extra-file=$CONFFILE"` \ --pid-file=$MYSQLD_PID_FILE \ `[ -n "$MYSQLD_PROG" ] && echo "--mysqld=$MYSQLD_PROG"` \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Jan 2 01:48:02 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 02 Jan 2011 00:48:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[12143] csw/mgar/pkg/mysql5/branches/mysql-5.0.x Message-ID: Revision: 12143 http://gar.svn.sourceforge.net/gar/?rev=12143&view=rev Author: wahwah Date: 2011-01-02 00:48:02 +0000 (Sun, 02 Jan 2011) Log Message: ----------- mysql-5.0.x: Using /etc/opt/csw for configuration Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.postinstall csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/quick_start-csw Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2011-01-01 18:18:23 UTC (rev 12142) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/Makefile 2011-01-02 00:48:02 UTC (rev 12143) @@ -27,8 +27,8 @@ # Change prefix to /opt/csw/$(NAME) prefix = /opt/csw/$(NAME) -localstatedir = /var/opt/csw/$(NAME) -sysconfdir = /etc/opt/csw/$(NAME) +localstatedir = /var$(prefix) +sysconfdir = /etc$(prefix) # Where to put the init script global_sysconfdir = /etc/opt/csw @@ -243,4 +243,5 @@ # http://www.opencsw.org/bugtrack/view.php?id=4149 ginstall -m 755 -d $(PKGROOT)/opt/csw/lib gln -s ../mysql5/lib/mysql $(PKGROOT)/opt/csw/lib/mysql + ginstall -m 755 -d $(PKGROOT)$(sysconfdir) @$(MAKECOOKIE) Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.postinstall =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.postinstall 2011-01-01 18:18:23 UTC (rev 12142) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.postinstall 2011-01-02 00:48:02 UTC (rev 12143) @@ -8,11 +8,11 @@ # This script creates a default database with the small-memory footprint. # Input may be provided for DATADIR and DEFAULTS_FILE # -MYSQL_HOME="/opt/csw/mysql5" -MYSQL_VAR="/var/opt/csw/mysql5" -sysconfdir="/etc/opt/csw/mysql5" +prefix="/opt/csw/mysql5" +MYSQL_HOME="${prefix}" +MYSQL_VAR="/var${prefix}" +sysconfdir="/etc${prefix}" # https://www.opencsw.org/mantis/view.php?id=4646 -WRONG_LOCATION_DEFAULTS_FILES="${MYSQL_VAR}/my.cnf" DEFAULTS_FILE="${sysconfdir}/my.cnf" MYSQLD_USER="mysql" # Provide the default data directory Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/quick_start-csw =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/quick_start-csw 2011-01-01 18:18:23 UTC (rev 12142) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/quick_start-csw 2011-01-02 00:48:02 UTC (rev 12143) @@ -10,10 +10,11 @@ # # TODO: This file should be integrated with CSWmysql5.postinstall file. -BASEDIR=/opt/csw/mysql5 -MYSQL_VAR=/var/opt/csw/mysql5 -DEFAULTS_FILE=$BASEDIR/my.cnf -SAVE_DEFAULTS_FILE=$MYSQL_VAR/my.cnf +prefix=/opt/csw/mysql5 +MYSQL_HOME=${prefix} +MYSQL_VAR=/var${prefix} +sysconfdir=/etc${prefix} +DEFAULTS_FILE=${sysconfdir}/my.cnf MYSQLD_USER=mysql # # Provide a default data directory @@ -23,7 +24,7 @@ echo "This is the start script to setup a MySQL-5 database" echo " directory." echo -echo " The base directory is $BASEDIR." +echo " The base directory is $MYSQL_HOME." echo " The default database directory is $MYSQLD_DATADIR." echo echo " If you have not setup a partition for the database and" @@ -53,7 +54,7 @@ ` || exit $? if [ $usrin = "[default]" ]; then if [ ! -f "$DEFAULTS_FILE" ]; then - IN_DEFAULTS_FILE=$BASEDIR/share/mysql/my-small.cnf + IN_DEFAULTS_FILE=$MYSQL_HOME/share/mysql/my-small.cnf echo "Using $IN_DEFAULTS_FILE to create the options file." else IN_DEFAULTS_FILE=$DEFAULTS_FILE @@ -104,10 +105,10 @@ echo "Creating MySQL core database in $MYSQLD_DATADIR" echo echo "### The following messages are from mysql_install_db." -$BASEDIR/bin/mysql_install_db \ +$MYSQL_HOME/bin/mysql_install_db \ --defaults-extra-file=$DEFAULTS_FILE \ --user=$MYSQLD_USER \ - --basedir=$BASEDIR \ + --basedir=$MYSQL_HOME \ --datadir=$MYSQLD_DATADIR # This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Jan 2 11:41:21 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 02 Jan 2011 10:41:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[12144] csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/ cswmysql5 Message-ID: Revision: 12144 http://gar.svn.sourceforge.net/gar/?rev=12144&view=rev Author: wahwah Date: 2011-01-02 10:41:21 +0000 (Sun, 02 Jan 2011) Log Message: ----------- mysql-5.0.x: Rename variables in the startup script Also a little bit of cleanup Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5 Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5 =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5 2011-01-02 00:48:02 UTC (rev 12143) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5 2011-01-02 10:41:21 UTC (rev 12144) @@ -16,11 +16,11 @@ # RETVAL=0 -MYSQL_HOME="/opt/csw/mysql5" -MYSQL_VAR="/var/opt/csw/mysql5" -sysconfdir="/etc/opt/csw/mysql5" -MYSQLD_DATADIR=$MYSQL_VAR -MYSQLD_PID_FILE=$MYSQL_VAR/mysql.pid +BASEDIR="/opt/csw/mysql5" +MYSQL_HOME="/var${BASEDIR}" +sysconfdir="/etc${BASEDIR}" +MYSQLD_DATADIR=$MYSQL_HOME +MYSQLD_PID_FILE=$MYSQL_HOME/mysql.pid CONFFILE=${sysconfdir}/my.cnf # @@ -29,7 +29,7 @@ [ -r /etc/opt/csw/mysql5rc ] && . /etc/opt/csw/mysql5rc # To get started quickly, copy a sample configuration file from -# $MYSQL_HOME/share/mysql +# $BASEDIR/share/mysql # For example, # cp /opt/csw/mysql5/share/mysql/my-medium.cnf /opt/csw/mysql5/var/my.cnf # @@ -46,18 +46,20 @@ fi # If CONFFILE is the server default file, unset CONFFILE -if [ x"$CONFFILE" = x"$MYSQL_VAR/my.cnf" ]; then +if [ "${CONFFILE}" = "${MYSQL_HOME}/my.cnf" \ + -o \ + "${CONFFILE}" = "${sysconfdir}/my.cnf" ]; then CONFFILE= fi # If MYSQLD_DATADIR does not contain a mysql directory, unset MYSQLD_DATADIR # Also, check that MYSQLD_DATADIR contains a mysql directory -if [ ! -d "$MYSQL_VAR/mysql" -a ! -d "$MYSQLD_DATADIR/mysql" ] ; then +if [ ! -d "$MYSQL_HOME/mysql" -a ! -d "$MYSQLD_DATADIR/mysql" ] ; then MYSQLD_DATADIR= fi # Make sure required vars are set -MYSQLD_PID_FILE=${MYSQLD_PID_FILE:=$MYSQL_VAR/mysql.pid} +MYSQLD_PID_FILE=${MYSQLD_PID_FILE:=$MYSQL_HOME/mysql.pid} # If a database already exists, start whether or not there is a conf file. # If no conf file, the database will just use internal defaults for everything. @@ -71,18 +73,20 @@ fi printf "%-60s" "Starting mysqld: " -# 2006-03-11 -# This script no longer creates the default database. You may create the -# default database manually or use /opt/csw/mysql5/share/mysql/quick_start-csw -# if [ ! -d "$MYSQL_HOME/var/mysql" ] ; then -# echo MySQL core database has not been created. -# echo Creating it now... -# $MYSQL_HOME/bin/mysql_install_db -# chown -R mysql:mysql $MYSQL_HOME/var -# fi -# 2006-04-16 --defaults-file is changed to --defaults-extra-file - $MYSQL_HOME/bin/mysqld_safe \ + # 2006-03-11 + # This script no longer creates the default database. You may create the + # default database manually or use + # /opt/csw/mysql5/share/mysql/quick_start-csw + # if [ ! -d "$BASEDIR/var/mysql" ] ; then + # echo MySQL core database has not been created. + # echo Creating it now... + # $BASEDIR/bin/mysql_install_db + # chown -R mysql:mysql $BASEDIR/var + # fi + + # 2006-04-16 --defaults-file is changed to --defaults-extra-file + $BASEDIR/bin/mysqld_safe \ `[ -n "$CONFFILE" ] && echo "--defaults-extra-file=$CONFFILE"` \ --pid-file=$MYSQLD_PID_FILE \ `[ -n "$MYSQLD_PROG" ] && echo "--mysqld=$MYSQLD_PROG"` \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Jan 2 11:46:54 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 02 Jan 2011 10:46:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[12145] csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/ cswmysql5 Message-ID: Revision: 12145 http://gar.svn.sourceforge.net/gar/?rev=12145&view=rev Author: wahwah Date: 2011-01-02 10:46:54 +0000 (Sun, 02 Jan 2011) Log Message: ----------- mysql-5.0.x: Fix a bug with restarts in the global zone Using pgrep without the -z option results in processes from other zones being printed; the restart command in the global zone would never finish unless processes in non-global zones are stopped. Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5 Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5 =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5 2011-01-02 10:41:21 UTC (rev 12144) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5 2011-01-02 10:46:54 UTC (rev 12145) @@ -173,7 +173,13 @@ restart) stop_it - while pgrep mysqld > /dev/null + if [ -x /bin/zonename ] + then + pgrep_opts="-z `/bin/zonename`" + else + pgrep_opts="" + fi + while pgrep ${pgrep_opts} mysqld > /dev/null do sleep 1 done This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Jan 2 12:53:49 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 02 Jan 2011 11:53:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[12146] csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/ cswmysql5 Message-ID: Revision: 12146 http://gar.svn.sourceforge.net/gar/?rev=12146&view=rev Author: wahwah Date: 2011-01-02 11:53:49 +0000 (Sun, 02 Jan 2011) Log Message: ----------- mysql-5.0.x: Export MYSQL_HOME so that /opt/csw/mysql5/my.cnf is ignored Reference: http://dev.mysql.com/doc/refman/5.0/en/option-files.html Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5 Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5 =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5 2011-01-02 10:46:54 UTC (rev 12145) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5 2011-01-02 11:53:49 UTC (rev 12146) @@ -28,6 +28,8 @@ [ -r /opt/csw/mysql5/etc/mysql5rc ] && . /opt/csw/mysql5/etc/mysql5rc [ -r /etc/opt/csw/mysql5rc ] && . /etc/opt/csw/mysql5rc +export MYSQL_HOME + # To get started quickly, copy a sample configuration file from # $BASEDIR/share/mysql # For example, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Jan 2 12:55:25 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 02 Jan 2011 11:55:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[12147] csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/ CSWmysql5.postinstall Message-ID: Revision: 12147 http://gar.svn.sourceforge.net/gar/?rev=12147&view=rev Author: wahwah Date: 2011-01-02 11:55:25 +0000 (Sun, 02 Jan 2011) Log Message: ----------- mysql-5.0.x: Warn if old my.cnf file is present Also, set BASEDIR and MYSQL_HOME the same way that MySQL's documentation uses them. Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.postinstall Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.postinstall =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.postinstall 2011-01-02 11:53:49 UTC (rev 12146) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/CSWmysql5.postinstall 2011-01-02 11:55:25 UTC (rev 12147) @@ -8,22 +8,31 @@ # This script creates a default database with the small-memory footprint. # Input may be provided for DATADIR and DEFAULTS_FILE # +# http://dev.mysql.com/doc/refman/5.0/en/option-files.html +# prefix="/opt/csw/mysql5" -MYSQL_HOME="${prefix}" -MYSQL_VAR="/var${prefix}" +BASEDIR="${prefix}" +MYSQL_HOME="/var${prefix}" sysconfdir="/etc${prefix}" # https://www.opencsw.org/mantis/view.php?id=4646 DEFAULTS_FILE="${sysconfdir}/my.cnf" MYSQLD_USER="mysql" # Provide the default data directory -MYSQLD_DATADIR="${MYSQL_VAR}" +MYSQLD_DATADIR="${MYSQL_HOME}" +DEPRECATED_DEFAULTS_FILE="${BASEDIR}/my.cnf" # http://bugs.mysql.com/bug.php?id=31164 # ERROR: 1004 Can't create file '/var/tmp//installRJaiQ3/#sql6fee_1_0.frm' (errno: 13) unset TMPDIR +if [ -r "${DEPRECATED_DEFAULTS_FILE}" ]; then + echo "*** WARNING ***" + echo "File '${DEPRECATED_DEFAULTS_FILE}' found. This location is deprecated." + echo "This file takes no effect." +fi + if [ ! -f "$DEFAULTS_FILE" ]; then - IN_DEFAULTS_FILE=$MYSQL_HOME/share/mysql/my-small.cnf + IN_DEFAULTS_FILE=$BASEDIR/share/mysql/my-small.cnf echo "Using $IN_DEFAULTS_FILE to create the options file." else IN_DEFAULTS_FILE=$DEFAULTS_FILE @@ -55,10 +64,10 @@ echo "Creating MySQL core database in $MYSQLD_DATADIR" echo echo "### The following messages are from mysql_install_db." -$MYSQL_HOME/bin/mysql_install_db \ +$BASEDIR/bin/mysql_install_db \ --defaults-extra-file="$DEFAULTS_FILE" \ --user="$MYSQLD_USER" \ - --basedir="$MYSQL_HOME" \ + --basedir="$BASEDIR" \ --datadir="$MYSQLD_DATADIR" # Fix permissions on the data directory, since mysql_install_db was run as 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 Jan 2 16:33:18 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 02 Jan 2011 15:33:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[12148] csw/mgar/pkg/coreutils/trunk Message-ID: Revision: 12148 http://gar.svn.sourceforge.net/gar/?rev=12148&view=rev Author: bdwalton Date: 2011-01-02 15:33:17 +0000 (Sun, 02 Jan 2011) Log Message: ----------- coreutils/trunk: update version to 8.8 Modified Paths: -------------- csw/mgar/pkg/coreutils/trunk/Makefile csw/mgar/pkg/coreutils/trunk/checksums Modified: csw/mgar/pkg/coreutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/coreutils/trunk/Makefile 2011-01-02 11:55:25 UTC (rev 12147) +++ csw/mgar/pkg/coreutils/trunk/Makefile 2011-01-02 15:33:17 UTC (rev 12148) @@ -1,5 +1,5 @@ NAME = coreutils -VERSION = 8.7 +VERSION = 8.8 CATEGORIES = utils # seq has issues related to the handling of long double's with -O2. Modified: csw/mgar/pkg/coreutils/trunk/checksums =================================================================== --- csw/mgar/pkg/coreutils/trunk/checksums 2011-01-02 11:55:25 UTC (rev 12147) +++ csw/mgar/pkg/coreutils/trunk/checksums 2011-01-02 15:33:17 UTC (rev 12148) @@ -1 +1 @@ -3c1ae9531159447083ae8f25ae554b81 coreutils-8.7.tar.gz +bad596d9654e299eedea0eaf93f178fa coreutils-8.8.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sun Jan 2 18:45:33 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 02 Jan 2011 17:45:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[12149] csw/mgar/pkg/mercurial/trunk Message-ID: Revision: 12149 http://gar.svn.sourceforge.net/gar/?rev=12149&view=rev Author: rthurner Date: 2011-01-02 17:45:33 +0000 (Sun, 02 Jan 2011) Log Message: ----------- mercurial - upgrade to hg-1.7.3 Modified Paths: -------------- csw/mgar/pkg/mercurial/trunk/Makefile csw/mgar/pkg/mercurial/trunk/checksums Modified: csw/mgar/pkg/mercurial/trunk/Makefile =================================================================== --- csw/mgar/pkg/mercurial/trunk/Makefile 2011-01-02 15:33:17 UTC (rev 12148) +++ csw/mgar/pkg/mercurial/trunk/Makefile 2011-01-02 17:45:33 UTC (rev 12149) @@ -1,5 +1,5 @@ NAME = mercurial -VERSION = 1.7.2 +VERSION = 1.7.3 CATEGORIES = python DESCRIPTION = Fast, lightweight Source Control Management system Modified: csw/mgar/pkg/mercurial/trunk/checksums =================================================================== --- csw/mgar/pkg/mercurial/trunk/checksums 2011-01-02 15:33:17 UTC (rev 12148) +++ csw/mgar/pkg/mercurial/trunk/checksums 2011-01-02 17:45:33 UTC (rev 12149) @@ -1 +1 @@ -e9e99a0a20ded8f6d9463ffb94021b12 mercurial-1.7.2.tar.gz +1d635ad307fa20a5e9c6afba6145a73b mercurial-1.7.3.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bdwalton at users.sourceforge.net Sun Jan 2 19:37:21 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Sun, 02 Jan 2011 18:37:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[12150] csw/mgar/pkg/coreutils/trunk Message-ID: Revision: 12150 http://gar.svn.sourceforge.net/gar/?rev=12150&view=rev Author: bdwalton Date: 2011-01-02 18:37:20 +0000 (Sun, 02 Jan 2011) Log Message: ----------- add a patch file to prevent known test failure from stopping the build Modified Paths: -------------- csw/mgar/pkg/coreutils/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/coreutils/trunk/files/0001-Import-a-patch-to-prevent-breakage-on-vasprintf-gnul.patch Modified: csw/mgar/pkg/coreutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/coreutils/trunk/Makefile 2011-01-02 17:45:33 UTC (rev 12149) +++ csw/mgar/pkg/coreutils/trunk/Makefile 2011-01-02 18:37:20 UTC (rev 12150) @@ -28,6 +28,7 @@ MASTER_SITES = $(GNU_MIRROR) DISTFILES = $(NAME)-$(VERSION).tar.gz +PATCHFILES += 0001-Import-a-patch-to-prevent-breakage-on-vasprintf-gnul.patch # We define upstream file regex so we can be notifed of new upstream # software release Added: csw/mgar/pkg/coreutils/trunk/files/0001-Import-a-patch-to-prevent-breakage-on-vasprintf-gnul.patch =================================================================== --- csw/mgar/pkg/coreutils/trunk/files/0001-Import-a-patch-to-prevent-breakage-on-vasprintf-gnul.patch (rev 0) +++ csw/mgar/pkg/coreutils/trunk/files/0001-Import-a-patch-to-prevent-breakage-on-vasprintf-gnul.patch 2011-01-02 18:37:20 UTC (rev 12150) @@ -0,0 +1,47 @@ +From ac3821f923d5c54b575110d984701c06d22149d0 Mon Sep 17 00:00:00 2001 +From: Ben Walton +Date: Sun, 2 Jan 2011 19:33:50 +0100 +Subject: [PATCH] Import a patch to prevent breakage on vasprintf gnulib test + +Solaris has a known breakage of some *printf function handling. +This patch makes the test a skip instead of a fail so that it's +a noted failure, but not a deal breaker for the build. + +It was gleaned from the larger commit that was added to upstream +gnulib here: +http://www.mail-archive.com/bug-gnulib at gnu.org/msg20851.html + +Signed-off-by: Ben Walton +--- + gnulib-tests/test-vasprintf-posix.c | 15 +++++++++++++++ + 1 files changed, 15 insertions(+), 0 deletions(-) + +diff --git a/gnulib-tests/test-vasprintf-posix.c b/gnulib-tests/test-vasprintf-posix.c +index ec908e3..17be838 100644 +--- a/gnulib-tests/test-vasprintf-posix.c ++++ b/gnulib-tests/test-vasprintf-posix.c +@@ -3550,6 +3550,21 @@ test_function (int (*my_asprintf) (char **, const char *, ...)) + } + + { ++ char *result; ++ int retval = ++ my_asprintf (&result, "%.511f %d", 1.0, 99); ++ size_t i; ++ ASSERT (result != NULL); ++ ASSERT (result[0] == '1'); ++ ASSERT (result[1] == '.'); ++ for (i = 0; i < 511; i++) ++ ASSERT (result[2 + i] == '0'); ++ ASSERT (strcmp (result + 2 + 511, " 99") == 0); ++ ASSERT (retval == strlen (result)); ++ free (result); ++ } ++ ++ { + char input[5000]; + char *result; + int retval; +-- +1.7.3.2 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 2 20:06:14 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 02 Jan 2011 19:06:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[12151] csw/mgar/pkg/cpan/Package-Constants/trunk/Makefile Message-ID: Revision: 12151 http://gar.svn.sourceforge.net/gar/?rev=12151&view=rev Author: wbonnet Date: 2011-01-02 19:06:14 +0000 (Sun, 02 Jan 2011) Log Message: ----------- Fix bug 4568 Modified Paths: -------------- csw/mgar/pkg/cpan/Package-Constants/trunk/Makefile Modified: csw/mgar/pkg/cpan/Package-Constants/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Package-Constants/trunk/Makefile 2011-01-02 18:37:20 UTC (rev 12150) +++ csw/mgar/pkg/cpan/Package-Constants/trunk/Makefile 2011-01-02 19:06:14 UTC (rev 12151) @@ -17,6 +17,8 @@ LICENSE = README +EXTRA_MERGE_EXCLUDE_FILES = .*\/man\/man3\/.* .*\/man\/man1\/.* + include gar/category.mk post-extract: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From j_arndt at users.sourceforge.net Sun Jan 2 22:12:33 2011 From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net) Date: Sun, 02 Jan 2011 21:12:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[12152] csw/mgar/pkg/munin/trunk Message-ID: Revision: 12152 http://gar.svn.sourceforge.net/gar/?rev=12152&view=rev Author: j_arndt Date: 2011-01-02 21:12:33 +0000 (Sun, 02 Jan 2011) Log Message: ----------- munin: changed dependencies to match new rrdtool packages Modified Paths: -------------- csw/mgar/pkg/munin/trunk/Makefile csw/mgar/pkg/munin/trunk/files/Makefile.config.patch csw/mgar/pkg/munin/trunk/files/Makefile.patch Modified: csw/mgar/pkg/munin/trunk/Makefile =================================================================== --- csw/mgar/pkg/munin/trunk/Makefile 2011-01-02 19:06:14 UTC (rev 12151) +++ csw/mgar/pkg/munin/trunk/Makefile 2011-01-02 21:12:33 UTC (rev 12152) @@ -49,7 +49,7 @@ ARCHALL_CSWmunincommon = 1 RUNTIME_DEP_PKGS_CSWmuninmaster = CSWperl CSWpmhtmltmpl CSWpmprmsvldt CSWpmlog4perl CSWmunincommon -RUNTIME_DEP_PKGS_CSWmuninmaster += CSWrrd CSWapache2 +RUNTIME_DEP_PKGS_CSWmuninmaster += CSWrrdtool CSWpm-rrdtool CSWapache2 RUNTIME_DEP_PKGS_CSWmuninmaster += CSWcswclassutils RUNTIME_DEP_PKGS_CSWmuninnode = CSWperl CSWpmnetsnmp CSWpmnetserver CSWmunincommon @@ -79,10 +79,8 @@ @$(MAKECOOKIE) install-custom: - @cat $(WORKSRC)/Makefile.config | sed -e "s;$$(DESTDIR);$(DESTDIR);g" > $(WORKSRC)/Makefile.config.tmp - @mv $(WORKSRC)/Makefile.config.tmp $(WORKSRC)/Makefile.config - @( cd $(WORKSRC); gmake -f Makefile ; gmake -f Makefile install) - #mv $(DESTDIR)/opt/csw/lib/plugins $(DESTDIR)/opt/csw/lib/munin_plugins + @cat $(WORKSRC)/Makefile | sed -e "s;DESTDIR =;& $(DESTDIR);g" > $(WORKSRC)/Makefile.tmp + @( cd $(WORKSRC); gmake -f Makefile ; cp Makefile.tmp Makefile ; gmake -f Makefile install) @mv $(DESTDIR)/etc/opt/csw/munin/munin-node.conf $(DESTDIR)/etc/opt/csw/munin/munin-node.conf.CSW @mv $(DESTDIR)/etc/opt/csw/munin/munin.conf $(DESTDIR)/etc/opt/csw/munin/munin.conf.CSW @mv $(DESTDIR)/var/opt/csw/munin/www/.htaccess $(DESTDIR)/var/opt/csw/munin/www/.htaccess.CSW Modified: csw/mgar/pkg/munin/trunk/files/Makefile.config.patch =================================================================== --- csw/mgar/pkg/munin/trunk/files/Makefile.config.patch 2011-01-02 19:06:14 UTC (rev 12151) +++ csw/mgar/pkg/munin/trunk/files/Makefile.config.patch 2011-01-02 21:12:33 UTC (rev 12152) @@ -1,22 +1,17 @@ -From 0298d86c798e9ad08f763a05932b3bdc1d5db118 Mon Sep 17 00:00:00 2001 +From 9cdc800db0243d4b6ab1464fbf5e989252e655e4 Mon Sep 17 00:00:00 2001 From: Juergen Arndt -Date: Sun, 11 Jul 2010 18:03:49 +0200 -Subject: [PATCH] set paths to match OpenCSW +Date: Sun, 2 Jan 2011 20:43:45 +0100 +Subject: [PATCH] changed pathes for OpenCSW --- - Makefile.config | 42 ++++++++++++++++++++++-------------------- - 1 files changed, 22 insertions(+), 20 deletions(-) + Makefile.config | 40 ++++++++++++++++++++-------------------- + 1 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Makefile.config b/Makefile.config -index 84f155b..cacaf20 100644 +index 84f155b..2eb37ea 100644 --- a/Makefile.config +++ b/Makefile.config -@@ -14,13 +14,15 @@ - # and LOGDIR as subdirectories. Today, DBDIR contains configured - # domains, as well as PLUGSTATE, and we risk collisions. - -+DESTDIR=$(DESTDIR) -+ +@@ -17,10 +17,10 @@ # # the base of the Munin installation. # @@ -29,7 +24,7 @@ # Server only - where to put munin-cron BINDIR = $(PREFIX)/bin -@@ -29,47 +31,47 @@ BINDIR = $(PREFIX)/bin +@@ -29,47 +29,47 @@ BINDIR = $(PREFIX)/bin SBINDIR = $(PREFIX)/sbin # Where to put text and html documentation @@ -88,7 +83,7 @@ # The ruby interpreter to use (used by some plugins) RUBY := /usr/bin/env ruby -@@ -95,11 +97,11 @@ JAVALIBDIR:= $(LIBDIR) +@@ -95,11 +95,11 @@ JAVALIBDIR:= $(LIBDIR) GOODSH := $(shell PATH=`getconf PATH` sh -c 'type sh | sed "s/.* //"') # Path of bash for bash specific plugins @@ -102,7 +97,7 @@ # Client only - Install plugins for this architecture OSTYPE := $(shell uname | tr '[A-Z]' '[a-z]') -@@ -111,7 +113,7 @@ HOSTNAME := $(shell hostname) +@@ -111,7 +111,7 @@ HOSTNAME := $(shell hostname) # What is the safest way to create a tempfile. # Default is to figure it out by testing various methods. # Replace this with a known platform-specific method @@ -111,7 +106,7 @@ # Munin version number. VERSION := $(shell ./getversion) -@@ -126,9 +128,9 @@ PLUGINUSER := nobody +@@ -126,9 +126,9 @@ PLUGINUSER := nobody # Which command to use to check if the USER and GROUP to run Munin as, exists. # These will work on most modern OSes: # @@ -124,12 +119,12 @@ # For OSX, comment out the previous two lines and comment in these # -@@ -159,4 +161,4 @@ JAR := jar +@@ -159,4 +159,4 @@ JAR := jar JCVALID := $(shell $(JC) -version >/dev/null 2>/dev/null && echo "yes") # Check whether setruid functionality can be used -HASSETR := $(shell perl -e 'use Config; my @vars=("d_setruid", "d_setreuid", "d_setresuid"); foreach my $$var (@vars) { if ($$Config{$$var} eq "define") { print "1\n"; exit 0; } } print "0\n"; exit 0;' ) +HASSETR := $(shell /opt/csw/bin/perl -e 'use Config; my @vars=("d_setruid", "d_setreuid", "d_setresuid"); foreach my $$var (@vars) { if ($$Config{$$var} eq "define") { print "1\n"; exit 0; } } print "0\n"; exit 0;' ) -- -1.7.1 +1.7.3.2 Modified: csw/mgar/pkg/munin/trunk/files/Makefile.patch =================================================================== --- csw/mgar/pkg/munin/trunk/files/Makefile.patch 2011-01-02 19:06:14 UTC (rev 12151) +++ csw/mgar/pkg/munin/trunk/files/Makefile.patch 2011-01-02 21:12:33 UTC (rev 12152) @@ -1,17 +1,26 @@ -From 7ce22ffb9ee515d86ca799df9d8cc20fe723ffd0 Mon Sep 17 00:00:00 2001 +From 1870ed31733cc218c7a308aea7f96b8f67c0e934 Mon Sep 17 00:00:00 2001 From: Juergen Arndt -Date: Sun, 11 Jul 2010 13:55:58 +0200 +Date: Sun, 2 Jan 2011 20:49:51 +0100 Subject: [PATCH] expanded pathes to $(DESTDIR) --- - Makefile | 177 ++++++++++++++++++++++++++++++-------------------------------- - 1 files changed, 86 insertions(+), 91 deletions(-) + Makefile | 179 ++++++++++++++++++++++++++++++------------------------------- + 1 files changed, 88 insertions(+), 91 deletions(-) diff --git a/Makefile b/Makefile -index 88f8952..6099fc1 100644 +index 88f8952..0cc40f9 100644 --- a/Makefile +++ b/Makefile -@@ -49,8 +49,8 @@ uninstall: +@@ -9,6 +9,8 @@ + DEFAULTS = Makefile.config + CONFIG = Makefile.config + ++DESTDIR = ++ + include $(DEFAULTS) + include $(CONFIG) + +@@ -49,8 +51,8 @@ uninstall: # This removes the installed config so that the next install-pass installs # a new config. Target _only_ suitable for maintainers. unconfig: @@ -22,7 +31,7 @@ tags: -rm -f TAGS -@@ -66,52 +66,51 @@ endif +@@ -66,52 +68,51 @@ endif install-pre: Makefile Makefile.config @$(CHECKUSER) @@ -107,7 +116,7 @@ # ALWAYS DO THE OS SPECIFIC PLUGINS LAST! THAT WAY THEY OVERWRITE THE # GENERIC ONES -@@ -122,28 +121,24 @@ install-node-plugins: install-plugins-prime +@@ -122,28 +123,24 @@ install-node-plugins: install-plugins-prime install-plugins-prime: install-plugins build $(PLUGINS) Makefile Makefile.config @$(CHECKGROUP) @@ -146,7 +155,7 @@ #TODO: # configure plugins. Or not. Better done under the direction of the installer -@@ -152,30 +147,30 @@ install-plugins-java: build-plugins-java +@@ -152,30 +149,30 @@ install-plugins-java: build-plugins-java install-node-prime: install-node-pre install-node install-node-pre: build/node/munin-node.conf install-pre @@ -192,7 +201,7 @@ ###################################################################### -@@ -189,28 +184,28 @@ build/%: %.in +@@ -189,28 +186,28 @@ build/%: %.in @echo "$< -> $@" @mkdir -p build/`dirname $<` @sed -e 's|@@PREFIX@@|$(PREFIX)|g' \ @@ -234,7 +243,7 @@ -e 's|@@USER@@|$(USER)|g' \ -e 's|@@GROUP@@|$(GROUP)|g' \ -e 's|@@PLUGINUSER@@|$(PLUGINUSER)|g' \ -@@ -354,20 +349,20 @@ old-test: t/*.t +@@ -354,20 +351,20 @@ old-test: t/*.t $(MAKE) $@ CONFIG=t/Makefile.config else test_plugins = id_default id_root env @@ -263,7 +272,7 @@ echo 'Done?' t/install: -@@ -391,12 +386,12 @@ build-common: common/Build +@@ -391,12 +388,12 @@ build-common: common/Build # can't seem to find a way to persuade it to write otherwhere. install-%: %/Build cd $* && $(PERL) Build install \ @@ -283,5 +292,5 @@ test-%: %/Build cd $* && $(PERL) Build test || true -- -1.7.1 +1.7.3.2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From theferret at users.sourceforge.net Mon Jan 3 01:14:32 2011 From: theferret at users.sourceforge.net (theferret at users.sourceforge.net) Date: Mon, 03 Jan 2011 00:14:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[12153] csw/mgar/pkg/cswclassutils/trunk/files/ CSWcswclassutils.i.cswcptemplates Message-ID: Revision: 12153 http://gar.svn.sourceforge.net/gar/?rev=12153&view=rev Author: theferret Date: 2011-01-03 00:14:31 +0000 (Mon, 03 Jan 2011) Log Message: ----------- cswcptemplates: half of new class action script, to copy from /opt/csw/etc to /etc/opt/csw... or elsewhere Added Paths: ----------- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswcptemplates Added: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswcptemplates =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswcptemplates (rev 0) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswcptemplates 2011-01-03 00:14:31 UTC (rev 12153) @@ -0,0 +1,106 @@ +#!/bin/sh + +# Originally modelled after my cswpreserveconf, but taken one step +# further. +# Instead of taking the initial templates from +# $(SOMEDIR) and copying right back into $(SOMEDIR) +# it presumes that the source is +# /opt/csw/etc/templates/CSWpkgname/{.....} +# and the default destination for a file is +# /etc/opt/csw/filename +# +# If destination should be somewhere else, then make subdirs as follows: +# +# /opt/csw/etc/templates/CSWpkgname/var/some/file +# gets copied to +# /var/some/file +# +# There are two surprising oddities: +# 1. the old ".csw" postfix is gone. name the file EXACTLY how it should be +# 2. The actual copying to final destination is done by virtue of +# just scaning the entire templates/CSWpkgname directory. +# This is so that the script will work right, for sparse zones. +# +# Author: Philip Brown 2011 +# May be used/copied freely +# + +# extra checks and warnings to help people run this manually +if [ "$PKG" = "" ] ; then + echo ERROR: PKG env variable must be set + exit 1 +fi + +# Note: for "normal" installs, we get passed one line per file in our "class" +# However, for sparse-zone installs, the files have already been 'installed', +# so we will get called, but have no files passed on stdin +while read src dest ; do + cp $src $dest + if [ $? -ne 0 ] ; then + # It's technically "okay" if the copy fails in some situations. + # For example, if we have shared root and the file is already + # there. Except I dont think we would be run in that case + # anyway. erm.. + if [ ! -f $src ] ; then + echo ERROR: src $src does not exist + exit 1 + fi + fi + # reminder: $dest will already have $PKG_INSTALL_ROOT prepended for us +done + + +cd $PKG_INSTALL_ROOT/opt/csw/etc/templates/$PKG || exit 0 +# I dont see how we would be called if that dir does not exist, but be +# paranoid. + + +for template in `find . -type f ` ; do +case $template in + */*) + confdest=$PKG_INSTALL_ROOT/$template + ;; + *) + confdest=$PKG_INSTALL_ROOT/etc/opt/csw/$template + ;; +esac + # Now we copy all templates to the "real" location, + # IF there is not already a file there, or a previously saved copy + + + preservedir=$PKG_INSTALL_ROOT/etc/opt/csw/preserve/$PKG + confbasename=`basename $confdest` + preservedconf=$preservedir/$confbasename + + ##overridedir=`sed -n 's/.*CSWDESTDIR=\([^ ]*\).*/\1/p' $src` + + if [ -f $preservedconf ] ; then + echo Restoring $preservedconf + cp -p $preservedconf $confdest + elif [ -f $confdest ] ; then + echo $confdest already exists. Not overwriting + else + echo Copying $template to $confdest + cp $template $confdest + + echo Forcing proper permissions on $confdest + [ -x $PKG_INSTALL_ROOT/usr/bin/pkgadm ] && $PKG_INSTALL_ROOT/usr/bin/pkgadm sync > /dev/null 2>&1 + if [ "$PKG_INSTALL_ROOT" ]; then + file=`echo $template | sed -e "s,$PKG_INSTALL_ROOT,,"` + else + file=$template + fi + contents=`grep "^${file} " $PKG_INSTALL_ROOT/var/sadm/install/contents` + if [ "$contents" ]; then + mode=`echo $contents | awk '{print $4}'` + user=`echo $contents | awk '{print $5}'` + group=`echo $contents | awk '{print $6}'` + chmod $mode $confdest + chown $user:$group $confdest + fi + fi +done + + +echo '' + Property changes on: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswcptemplates ___________________________________________________________________ Added: svn:executable + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From theferret at users.sourceforge.net Mon Jan 3 01:48:50 2011 From: theferret at users.sourceforge.net (theferret at users.sourceforge.net) Date: Mon, 03 Jan 2011 00:48:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[12154] csw/mgar/pkg/cswclassutils/trunk/files/ CSWcswclassutils.r.cswcptemplates Message-ID: Revision: 12154 http://gar.svn.sourceforge.net/gar/?rev=12154&view=rev Author: theferret Date: 2011-01-03 00:48:49 +0000 (Mon, 03 Jan 2011) Log Message: ----------- cswcptemplates: other half Added Paths: ----------- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswcptemplates Added: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswcptemplates =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswcptemplates (rev 0) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswcptemplates 2011-01-03 00:48:49 UTC (rev 12154) @@ -0,0 +1,86 @@ +#!/bin/sh +# +# See i.cswcptemplates for more detailed comments. +# +# Author: Philip Brown 2010 +# May be used/copied freely +# + + +# extra checks and warnings to help people run this manually +if [ "$PKG" = "" ] ; then + echo ERROR: PKG env variable must be set + exit 1 +fi + +# Note: for "normal" installs, we get passed one line per file in our "class" +# However, for sparse-zone installs, the files have already been 'installed', +# so we will get called, but have no files passed on stdin +# erm.. I think. True of INSTALL, but havent explicitly tested for pkgrm + +# Either way, we actually do work based on +# "All files under /opt/csw/etc/templates/$PKG" + + +#we remove all templated files that are unchanged. +# Or, preserve ones that have been changed +# First, go through list of templates that THIS package provides + +cd $PKG_INSTALL_ROOT/opt/csw/etc/templates/$PKG || exit 0 +# I dont see how we would be called if that dir does not exist, but be +# paranoid. + + +remove_cpfiles() +{ + cd $PKG_INSTALL_ROOT/opt/csw/etc/templates/$PKG + if [ $? -ne 0 ] ; then #paranoia good. + echo ERROR: $PKG_INSTALL_ROOT/opt/csw/etc/templates/$PKG does not exist + return + fi + + for template in `find . -type f ` ; do + case $template in + */*) + confdest=$PKG_INSTALL_ROOT/$template + ;; + *) + confdest=$PKG_INSTALL_ROOT/etc/opt/csw/$template + ;; + esac + + + preservedir=$PKG_INSTALL_ROOT/etc/opt/csw/preserve/$PKG + confbasename=`basename $confdest` + preservedconf=$preservedir/$confbasename + + if [ -f $confdest ] ; then + if cmp $confdest $template >/dev/null ; then + echo $confdest is identical to sample config file $template + echo Removing $confdest + rm -f $confdest + else + echo "preserving $confdest to $preservedconf" + mkdir -p $preservedir 2>/dev/null + # note: for safety, do this way, not "mv" + cp -p $confdest $preservedconf && rm $confdest + fi + fi + + done +} + + +#remove files cp'd from templates +remove_cpfiles + + +# Lastly, remove pkg templates as per SVR4 pkg spec requirements +while read dest ; do + # reminder: $dest will already have $PKG_INSTALL_ROOT prepended for us + + + # Any way it shakes out, we always remove the "sample conf", or + # whatever file the OS itself, passes into us on stdin + rm -f $dest +done Property changes on: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswcptemplates ___________________________________________________________________ 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 Mon Jan 3 13:18:44 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 03 Jan 2011 12:18:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[12155] csw/mgar/pkg/lame/trunk Message-ID: Revision: 12155 http://gar.svn.sourceforge.net/gar/?rev=12155&view=rev Author: dmichelsen Date: 2011-01-03 12:18:44 +0000 (Mon, 03 Jan 2011) Log Message: ----------- lame: Update to 3.98.4 and split packages Modified Paths: -------------- csw/mgar/pkg/lame/trunk/Makefile csw/mgar/pkg/lame/trunk/checksums Modified: csw/mgar/pkg/lame/trunk/Makefile =================================================================== --- csw/mgar/pkg/lame/trunk/Makefile 2011-01-03 00:48:49 UTC (rev 12154) +++ csw/mgar/pkg/lame/trunk/Makefile 2011-01-03 12:18:44 UTC (rev 12155) @@ -1,6 +1,5 @@ NAME = lame -VERSION = 398-2 -SPKG_VERSION = 3.98.2 +VERSION = 3.98.4 CATEGORIES = apps DESCRIPTION = LAME is an LGPL MP3 encoder @@ -11,22 +10,43 @@ MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(NAME)-$(VERSION).tar.gz -RUNTIME_DEP_PKGS = CSWncurses +PACKAGES = CSWlame CSWlame-mp3x CSWlame-devel CSWlibmp3lame0 -SPKG_SOURCEURL = http://lame.sourceforge.net/ +CATALOGNAME_CSWlame = lame +CATALOGNAME_CSWlame-mp3x = lame_mp3x +CATALOGNAME_CSWlame-devel = lame_devel +CATALOGNAME_CSWlibmp3lame0 = libmp3lame0 +SPKG_DESC_CSWlame = $(DESCRIPTION) +SPKG_DESC_CSWlame-mp3x = LAME Frame Analyzer for X11 +SPKG_DESC_CSWlame-devel = Development files for LAME +SPKG_DESC_CSWlibmp3lame0 = Librare for LAME providing libmp3lame.so.0 + +RUNTIME_DEP_PKGS_CSWlame = CSWncurses +RUNTIME_DEP_PKGS_CSWlame-mp3x = CSWglib CSWgtk CSWncurses +RUNTIME_DEP_PKGS_CSWlame-devel = CSWlibmp3lame0 + + +PKGFILES_CSWlame-mp3x = .*/mp3x +PKGFILES_CSWlame-devel = $(PKGFILES_DEVEL) +PKGFILES_CSWlibmp3lame0 = $(call baseisadirs,$(libdir),libmp3lame\.so\.0(\.\d+)*) + +VENDOR_URL = http://lame.sourceforge.net/ + # We define upstream file regex so we can be notifed of new upstream software release UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=628063 UPSTREAM_USE_SF = 1 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 = - BUILD64 = 1 EXTRA_BUILD_ISAS = sparcv8plus+vis pentium_pro -CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS_isa-i386 = ac_cv_header_xmmintrin_h=no +CONFIGURE_ARGS_isa-pentium_pro = ac_cv_header_xmmintrin_h=no +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-mp3x +CONFIGURE_ARGS += --enable-mp3rtp +CONFIGURE_ARGS += $(CONFIGURE_ARGS_isa-$(ISA)) + include gar/category.mk Modified: csw/mgar/pkg/lame/trunk/checksums =================================================================== --- csw/mgar/pkg/lame/trunk/checksums 2011-01-03 00:48:49 UTC (rev 12154) +++ csw/mgar/pkg/lame/trunk/checksums 2011-01-03 12:18:44 UTC (rev 12155) @@ -1 +1 @@ -719dae0ee675d0c16e0e89952930ed35 download/lame-398-2.tar.gz +8e9866ad6b570c6c95c8cba48060473f lame-3.98.4.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Jan 3 14:33:03 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 03 Jan 2011 13:33:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[12156] csw/mgar/pkg/help2man/trunk/Makefile Message-ID: Revision: 12156 http://gar.svn.sourceforge.net/gar/?rev=12156&view=rev Author: dmichelsen Date: 2011-01-03 13:33:03 +0000 (Mon, 03 Jan 2011) Log Message: ----------- help2man: Add NLS and fix documentation for that Modified Paths: -------------- csw/mgar/pkg/help2man/trunk/Makefile Modified: csw/mgar/pkg/help2man/trunk/Makefile =================================================================== --- csw/mgar/pkg/help2man/trunk/Makefile 2011-01-03 12:18:44 UTC (rev 12155) +++ csw/mgar/pkg/help2man/trunk/Makefile 2011-01-03 13:33:03 UTC (rev 12156) @@ -14,18 +14,15 @@ UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz -RUNTIME_DEP_PKGS = CSWpmlocalegettext -BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) +DEP_PKGS = CSWpmlocalegettext CONFIGURE_ARGS = $(DIRPATHS) -# We need to disable NLS as we don't have preloadable_libintl.so -# (only installed on glibc systems) -CONFIGURE_ARGS += --disable-nls TEST_SCRIPTS = -ARCHALL = 1 - CHECKPKG_OVERRIDES_CSWhelp2man += surplus-dependency|CSWpmlocalegettext include gar/category.mk + +post-install-modulated: + -perl -pi -e 's,/usr/lib,$(libdir),' $(DESTDIR)$(infodir)/help2man.info This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Jan 3 15:14:24 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 03 Jan 2011 14:14:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[12157] csw/mgar/pkg Message-ID: Revision: 12157 http://gar.svn.sourceforge.net/gar/?rev=12157&view=rev Author: wahwah Date: 2011-01-03 14:14:24 +0000 (Mon, 03 Jan 2011) Log Message: ----------- opencsw-policy: Initial commit An example page written in asciidoc. The purpose is to review the language on the mailing list. http://lists.opencsw.org/pipermail/maintainers/2011-January/013615.html Modified Paths: -------------- csw/mgar/pkg/opencsw-policy/trunk/Makefile csw/mgar/pkg/opencsw-policy/trunk/checksums Added Paths: ----------- csw/mgar/pkg/opencsw-policy/ csw/mgar/pkg/opencsw-policy/trunk/files/index.txt csw/mgar/pkg/opencsw-policy/trunk/files/shared-csw-opt.txt Modified: csw/mgar/pkg/opencsw-policy/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2010-12-15 04:27:05 UTC (rev 11951) +++ csw/mgar/pkg/opencsw-policy/trunk/Makefile 2011-01-03 14:14:24 UTC (rev 12157) @@ -2,184 +2,43 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -## This file contains comments to guide you through various GAR settings. -## Please remove unnecessary comments before committing your code to the code -## repository. The comments to remove are marked with double hashes. -## If you want to remove them all in-place, use: -## gsed -i -e '/^##/d' Makefile -## -## For more information about GAR variables, please see: -## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference -## -NAME = mypkg -VERSION = 1.0 -## -## The category that your software fits in. This is not a descriptive field, but -## influences the build process. Depending on the CATEGORIES setting, different -## Makefiles are included from gar/categories/ in your trunk directory, which -## adjust the build settings for the respective category. -## -## Possible settings are: -## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, -## utils, x11, xfce, xorg, xtra +NAME = opencsw-policy +VERSION = 0.1 CATEGORIES = lib -## -## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = -## -## A longer description of the package. This is only for descriptive purposes -## inside the Makefile and is not used elsewhere. +DESCRIPTION = OpenCSW packaging policy define BLURB - endef -## -## Upstream URL that should show up in the VENDOR field as well as on -## http://opencsw.org/packages/. -SPKG_SOURCEURL = -## -## Whitespace-separated list of URLs to download the source package from. -## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). -MASTER_SITES = -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(NAME). Specifies the Sourceforge -## project name of the software you wish to download. -## SF_PROJ = -## -## A list of space separated patch filenames from files/ that are to be applied -## to the extracted software before the ./configure stage. Patches need to be -## included in the DISTFILES variable as well. -## PATCHFILES = -## -## Whitespace-separated list of files which comprise this build. mGAR will look -## for the files in the $(FILEDIR) (trunk/files) directory and on the -## $(MASTER_SITES). -DISTFILES = $(NAME)-$(VERSION).tar.gz -## -## We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz -## -## Catalog name is the name to be used with pkg{-get,util} -i . -## It is different from the system package name, which by convention is CSWpkgname. -## CATALOGNAME = -## -## Set to 1 to mark the package as architecture-independent. -## ARCHALL = 0 -## -## A list of files / patterns that should be excluded from the package. Amends -## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which -## contains things like libtool .la files and files with a leading ~. -## EXTRA_MERGE_EXCLUDE_FILES = -## -## A list of space separated package names that should be marked as -## incompatible with the current package. This will go into the depend file. -## When a user has one of the incompatible packages installed and installs -## your package, he will be prompted that the incompatible package must be -## removed. He will however not be prevented to install your package without -## removing the conflicting package first. -## INCOMPATIBLE_PKGS = -## -## The name of the license file that should be included in your package. Defaults -## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details -## on including and displaying licenses. -## LICENSE = -## -## A list of space separated package names that should be produced from your -## Makefile. This is used when a software has different components that can be -## packaged and used individually (think runtime libraries, client tools, server -## files, development headers). You don't need to set this when you just want to -## produce one package. -## -## When you set this variable to include more than one package, you also need to -## set PKGFILES_CSWpkgname for each package (except for the first one in your -## $(PACKAGES) list) to define which files go into each package. The first -## package from $(PACKAGES) one will hold all files that are not matched by -## PKGFILES_ for other packages. -## PACKAGES = -## -## If specified, GAR feeds the almost-final package prototype file to -## $(PROTOTYPE_FILTER) and reads the final package prototype file from it. -## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used -## to prepare the prototype file for use with cswclassutils (see -## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils, -## you will rarely have to use this. A still valid use case would be to change -## the file permissions of a file to be set-UID. -## See http://wiki.opencsw.org/cswclassutils-package for common usage information -## PROTOTYPE_FILTER = -## -## cswclassutils settings -## -## A list of action classes. Possible values are: -## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf -## cswinetd cswetcservices -## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils, -## you need to add CSWcswclassutils to RUNTIME_DEP_PKGS. -## SPKG_CLASSES = none -## Simplified settings for classes: -## PRESERVECONF = -## SAMPLECONF = -## INITSMF = -## USERGROUP = -## ETCSERVICES = -## INETDCONF = -## A list of runtime package dependencies in the form of CSWfoo. -## RUNTIME_DEP_PKGS = -## -## A list of packages necessary to build this package -## BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) -## -## When using non-empty $(PACKAGES): -## RUNTIME_DEP_PKGS_CSWpkgname = -## SPKG_DESC_CSWpkgname = -## PKGFILES_CSWpkgname = -## CATALOGNAME_CSWpkgname = -## -## A list of space separated directories where objects should be stripped in -## addition to the bin/ and sbin/ directories. -## STRIP_DIRS = -## -## Define a custom target for the configure phase. When you set this, the target -## that will be used instead of configure: target, is named -## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile -## after including gar/gar.include.mk. If you want to skip the configure phase -## completely (for example when your software doesn't need to be compiled) assign -## this variable an empty value. The procedure works for configure, build, -## install and test steps. -## CONFIGURE_SCRIPTS = -## BUILD_SCRIPTS = -## INSTALL_SCRIPTS = -## TEST_SCRIPTS = -## -## Compilation settings -## -## The build directory. -## WORKSRC = $(WORKDIR)/$(NAME)-$(VERSION) -## -## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this -## for example, if you need to override Makefile variables. -## BUILD_ARGS = -## -## Arguments passed to the ./configure script. -CONFIGURE_ARGS = $(DIRPATHS) -## -## BUILD64 = -## CONFIGURE_ENV = -## EXTRA_CFLAGS = -## EXTRA_LDFLAGS = -## EXTRA_INC = -## EXTRA_LIB = -## GARFLAVOR = -## INSTALL_ARGS = -## OPT_FLAGS_SOS = -xO3 -## OPT_FLAGS_GCC = -O2 -pipe -## -## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. -## GARCOMPILER = SOS11 -## -# Remove the following rules and uncomment the -# include before building. -all: .DEFAULT -.DEFAULT: - @true +SPKG_SOURCEURL = http://www.opencsw.org +MASTER_SITES = http://www.gnu.org/licenses/ +DISTFILES = fdl-1.3.txt +CONFIGURE_SCRIPTS = +BUILD_SCRIPTS = policy +INSTALL_SCRIPTS = policy +TEST_SCRIPTS = +ARCHALL_CSWopencsw-policy = 1 +CATALOGNAME_CSWopencsw-policy = opencsw_policy +LICENSE = fdl-1.3.txt -#include gar/category.mk +BUILD_DEP_PKGS = CSWasciidoc + +include gar/category.mk + +%.html: %.txt + asciidoc -o $@ $< + +build-policy: \ + copy-asciidoc \ + $(WORKSRC)/index.html + +copy-asciidoc: + gcp -v $(FILEDIR)/*.txt $(WORKSRC) + +install-policy: + ginstall -m 755 -d $(PKGROOT)$(docdir)/$(CATALOGNAME_CSWopencsw-policy) + for f in $(WORKSRC)/*.html $(WORKSRC)/*.txt; do \ + ginstall $${f} $(PKGROOT)$(docdir)/$(CATALOGNAME_CSWopencsw-policy); \ + done + @$(MAKECOOKIE) + +post-merge: + cp $(PKGROOT)/opt/csw/share/doc/opencsw_policy/index.html $(HOME)/public_html/policy || true Modified: csw/mgar/pkg/opencsw-policy/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2010-12-15 04:27:05 UTC (rev 11951) +++ csw/mgar/pkg/opencsw-policy/trunk/checksums 2011-01-03 14:14:24 UTC (rev 12157) @@ -0,0 +1 @@ +10b9de612d532fdeeb7fe8fcd1435cc6 fdl-1.3.txt Added: csw/mgar/pkg/opencsw-policy/trunk/files/index.txt =================================================================== --- csw/mgar/pkg/opencsw-policy/trunk/files/index.txt (rev 0) +++ csw/mgar/pkg/opencsw-policy/trunk/files/index.txt 2011-01-03 14:14:24 UTC (rev 12157) @@ -0,0 +1,9 @@ +OpenCSW packaging policy +======================== +$Id: Makefile 11888 2010-12-12 12:43:48Z skayser $ +:toc: +:website: http://www.opencsw.org + +:leveloffset: 1 + +include::shared-csw-opt.txt[] Added: csw/mgar/pkg/opencsw-policy/trunk/files/shared-csw-opt.txt =================================================================== --- csw/mgar/pkg/opencsw-policy/trunk/files/shared-csw-opt.txt (rev 0) +++ csw/mgar/pkg/opencsw-policy/trunk/files/shared-csw-opt.txt 2011-01-03 14:14:24 UTC (rev 12157) @@ -0,0 +1,169 @@ +Shared /opt/csw +=============== + +When creating packages that require configuration files, or startup +information, etc. it is important to be aware that some sites may deploy their +systems with a shared /opt/csw across multiple machines. + +There are a few different variants of this. Among them are: + +* NFS-shared /opt/csw, shared read-only across multiple machines +* /opt/csw duplicated via rsync or other means +* A filesystem shared across multiple zones +* A filesystem shared across multiple "Boot Environments" on the same machine + (a la "beadm") + + +There are multiple reasons why a site may choose to go this route. One may be +that it is a heterogenous environment, and a central NFS server is simply +their standard way of sharing things out. One central file server, means one +and only central place to do backups, etc. + +Another reason may be: when you have a high number of zones on a box, having +every single pkgadd go through each zone and do the strange +child-zone-specific pkgadd/pkgrm, is too aggravating to deal with. So they may +choose to have /opt/csw be a NON-"inherit-pkg-dir" mount from the global zone. +Or, they may choose to not add packages in the global zone at all! but allow +one zone to be the csw package master, and then share /opt/csw from that zone, +to other zones. + +The good news for maintainers is, we dont need to know the specifics of each +site configuration. We can service any and all of the above cases quite +nicely, by following some basic principles. + +Yes, this unfortunately may mean more work for the maintainer! But this is +a major reason for people to value OpenCSW packages, over just a blind +"compile and install" approach. + +Categories of packaging challege +-------------------------------- + +All software to be packaged will most likely fall into one, or sometimes two, of the following categories: + +* Standalone tools - No config needed! +* Machine-individual configuration/data always required +* Configuration "required", but almost always the same on ANYONE's site +* Daemons +* Programs that already are, or can be made to be, dual config (one global in /opt/csw/etc, and one in /etc/opt/csw) +* Optional configuration + +Lets address each of these one by one + +Standalone tools +~~~~~~~~~~~~~~~~ + +Congratulations you lucky person! You're done here! + +Machine-individual configuration always required +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Okay, some things (such as databases) always need a local configuration to +work. If you are nice, you may have provided some kind of postinstall script +to automate this as much as possible. However, NFS-shared type sites, dont +automatically get the postinstall run on each machine! At minimum, you need +to provide documentation (under our normal location of +/opt/csw/share/progname/) of what is required to get the software properly +working on each individual machine. Ideally, you would create some kind of +auto-install script, that can be called EITHER by postinstall, OR by hand, on +an individual machine that has nothing but /opt/csw mounted. + + +Configuration "required", but almost always the same +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +If you're really really REALLY sure that no sane person will ever edit the +config file, it might be okay to put it directly in /opt/csw/etc and be done +with it. However, the "right" way to handle this would be to put your expected +config as a template, /opt/csw/etc/yourprog.conf.CSW, and then use one of our +"cswclassutils" to automatically install and remove it to the normal place, IF +the site admin has not chosen to make local tweaks. That's it! You're done +here. + +Daemons +~~~~~~~ + +A lot to talk about here. As far as configs go, you could start by treating +them as the "machine local config always required" case, but there are +additional considerations. You really need to read the full Daemon +configuration page. + +Programs that already are, or can be made to be, dual config +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Happily, some enterprise-level software is already capable of having both +a "global" and a "local" set of configs. In this case, your task is easy. +Create the default global ones (ideally by following the steps in the "always +the same" item, above), and then provide sample local config files as +appropriate. Possibly, your template global config +file(/opt/csw/etc/prog.conf.CSW) will serve fine for this as well. If so, make +sure to comment that fact in your template one. There are some programs that +do not act this way "out of the box", but can be made to act this way, with +appropriate tweaks. For example, some programs allow for an optional +"include" syntax, that will pull in an extra config file if present, but not +complain too much if it is not there. In these cases, take advantage of this +syntax in the global file, and ship it as a dual config style package. + + +Optional configuration +~~~~~~~~~~~~~~~~~~~~~~ + +Some programs can "allow for" a local configuration, but can still run with +a reasonable set of defaults. If your program is in this category (or at least +can be MADE to fit in this category), then *just make sure that "it runs", if +nothing outside of /opt/csw gets distributed.* Put information in our usual +location of /opt/csw/share/progname/ of how to add in local tweaks. Provide +sample configs, or a setup script if appropriate. + +Summary of acceptable directory use +----------------------------------- + +It's possible to share the /opt/csw directory among multiple Solaris zones, or +among multiple systems, using NFS. Such setup required paying attention to +some details. In the case of sharing /opt/csw among sparse non-global Solaris +zones, the /opt/csw directory is going to be read-only. Some programs are +going to need separate configuration files, or a separate state keeping +directory. To have this setup working, one needs: + +[options="header"] +|=============================================================================== +| | directory | writable | Allowable use +| 1. | /opt/csw | No | Non-changable files, with exceptions below +| 2. | /opt/csw**/var** | No | *Never use this* +| 3. | /opt/csw**/etc** | (special) | +Use for template files(packaged), and global configs (postinstall/classutil) +generated from template files + +| 4. | **/var**/opt/csw | *Yes* | +Allowable for *run-time-only* data. Do not deliver files in package here + +| 5. | **/etc**/opt/csw | *Yes* | +Optional site-admin, or template-copied, configs only. No "packaged" files + +|=============================================================================== + +Note that for #3, if you have a postinstall or class action script generating +content in /opt/csw/etc, it must fail gracefully if /opt/csw is read-only. + +A very few, ancient packages are still using the /opt/csw/var and +/opt/csw/etc directories and may not work correctly. There's ongoing work +to update them to use the correct directories. + +GAR tweaks to set autoconf progs to use local /etc +-------------------------------------------------- + +For the case of "Machine-individual configuration always required", in GAR, +only the two following variables need to be set, usually: + +.GAR configuration sample +-------------------------------------------------------------------------------- +localstatedir = /var$(prefix) +sysconfdir = /etc$(prefix) +-------------------------------------------------------------------------------- + +There are actually standard GNU autoconf (configure) settings, which will be passed on. + +See also +-------- + +* Configuration directory migration +* http://www.opencsw.org/userguide/sharingcsw[Sharing /opt/csw] at opencsw.org Property changes on: csw/mgar/pkg/opencsw-policy/trunk/files/shared-csw-opt.txt ___________________________________________________________________ Added: svn:keywords + Id This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Jan 3 15:18:34 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 03 Jan 2011 14:18:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[12158] csw/mgar/pkg/opencsw-policy/trunk/Makefile Message-ID: Revision: 12158 http://gar.svn.sourceforge.net/gar/?rev=12158&view=rev Author: wahwah Date: 2011-01-03 14:18:34 +0000 (Mon, 03 Jan 2011) Log Message: ----------- opencsw-policy: Copying of sample index.html optional Depending on the presence of ~/public_html/policy (This is for testing.) Modified Paths: -------------- csw/mgar/pkg/opencsw-policy/trunk/Makefile Modified: csw/mgar/pkg/opencsw-policy/trunk/Makefile =================================================================== --- csw/mgar/pkg/opencsw-policy/trunk/Makefile 2011-01-03 14:14:24 UTC (rev 12157) +++ csw/mgar/pkg/opencsw-policy/trunk/Makefile 2011-01-03 14:18:34 UTC (rev 12158) @@ -41,4 +41,6 @@ @$(MAKECOOKIE) post-merge: - cp $(PKGROOT)/opt/csw/share/doc/opencsw_policy/index.html $(HOME)/public_html/policy || true + if [ -d $(HOME)/public_html/policy ]; then \ + cp $(PKGROOT)/opt/csw/share/doc/opencsw_policy/index.html $(HOME)/public_html/policy; \ + fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Mon Jan 3 16:28:56 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 03 Jan 2011 15:28:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[12159] csw/mgar/pkg/taglib/trunk/Makefile Message-ID: Revision: 12159 http://gar.svn.sourceforge.net/gar/?rev=12159&view=rev Author: dmichelsen Date: 2011-01-03 15:28:56 +0000 (Mon, 03 Jan 2011) Log Message: ----------- taglib: Split off soname-specific libraries Modified Paths: -------------- csw/mgar/pkg/taglib/trunk/Makefile Modified: csw/mgar/pkg/taglib/trunk/Makefile =================================================================== --- csw/mgar/pkg/taglib/trunk/Makefile 2011-01-03 14:18:34 UTC (rev 12158) +++ csw/mgar/pkg/taglib/trunk/Makefile 2011-01-03 15:28:56 UTC (rev 12159) @@ -20,20 +20,25 @@ VENDOR_URL = http://developer.kde.org/~wheeler/taglib.html -PACKAGES = CSWtaglib CSWtaglibdevel +PACKAGES += CSWtaglib-devel +CATALOGNAME_CSWtaglib-devel = taglib_devel +SPKG_DESC_CSWtaglib-devel = Developer files for taglib (composed of libtag1 and libtag_c0) +RUNTIME_DEP_PKGS_CSWtaglib-devel = CSWlibtag1 CSWlibtag-c0 +PKGFILES_CSWtaglib-devel = $(PKGFILES_DEVEL) -CATALOGNAME_CSWtaglib = taglib -CATALOGNAME_CSWtaglibdevel = taglib_devel +PACKAGES += CSWlibtag1 +CATALOGNAME_CSWlibtag1 = libtag1 +SPKG_DESC_CSWlibtag1 += Library for reading and editing the meta-data of several popular audio formats, libtag.so.1 +RUNTIME_DEP_PKGS_CSWlibtag1 += CSWzlib +PKGFILES_CSWlibtag1 += $(call baseisadirs,$(libdir),libtag\.so\.1(\.\d+)*) -SPKG_DESC_CSWtaglib = $(DESCRIPTION) -SPKG_DESC_CSWtaglibdevel = Developer files for taglib +PACKAGES += CSWlibtag-c0 +CATALOGNAME_CSWlibtag-c0 = libtag_c0 +SPKG_DESC_CSWlibtag-c0 += Library for reading and editing the meta-data of several popular audio formats, libtag_c.so.0 +PKGFILES_CSWlibtag-c0 += $(call baseisadirs,$(libdir),libtag_c\.so\.0(\.\d+)*) +RUNTIME_DEP_PKGS_CSWlibtag-c0 += CSWlibtag1 +RUNTIME_DEP_PKGS_CSWlibtag-c0 += CSWzlib -RUNTIME_DEP_PKGS_CSWtaglib = CSWzlib -RUNTIME_DEP_PKGS_CSWtaglibdevel = CSWtaglib -CHECKPKG_OVERRIDES_CSWtaglibdevel += surplus-dependency|CSWtaglib - -PKGFILES_CSWtaglibdevel = $(PKGFILES_DEVEL) - EXTRA_LD_FLAGS += -lCstd -lCrun -lc -lm BUILD64 = 1 @@ -43,4 +48,10 @@ CHECKPKG_OVERRIDES_CSWtaglib += non-uniform-lib-versions-in-package|sonames=['libtag.so.1',|'libtag_c.so.0'] +# There are collisions with the existing taglib_gcc at the moment. These will go away +# as soon as the updated taglib_gcc has been released. +CHECKPKG_OVERRIDES_CSWlibtag-c0 += file-collision +CHECKPKG_OVERRIDES_CSWlibtag1 += file-collision +CHECKPKG_OVERRIDES_CSWtaglib-devel += file-collision + 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 Jan 3 16:30:09 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 03 Jan 2011 15:30:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[12160] csw/mgar/pkg/pcre/trunk Message-ID: Revision: 12160 http://gar.svn.sourceforge.net/gar/?rev=12160&view=rev Author: dmichelsen Date: 2011-01-03 15:30:08 +0000 (Mon, 03 Jan 2011) Log Message: ----------- pcre: Update to 8.11 and split off soname-specific libraries Modified Paths: -------------- csw/mgar/pkg/pcre/trunk/Makefile csw/mgar/pkg/pcre/trunk/checksums csw/mgar/pkg/pcre/trunk/files/0001-Allow-norunpath-for-libtool.patch Added Paths: ----------- csw/mgar/pkg/pcre/trunk/files/bug-attachment-433.patch Modified: csw/mgar/pkg/pcre/trunk/Makefile =================================================================== --- csw/mgar/pkg/pcre/trunk/Makefile 2011-01-03 15:28:56 UTC (rev 12159) +++ csw/mgar/pkg/pcre/trunk/Makefile 2011-01-03 15:30:08 UTC (rev 12160) @@ -1,5 +1,5 @@ NAME = pcre -VERSION = 8.10 +VERSION = 8.11 CATEGORIES = lib DESCRIPTION = Perl-compatible regular expression tools @@ -11,26 +11,71 @@ endef MASTER_SITES = ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/ -DISTFILES = $(NAME)-$(VERSION).tar.gz - +DISTFILES = $(NAME)-$(VERSION).tar.bz2 PATCHFILES = 0001-Allow-norunpath-for-libtool.patch -SPKG_SOURCEURL = http://www.pcre.org +# pcregrep testsuite crashes as reported here: +# http://bugs.exim.org/show_bug.cgi?id=1054 +# Use fix for 64 bit PPC which solves the problem as reported in this bug report: +# http://bugs.exim.org/show_bug.cgi?id=1048 +PATCHFILES += bug-attachment-433.patch +# We define upstream file regex so we can be notifed of new upstream software release +UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2 + +VENDOR_URL = http://www.pcre.org + BUILD_DEP_PKGS = CSWgnulinks -RUNTIME_DEP_PKGS_CSWpcrert = CSWncurses -RUNTIME_DEP_PKGS_CSWpcre = CSWpcrert CSWzlib CSWbzip2 CSWreadline $(RUNTIME_DEP_PKGS_CSWpcrert) -PACKAGES = CSWpcre CSWpcrert +PACKAGES = CSWpcre CATALOGNAME_CSWpcrert = pcre_rt -LICENSE = LICENCE - -SPKG_DESC_CSWpcrert = Perl-compatible regular expression runtime libraries SPKG_DESC_CSWpcre = Perl-compatible regular expression tools +RUNTIME_DEP_PKGS_CSWpcre += CSWreadline +RUNTIME_DEP_PKGS_CSWpcre += CSWlibpcre0 +RUNTIME_DEP_PKGS_CSWpcre += CSWbzip2 +RUNTIME_DEP_PKGS_CSWpcre += CSWzlib +RUNTIME_DEP_PKGS_CSWpcre += CSWncurses +RUNTIME_DEP_PKGS_CSWpcre += CSWlibpcreposix0 -# We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +PACKAGES += CSWpcrert +CATALOGNAME_CSWpcrert = pcrert +SPKG_DESC_CSWpcrert = Legacy stub as contents was moved to libpcre0, libpcrecpp0 and libpcreposix0 +PKGFILES_CSWpcrert = NOFILES +RUNTIME_DEP_PKGS_CSWpcrert = CSWlibpcre0 CSWlibpcrecpp0 CSWlibpcreposix0 +# This is a legacy lib, force dependencies to new libraries +CHECKPKG_OVERRIDES_CSWpcrert += surplus-dependency|CSWlibpcrecpp0 +CHECKPKG_OVERRIDES_CSWpcrert += surplus-dependency|CSWlibpcreposix0 +CHECKPKG_OVERRIDES_CSWpcrert += surplus-dependency|CSWlibpcre0 +ARCHALL_CSWpcrert = 1 +PACKAGES += CSWpcre-devel +CATALOGNAME_CSWpcre-devel = pcre_devel +SPKG_DESC_CSWpcre-devel = Development files for PCRE +RUNTIME_DEP_PKGS_CSWpcre-devel += CSWlibpcre0 +RUNTIME_DEP_PKGS_CSWpcre-devel += CSWlibpcreposix0 +RUNTIME_DEP_PKGS_CSWpcre-devel += CSWlibpcrecpp0 +PKGFILES_CSWpcre-devel = $(PKGFILES_DEVEL) + +PACKAGES += CSWlibpcre0 +CATALOGNAME_CSWlibpcre0 = libpcre0 +SPKG_DESC_CSWlibpcre0 = Perl-compatible regular expression tools, libpcre.so.0 +PKGFILES_CSWlibpcre0 = $(call baseisadirs,$(libdir),libpcre\.so\.0(\.\d+)*) +RUNTIME_DEP_PKGS_CSWlibpcre0 += CSWncurses + +PACKAGES += CSWlibpcrecpp0 +CATALOGNAME_CSWlibpcrecpp0 = libpcrecpp0 +SPKG_DESC_CSWlibpcrecpp0 += Perl-compatible regular expression tools, libpcrecpp.so.0 +PKGFILES_CSWlibpcrecpp0 += $(call baseisadirs,$(libdir),libpcrecpp\.so\.0(\.\d+)*) +RUNTIME_DEP_PKGS_CSWlibpcrecpp0 += CSWncurses +RUNTIME_DEP_PKGS_CSWlibpcrecpp0 += CSWlibpcre0 + +PACKAGES += CSWlibpcreposix0 +CATALOGNAME_CSWlibpcreposix0 = libpcreposix0 +SPKG_DESC_CSWlibpcreposix0 += Perl-compatible regular expression tools, libpcreposix.so.0 +PKGFILES_CSWlibpcreposix0 += $(call baseisadirs,$(libdir),libpcreposix\.so\.0(\.\d+)*) +RUNTIME_DEP_PKGS_CSWlibpcreposix0 += CSWncurses +RUNTIME_DEP_PKGS_CSWlibpcreposix0 += CSWlibpcre0 + BUILD64 = 1 NOISAEXEC = 1 @@ -47,8 +92,6 @@ MERGE_SCRIPTS_isa-extra = copy-relocated-only copy-config-only MERGE_DIRS_isa-extra = $(libdir) -PKGFILES_CSWpcrert = $(PKGFILES_RT) - include gar/category.mk # The testcases need 'diff -u' which Solaris 8 diff does not have, Modified: csw/mgar/pkg/pcre/trunk/checksums =================================================================== --- csw/mgar/pkg/pcre/trunk/checksums 2011-01-03 15:28:56 UTC (rev 12159) +++ csw/mgar/pkg/pcre/trunk/checksums 2011-01-03 15:30:08 UTC (rev 12160) @@ -1,2 +1 @@ -6e0b68956c29258407405f6dc4995900 0001-Allow-norunpath-for-libtool.patch -9524f0ff50b9093c02c81f911e41b066 pcre-8.10.tar.gz +ef907b8792ec7f90f0dcd773848f0b3b pcre-8.11.tar.bz2 Modified: csw/mgar/pkg/pcre/trunk/files/0001-Allow-norunpath-for-libtool.patch =================================================================== --- csw/mgar/pkg/pcre/trunk/files/0001-Allow-norunpath-for-libtool.patch 2011-01-03 15:28:56 UTC (rev 12159) +++ csw/mgar/pkg/pcre/trunk/files/0001-Allow-norunpath-for-libtool.patch 2011-01-03 15:30:08 UTC (rev 12160) @@ -1,6 +1,6 @@ -From aee3f4961e3d9be5b67fdf9589e7e1dcc22a5564 Mon Sep 17 00:00:00 2001 +From a023da4c69da0ad9f922764b0701762c7e6c53d6 Mon Sep 17 00:00:00 2001 From: Dagobert Michelsen -Date: Mon, 28 Jun 2010 16:39:45 +0200 +Date: Mon, 3 Jan 2011 15:04:02 +0100 Subject: [PATCH] Allow -norunpath for libtool --- @@ -8,18 +8,18 @@ 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ltmain.sh b/ltmain.sh -index a72f2fd..6b8bee1 100755 +index 04eaea4..fd4ac68 100755 --- a/ltmain.sh +++ b/ltmain.sh -@@ -4765,7 +4765,7 @@ func_mode_link () - # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC - # @file GCC response files +@@ -5091,7 +5091,7 @@ func_mode_link () + # @file GCC response files + # -tp=* Portland pgcc target processor selection -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) -+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-norunpath) +- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*) ++ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|-norunpath) func_quote_for_eval "$arg" arg="$func_quote_for_eval_result" func_append compile_command " $arg" -- -1.7.1 +1.7.3.2 Added: csw/mgar/pkg/pcre/trunk/files/bug-attachment-433.patch =================================================================== --- csw/mgar/pkg/pcre/trunk/files/bug-attachment-433.patch (rev 0) +++ csw/mgar/pkg/pcre/trunk/files/bug-attachment-433.patch 2011-01-03 15:30:08 UTC (rev 12160) @@ -0,0 +1,61 @@ +From f67f1b7d0d17e85dd09a1112a2988efc54215910 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= +Date: Fri, 17 Dec 2010 14:29:23 +0100 +Subject: [PATCH] Do not cast long int to long via pointer + +This breaks things on big endian machine where long int is bigger than int. +--- + pcregrep.c | 16 ++++++++++------ + 1 files changed, 10 insertions(+), 6 deletions(-) + +diff --git a/pcregrep.c b/pcregrep.c +index 204a480..1598411 100644 +--- a/pcregrep.c ++++ b/pcregrep.c +@@ -186,8 +186,8 @@ static BOOL utf8 = FALSE; + + /* Structure for options and list of them */ + +-enum { OP_NODATA, OP_STRING, OP_OP_STRING, OP_NUMBER, OP_OP_NUMBER, +- OP_PATLIST }; ++enum { OP_NODATA, OP_STRING, OP_OP_STRING, OP_NUMBER, OP_LONGNUMBER, ++ OP_OP_NUMBER, OP_PATLIST }; + + typedef struct option_item { + int type; +@@ -239,8 +239,8 @@ static option_item optionlist[] = { + { OP_NODATA, N_LBUFFER, NULL, "line-buffered", "use line buffering" }, + { OP_NODATA, N_LOFFSETS, NULL, "line-offsets", "output line numbers and offsets, not text" }, + { OP_STRING, N_LOCALE, &locale, "locale=locale", "use the named locale" }, +- { OP_NUMBER, N_M_LIMIT,&match_limit, "match-limit=number", "set PCRE match limit option" }, +- { OP_NUMBER, N_M_LIMIT_REC,&match_limit_recursion, "recursion-limit=number", "set PCRE match recursion limit option" }, ++ { OP_LONGNUMBER, N_M_LIMIT,&match_limit, "match-limit=number", "set PCRE match limit option" }, ++ { OP_LONGNUMBER, N_M_LIMIT_REC,&match_limit_recursion, "recursion-limit=number", "set PCRE match recursion limit option" }, + { OP_NODATA, 'M', NULL, "multiline", "run in multiline mode" }, + { OP_STRING, 'N', &newline, "newline=type", "set newline type (CR, LF, CRLF, ANYCRLF or ANY)" }, + { OP_NODATA, 'n', NULL, "line-number", "print line number with output lines" }, +@@ -2278,7 +2278,8 @@ for (i = 1; i < argc; i++) + + /* Otherwise, deal with single string or numeric data values. */ + +- else if (op->type != OP_NUMBER && op->type != OP_OP_NUMBER) ++ else if (op->type != OP_NUMBER && op->type != OP_LONGNUMBER && ++ op->type != OP_OP_NUMBER) + { + *((char **)op->dataptr) = option_data; + } +@@ -2308,7 +2309,10 @@ for (i = 1; i < argc; i++) + option_data, op->one_char); + pcregrep_exit(usage(2)); + } +- *((int *)op->dataptr) = n; ++ if (op->type == OP_LONGNUMBER) ++ *((unsigned long int *)op->dataptr) = n; ++ else ++ *((int *)op->dataptr) = n; + } + } + +-- +1.7.3.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 Mon Jan 3 18:42:45 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 03 Jan 2011 17:42:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[12161] csw/mgar/pkg/coreutils/trunk/files/ 0001-Import-a-patch-to-prevent-breakage-on-vasprintf-gnul.patch Message-ID: Revision: 12161 http://gar.svn.sourceforge.net/gar/?rev=12161&view=rev Author: bdwalton Date: 2011-01-03 17:42:45 +0000 (Mon, 03 Jan 2011) Log Message: ----------- coreutils/trunk: updated patch to include more required bits from the upstream commit Modified Paths: -------------- csw/mgar/pkg/coreutils/trunk/files/0001-Import-a-patch-to-prevent-breakage-on-vasprintf-gnul.patch Modified: csw/mgar/pkg/coreutils/trunk/files/0001-Import-a-patch-to-prevent-breakage-on-vasprintf-gnul.patch =================================================================== --- csw/mgar/pkg/coreutils/trunk/files/0001-Import-a-patch-to-prevent-breakage-on-vasprintf-gnul.patch 2011-01-03 15:30:08 UTC (rev 12160) +++ csw/mgar/pkg/coreutils/trunk/files/0001-Import-a-patch-to-prevent-breakage-on-vasprintf-gnul.patch 2011-01-03 17:42:45 UTC (rev 12161) @@ -1,4 +1,4 @@ -From ac3821f923d5c54b575110d984701c06d22149d0 Mon Sep 17 00:00:00 2001 +From 2d06b90935278549839ffcc4c040cca2fe141dde Mon Sep 17 00:00:00 2001 From: Ben Walton Date: Sun, 2 Jan 2011 19:33:50 +0100 Subject: [PATCH] Import a patch to prevent breakage on vasprintf gnulib test @@ -14,7 +14,8 @@ Signed-off-by: Ben Walton --- gnulib-tests/test-vasprintf-posix.c | 15 +++++++++++++++ - 1 files changed, 15 insertions(+), 0 deletions(-) + m4/printf.m4 | 12 ++++++++---- + 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/gnulib-tests/test-vasprintf-posix.c b/gnulib-tests/test-vasprintf-posix.c index ec908e3..17be838 100644 @@ -42,6 +43,47 @@ char input[5000]; char *result; int retval; +diff --git a/m4/printf.m4 b/m4/printf.m4 +index 8cffa6a..6c8a7a4 100644 +--- a/m4/printf.m4 ++++ b/m4/printf.m4 +@@ -1,4 +1,4 @@ +-# printf.m4 serial 41 ++# printf.m4 serial 42 + dnl Copyright (C) 2003, 2007-2010 Free Software Foundation, Inc. + dnl This file is free software; the Free Software Foundation + dnl gives unlimited permission to copy and/or distribute it, +@@ -890,8 +890,9 @@ changequote([,])dnl + dnl Test whether the *printf family of functions supports large precisions. + dnl On mingw, precisions larger than 512 are treated like 512, in integer, + dnl floating-point or pointer output. On Solaris 10/x86, precisions larger +-dnl than 510 in floating-point output crash the program. On BeOS, precisions +-dnl larger than 1044 crash the program. ++dnl than 510 in floating-point output crash the program. On Solaris 10/SPARC, ++dnl precisions larger than 510 in floating-point output yield wrong results. ++dnl On BeOS, precisions larger than 1044 crash the program. + dnl Result is gl_cv_func_printf_precision. + + AC_DEFUN([gl_PRINTF_PRECISION], +@@ -917,6 +918,9 @@ int main () + result |= 1; + if (sprintf (buf, "%.4000f %d", 1.0, 33, 44) < 4000 + 5) + result |= 2; ++ if (sprintf (buf, "%.511f %d", 1.0, 33, 44) < 511 + 5 ++ || buf[0] != '1') ++ result |= 4; + return result; + }]])], + [gl_cv_func_printf_precision=yes], +@@ -1459,7 +1463,7 @@ dnl Cygwin 1.5.25 (2008) . . . # # . . # . . . . . # . + dnl Cygwin 1.5.19 (2006) # . . # # # . # . # . # # # . . . . . . + dnl Solaris 11 2010-11 . . # # # . . # . . . # . . . . . . . . + dnl Solaris 10 . . # # # . . # . . . # # . . . . . . . +-dnl Solaris 2.6 ... 9 # . # # # # . # . . . # . . . . # . . . ++dnl Solaris 2.6 ... 9 # . # # # # . # . . . # # . . . # . . . + dnl Solaris 2.5.1 # . # # # # . # . . . # . . # # # # # # + dnl AIX 5.2, 7.1 . . # # # . . . . . . # . . . . . . . . + dnl AIX 4.3.2, 5.1 # . # # # # . . . . . # . . . . # . . . -- 1.7.3.2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From theferret at users.sourceforge.net Mon Jan 3 20:56:57 2011 From: theferret at users.sourceforge.net (theferret at users.sourceforge.net) Date: Mon, 03 Jan 2011 19:56:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[12162] csw/mgar/pkg/cswclassutils/trunk/files Message-ID: Revision: 12162 http://gar.svn.sourceforge.net/gar/?rev=12162&view=rev Author: theferret Date: 2011-01-03 19:56:57 +0000 (Mon, 03 Jan 2011) Log Message: ----------- cswcptemplates: bugfixes and paranoia Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswcptemplates csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswcptemplates Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswcptemplates =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswcptemplates 2011-01-03 17:42:45 UTC (rev 12161) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswcptemplates 2011-01-03 19:56:57 UTC (rev 12162) @@ -25,15 +25,39 @@ # May be used/copied freely # +TEMPLATEDIR=/opt/csw/etc/templates + # extra checks and warnings to help people run this manually if [ "$PKG" = "" ] ; then echo ERROR: PKG env variable must be set exit 1 fi +echo 'class running' + # Note: for "normal" installs, we get passed one line per file in our "class" # However, for sparse-zone installs, the files have already been 'installed', # so we will get called, but have no files passed on stdin + +if [ ! -d $PKG_INSTALL_ROOT$TEMPLATEDIR/$PKG ] ; then + if [ ! -d $PKG_INSTALL_ROOT$TEMPLATEDIR ] ; then + echo ERROR: $PKG_INSTALL_ROOT$TEMPLATEDIR does not exist + echo Possibly corrupt install of CSWcas-cswcptemplates + exit 1 + fi + # we can add dirs for the package calling us. + # But cswcptemplates never calls this script itself, so would be + # dubious to call that ourselves + if [ "$PKG_INSTALL_ROOT" = "" ] ; then + installf $PKG $TEMPLATEDIR/$PKG d 0755 root bin + else + installf -R $PKG_INSTALL_ROOT $PKG $TEMPLATEDIR/$PKG d 0755 root bin + fi + mkdir $PKG_INSTALL_ROOT$TEMPLATEDIR/$PKG + chown root:bin $PKG_INSTALL_ROOT$TEMPLATEDIR/$PKG + chmod 0755 $PKG_INSTALL_ROOT$TEMPLATEDIR/$PKG +fi + while read src dest ; do cp $src $dest if [ $? -ne 0 ] ; then @@ -50,17 +74,25 @@ done -cd $PKG_INSTALL_ROOT/opt/csw/etc/templates/$PKG || exit 0 +cd $PKG_INSTALL_ROOT$TEMPLATEDIR/$PKG || exit 0 # I dont see how we would be called if that dir does not exist, but be # paranoid. for template in `find . -type f ` ; do +template=`echo $template|sed 's:^./::'` case $template in - */*) + var/opt/csw/*) confdest=$PKG_INSTALL_ROOT/$template ;; - *) + etc/opt/csw/*) + confdest=$PKG_INSTALL_ROOT/$template + ;; + */*) + echo ERROR: unrecognized/invalid path $template + exit 1 + ;; + *) #should be just "filename" now confdest=$PKG_INSTALL_ROOT/etc/opt/csw/$template ;; esac @@ -80,7 +112,7 @@ elif [ -f $confdest ] ; then echo $confdest already exists. Not overwriting else - echo Copying $template to $confdest + echo Copying $TEMPLATEDIR/$template to $confdest cp $template $confdest echo Forcing proper permissions on $confdest Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswcptemplates =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswcptemplates 2011-01-03 17:42:45 UTC (rev 12161) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswcptemplates 2011-01-03 19:56:57 UTC (rev 12162) @@ -26,25 +26,32 @@ # Or, preserve ones that have been changed # First, go through list of templates that THIS package provides -cd $PKG_INSTALL_ROOT/opt/csw/etc/templates/$PKG || exit 0 -# I dont see how we would be called if that dir does not exist, but be -# paranoid. +echo 'class removal running' remove_cpfiles() { - cd $PKG_INSTALL_ROOT/opt/csw/etc/templates/$PKG - if [ $? -ne 0 ] ; then #paranoia good. + #paranoia good. + if [ ! -d $PKG_INSTALL_ROOT/opt/csw/etc/templates/$PKG ] ; then echo ERROR: $PKG_INSTALL_ROOT/opt/csw/etc/templates/$PKG does not exist return fi + cd $PKG_INSTALL_ROOT/opt/csw/etc/templates/$PKG - for template in `find . -type f ` ; do + for template in `find . -type f ` ; do + template=`echo $template|sed 's:^./::'` case $template in - */*) + var/opt/csw/*) confdest=$PKG_INSTALL_ROOT/$template ;; - *) + etc/opt/csw/*) + confdest=$PKG_INSTALL_ROOT/$template + ;; + */*) + echo ERROR: unrecognized/invalid path $template + exit 1 + ;; + *) #should be just "filename" now confdest=$PKG_INSTALL_ROOT/etc/opt/csw/$template ;; esac @@ -84,3 +91,4 @@ # whatever file the OS itself, passes into us on stdin rm -f $dest done +echo '' This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From theferret at users.sourceforge.net Tue Jan 4 02:32:02 2011 From: theferret at users.sourceforge.net (theferret at users.sourceforge.net) Date: Tue, 04 Jan 2011 01:32:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[12163] csw/mgar/pkg/cswclassutils/trunk/Makefile Message-ID: Revision: 12163 http://gar.svn.sourceforge.net/gar/?rev=12163&view=rev Author: theferret Date: 2011-01-04 01:32:02 +0000 (Tue, 04 Jan 2011) Log Message: ----------- cswclassutils: Tweaked Makefile for cptemplates. or tried to anyway Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/Makefile Modified: csw/mgar/pkg/cswclassutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/Makefile 2011-01-03 19:56:57 UTC (rev 12162) +++ csw/mgar/pkg/cswclassutils/trunk/Makefile 2011-01-04 01:32:02 UTC (rev 12163) @@ -98,6 +98,7 @@ # Add non-auto changes to checkpkg overrides, pkg files, etc. +PKGFILES_CSWcas-cptemplates += /opt/csw/etc/templates PKGFILES_CSWcas-initsmf += /opt/csw/etc/init.d/.* PKGFILES_CSWcas-initsmf += /var/opt/csw/svc/.* @@ -116,6 +117,7 @@ @echo " ==> Installing $(NAME) (custom)" @rm -rf $(DESTDIR) @ginstall -m 0755 -d $(DESTDIR)/opt/csw/etc/init.d + @ginstall -m 0755 -d $(DESTDIR)/opt/csw/etc/templates @ginstall -m 0755 -d $(DESTDIR)$(docdir)/$(NAME) @ginstall -m 0755 -d $(DESTDIR)/usr/sadm/install/scripts @ginstall -m 0755 -d $(DESTDIR)/var/opt/csw/svc/manifest 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 Jan 4 03:19:21 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 04 Jan 2011 02:19:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[12164] csw/mgar/pkg/coreutils/trunk/Makefile Message-ID: Revision: 12164 http://gar.svn.sourceforge.net/gar/?rev=12164&view=rev Author: bdwalton Date: 2011-01-04 02:19:21 +0000 (Tue, 04 Jan 2011) Log Message: ----------- coreutils/trunk: skip tests againt until next version bump Modified Paths: -------------- csw/mgar/pkg/coreutils/trunk/Makefile Modified: csw/mgar/pkg/coreutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/coreutils/trunk/Makefile 2011-01-04 01:32:02 UTC (rev 12163) +++ csw/mgar/pkg/coreutils/trunk/Makefile 2011-01-04 02:19:21 UTC (rev 12164) @@ -50,7 +50,7 @@ PROTOTYPE_FILTER = awk '$$$$3 == "/opt/csw/bin/gsu" { $$$$4 = "4555" }; { print }' -ifneq ($(VERSION), 8.6) +ifneq ($(VERSION), 8.8) TEST_TARGET = check else TEST_SCRIPTS = This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Jan 4 10:28:09 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 04 Jan 2011 09:28:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[12165] csw/mgar/pkg/msmtp/trunk Message-ID: Revision: 12165 http://gar.svn.sourceforge.net/gar/?rev=12165&view=rev Author: dmichelsen Date: 2011-01-04 09:28:08 +0000 (Tue, 04 Jan 2011) Log Message: ----------- msmtp: Update to 1.4.22 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 2011-01-04 02:19:21 UTC (rev 12164) +++ csw/mgar/pkg/msmtp/trunk/Makefile 2011-01-04 09:28:08 UTC (rev 12165) @@ -1,5 +1,5 @@ NAME = msmtp -VERSION = 1.4.21 +VERSION = 1.4.22 CATEGORIES = net DESCRIPTION = SMTP client @@ -31,7 +31,7 @@ UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2 BUILD_DEP_PKGS = CSWgnutlsdevel CSWlibgsasldevel CSWggettext -RUNTIME_DEP_PKGS = CSWlibidn CSWgnutls CSWlibgsasl CSWggettextrt +RUNTIME_DEP_PKGS = CSWlibidn CSWgnutls CSWlibgsasl7 CSWggettextrt CONFIGURE_ARGS = $(DIRPATHS) Modified: csw/mgar/pkg/msmtp/trunk/checksums =================================================================== --- csw/mgar/pkg/msmtp/trunk/checksums 2011-01-04 02:19:21 UTC (rev 12164) +++ csw/mgar/pkg/msmtp/trunk/checksums 2011-01-04 09:28:08 UTC (rev 12165) @@ -1 +1 @@ -9d764cd9036168f49bc9d6531a7f3dba msmtp-1.4.21.tar.bz2 +de0a4e6f3133519b301fc114daf81f49 msmtp-1.4.22.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 Jan 4 10:31:10 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 04 Jan 2011 09:31:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[12166] csw/mgar/pkg/taglib/trunk/Makefile Message-ID: Revision: 12166 http://gar.svn.sourceforge.net/gar/?rev=12166&view=rev Author: dmichelsen Date: 2011-01-04 09:31:09 +0000 (Tue, 04 Jan 2011) Log Message: ----------- taglib: Reenable taglib as metapackage for all libs Modified Paths: -------------- csw/mgar/pkg/taglib/trunk/Makefile Modified: csw/mgar/pkg/taglib/trunk/Makefile =================================================================== --- csw/mgar/pkg/taglib/trunk/Makefile 2011-01-04 09:28:08 UTC (rev 12165) +++ csw/mgar/pkg/taglib/trunk/Makefile 2011-01-04 09:31:09 UTC (rev 12166) @@ -20,6 +20,15 @@ VENDOR_URL = http://developer.kde.org/~wheeler/taglib.html +PACKAGES += CSWtaglib +CATALOGNAME_CSWtaglib = taglib +SPKG_DESC_CSWtaglib = Library for reading and editing the meta-data of several popular audio formats +RUNTIME_DEP_PKGS_CSWtaglib = CSWlibtag1 CSWlibtag-c0 +CHECKPKG_OVERRIDES_CSWtaglib += surplus-dependency|CSWlibtag-c0 +CHECKPKG_OVERRIDES_CSWtaglib += surplus-dependency|CSWlibtag1 +ARCHALL_CSWtaglib = 1 +PKGFILES_CSWtaglib = NOFILES + PACKAGES += CSWtaglib-devel CATALOGNAME_CSWtaglib-devel = taglib_devel SPKG_DESC_CSWtaglib-devel = Developer files for taglib (composed of libtag1 and libtag_c0) @@ -46,8 +55,6 @@ TEST_TARGET = check -CHECKPKG_OVERRIDES_CSWtaglib += non-uniform-lib-versions-in-package|sonames=['libtag.so.1',|'libtag_c.so.0'] - # There are collisions with the existing taglib_gcc at the moment. These will go away # as soon as the updated taglib_gcc has been released. CHECKPKG_OVERRIDES_CSWlibtag-c0 += file-collision 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 Jan 4 10:33:54 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 04 Jan 2011 09:33:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[12167] csw/mgar/pkg/di/trunk Message-ID: Revision: 12167 http://gar.svn.sourceforge.net/gar/?rev=12167&view=rev Author: dmichelsen Date: 2011-01-04 09:33:53 +0000 (Tue, 04 Jan 2011) Log Message: ----------- di: Update to 4.27 and make extra package for Solaris 10 as di is zone-aware when API is available 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 2011-01-04 09:31:09 UTC (rev 12166) +++ csw/mgar/pkg/di/trunk/Makefile 2011-01-04 09:33:53 UTC (rev 12167) @@ -1,5 +1,5 @@ NAME = di -VERSION = 4.26 +VERSION = 4.27 CATEGORIES = utils DESCRIPTION = Disk information utility @@ -20,6 +20,10 @@ LICENSE = LICENSE +PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386 +# Make extra packages for Solaris 10 as di is zone-aware +PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386 + CONFIGURE_SCRIPTS = TEST_SCRIPTS = Modified: csw/mgar/pkg/di/trunk/checksums =================================================================== --- csw/mgar/pkg/di/trunk/checksums 2011-01-04 09:31:09 UTC (rev 12166) +++ csw/mgar/pkg/di/trunk/checksums 2011-01-04 09:33:53 UTC (rev 12167) @@ -1 +1 @@ -7568e18b1c5c72bfbe3d9ba55c30d1ed di-4.26.tar.gz +b1a7ee87b83d72c273558a5ec815bfc3 di-4.27.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Jan 4 11:13:17 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 04 Jan 2011 10:13:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[12168] csw/mgar/pkg/doxygen/trunk Message-ID: Revision: 12168 http://gar.svn.sourceforge.net/gar/?rev=12168&view=rev Author: dmichelsen Date: 2011-01-04 10:13:17 +0000 (Tue, 04 Jan 2011) Log Message: ----------- doxygen: Update to 1.7.3 Modified Paths: -------------- csw/mgar/pkg/doxygen/trunk/Makefile csw/mgar/pkg/doxygen/trunk/checksums Modified: csw/mgar/pkg/doxygen/trunk/Makefile =================================================================== --- csw/mgar/pkg/doxygen/trunk/Makefile 2011-01-04 09:33:53 UTC (rev 12167) +++ csw/mgar/pkg/doxygen/trunk/Makefile 2011-01-04 10:13:17 UTC (rev 12168) @@ -1,5 +1,5 @@ NAME = doxygen -VERSION = 1.7.2 +VERSION = 1.7.3 CATEGORIES = utils DESCRIPTION = A documentation system for programming languages @@ -29,6 +29,8 @@ BUILD_DEP_PKGS = CSWgraphviz +EXTRA_CXXFLAGS = -features=tmplrefstatic + CONFIGURE_ARGS = --prefix $(prefix) CONFIGURE_ARGS += --release CONFIGURE_ARGS += --docdir $(docdir)/doxygen @@ -48,9 +50,6 @@ # for these tiny examples seems overkill. CHECKPKG_OVERRIDES_CSWdoxygendoc = missing-dependency|CSWpython -# I can't get -norunpath to CXX, override for now -CHECKPKG_OVERRIDES_CSWdoxygen += bad-rpath-entry - # Use CSW Perl instead of #!/usr/local/bin/perl in # /opt/csw/share/doc/doxygen/examples/Makefile # some time... Modified: csw/mgar/pkg/doxygen/trunk/checksums =================================================================== --- csw/mgar/pkg/doxygen/trunk/checksums 2011-01-04 09:33:53 UTC (rev 12167) +++ csw/mgar/pkg/doxygen/trunk/checksums 2011-01-04 10:13:17 UTC (rev 12168) @@ -1 +1 @@ -d5f3e32474186abc64288db6b8ffd7f0 doxygen-1.7.2.src.tar.gz +6cc5ad566dbec5cf843dc600b1162808 doxygen-1.7.3.src.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Jan 4 13:06:36 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 04 Jan 2011 12:06:36 +0000 Subject: [csw-devel] SF.net SVN: gar:[12169] csw/mgar/pkg/libicu/branches Message-ID: Revision: 12169 http://gar.svn.sourceforge.net/gar/?rev=12169&view=rev Author: dmichelsen Date: 2011-01-04 12:06:36 +0000 (Tue, 04 Jan 2011) Log Message: ----------- libicu/libicu42: Make soname-specific branch Modified Paths: -------------- csw/mgar/pkg/libicu/branches/libicu42/Makefile csw/mgar/pkg/libicu/branches/libicu42/checksums Added Paths: ----------- csw/mgar/pkg/libicu/branches/libicu42/ Modified: csw/mgar/pkg/libicu/branches/libicu42/Makefile =================================================================== --- csw/mgar/pkg/libicu/trunk/Makefile 2011-01-04 02:19:21 UTC (rev 12164) +++ csw/mgar/pkg/libicu/branches/libicu42/Makefile 2011-01-04 12:06:36 UTC (rev 12169) @@ -1,46 +1,48 @@ # $Id$ NAME = libicu -VERSION = 4.4.1 +VERSION = 4.2.1 CATEGORIES = lib DESCRIPTION = International Components for Unicode define BLURB endef -EXTRA_MODULATORS = VERSION -MODULATIONS_VERSION = 4.2.1 4.4.1 - -SKIP_MODULATIONS = isa-sparcv9-garversion-4.2.1 -SKIP_MODULATIONS += isa-amd64-garversion-4.2.1 - -# filename = icu4c-$(shell echo $(1) | tr '.' '_')-src.tgz _V-4.2.1 = 4_2_1 -_V-4.4.1 = 4_4_1 filename = icu4c-$(_V-$(1))-src.tgz -MASTER_SITES = $(addsuffix /,$(addprefix http://download.icu-project.org/files/icu4c/,$(MODULATIONS_VERSION))) -SOURCEFILES = $(foreach VERSION,$(MODULATIONS_VERSION), $(call filename,$(VERSION))) +MASTER_SITES = $(addsuffix /,$(addprefix http://download.icu-project.org/files/icu4c/,$(VERSION))) +SOURCEFILES = $(call filename,$(VERSION)) DISTFILES = $(SOURCEFILES) # icu-config is broken with ECHO_N/ECHO_C detection: # http://bugs.icu-project.org/trac/ticket/7768 PATCHFILES = 0001-Add-workaround-for-echo-n.patch -NOEXTRACT = $(filter-out $(call filename,$(VERSION)),$(SOURCEFILES)) - # File name regex to get notifications about upstream software releases UFILES_REGEX = $(NAME)-(\d+(?:_\d+)*)-src.tgz -PACKAGES = CSWlibicu CSWlibicudevel +PACKAGES += CSWlibicu42 +CATALOGNAME_CSWlibicu42 = libicu42 +SPKG_DESC_CSWlibicu42 = International Components for Unicode, libicu*.so.42 -CATALOGNAME_CSWlibicu = libicu -CATALOGNAME_CSWlibicudevel = libicu_devel +# These are ok. As they are all used and bundled together they are also +# released together in one soname-specific package. +CHECKPKG_OVERRIDES_CSWlibicu42 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libicudata.so.42.1|soname=libicudata.so.42|pkgname=CSWlibicu42|expected=CSWlibicudata42 +CHECKPKG_OVERRIDES_CSWlibicu42 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libicui18n.so.42.1|soname=libicui18n.so.42|pkgname=CSWlibicu42|expected=CSWlibicui18n42 +CHECKPKG_OVERRIDES_CSWlibicu42 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libicuio.so.42.1|soname=libicuio.so.42|pkgname=CSWlibicu42|expected=CSWlibicuio42 +CHECKPKG_OVERRIDES_CSWlibicu42 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libicule.so.42.1|soname=libicule.so.42|pkgname=CSWlibicu42|expected=CSWlibicule42 +CHECKPKG_OVERRIDES_CSWlibicu42 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libiculx.so.42.1|soname=libiculx.so.42|pkgname=CSWlibicu42|expected=CSWlibiculx42 +CHECKPKG_OVERRIDES_CSWlibicu42 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libicutu.so.42.1|soname=libicutu.so.42|pkgname=CSWlibicu42|expected=CSWlibicutu42 +CHECKPKG_OVERRIDES_CSWlibicu42 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libicuuc.so.42.1|soname=libicuuc.so.42|pkgname=CSWlibicu42|expected=CSWlibicuuc42 -SPKG_DESC_CSWlibicu = International Components for Unicode -SPKG_DESC_CSWlibicudevel = Development Files for libicu +PACKAGES += CSWlibicu +CATALOGNAME_CSWlibicu = libicu +SPKG_DESC_CSWlibicu = Stub as contents moved to library-specific legacy CSWlibicu42 +RUNTIME_DEP_PKGS_CSWlibicu = CSWlibicu42 +CHECKPKG_OVERRIDES_CSWlibicu += surplus-dependency|CSWlibicu42 +PKGFILES_CSWlibicu = NOFILES +ARCHALL_CSWlibicu = 1 -RUNTIME_DEP_PKGS_CSWlibicudevel += CSWlibicu - LICENSE = license.html VENDOR_URL = http://icu-project.org/ @@ -57,26 +59,8 @@ # packages using the libs will bail out as they assume the libs are self-contained. LINKER_FLAGS = -lCrun -lCstd -BUILD64 = 1 -NOISAEXEC = 1 -NOISALIST = 1 CONFIGURE_ARGS = $(DIRPATHS) -MERGE_SCRIPTS_isa-default-garversion-4.2.1 = copy-only -MERGE_DIRS_isa-default-garversion-4.2.1 = $(libdir) +PKGFILES_CSWlibicu42 = $(call baseisadirs,$(libdir),libicu.*\.so\.42(\.\d+)*) -MERGE_SCRIPTS_isa-default-garversion-4.4.1 = copy-all -MERGE_SCRIPTS_isa-default64-garversion-4.4.1 = copy-relocated-only copy-config-only -MERGE_DIRS_isa-default64-garversion-4.4.1 = $(libdir) - -PKGFILES_CSWlibicu = $(PKGFILES_RT) - -CHECKPKG_OVERRIDES_CSWlibicu += soname-not-found|libm.so.2|is|needed|by|opt/csw/lib/amd64/libicui18n.so.44.1 -CHECKPKG_OVERRIDES_CSWlibicu += soname-not-found|libm.so.2|is|needed|by|opt/csw/lib/amd64/libicule.so.44.1 -CHECKPKG_OVERRIDES_CSWlibicu += soname-not-found|libm.so.2|is|needed|by|opt/csw/lib/amd64/libiculx.so.44.1 -CHECKPKG_OVERRIDES_CSWlibicu += soname-not-found|libm.so.2|is|needed|by|opt/csw/lib/amd64/libicuuc.so.44.1 -CHECKPKG_OVERRIDES_CSWlibicu += soname-not-found|libm.so.2|is|needed|by|opt/csw/lib/amd64/libicutu.so.44.1 -CHECKPKG_OVERRIDES_CSWlibicu += soname-not-found|libm.so.2|is|needed|by|opt/csw/lib/amd64/libicuio.so.44.1 -CHECKPKG_OVERRIDES_CSWlibicu += soname-not-found|libm.so.2|is|needed|by|opt/csw/lib/amd64/libicutest.so.44.1 - include gar/category.mk Modified: csw/mgar/pkg/libicu/branches/libicu42/checksums =================================================================== --- csw/mgar/pkg/libicu/trunk/checksums 2011-01-04 02:19:21 UTC (rev 12164) +++ csw/mgar/pkg/libicu/branches/libicu42/checksums 2011-01-04 12:06:36 UTC (rev 12169) @@ -1,3 +1 @@ -0c9e587cf8dced7405c361c9cd81d98e 0001-Add-workaround-for-echo-n.patch e3738abd0d3ce1870dc1fd1f22bba5b1 icu4c-4_2_1-src.tgz -b6bc0a1153540b2088f8b03e0ba625d3 icu4c-4_4_1-src.tgz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Jan 4 13:59:12 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 04 Jan 2011 12:59:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[12170] csw/mgar/pkg/libicu/trunk Message-ID: Revision: 12170 http://gar.svn.sourceforge.net/gar/?rev=12170&view=rev Author: dmichelsen Date: 2011-01-04 12:59:11 +0000 (Tue, 04 Jan 2011) Log Message: ----------- libicu: Update to 4.6 and split library Modified Paths: -------------- csw/mgar/pkg/libicu/trunk/Makefile csw/mgar/pkg/libicu/trunk/checksums Modified: csw/mgar/pkg/libicu/trunk/Makefile =================================================================== --- csw/mgar/pkg/libicu/trunk/Makefile 2011-01-04 12:06:36 UTC (rev 12169) +++ csw/mgar/pkg/libicu/trunk/Makefile 2011-01-04 12:59:11 UTC (rev 12170) @@ -1,45 +1,57 @@ # $Id$ NAME = libicu -VERSION = 4.4.1 +VERSION = 4.6 CATEGORIES = lib DESCRIPTION = International Components for Unicode define BLURB endef -EXTRA_MODULATORS = VERSION -MODULATIONS_VERSION = 4.2.1 4.4.1 - -SKIP_MODULATIONS = isa-sparcv9-garversion-4.2.1 -SKIP_MODULATIONS += isa-amd64-garversion-4.2.1 - # filename = icu4c-$(shell echo $(1) | tr '.' '_')-src.tgz -_V-4.2.1 = 4_2_1 -_V-4.4.1 = 4_4_1 +_V-4.6 = 4_6 filename = icu4c-$(_V-$(1))-src.tgz -MASTER_SITES = $(addsuffix /,$(addprefix http://download.icu-project.org/files/icu4c/,$(MODULATIONS_VERSION))) -SOURCEFILES = $(foreach VERSION,$(MODULATIONS_VERSION), $(call filename,$(VERSION))) -DISTFILES = $(SOURCEFILES) +MASTER_SITES = http://download.icu-project.org/files/icu4c/$(VERSION)/ +SOURCEFILES = $(call filename,$(VERSION)) +DISTFILES = $(SOURCEFILES) # icu-config is broken with ECHO_N/ECHO_C detection: # http://bugs.icu-project.org/trac/ticket/7768 -PATCHFILES = 0001-Add-workaround-for-echo-n.patch +#PATCHFILES = 0001-Add-workaround-for-echo-n.patch -NOEXTRACT = $(filter-out $(call filename,$(VERSION)),$(SOURCEFILES)) - # File name regex to get notifications about upstream software releases UFILES_REGEX = $(NAME)-(\d+(?:_\d+)*)-src.tgz -PACKAGES = CSWlibicu CSWlibicudevel +PACKAGES += CSWlibicu46 +CATALOGNAME_CSWlibicu46 = libicu46 +SPKG_DESC_CSWlibicu46 = International Components for Unicode, libicu*.so.46 +PKGFILES_CSWlibicu46 = $(call baseisadirs,$(libdir),libicu.*\.so\.46(\.\d+)*) +# These are ok. As they are all used and bundled together they are also +# released together in one soname-specific package. +CHECKPKG_OVERRIDES_CSWlibicu46 += shared-lib-pkgname-mismatch -CATALOGNAME_CSWlibicu = libicu -CATALOGNAME_CSWlibicudevel = libicu_devel +PACKAGES += CSWlibicu-devel +CATALOGNAME_CSWlibicu-devel = libicu_devel +SPKG_DESC_CSWlibicu-devel = Development Files for libicu +PKGFILES_CSWlibicu-devel = $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWlibicu-devel = CSWlibicu CSWlibicu46 -SPKG_DESC_CSWlibicu = International Components for Unicode -SPKG_DESC_CSWlibicudevel = Development Files for libicu +PACKAGES += CSWlibicu +CATALOGNAME_CSWlibicu = libicu +SPKG_DESC_CSWlibicu = $(DESCRIPTION) +RUNTIME_DEP_PKGS_CSWlibicu = CSWlibicu46 +# There are still legacy packages depending on CSWlibicu and expecting .so.42 in it. +# Also depend on legacy soname-package until all these have been resolved. +RUNTIME_DEP_PKGS_CSWlibicu += CSWlibicu42 +CHECKPKG_OVERRIDES_CSWlibicu += surplus-dependency|CSWlibicu42 +# This package is generated in a branch and cannot be found in this build. +CHECKPKG_OVERRIDES_CSWlibicu += unidentified-dependency|CSWlibicu42 -RUNTIME_DEP_PKGS_CSWlibicudevel += CSWlibicu +# The collisions will be there until CSWlibicu has also been updated. +# This will happen at the same time as the CSWlibicu42 release. +CHECKPKG_OVERRIDES_CSWlibicu46 += file-collision +CHECKPKG_OVERRIDES_CSWlibicu-devel += file-collision +CHECKPKG_OVERRIDES_CSWlibicu += file-collision LICENSE = license.html @@ -62,21 +74,6 @@ NOISALIST = 1 CONFIGURE_ARGS = $(DIRPATHS) -MERGE_SCRIPTS_isa-default-garversion-4.2.1 = copy-only -MERGE_DIRS_isa-default-garversion-4.2.1 = $(libdir) - -MERGE_SCRIPTS_isa-default-garversion-4.4.1 = copy-all -MERGE_SCRIPTS_isa-default64-garversion-4.4.1 = copy-relocated-only copy-config-only -MERGE_DIRS_isa-default64-garversion-4.4.1 = $(libdir) - PKGFILES_CSWlibicu = $(PKGFILES_RT) -CHECKPKG_OVERRIDES_CSWlibicu += soname-not-found|libm.so.2|is|needed|by|opt/csw/lib/amd64/libicui18n.so.44.1 -CHECKPKG_OVERRIDES_CSWlibicu += soname-not-found|libm.so.2|is|needed|by|opt/csw/lib/amd64/libicule.so.44.1 -CHECKPKG_OVERRIDES_CSWlibicu += soname-not-found|libm.so.2|is|needed|by|opt/csw/lib/amd64/libiculx.so.44.1 -CHECKPKG_OVERRIDES_CSWlibicu += soname-not-found|libm.so.2|is|needed|by|opt/csw/lib/amd64/libicuuc.so.44.1 -CHECKPKG_OVERRIDES_CSWlibicu += soname-not-found|libm.so.2|is|needed|by|opt/csw/lib/amd64/libicutu.so.44.1 -CHECKPKG_OVERRIDES_CSWlibicu += soname-not-found|libm.so.2|is|needed|by|opt/csw/lib/amd64/libicuio.so.44.1 -CHECKPKG_OVERRIDES_CSWlibicu += soname-not-found|libm.so.2|is|needed|by|opt/csw/lib/amd64/libicutest.so.44.1 - include gar/category.mk Modified: csw/mgar/pkg/libicu/trunk/checksums =================================================================== --- csw/mgar/pkg/libicu/trunk/checksums 2011-01-04 12:06:36 UTC (rev 12169) +++ csw/mgar/pkg/libicu/trunk/checksums 2011-01-04 12:59:11 UTC (rev 12170) @@ -1,3 +1 @@ -0c9e587cf8dced7405c361c9cd81d98e 0001-Add-workaround-for-echo-n.patch -e3738abd0d3ce1870dc1fd1f22bba5b1 icu4c-4_2_1-src.tgz -b6bc0a1153540b2088f8b03e0ba625d3 icu4c-4_4_1-src.tgz +43e56b71c407be5154de681eaa646a4a icu4c-4_6-src.tgz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Jan 4 13:59:50 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 04 Jan 2011 12:59:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[12171] csw/mgar/pkg/libicu/branches/libicu42/Makefile Message-ID: Revision: 12171 http://gar.svn.sourceforge.net/gar/?rev=12171&view=rev Author: dmichelsen Date: 2011-01-04 12:59:50 +0000 (Tue, 04 Jan 2011) Log Message: ----------- libicu/libicu42: Move building of CSWlibicu to trunk/ Modified Paths: -------------- csw/mgar/pkg/libicu/branches/libicu42/Makefile Modified: csw/mgar/pkg/libicu/branches/libicu42/Makefile =================================================================== --- csw/mgar/pkg/libicu/branches/libicu42/Makefile 2011-01-04 12:59:11 UTC (rev 12170) +++ csw/mgar/pkg/libicu/branches/libicu42/Makefile 2011-01-04 12:59:50 UTC (rev 12171) @@ -35,13 +35,9 @@ CHECKPKG_OVERRIDES_CSWlibicu42 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libicutu.so.42.1|soname=libicutu.so.42|pkgname=CSWlibicu42|expected=CSWlibicutu42 CHECKPKG_OVERRIDES_CSWlibicu42 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libicuuc.so.42.1|soname=libicuuc.so.42|pkgname=CSWlibicu42|expected=CSWlibicuuc42 -PACKAGES += CSWlibicu -CATALOGNAME_CSWlibicu = libicu -SPKG_DESC_CSWlibicu = Stub as contents moved to library-specific legacy CSWlibicu42 -RUNTIME_DEP_PKGS_CSWlibicu = CSWlibicu42 -CHECKPKG_OVERRIDES_CSWlibicu += surplus-dependency|CSWlibicu42 -PKGFILES_CSWlibicu = NOFILES -ARCHALL_CSWlibicu = 1 +# The collisions will be there until CSWlibicu has also been updated. +# This will happen at the same time as the CSWlibicu42 release. +CHECKPKG_OVERRIDES_CSWlibicu42 += file-collision LICENSE = license.html This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Jan 4 14:04:55 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 04 Jan 2011 13:04:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[12172] csw/mgar/pkg/libicu/trunk/Makefile Message-ID: Revision: 12172 http://gar.svn.sourceforge.net/gar/?rev=12172&view=rev Author: dmichelsen Date: 2011-01-04 13:04:54 +0000 (Tue, 04 Jan 2011) Log Message: ----------- libicu: Remove extra definition Modified Paths: -------------- csw/mgar/pkg/libicu/trunk/Makefile Modified: csw/mgar/pkg/libicu/trunk/Makefile =================================================================== --- csw/mgar/pkg/libicu/trunk/Makefile 2011-01-04 12:59:50 UTC (rev 12171) +++ csw/mgar/pkg/libicu/trunk/Makefile 2011-01-04 13:04:54 UTC (rev 12172) @@ -74,6 +74,4 @@ NOISALIST = 1 CONFIGURE_ARGS = $(DIRPATHS) -PKGFILES_CSWlibicu = $(PKGFILES_RT) - include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Jan 4 14:06:25 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 04 Jan 2011 13:06:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[12173] csw/mgar/pkg/libarchive/trunk Message-ID: Revision: 12173 http://gar.svn.sourceforge.net/gar/?rev=12173&view=rev Author: dmichelsen Date: 2011-01-04 13:06:25 +0000 (Tue, 04 Jan 2011) Log Message: ----------- libarchive: Update to 2.8.4 and split package Modified Paths: -------------- csw/mgar/pkg/libarchive/trunk/Makefile csw/mgar/pkg/libarchive/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/libarchive/trunk/files/0001-Check-against-gids-0-and-1-for-root-on-Solaris.patch Modified: csw/mgar/pkg/libarchive/trunk/Makefile =================================================================== --- csw/mgar/pkg/libarchive/trunk/Makefile 2011-01-04 13:04:54 UTC (rev 12172) +++ csw/mgar/pkg/libarchive/trunk/Makefile 2011-01-04 13:06:25 UTC (rev 12173) @@ -1,6 +1,6 @@ # : Makefile 9089 2010-03-11 08:34:46Z wahwah $ NAME = libarchive -VERSION = 2.8.3 +VERSION = 2.8.4 CATEGORIES = lib DESCRIPTION = C library for reading and writing various archive formats @@ -10,22 +10,49 @@ MASTER_SITES = $(GOOGLE_MIRROR) DISTFILES = $(NAME)-$(VERSION).tar.gz -# This is already in trunk from r2347: -# -PATCHFILES = 0001-Check-against-gids-0-and-1-for-root-on-Solaris.patch - # File name regex to get notifications about upstream software releases UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz VENDOR_URL = http://code.google.com/p/libarchive/ -DEP_PKGS = CSWxz CSWbzip2 CSWiconv CSWlibxml2 CSWzlib CSWosslrt +PACKAGES += CSWlibarchive2 +CATALOGNAME_CSWlibarchive2 = libarchive2 +SPKG_DESC_CSWlibarchive2 = $(DESCRIPTION), libarchive.so.2 +PKGFILES_CSWlibarchive2 = $(call baseisadirs,$(libdir),libarchive\.so\.2(\.\d+)*) +RUNTIME_DEP_PKGS_CSWlibarchive2 += CSWiconv +RUNTIME_DEP_PKGS_CSWlibarchive2 += CSWxz +RUNTIME_DEP_PKGS_CSWlibarchive2 += CSWzlib +RUNTIME_DEP_PKGS_CSWlibarchive2 += CSWlibxml2 +RUNTIME_DEP_PKGS_CSWlibarchive2 += CSWbzip2 +RUNTIME_DEP_PKGS_CSWlibarchive2 += CSWosslrt +PACKAGES += CSWlibarchive-devel +CATALOGNAME_CSWlibarchive-devel = libarchive_devel +SPKG_DESC_CSWlibarchive-devel = Development files for libarchive +RUNTIME_DEP_PKGS_CSWlibarchive-devel = CSWlibarchive2 +PKGFILES_CSWlibarchive-devel = $(PKGFILES_DEVEL) + +PACKAGES += CSWlibarchive +CATALOGNAME_CSWlibarchive = libarchive +SPKG_DESC_CSWlibarchive = $(DESCRIPTION) +RUNTIME_DEP_PKGS_CSWlibarchive += CSWiconv +RUNTIME_DEP_PKGS_CSWlibarchive += CSWxz +RUNTIME_DEP_PKGS_CSWlibarchive += CSWzlib +RUNTIME_DEP_PKGS_CSWlibarchive += CSWlibxml2 +RUNTIME_DEP_PKGS_CSWlibarchive += CSWbzip2 +RUNTIME_DEP_PKGS_CSWlibarchive += CSWosslrt + +BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS_CSWlibarchive42) +BUILD_DEP_PKGS += CSWlibxml2devel CSWossldevel + EXTRA_INC = $(includedir)/cryptopp BUILD64 = 1 +NOISAEXEC = 1 CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = check +MERGE_DIRS_isa-extra = $(libdir) + include gar/category.mk Modified: csw/mgar/pkg/libarchive/trunk/checksums =================================================================== --- csw/mgar/pkg/libarchive/trunk/checksums 2011-01-04 13:04:54 UTC (rev 12172) +++ csw/mgar/pkg/libarchive/trunk/checksums 2011-01-04 13:06:25 UTC (rev 12173) @@ -1,2 +1 @@ -9539f1e6273764c7d7f798876c198a83 0001-Check-against-gids-0-and-1-for-root-on-Solaris.patch -fe8d917e101d4b37580124030842a1d0 libarchive-2.8.3.tar.gz +83b237a542f27969a8d68ac217dc3796 libarchive-2.8.4.tar.gz Deleted: csw/mgar/pkg/libarchive/trunk/files/0001-Check-against-gids-0-and-1-for-root-on-Solaris.patch =================================================================== --- csw/mgar/pkg/libarchive/trunk/files/0001-Check-against-gids-0-and-1-for-root-on-Solaris.patch 2011-01-04 13:04:54 UTC (rev 12172) +++ csw/mgar/pkg/libarchive/trunk/files/0001-Check-against-gids-0-and-1-for-root-on-Solaris.patch 2011-01-04 13:06:25 UTC (rev 12173) @@ -1,31 +0,0 @@ -From 9c1bc0a961436ef420f1b379f58309db7ce43d60 Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Fri, 14 May 2010 12:01:53 +0200 -Subject: [PATCH] Check against gids 0 and 1 for root on Solaris - ---- - cpio/test/test_owner_parse.c | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -diff --git a/cpio/test/test_owner_parse.c b/cpio/test/test_owner_parse.c -index 9875e91..a3ebccd 100644 ---- a/cpio/test/test_owner_parse.c -+++ b/cpio/test/test_owner_parse.c -@@ -30,8 +30,14 @@ __FBSDID("$FreeBSD$"); - - #if !defined(_WIN32) - #define ROOT "root" -+#if defined(__sun) -+static int root_uids[] = { 0 }; -+/* Solaris 9 has gid 1 (=other) */ -+static int root_gids[] = { 0, 1 }; -+#else - static int root_uids[] = { 0 }; - static int root_gids[] = { 0 }; -+#endif - #elif defined(__CYGWIN__) - /* On cygwin, the Administrator user most likely exists (unless - * it has been renamed or is in a non-English localization), but --- -1.7.0 - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Jan 4 14:28:28 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 04 Jan 2011 13:28:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[12174] csw/mgar/pkg/libicu/trunk/Makefile Message-ID: Revision: 12174 http://gar.svn.sourceforge.net/gar/?rev=12174&view=rev Author: dmichelsen Date: 2011-01-04 13:28:28 +0000 (Tue, 04 Jan 2011) Log Message: ----------- libicu: Move all files from libicu to libicu_devel Modified Paths: -------------- csw/mgar/pkg/libicu/trunk/Makefile Modified: csw/mgar/pkg/libicu/trunk/Makefile =================================================================== --- csw/mgar/pkg/libicu/trunk/Makefile 2011-01-04 13:06:25 UTC (rev 12173) +++ csw/mgar/pkg/libicu/trunk/Makefile 2011-01-04 13:28:28 UTC (rev 12174) @@ -33,13 +33,14 @@ PACKAGES += CSWlibicu-devel CATALOGNAME_CSWlibicu-devel = libicu_devel SPKG_DESC_CSWlibicu-devel = Development Files for libicu -PKGFILES_CSWlibicu-devel = $(PKGFILES_DEVEL) +# This package is PKGFILES catchall RUNTIME_DEP_PKGS_CSWlibicu-devel = CSWlibicu CSWlibicu46 PACKAGES += CSWlibicu CATALOGNAME_CSWlibicu = libicu SPKG_DESC_CSWlibicu = $(DESCRIPTION) -RUNTIME_DEP_PKGS_CSWlibicu = CSWlibicu46 +PKGFILES_CSWlibicu = NOFILES +ARCHALL_CSWlibicu = 1 # There are still legacy packages depending on CSWlibicu and expecting .so.42 in it. # Also depend on legacy soname-package until all these have been resolved. RUNTIME_DEP_PKGS_CSWlibicu += CSWlibicu42 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 Jan 4 15:17:14 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 04 Jan 2011 14:17:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[12175] csw/mgar/pkg/tin/trunk Message-ID: Revision: 12175 http://gar.svn.sourceforge.net/gar/?rev=12175&view=rev Author: dmichelsen Date: 2011-01-04 14:17:14 +0000 (Tue, 04 Jan 2011) Log Message: ----------- tin: Update to 1.9.6 Modified Paths: -------------- csw/mgar/pkg/tin/trunk/Makefile csw/mgar/pkg/tin/trunk/checksums Modified: csw/mgar/pkg/tin/trunk/Makefile =================================================================== --- csw/mgar/pkg/tin/trunk/Makefile 2011-01-04 13:28:28 UTC (rev 12174) +++ csw/mgar/pkg/tin/trunk/Makefile 2011-01-04 14:17:14 UTC (rev 12175) @@ -1,5 +1,5 @@ NAME = tin -VERSION = 1.9.5 +VERSION = 1.9.6 CATEGORIES = net DESCRIPTION = Terminal-based news reader @@ -16,8 +16,11 @@ UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz -DEP_PKGS = CSWpcrert CSWggettextrt CSWperl CSWlibidn CSWlibicu CSWiconv +RUNTIME_DEP_PKGS = CSWpcrert CSWggettextrt CSWperl CSWlibidn CSWlibicu46 CSWiconv +BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) CSWpcre CSWlibicu-devel +VENDOR_URL = http://www.tin.org/ + CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-coffee CONFIGURE_ARGS += --enable-ipv6 --enable-curses @@ -32,6 +35,15 @@ # tin doesn't have a test target TEST_TARGET = +# These are provided by CSWmutt-base +EXTRA_MERGE_EXCLUDE_FILES += $(mandir)/man5/mmdf\.5 +EXTRA_MERGE_EXCLUDE_FILES += $(mandir)/man5/mbox\.5 + +# These will be necessary until CSWlibicu46 has been officially released +CHECKPKG_OVERRIDES_CSWtin += unidentified-dependency|CSWlibicu46 +CHECKPKG_OVERRIDES_CSWtin += soname-not-found|libicuuc.so.46|is|needed|by|opt/csw/bin/tin +CHECKPKG_OVERRIDES_CSWtin += surplus-dependency|CSWlibicu46 + include gar/category.mk post-install-modulated: Modified: csw/mgar/pkg/tin/trunk/checksums =================================================================== --- csw/mgar/pkg/tin/trunk/checksums 2011-01-04 13:28:28 UTC (rev 12174) +++ csw/mgar/pkg/tin/trunk/checksums 2011-01-04 14:17:14 UTC (rev 12175) @@ -1,3 +1 @@ -3775480a712fc46a69647678acb234cb COPYING -bb7e3b3753343b3beae9192cc87f83e3 configure.patch -51661ec8ae10aa7ccf97cbf309cbbf11 tin-1.9.5.tar.gz +2102f3efd82a342005bd9afd30e03778 tin-1.9.6.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Jan 4 16:50:16 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 04 Jan 2011 15:50:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[12176] csw/mgar/pkg/x3270/trunk Message-ID: Revision: 12176 http://gar.svn.sourceforge.net/gar/?rev=12176&view=rev Author: dmichelsen Date: 2011-01-04 15:50:16 +0000 (Tue, 04 Jan 2011) Log Message: ----------- x3270: Update to 3.3.11ga6 and removed conversions which have been in 3.3.5 but are no longer used Modified Paths: -------------- csw/mgar/pkg/x3270/trunk/Makefile csw/mgar/pkg/x3270/trunk/checksums Added Paths: ----------- csw/mgar/pkg/x3270/trunk/files/0002-Propagate-CFLAGS-to-building-of-version.o.patch csw/mgar/pkg/x3270/trunk/files/c3270-3.3_ncurses.patch csw/mgar/pkg/x3270/trunk/files/x3270-3.3.6_DBCS.patch Removed Paths: ------------- csw/mgar/pkg/x3270/trunk/files/ibm-1027_P100-1995.cnv csw/mgar/pkg/x3270/trunk/files/ibm-1385_P100-1997.cnv csw/mgar/pkg/x3270/trunk/files/ibm-1388_P103-2001.cnv csw/mgar/pkg/x3270/trunk/files/ibm-300_P110-1997.cnv csw/mgar/pkg/x3270/trunk/files/ibm-837_P100-2000.cnv Modified: csw/mgar/pkg/x3270/trunk/Makefile =================================================================== --- csw/mgar/pkg/x3270/trunk/Makefile 2011-01-04 14:17:14 UTC (rev 12175) +++ csw/mgar/pkg/x3270/trunk/Makefile 2011-01-04 15:50:16 UTC (rev 12176) @@ -1,6 +1,6 @@ # $Id$ NAME = x3270 -VERSION = $(BASEREL).10ga5 +VERSION = $(BASEREL).11ga6 CATEGORIES = apps DESCRIPTION = An IBM 3270 terminal emulator @@ -11,15 +11,12 @@ DISTFILES = suite3270-$(VERSION)-src.tgz DISTFILES += COPYING -CONVERSIONS = ibm-1027_P100-1995.cnv -CONVERSIONS += ibm-1385_P100-1997.cnv -CONVERSIONS += ibm-1388_P103-2001.cnv -CONVERSIONS += ibm-300_P110-1997.cnv -CONVERSIONS += ibm-837_P100-2000.cnv -DISTFILES += $(CONVERSIONS) - PATCHFILES = 0001-Add-Error-function.patch +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 @@ -57,7 +54,7 @@ # EXTRA_PAX_ARGS = -s ",\./usr/openwin/bin/,.$(bindir)/,p" -MIGRATE_FILES = $(addprefix x3270/,ibm_hosts $(CONVERSIONS)) +MIGRATE_FILES = x3270/ibm_hosts PRESERVECONF = $(addprefix $(sysconfdir)/,$(MIGRATE_FILES)) #MANPAGES = s3270-$(BASEREL)/s3270 @@ -83,5 +80,5 @@ ginstall -d $(DESTDIR)$(mandir)/man5 ginstall $(WORKSRC)/x3270-$(BASEREL)/ibm_hosts.man $(DESTDIR)$(mandir)/man5/ibm_hosts.5 $(foreach S,$(SUBSYSTEMS),ginstall -d $(DESTDIR)$(docdir)/x3270/$S; cp -rp $(WORKSRC)/$S-$(BASEREL)/README $(WORKSRC)/$S-$(BASEREL)/html $(DESTDIR)$(docdir)/x3270/$S;) - $(foreach C,$(CONVERSIONS),ginstall $(WORKDIR)/$C $(DESTDIR)$(sysconfdir)/x3270/$C;) + #$(foreach C,$(CONVERSIONS),ginstall $(WORKDIR)/$C $(DESTDIR)$(sysconfdir)/x3270/$C;) @$(MAKECOOKIE) Modified: csw/mgar/pkg/x3270/trunk/checksums =================================================================== --- csw/mgar/pkg/x3270/trunk/checksums 2011-01-04 14:17:14 UTC (rev 12175) +++ csw/mgar/pkg/x3270/trunk/checksums 2011-01-04 15:50:16 UTC (rev 12176) @@ -1,8 +1 @@ -c44cd68f5450aec260ee3866ad0a7177 0001-Add-Error-function.patch -63a33fe276b48131d50ee84e665f3a3e COPYING -dd7f1ab9a53ab6ff17be8a7f328713cc ibm-1027_P100-1995.cnv -6a04cfbfdda619ec2b1424a1168996f8 ibm-1385_P100-1997.cnv -079111e619157e0f8d5156e6bafda225 ibm-1388_P103-2001.cnv -2d8643cc3f22c60846e5bf980328c9b6 ibm-300_P110-1997.cnv -3c2397ee0befcf53743faca9f351c902 ibm-837_P100-2000.cnv -d373e5657d688d3e5ce35eb226ab19e8 suite3270-3.3.10ga5-src.tgz +01d6d3809a457e6f6bd3731642e0c02d suite3270-3.3.11ga6-src.tgz Added: csw/mgar/pkg/x3270/trunk/files/0002-Propagate-CFLAGS-to-building-of-version.o.patch =================================================================== --- csw/mgar/pkg/x3270/trunk/files/0002-Propagate-CFLAGS-to-building-of-version.o.patch (rev 0) +++ csw/mgar/pkg/x3270/trunk/files/0002-Propagate-CFLAGS-to-building-of-version.o.patch 2011-01-04 15:50:16 UTC (rev 12176) @@ -0,0 +1,99 @@ +From 1abf9972f9939fa438dffe2007552fe80dddd086 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Tue, 4 Jan 2011 16:12:52 +0100 +Subject: [PATCH 2/2] Propagate CFLAGS to building of version.o + +--- + c3270-3.3/mkversion.sh | 2 +- + pr3287-3.3/mkversion.sh | 2 +- + s3270-3.3/mkversion.sh | 2 +- + tcl3270-3.3/mkversion.sh | 2 +- + wc3270-3.3/mkversion.sh | 2 +- + wpr3287-3.3/mkversion.sh | 2 +- + ws3270-3.3/mkversion.sh | 2 +- + x3270-3.3/mkversion.sh | 2 +- + 8 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/c3270-3.3/mkversion.sh b/c3270-3.3/mkversion.sh +index e9093e0..bc3c0c9 100755 +--- a/c3270-3.3/mkversion.sh ++++ b/c3270-3.3/mkversion.sh +@@ -59,4 +59,4 @@ const char *build_rpq_timestamp = "$rpq_timestamp"; + const char *build_rpq_version = "$version"; + EOF + +-${1-cc} -c version.c ++${1-cc} ${CFLAGS} -c version.c +diff --git a/pr3287-3.3/mkversion.sh b/pr3287-3.3/mkversion.sh +index bcbd6bd..f5045bd 100755 +--- a/pr3287-3.3/mkversion.sh ++++ b/pr3287-3.3/mkversion.sh +@@ -47,4 +47,4 @@ const char *app_defaults_version = "$adversion"; + static const char sccsid[] = "@(#)${2-x3270} v$version $sccsdate $user"; + EOF + +-${1-cc} -c version.c ++${1-cc} ${CFLAGS} -c version.c +diff --git a/s3270-3.3/mkversion.sh b/s3270-3.3/mkversion.sh +index e9093e0..bc3c0c9 100755 +--- a/s3270-3.3/mkversion.sh ++++ b/s3270-3.3/mkversion.sh +@@ -59,4 +59,4 @@ const char *build_rpq_timestamp = "$rpq_timestamp"; + const char *build_rpq_version = "$version"; + EOF + +-${1-cc} -c version.c ++${1-cc} ${CFLAGS} -c version.c +diff --git a/tcl3270-3.3/mkversion.sh b/tcl3270-3.3/mkversion.sh +index e9093e0..bc3c0c9 100755 +--- a/tcl3270-3.3/mkversion.sh ++++ b/tcl3270-3.3/mkversion.sh +@@ -59,4 +59,4 @@ const char *build_rpq_timestamp = "$rpq_timestamp"; + const char *build_rpq_version = "$version"; + EOF + +-${1-cc} -c version.c ++${1-cc} ${CFLAGS} -c version.c +diff --git a/wc3270-3.3/mkversion.sh b/wc3270-3.3/mkversion.sh +index e9093e0..bc3c0c9 100755 +--- a/wc3270-3.3/mkversion.sh ++++ b/wc3270-3.3/mkversion.sh +@@ -59,4 +59,4 @@ const char *build_rpq_timestamp = "$rpq_timestamp"; + const char *build_rpq_version = "$version"; + EOF + +-${1-cc} -c version.c ++${1-cc} ${CFLAGS} -c version.c +diff --git a/wpr3287-3.3/mkversion.sh b/wpr3287-3.3/mkversion.sh +index bcbd6bd..f5045bd 100755 +--- a/wpr3287-3.3/mkversion.sh ++++ b/wpr3287-3.3/mkversion.sh +@@ -47,4 +47,4 @@ const char *app_defaults_version = "$adversion"; + static const char sccsid[] = "@(#)${2-x3270} v$version $sccsdate $user"; + EOF + +-${1-cc} -c version.c ++${1-cc} ${CFLAGS} -c version.c +diff --git a/ws3270-3.3/mkversion.sh b/ws3270-3.3/mkversion.sh +index e9093e0..bc3c0c9 100755 +--- a/ws3270-3.3/mkversion.sh ++++ b/ws3270-3.3/mkversion.sh +@@ -59,4 +59,4 @@ const char *build_rpq_timestamp = "$rpq_timestamp"; + const char *build_rpq_version = "$version"; + EOF + +-${1-cc} -c version.c ++${1-cc} ${CFLAGS} -c version.c +diff --git a/x3270-3.3/mkversion.sh b/x3270-3.3/mkversion.sh +index 31a9b41..e5eae74 100755 +--- a/x3270-3.3/mkversion.sh ++++ b/x3270-3.3/mkversion.sh +@@ -60,4 +60,4 @@ const char *build_rpq_timestamp = "$rpq_timestamp"; + const char *build_rpq_version = "$version"; + EOF + +-${1-cc} -c version.c ++${1-cc} ${CFLAGS} -c version.c +-- +1.7.3.2 + Copied: csw/mgar/pkg/x3270/trunk/files/c3270-3.3_ncurses.patch (from rev 10463, csw/mgar/pkg/x3270/tags/legacy/x3270-3.3.6/c3270-3.3_ncurses.patch) =================================================================== --- csw/mgar/pkg/x3270/trunk/files/c3270-3.3_ncurses.patch (rev 0) +++ csw/mgar/pkg/x3270/trunk/files/c3270-3.3_ncurses.patch 2011-01-04 15:50:16 UTC (rev 12176) @@ -0,0 +1,58 @@ +--- c3270-3.3/configure.in-orig Sat Jan 1 09:02:25 2005 ++++ c3270-3.3/configure.in Wed Oct 11 21:13:00 2006 +@@ -85,7 +85,7 @@ + AC_CHECK_HEADERS(libutil.h) + AC_CHECK_HEADERS(util.h) + AC_CHECK_HEADERS(getopt.h) +-AC_CHECK_HEADERS(ncurses.h, , [AC_CHECK_HEADERS(curses.h, , [AC_MSG_ERROR(Can't find ncurses.h or curses.h)])]) ++AC_CHECK_HEADERS(ncurses.h ncurses/ncurses.h, , [AC_CHECK_HEADERS(curses.h, , [AC_MSG_ERROR(Can't find ncurses.h or curses.h)])]) + + dnl Check for libncurses/ncurses.h inconsistency + if test $ac_cv_lib_ncurses_newterm != $ac_cv_header_ncurses_h +--- c3270-3.3/conf.h.in-orig Tue Dec 24 16:14:31 2002 ++++ c3270-3.3/conf.h.in Tue Oct 10 23:35:16 2006 +@@ -28,6 +28,7 @@ + #undef HAVE_LIBSSL + + /* Header files. */ ++#undef HAVE_NCURSES_NCURSES_H + #undef HAVE_NCURSES_H + #undef HAVE_CURSES_H + #undef HAVE_SYS_SELECT_H +--- c3270-3.3/configure-orig Sat Jan 1 09:02:45 2005 ++++ c3270-3.3/configure Tue Oct 10 23:24:18 2006 +@@ -3653,7 +3653,7 @@ + done + + +-for ac_header in ncurses.h ++for ac_header in ncurses/ncurses.h + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` + if eval "test \"\${$as_ac_Header+set}\" = set"; then +--- c3270-3.3/keymap.c-orig Thu Apr 10 10:24:01 2003 ++++ c3270-3.3/keymap.c Tue Oct 10 23:29:24 2006 +@@ -40,7 +40,9 @@ + #undef COLOR_YELLOW + #undef COLOR_BLUE + #undef COLOR_WHITE +-#if defined(HAVE_NCURSES_H) /*[*/ ++#if defined(HAVE_NCURSES_NCURSES_H) ++#include ++#elif defined(HAVE_NCURSES_H) /*[*/ + #include + #else /*][*/ + #include +--- c3270-3.3/screen.c-orig Mon Apr 4 14:34:58 2005 ++++ c3270-3.3/screen.c Tue Oct 10 23:29:30 2006 +@@ -46,7 +46,9 @@ + #undef COLOR_YELLOW + #undef COLOR_BLUE + #undef COLOR_WHITE +-#if defined(HAVE_NCURSES_H) /*[*/ ++#if defined(HAVE_NCURSES_NCURSES_H) ++#include ++#elif defined(HAVE_NCURSES_H) /*[*/ + #include + #else /*][*/ + #include Deleted: csw/mgar/pkg/x3270/trunk/files/ibm-1027_P100-1995.cnv =================================================================== (Binary files differ) Deleted: csw/mgar/pkg/x3270/trunk/files/ibm-1385_P100-1997.cnv =================================================================== (Binary files differ) Deleted: csw/mgar/pkg/x3270/trunk/files/ibm-1388_P103-2001.cnv =================================================================== (Binary files differ) Deleted: csw/mgar/pkg/x3270/trunk/files/ibm-300_P110-1997.cnv =================================================================== (Binary files differ) Deleted: csw/mgar/pkg/x3270/trunk/files/ibm-837_P100-2000.cnv =================================================================== (Binary files differ) Copied: csw/mgar/pkg/x3270/trunk/files/x3270-3.3.6_DBCS.patch (from rev 10463, csw/mgar/pkg/x3270/tags/legacy/x3270-3.3.6/x3270-3.3.6_DBCS.patch) =================================================================== --- csw/mgar/pkg/x3270/trunk/files/x3270-3.3.6_DBCS.patch (rev 0) +++ csw/mgar/pkg/x3270/trunk/files/x3270-3.3.6_DBCS.patch 2011-01-04 15:50:16 UTC (rev 12176) @@ -0,0 +1,156 @@ +--- c3270-3.3/configure-orig Sat Aug 4 21:01:30 2007 ++++ c3270-3.3/configure Sat Aug 4 22:12:23 2007 +@@ -5524,14 +5524,14 @@ + then LDFLAGS="$orig_LDFLAGS -L$dir/lib" + fi + +-as_ac_Lib=`echo "ac_cv_lib_icui18n_ucnv_open${icu_suffix}" | $as_tr_sh` +-echo "$as_me:$LINENO: checking for ucnv_open${icu_suffix} in -licui18n" >&5 +-echo $ECHO_N "checking for ucnv_open${icu_suffix} in -licui18n... $ECHO_C" >&6 ++as_ac_Lib=`echo "ac_cv_lib_icuuc_ucnv_open${icu_suffix}" | $as_tr_sh` ++echo "$as_me:$LINENO: checking for ucnv_open${icu_suffix} in -licuuc" >&5 ++echo $ECHO_N "checking for ucnv_open${icu_suffix} in -licuuc... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Lib+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-licui18n $LIBS" ++LIBS="-licuuc $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -5594,7 +5594,7 @@ + #define HAVE_LIBICUI18N 1 + _ACEOF + +- LIBS="-licui18n $LIBS" ++ LIBS="-licuuc $LIBS" + + else + lib_fail=1 +@@ -5603,7 +5603,7 @@ + if test "$lib_fail" -eq 0 + then break + fi +- unset `echo ac_cv_lib_icui18n_ucnv_open${icu_suffix} | $as_tr_sh` ++ unset `echo ac_cv_lib_icuuc_ucnv_open${icu_suffix} | $as_tr_sh` + LDFLAGS="$orig_LDFLAGS" + any=1 + done +--- pr3287-3.3/configure-orig Sat Jun 23 13:05:46 2007 ++++ pr3287-3.3/configure Sat Aug 4 22:12:27 2007 +@@ -3675,14 +3675,14 @@ + then LDFLAGS="$orig_LDFLAGS -L$dir/lib" + fi + +-as_ac_Lib=`echo "ac_cv_lib_icui18n_ucnv_open${icu_suffix}" | $as_tr_sh` +-echo "$as_me:$LINENO: checking for ucnv_open${icu_suffix} in -licui18n" >&5 +-echo $ECHO_N "checking for ucnv_open${icu_suffix} in -licui18n... $ECHO_C" >&6 ++as_ac_Lib=`echo "ac_cv_lib_icuuc_ucnv_open${icu_suffix}" | $as_tr_sh` ++echo "$as_me:$LINENO: checking for ucnv_open${icu_suffix} in -licuuc" >&5 ++echo $ECHO_N "checking for ucnv_open${icu_suffix} in -licuuc... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Lib+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-licui18n $LIBS" ++LIBS="-licuuc $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -3745,7 +3745,7 @@ + #define HAVE_LIBICUI18N 1 + _ACEOF + +- LIBS="-licui18n $LIBS" ++ LIBS="-licuuc $LIBS" + + else + lib_fail=1 +@@ -3754,7 +3754,7 @@ + if test "$lib_fail" -eq 0 + then break + fi +- unset `echo ac_cv_lib_icui18n_ucnv_open${icu_suffix} | $as_tr_sh` ++ unset `echo ac_cv_lib_icuuc_ucnv_open${icu_suffix} | $as_tr_sh` + LDFLAGS="$orig_LDFLAGS" + any=1 + done +--- s3270-3.3/configure-orig Mon Jun 18 08:29:58 2007 ++++ s3270-3.3/configure Sat Aug 4 22:12:31 2007 +@@ -4793,14 +4793,14 @@ + then LDFLAGS="$orig_LDFLAGS -L$dir/lib" + fi + +-as_ac_Lib=`echo "ac_cv_lib_icui18n_ucnv_open${icu_suffix}" | $as_tr_sh` +-echo "$as_me:$LINENO: checking for ucnv_open${icu_suffix} in -licui18n" >&5 +-echo $ECHO_N "checking for ucnv_open${icu_suffix} in -licui18n... $ECHO_C" >&6 ++as_ac_Lib=`echo "ac_cv_lib_icuuc_ucnv_open${icu_suffix}" | $as_tr_sh` ++echo "$as_me:$LINENO: checking for ucnv_open${icu_suffix} in -licuuc" >&5 ++echo $ECHO_N "checking for ucnv_open${icu_suffix} in -licuuc... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Lib+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-licui18n $LIBS" ++LIBS="-licuuc $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -4863,7 +4863,7 @@ + #define HAVE_LIBICUI18N 1 + _ACEOF + +- LIBS="-licui18n $LIBS" ++ LIBS="-licuuc $LIBS" + + else + lib_fail=1 +@@ -4872,7 +4872,7 @@ + if test "$lib_fail" -eq 0 + then break + fi +- unset `echo ac_cv_lib_icui18n_ucnv_open${icu_suffix} | $as_tr_sh` ++ unset `echo ac_cv_lib_icuuc_ucnv_open${icu_suffix} | $as_tr_sh` + LDFLAGS="$orig_LDFLAGS" + any=1 + done +--- tcl3270-3.3/configure-orig Mon Jun 18 08:21:23 2007 ++++ tcl3270-3.3/configure Sat Aug 4 22:12:37 2007 +@@ -5327,14 +5327,14 @@ + then LDFLAGS="$orig_LDFLAGS -L$dir/lib" + fi + +-as_ac_Lib=`echo "ac_cv_lib_icui18n_ucnv_open${icu_suffix}" | $as_tr_sh` +-echo "$as_me:$LINENO: checking for ucnv_open${icu_suffix} in -licui18n" >&5 +-echo $ECHO_N "checking for ucnv_open${icu_suffix} in -licui18n... $ECHO_C" >&6 ++as_ac_Lib=`echo "ac_cv_lib_icuuc_ucnv_open${icu_suffix}" | $as_tr_sh` ++echo "$as_me:$LINENO: checking for ucnv_open${icu_suffix} in -licuuc" >&5 ++echo $ECHO_N "checking for ucnv_open${icu_suffix} in -licuuc... $ECHO_C" >&6 + if eval "test \"\${$as_ac_Lib+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-licui18n $LIBS" ++LIBS="-licuuc $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -5397,7 +5397,7 @@ + #define HAVE_LIBICUI18N 1 + _ACEOF + +- LIBS="-licui18n $LIBS" ++ LIBS="-licuuc $LIBS" + + else + lib_fail=1 +@@ -5406,7 +5406,7 @@ + if test "$lib_fail" -eq 0 + then break + fi +- unset `echo ac_cv_lib_icui18n_ucnv_open${icu_suffix} | $as_tr_sh` ++ unset `echo ac_cv_lib_icuuc_ucnv_open${icu_suffix} | $as_tr_sh` + LDFLAGS="$orig_LDFLAGS" + any=1 + done This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Jan 4 17:25:56 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 04 Jan 2011 16:25:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[12177] csw/mgar/pkg Message-ID: Revision: 12177 http://gar.svn.sourceforge.net/gar/?rev=12177&view=rev Author: dmichelsen Date: 2011-01-04 16:25:56 +0000 (Tue, 04 Jan 2011) Log Message: ----------- x026: Initial commit Added Paths: ----------- csw/mgar/pkg/x026/ csw/mgar/pkg/x026/branches/ csw/mgar/pkg/x026/tags/ csw/mgar/pkg/x026/trunk/ csw/mgar/pkg/x026/trunk/Makefile csw/mgar/pkg/x026/trunk/checksums csw/mgar/pkg/x026/trunk/files/ csw/mgar/pkg/x026/trunk/files/COPYING Property changes on: csw/mgar/pkg/x026/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/x026/trunk/Makefile =================================================================== --- csw/mgar/pkg/x026/trunk/Makefile (rev 0) +++ csw/mgar/pkg/x026/trunk/Makefile 2011-01-04 16:25:56 UTC (rev 12177) @@ -0,0 +1,32 @@ +# $Id$ +NAME = x026 +VERSION = 1.2 +CATEGORIES = apps + +DESCRIPTION = IBM 026 Keypunch Emulator for X11 +define BLURB +endef + +SF_PROJ = x3270 +MASTER_SITES = $(SF_MIRROR) +DISTFILES = $(DISTNAME).tgz +DISTFILES += COPYING + +# File name regex to get notifications about upstream software releases +UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tgz + +DEP_PKGS = CSWxpm + +CONFIGURE_SCRIPTS = $(WORKSRC)/Imakefile + +BUILD_OVERRIDE_VARS = XPMLIB +BUILD_OVERRIDE_VAR_XPMLIB = -L$(libdir) -R$(libdir) -lXpm + +TEST_SCRIPTS = + +INSTALL_ARGS = install install.man +INSTALL_OVERRIDE_VARS = BINDIR MANPATH +INSTALL_OVERRIDE_VAR_BINDIR = $(bindir) +INSTALL_OVERRIDE_VAR_MANPATH = $(mandir) + +include gar/category.mk Property changes on: csw/mgar/pkg/x026/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/x026/trunk/checksums =================================================================== --- csw/mgar/pkg/x026/trunk/checksums (rev 0) +++ csw/mgar/pkg/x026/trunk/checksums 2011-01-04 16:25:56 UTC (rev 12177) @@ -0,0 +1 @@ +00fb68f2f663ac05cacb3fddafdaae5e x026-1.2.tgz Added: csw/mgar/pkg/x026/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/x026/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/x026/trunk/files/COPYING 2011-01-04 16:25:56 UTC (rev 12177) @@ -0,0 +1,11 @@ +/* + * Copyright 1993, 1995, 2002, 2003 Paul Mattes. All Rights Reserved. + * Permission to use, copy, modify, and distribute this software and its + * documentation for any purpose and without fee is hereby granted, + * provided that the above copyright notice appear in all copies and that + * both that copyright notice and this permission notice appear in + * supporting documentation. + * + * x026 -- A Keypunch Simluator + */ + 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 Jan 4 17:29:10 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 04 Jan 2011 16:29:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[12178] csw/mgar/pkg/x3270/trunk Message-ID: Revision: 12178 http://gar.svn.sourceforge.net/gar/?rev=12178&view=rev Author: dmichelsen Date: 2011-01-04 16:29:10 +0000 (Tue, 04 Jan 2011) Log Message: ----------- x3270: Remove unneeded stuff from older builds Modified Paths: -------------- csw/mgar/pkg/x3270/trunk/Makefile Removed Paths: ------------- csw/mgar/pkg/x3270/trunk/files/0001-Add-Error-function.patch csw/mgar/pkg/x3270/trunk/files/COPYING csw/mgar/pkg/x3270/trunk/files/c3270-3.3_ncurses.patch csw/mgar/pkg/x3270/trunk/files/x3270-3.3.6_DBCS.patch Modified: csw/mgar/pkg/x3270/trunk/Makefile =================================================================== --- csw/mgar/pkg/x3270/trunk/Makefile 2011-01-04 16:25:56 UTC (rev 12177) +++ csw/mgar/pkg/x3270/trunk/Makefile 2011-01-04 16:29:10 UTC (rev 12178) @@ -9,9 +9,9 @@ MASTER_SITES = $(SF_MIRROR) DISTFILES = suite3270-$(VERSION)-src.tgz -DISTFILES += COPYING -PATCHFILES = 0001-Add-Error-function.patch +# Add patch until this bug is resolved: +# 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 @@ -29,6 +29,8 @@ # SUBSYSTEMS = c3270 pr3287 s3270 tcl3270 wc3270 wpr3287 ws3270 x3270 SUBSYSTEMS = c3270 pr3287 s3270 tcl3270 x3270 +LICENSE = c3270-$(BASEREL)/LICENSE + DEP_PKGS = CSWiconv CSWtcl CSWreadline CSWosslrt CSWncurses EXTRA_LINKER_FLAGS = -liconv @@ -39,7 +41,7 @@ sysconfdir = /etc/opt/csw CONFIGURE_ARGS-tcl3270 = --with-tcl=8.4 -CONFIGURE_ARGS-x3270 = --without-pr3287 --with-fontdir=$(sharedstatedir)/x3270 +CONFIGURE_ARGS-x3270 = --with-fontdir=$(sharedstatedir)/x3270 CONFIGURE_ARGS = $(DIRPATHS) BUILD_SCRIPTS = $(foreach S,$(SUBSYSTEMS),$(WORKDIR)/$S-$(BASEREL)/Makefile) @@ -52,19 +54,9 @@ INSTALL_OVERRIDE_VAR_MANPATH = $(mandir) INSTALL_OVERRIDE_VAR_BINDIR = $(bindir) -# EXTRA_PAX_ARGS = -s ",\./usr/openwin/bin/,.$(bindir)/,p" - MIGRATE_FILES = x3270/ibm_hosts PRESERVECONF = $(addprefix $(sysconfdir)/,$(MIGRATE_FILES)) -#MANPAGES = s3270-$(BASEREL)/s3270 -#MANPAGES += c3270-$(BASEREL)/c3270 -#MANPAGES += tcl3270-$(BASEREL)/tcl3270 -#MANPAGES += pr3287-$(BASEREL)/pr3287 -#MANPAGES += x3270-$(BASEREL)/x3270 -#MANPAGES += x3270-$(BASEREL)/x3270if -#MANPAGES += x3270-$(BASEREL)/x3270-script - include gar/category.mk configure-x3270-%: @@ -75,10 +67,5 @@ post-install-modulated: ginstall -d $(DESTDIR)$(libdir)/x3270 ginstall $(WORKSRC)/x3270-$(BASEREL)/x3270_glue.expect $(DESTDIR)$(libdir)/x3270/x3270_glue.expect - #ginstall -d $(DESTDIR)$(mandir)/man1 - #$(foreach M,$(MANPAGES),ginstall $(WORKSRC)/$(M).man $(DESTDIR)$(mandir)/man1/$(notdir $M).1;) - ginstall -d $(DESTDIR)$(mandir)/man5 - ginstall $(WORKSRC)/x3270-$(BASEREL)/ibm_hosts.man $(DESTDIR)$(mandir)/man5/ibm_hosts.5 $(foreach S,$(SUBSYSTEMS),ginstall -d $(DESTDIR)$(docdir)/x3270/$S; cp -rp $(WORKSRC)/$S-$(BASEREL)/README $(WORKSRC)/$S-$(BASEREL)/html $(DESTDIR)$(docdir)/x3270/$S;) - #$(foreach C,$(CONVERSIONS),ginstall $(WORKDIR)/$C $(DESTDIR)$(sysconfdir)/x3270/$C;) - @$(MAKECOOKIE) + #@$(MAKECOOKIE) Deleted: csw/mgar/pkg/x3270/trunk/files/0001-Add-Error-function.patch =================================================================== --- csw/mgar/pkg/x3270/trunk/files/0001-Add-Error-function.patch 2011-01-04 16:25:56 UTC (rev 12177) +++ csw/mgar/pkg/x3270/trunk/files/0001-Add-Error-function.patch 2011-01-04 16:29:10 UTC (rev 12178) @@ -1,29 +0,0 @@ -From f17056fb38d8ad44449269999c7c272557f24960 Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Thu, 24 Jun 2010 11:06:55 +0200 -Subject: [PATCH] Add Error function - ---- - pr3287-3.3/pr3287.c | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -diff --git a/pr3287-3.3/pr3287.c b/pr3287-3.3/pr3287.c -index 9f759c6..e749845 100644 ---- a/pr3287-3.3/pr3287.c -+++ b/pr3287-3.3/pr3287.c -@@ -309,6 +309,12 @@ NewString(const char *s) - } - - void -+Warning(const char *msg) -+{ -+ errmsg(msg); -+} -+ -+void - Error(const char *msg) - { - errmsg(msg); --- -1.7.1 - Deleted: csw/mgar/pkg/x3270/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/x3270/trunk/files/COPYING 2011-01-04 16:25:56 UTC (rev 12177) +++ csw/mgar/pkg/x3270/trunk/files/COPYING 2011-01-04 16:29:10 UTC (rev 12178) @@ -1,83 +0,0 @@ -Licensing Information -+++++++++++++++++++++ - -Here is the official copyright notice for -x3270 , c3270 , wc3270 , s3270 , tcl3270 and pr3287 - -It is a standard 3-element BSD license. -Copyright \xA9 1993-2009, Paul Mattes. Copyright \xA9 2004-2005, Don Russell. -Copyright \xA9 2004, Dick Altenbern. Copyright \xA9 1990, Jeff Sparkes. -Copyright \xA9 1989, Georgia Tech Research Corporation (GTRC), Atlanta, GA -30332. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in - the documentation and/or other materials provided with the - distribution. - * Neither the names of Paul Mattes, Don Russell, Dick Altenbern, - Jeff Sparkes, GTRC nor the names of their contributors may be used - to endorse or promote products derived from this software without - specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY PAUL MATTES, DON RUSSELL, DICK ALTENBERN, -JEFF SPARKES AND GTRC "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, -INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY -AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL -PAUL MATTES, DON RUSSELL, DICK ALTENBERN, JEFF SPARKES OR GTRC BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF -THE POSSIBILITY OF SUCH DAMAGE. - -The 3270-20 font is derived from an NCD font, so it carries an -additional notice (an MIT license): -Copyright \xA9 1989-1991 Network Computing Devices, Inc. NCD is a -registered trademark of Network Computing Devices, Inc. - -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, -provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in -supporting documentation, and that the name of NCD may not be used in -advertising or publicity pertaining to distribution of the software -without specific, written prior permission. NCD makes no representations -about the suitability of this software for any purpose. It is provided -``as is'' without express or implied warranty. - -NCD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL NCD -BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY -DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER -IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING -OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - -The ComplexMenu sources are derived from the MIT X11R5 Athena SimpleMenu -widget, and carry an additional notice (another MIT license): -Copyright \xA9 1989 Massachusetts Institute of Technology - -Permission to use, copy, modify, distribute, and sell this software and -its documentation for any purpose is hereby granted without fee, -provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in -supporting documentation, and that the name of M.I.T. not be used in -advertising or publicity pertaining to distribution of the software -without specific, written prior permission. M.I.T. makes no -representations about the suitability of this software for any purpose. -It is provided "as is" without express or implied warranty. - -M.I.T. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING -ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL -M.I.T. BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR -ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, -WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, -ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS -SOFTWARE. - Deleted: csw/mgar/pkg/x3270/trunk/files/c3270-3.3_ncurses.patch =================================================================== --- csw/mgar/pkg/x3270/trunk/files/c3270-3.3_ncurses.patch 2011-01-04 16:25:56 UTC (rev 12177) +++ csw/mgar/pkg/x3270/trunk/files/c3270-3.3_ncurses.patch 2011-01-04 16:29:10 UTC (rev 12178) @@ -1,58 +0,0 @@ ---- c3270-3.3/configure.in-orig Sat Jan 1 09:02:25 2005 -+++ c3270-3.3/configure.in Wed Oct 11 21:13:00 2006 -@@ -85,7 +85,7 @@ - AC_CHECK_HEADERS(libutil.h) - AC_CHECK_HEADERS(util.h) - AC_CHECK_HEADERS(getopt.h) --AC_CHECK_HEADERS(ncurses.h, , [AC_CHECK_HEADERS(curses.h, , [AC_MSG_ERROR(Can't find ncurses.h or curses.h)])]) -+AC_CHECK_HEADERS(ncurses.h ncurses/ncurses.h, , [AC_CHECK_HEADERS(curses.h, , [AC_MSG_ERROR(Can't find ncurses.h or curses.h)])]) - - dnl Check for libncurses/ncurses.h inconsistency - if test $ac_cv_lib_ncurses_newterm != $ac_cv_header_ncurses_h ---- c3270-3.3/conf.h.in-orig Tue Dec 24 16:14:31 2002 -+++ c3270-3.3/conf.h.in Tue Oct 10 23:35:16 2006 -@@ -28,6 +28,7 @@ - #undef HAVE_LIBSSL - - /* Header files. */ -+#undef HAVE_NCURSES_NCURSES_H - #undef HAVE_NCURSES_H - #undef HAVE_CURSES_H - #undef HAVE_SYS_SELECT_H ---- c3270-3.3/configure-orig Sat Jan 1 09:02:45 2005 -+++ c3270-3.3/configure Tue Oct 10 23:24:18 2006 -@@ -3653,7 +3653,7 @@ - done - - --for ac_header in ncurses.h -+for ac_header in ncurses/ncurses.h - do - as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` - if eval "test \"\${$as_ac_Header+set}\" = set"; then ---- c3270-3.3/keymap.c-orig Thu Apr 10 10:24:01 2003 -+++ c3270-3.3/keymap.c Tue Oct 10 23:29:24 2006 -@@ -40,7 +40,9 @@ - #undef COLOR_YELLOW - #undef COLOR_BLUE - #undef COLOR_WHITE --#if defined(HAVE_NCURSES_H) /*[*/ -+#if defined(HAVE_NCURSES_NCURSES_H) -+#include -+#elif defined(HAVE_NCURSES_H) /*[*/ - #include - #else /*][*/ - #include ---- c3270-3.3/screen.c-orig Mon Apr 4 14:34:58 2005 -+++ c3270-3.3/screen.c Tue Oct 10 23:29:30 2006 -@@ -46,7 +46,9 @@ - #undef COLOR_YELLOW - #undef COLOR_BLUE - #undef COLOR_WHITE --#if defined(HAVE_NCURSES_H) /*[*/ -+#if defined(HAVE_NCURSES_NCURSES_H) -+#include -+#elif defined(HAVE_NCURSES_H) /*[*/ - #include - #else /*][*/ - #include Deleted: csw/mgar/pkg/x3270/trunk/files/x3270-3.3.6_DBCS.patch =================================================================== --- csw/mgar/pkg/x3270/trunk/files/x3270-3.3.6_DBCS.patch 2011-01-04 16:25:56 UTC (rev 12177) +++ csw/mgar/pkg/x3270/trunk/files/x3270-3.3.6_DBCS.patch 2011-01-04 16:29:10 UTC (rev 12178) @@ -1,156 +0,0 @@ ---- c3270-3.3/configure-orig Sat Aug 4 21:01:30 2007 -+++ c3270-3.3/configure Sat Aug 4 22:12:23 2007 -@@ -5524,14 +5524,14 @@ - then LDFLAGS="$orig_LDFLAGS -L$dir/lib" - fi - --as_ac_Lib=`echo "ac_cv_lib_icui18n_ucnv_open${icu_suffix}" | $as_tr_sh` --echo "$as_me:$LINENO: checking for ucnv_open${icu_suffix} in -licui18n" >&5 --echo $ECHO_N "checking for ucnv_open${icu_suffix} in -licui18n... $ECHO_C" >&6 -+as_ac_Lib=`echo "ac_cv_lib_icuuc_ucnv_open${icu_suffix}" | $as_tr_sh` -+echo "$as_me:$LINENO: checking for ucnv_open${icu_suffix} in -licuuc" >&5 -+echo $ECHO_N "checking for ucnv_open${icu_suffix} in -licuuc... $ECHO_C" >&6 - if eval "test \"\${$as_ac_Lib+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-licui18n $LIBS" -+LIBS="-licuuc $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -5594,7 +5594,7 @@ - #define HAVE_LIBICUI18N 1 - _ACEOF - -- LIBS="-licui18n $LIBS" -+ LIBS="-licuuc $LIBS" - - else - lib_fail=1 -@@ -5603,7 +5603,7 @@ - if test "$lib_fail" -eq 0 - then break - fi -- unset `echo ac_cv_lib_icui18n_ucnv_open${icu_suffix} | $as_tr_sh` -+ unset `echo ac_cv_lib_icuuc_ucnv_open${icu_suffix} | $as_tr_sh` - LDFLAGS="$orig_LDFLAGS" - any=1 - done ---- pr3287-3.3/configure-orig Sat Jun 23 13:05:46 2007 -+++ pr3287-3.3/configure Sat Aug 4 22:12:27 2007 -@@ -3675,14 +3675,14 @@ - then LDFLAGS="$orig_LDFLAGS -L$dir/lib" - fi - --as_ac_Lib=`echo "ac_cv_lib_icui18n_ucnv_open${icu_suffix}" | $as_tr_sh` --echo "$as_me:$LINENO: checking for ucnv_open${icu_suffix} in -licui18n" >&5 --echo $ECHO_N "checking for ucnv_open${icu_suffix} in -licui18n... $ECHO_C" >&6 -+as_ac_Lib=`echo "ac_cv_lib_icuuc_ucnv_open${icu_suffix}" | $as_tr_sh` -+echo "$as_me:$LINENO: checking for ucnv_open${icu_suffix} in -licuuc" >&5 -+echo $ECHO_N "checking for ucnv_open${icu_suffix} in -licuuc... $ECHO_C" >&6 - if eval "test \"\${$as_ac_Lib+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-licui18n $LIBS" -+LIBS="-licuuc $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -3745,7 +3745,7 @@ - #define HAVE_LIBICUI18N 1 - _ACEOF - -- LIBS="-licui18n $LIBS" -+ LIBS="-licuuc $LIBS" - - else - lib_fail=1 -@@ -3754,7 +3754,7 @@ - if test "$lib_fail" -eq 0 - then break - fi -- unset `echo ac_cv_lib_icui18n_ucnv_open${icu_suffix} | $as_tr_sh` -+ unset `echo ac_cv_lib_icuuc_ucnv_open${icu_suffix} | $as_tr_sh` - LDFLAGS="$orig_LDFLAGS" - any=1 - done ---- s3270-3.3/configure-orig Mon Jun 18 08:29:58 2007 -+++ s3270-3.3/configure Sat Aug 4 22:12:31 2007 -@@ -4793,14 +4793,14 @@ - then LDFLAGS="$orig_LDFLAGS -L$dir/lib" - fi - --as_ac_Lib=`echo "ac_cv_lib_icui18n_ucnv_open${icu_suffix}" | $as_tr_sh` --echo "$as_me:$LINENO: checking for ucnv_open${icu_suffix} in -licui18n" >&5 --echo $ECHO_N "checking for ucnv_open${icu_suffix} in -licui18n... $ECHO_C" >&6 -+as_ac_Lib=`echo "ac_cv_lib_icuuc_ucnv_open${icu_suffix}" | $as_tr_sh` -+echo "$as_me:$LINENO: checking for ucnv_open${icu_suffix} in -licuuc" >&5 -+echo $ECHO_N "checking for ucnv_open${icu_suffix} in -licuuc... $ECHO_C" >&6 - if eval "test \"\${$as_ac_Lib+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-licui18n $LIBS" -+LIBS="-licuuc $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -4863,7 +4863,7 @@ - #define HAVE_LIBICUI18N 1 - _ACEOF - -- LIBS="-licui18n $LIBS" -+ LIBS="-licuuc $LIBS" - - else - lib_fail=1 -@@ -4872,7 +4872,7 @@ - if test "$lib_fail" -eq 0 - then break - fi -- unset `echo ac_cv_lib_icui18n_ucnv_open${icu_suffix} | $as_tr_sh` -+ unset `echo ac_cv_lib_icuuc_ucnv_open${icu_suffix} | $as_tr_sh` - LDFLAGS="$orig_LDFLAGS" - any=1 - done ---- tcl3270-3.3/configure-orig Mon Jun 18 08:21:23 2007 -+++ tcl3270-3.3/configure Sat Aug 4 22:12:37 2007 -@@ -5327,14 +5327,14 @@ - then LDFLAGS="$orig_LDFLAGS -L$dir/lib" - fi - --as_ac_Lib=`echo "ac_cv_lib_icui18n_ucnv_open${icu_suffix}" | $as_tr_sh` --echo "$as_me:$LINENO: checking for ucnv_open${icu_suffix} in -licui18n" >&5 --echo $ECHO_N "checking for ucnv_open${icu_suffix} in -licui18n... $ECHO_C" >&6 -+as_ac_Lib=`echo "ac_cv_lib_icuuc_ucnv_open${icu_suffix}" | $as_tr_sh` -+echo "$as_me:$LINENO: checking for ucnv_open${icu_suffix} in -licuuc" >&5 -+echo $ECHO_N "checking for ucnv_open${icu_suffix} in -licuuc... $ECHO_C" >&6 - if eval "test \"\${$as_ac_Lib+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-licui18n $LIBS" -+LIBS="-licuuc $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -5397,7 +5397,7 @@ - #define HAVE_LIBICUI18N 1 - _ACEOF - -- LIBS="-licui18n $LIBS" -+ LIBS="-licuuc $LIBS" - - else - lib_fail=1 -@@ -5406,7 +5406,7 @@ - if test "$lib_fail" -eq 0 - then break - fi -- unset `echo ac_cv_lib_icui18n_ucnv_open${icu_suffix} | $as_tr_sh` -+ unset `echo ac_cv_lib_icuuc_ucnv_open${icu_suffix} | $as_tr_sh` - LDFLAGS="$orig_LDFLAGS" - any=1 - done This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Jan 4 21:13:00 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 04 Jan 2011 20:13:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[12179] csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/ cswmysql5 Message-ID: Revision: 12179 http://gar.svn.sourceforge.net/gar/?rev=12179&view=rev Author: wahwah Date: 2011-01-04 20:13:00 +0000 (Tue, 04 Jan 2011) Log Message: ----------- mysql-5.0.x: Bugfixes #0004646 and #0004653 #0004646: If /etc/opt/csw/mysql5/my.cnf is present, ignore /opt/csw/mysql5/my.cnf #0004653: Pass current zone name to pgrep and pkill if /bin/zonename is present Modified Paths: -------------- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5 Modified: csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5 =================================================================== --- csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5 2011-01-04 16:29:10 UTC (rev 12178) +++ csw/mgar/pkg/mysql5/branches/mysql-5.0.x/files/cswmysql5 2011-01-04 20:13:00 UTC (rev 12179) @@ -16,11 +16,12 @@ # RETVAL=0 -BASEDIR="/opt/csw/mysql5" -MYSQL_HOME="/var${BASEDIR}" -sysconfdir="/etc${BASEDIR}" -MYSQLD_DATADIR=$MYSQL_HOME -MYSQLD_PID_FILE=$MYSQL_HOME/mysql.pid +prefix="/opt/csw/mysql5" +BASEDIR="${prefix}" +MYSQL_VAR="/var${prefix}" +sysconfdir="/etc${prefix}" +MYSQLD_DATADIR=$MYSQL_VAR +MYSQLD_PID_FILE=$MYSQL_VAR/mysql.pid CONFFILE=${sysconfdir}/my.cnf # @@ -28,6 +29,11 @@ [ -r /opt/csw/mysql5/etc/mysql5rc ] && . /opt/csw/mysql5/etc/mysql5rc [ -r /etc/opt/csw/mysql5rc ] && . /etc/opt/csw/mysql5rc +if [ -r "${sysconfdir}/my.cnf" ]; then + MYSQL_HOME="${MYSQL_VAR}" +elif [ -r "${BASEDIR}/my.cnf" ]; then + MYSQL_HOME="${BASEDIR}" +fi export MYSQL_HOME # To get started quickly, copy a sample configuration file from @@ -149,7 +155,7 @@ printf "%-60s" "Shutting down mysqld: " if test -f "$MYSQLD_PID_FILE" ; then - pkill mysqld_safe >/dev/null 2>&1 + pkill `pgrep_opts` mysqld_safe >/dev/null 2>&1 kill `cat $MYSQLD_PID_FILE` >/dev/null 2>&1 RETVAL=$? else @@ -164,6 +170,13 @@ return 0 } +pgrep_opts() { + if [ -x /bin/zonename ] + then + echo "-z `/bin/zonename`" + fi +} + case $1 in start) start_it @@ -175,13 +188,7 @@ restart) stop_it - if [ -x /bin/zonename ] - then - pgrep_opts="-z `/bin/zonename`" - else - pgrep_opts="" - fi - while pgrep ${pgrep_opts} mysqld > /dev/null + while pgrep `pgrep_opts` mysqld > /dev/null do sleep 1 done This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Wed Jan 5 01:06:35 2011 From: maciej at opencsw.org (Maciej (Matchek) Blizinski) Date: Wed, 5 Jan 2011 00:06:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[12171] csw/mgar/pkg/libicu/branches/libicu42/Makefile In-Reply-To: References: Message-ID: No dia 4 de Janeiro de 2011 12:59, escreveu: > +# The collisions will be there until CSWlibicu has also been updated. > +# This will happen at the same time as the CSWlibicu42 release. > +CHECKPKG_OVERRIDES_CSWlibicu42 += file-collision You can build an empty CSWlibicu package in this build description instead of overriding this error. From dam at opencsw.org Wed Jan 5 10:57:36 2011 From: dam at opencsw.org (Dagobert Michelsen) Date: Wed, 5 Jan 2011 10:57:36 +0100 Subject: [csw-devel] SF.net SVN: gar:[12171] csw/mgar/pkg/libicu/branches/libicu42/Makefile In-Reply-To: References: Message-ID: Hi Maciej, Am 05.01.2011 um 01:06 schrieb Maciej (Matchek) Blizinski: > No dia 4 de Janeiro de 2011 12:59, escreveu: >> +# The collisions will be there until CSWlibicu has also been updated. >> +# This will happen at the same time as the CSWlibicu42 release. >> +CHECKPKG_OVERRIDES_CSWlibicu42 += file-collision > > You can build an empty CSWlibicu package in this build description > instead of overriding this error. I already build an empty CSWlibicu in the 4.6 description and I would prefer to not build the same package from different recipes at the same time. BUt thanks for the hint! Best regards -- Dago From dmichelsen at users.sourceforge.net Wed Jan 5 11:09:29 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 05 Jan 2011 10:09:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[12180] csw/mgar/pkg/libarchive/trunk/Makefile Message-ID: Revision: 12180 http://gar.svn.sourceforge.net/gar/?rev=12180&view=rev Author: dmichelsen Date: 2011-01-05 10:09:28 +0000 (Wed, 05 Jan 2011) Log Message: ----------- libarchive: Move binaries to libarchive_utils Modified Paths: -------------- csw/mgar/pkg/libarchive/trunk/Makefile Modified: csw/mgar/pkg/libarchive/trunk/Makefile =================================================================== --- csw/mgar/pkg/libarchive/trunk/Makefile 2011-01-04 20:13:00 UTC (rev 12179) +++ csw/mgar/pkg/libarchive/trunk/Makefile 2011-01-05 10:09:28 UTC (rev 12180) @@ -31,16 +31,17 @@ SPKG_DESC_CSWlibarchive-devel = Development files for libarchive RUNTIME_DEP_PKGS_CSWlibarchive-devel = CSWlibarchive2 PKGFILES_CSWlibarchive-devel = $(PKGFILES_DEVEL) +PKGFILES_CSWlibarchive-devel += $(mandir)/man5/.* -PACKAGES += CSWlibarchive -CATALOGNAME_CSWlibarchive = libarchive -SPKG_DESC_CSWlibarchive = $(DESCRIPTION) -RUNTIME_DEP_PKGS_CSWlibarchive += CSWiconv -RUNTIME_DEP_PKGS_CSWlibarchive += CSWxz -RUNTIME_DEP_PKGS_CSWlibarchive += CSWzlib -RUNTIME_DEP_PKGS_CSWlibarchive += CSWlibxml2 -RUNTIME_DEP_PKGS_CSWlibarchive += CSWbzip2 -RUNTIME_DEP_PKGS_CSWlibarchive += CSWosslrt +PACKAGES += CSWlibarchive-utils +CATALOGNAME_CSWlibarchive-utils = libarchive_utils +SPKG_DESC_CSWlibarchive-utils = Tools for reading and writing various archive formats +RUNTIME_DEP_PKGS_CSWlibarchive-utils += CSWiconv +RUNTIME_DEP_PKGS_CSWlibarchive-utils += CSWxz +RUNTIME_DEP_PKGS_CSWlibarchive-utils += CSWzlib +RUNTIME_DEP_PKGS_CSWlibarchive-utils += CSWlibxml2 +RUNTIME_DEP_PKGS_CSWlibarchive-utils += CSWbzip2 +RUNTIME_DEP_PKGS_CSWlibarchive-utils += CSWosslrt BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS_CSWlibarchive42) BUILD_DEP_PKGS += CSWlibxml2devel CSWossldevel 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 Jan 5 11:15:37 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 05 Jan 2011 10:15:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[12181] csw/mgar/pkg/pcre/trunk/Makefile Message-ID: Revision: 12181 http://gar.svn.sourceforge.net/gar/?rev=12181&view=rev Author: dmichelsen Date: 2011-01-05 10:15:37 +0000 (Wed, 05 Jan 2011) Log Message: ----------- pcre: Remove superflous dependency to ncurses Modified Paths: -------------- csw/mgar/pkg/pcre/trunk/Makefile Modified: csw/mgar/pkg/pcre/trunk/Makefile =================================================================== --- csw/mgar/pkg/pcre/trunk/Makefile 2011-01-05 10:09:28 UTC (rev 12180) +++ csw/mgar/pkg/pcre/trunk/Makefile 2011-01-05 10:15:37 UTC (rev 12181) @@ -34,7 +34,6 @@ RUNTIME_DEP_PKGS_CSWpcre += CSWlibpcre0 RUNTIME_DEP_PKGS_CSWpcre += CSWbzip2 RUNTIME_DEP_PKGS_CSWpcre += CSWzlib -RUNTIME_DEP_PKGS_CSWpcre += CSWncurses RUNTIME_DEP_PKGS_CSWpcre += CSWlibpcreposix0 PACKAGES += CSWpcrert @@ -60,20 +59,17 @@ CATALOGNAME_CSWlibpcre0 = libpcre0 SPKG_DESC_CSWlibpcre0 = Perl-compatible regular expression tools, libpcre.so.0 PKGFILES_CSWlibpcre0 = $(call baseisadirs,$(libdir),libpcre\.so\.0(\.\d+)*) -RUNTIME_DEP_PKGS_CSWlibpcre0 += CSWncurses PACKAGES += CSWlibpcrecpp0 CATALOGNAME_CSWlibpcrecpp0 = libpcrecpp0 SPKG_DESC_CSWlibpcrecpp0 += Perl-compatible regular expression tools, libpcrecpp.so.0 PKGFILES_CSWlibpcrecpp0 += $(call baseisadirs,$(libdir),libpcrecpp\.so\.0(\.\d+)*) -RUNTIME_DEP_PKGS_CSWlibpcrecpp0 += CSWncurses RUNTIME_DEP_PKGS_CSWlibpcrecpp0 += CSWlibpcre0 PACKAGES += CSWlibpcreposix0 CATALOGNAME_CSWlibpcreposix0 = libpcreposix0 SPKG_DESC_CSWlibpcreposix0 += Perl-compatible regular expression tools, libpcreposix.so.0 PKGFILES_CSWlibpcreposix0 += $(call baseisadirs,$(libdir),libpcreposix\.so\.0(\.\d+)*) -RUNTIME_DEP_PKGS_CSWlibpcreposix0 += CSWncurses RUNTIME_DEP_PKGS_CSWlibpcreposix0 += CSWlibpcre0 BUILD64 = 1 @@ -85,8 +81,6 @@ CONFIGURE_ARGS += --enable-pcregrep-libbz2 CONFIGURE_ARGS += --enable-pcretest-libreadline -EXTRA_LINKER_FLAGS = -lncurses - TEST_TARGET = check MERGE_SCRIPTS_isa-extra = copy-relocated-only copy-config-only 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 Jan 5 13:34:31 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 05 Jan 2011 12:34:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[12182] csw/mgar/pkg/rbgems Message-ID: Revision: 12182 http://gar.svn.sourceforge.net/gar/?rev=12182&view=rev Author: dmichelsen Date: 2011-01-05 12:34:31 +0000 (Wed, 05 Jan 2011) Log Message: ----------- rbgems/fastercsv: Initial commit Added Paths: ----------- csw/mgar/pkg/rbgems/fastercsv/ csw/mgar/pkg/rbgems/fastercsv/branches/ csw/mgar/pkg/rbgems/fastercsv/tags/ csw/mgar/pkg/rbgems/fastercsv/trunk/ csw/mgar/pkg/rbgems/fastercsv/trunk/Makefile csw/mgar/pkg/rbgems/fastercsv/trunk/checksums csw/mgar/pkg/rbgems/fastercsv/trunk/files/ Property changes on: csw/mgar/pkg/rbgems/fastercsv/trunk ___________________________________________________________________ Added: svn:ignore + work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/rbgems/fastercsv/trunk/Makefile =================================================================== --- csw/mgar/pkg/rbgems/fastercsv/trunk/Makefile (rev 0) +++ csw/mgar/pkg/rbgems/fastercsv/trunk/Makefile 2011-01-05 12:34:31 UTC (rev 12182) @@ -0,0 +1,17 @@ +NAME = fastercsv +VERSION = 1.5.3 +CATEGORIES = rbgems + +DESCRIPTION = FasterCSV is CSV, but this is faster, smaller, and cleaner + +define BLURB + FasterCSV is intended as a complete replacement to the CSV standard + library. It is significantly faster and smaler while stil being pure + Ruby code. It also strives for a beter interface. +endef + +LICENSE = LICENSE + +ARCHALL = 1 + +include gar/category.mk Added: csw/mgar/pkg/rbgems/fastercsv/trunk/checksums =================================================================== --- csw/mgar/pkg/rbgems/fastercsv/trunk/checksums (rev 0) +++ csw/mgar/pkg/rbgems/fastercsv/trunk/checksums 2011-01-05 12:34:31 UTC (rev 12182) @@ -0,0 +1 @@ +ff702e1a645db8ac055bd1af8ce9143c fastercsv-1.5.3.gem This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Jan 5 14:09:09 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 05 Jan 2011 13:09:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[12183] csw/mgar/pkg/tin/trunk/Makefile Message-ID: Revision: 12183 http://gar.svn.sourceforge.net/gar/?rev=12183&view=rev Author: dmichelsen Date: 2011-01-05 13:09:09 +0000 (Wed, 05 Jan 2011) Log Message: ----------- tin: Relocate news location to /var/opt/csw Modified Paths: -------------- csw/mgar/pkg/tin/trunk/Makefile Modified: csw/mgar/pkg/tin/trunk/Makefile =================================================================== --- csw/mgar/pkg/tin/trunk/Makefile 2011-01-05 12:34:31 UTC (rev 12182) +++ csw/mgar/pkg/tin/trunk/Makefile 2011-01-05 13:09:09 UTC (rev 12183) @@ -16,18 +16,29 @@ UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz -RUNTIME_DEP_PKGS = CSWpcrert CSWggettextrt CSWperl CSWlibidn CSWlibicu46 CSWiconv -BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) CSWpcre CSWlibicu-devel +RUNTIME_DEP_PKGS_CSWtin += CSWpcrert +RUNTIME_DEP_PKGS_CSWtin += CSWggettextrt +RUNTIME_DEP_PKGS_CSWtin += CSWperl +RUNTIME_DEP_PKGS_CSWtin += CSWlibidn +RUNTIME_DEP_PKGS_CSWtin += CSWlibicu46 +RUNTIME_DEP_PKGS_CSWtin += CSWiconv +RUNTIME_DEP_PKGS_CSWtin += CSWncurses +RUNTIME_DEP_PKGS_CSWtin += CSWlibgsasl7 +BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) CSWpcre + VENDOR_URL = http://www.tin.org/ CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-coffee -CONFIGURE_ARGS += --enable-ipv6 --enable-curses +CONFIGURE_ARGS += --enable-ipv6 +CONFIGURE_ARGS += --with-screen=ncursesw --with-curses-dir=$(prefix) CONFIGURE_ARGS += --with-pcre=$(prefix) CONFIGURE_ARGS += --x-includes=/usr/openwin/include CONFIGURE_ARGS += --x-libraries=/usr/openwin/lib CONFIGURE_ARGS += --with-x --with-Xaw3d +CONFIGURE_ARGS += --with-libdir=$(libdir)/news +CONFIGURE_ARGS += --with-spooldir=/var/opt/csw/spool/news # tin requires to run 'make build' BUILD_ARGS = build 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 Jan 5 15:04:25 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 05 Jan 2011 14:04:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[12184] csw/mgar/pkg/gnuplot/trunk/Makefile Message-ID: Revision: 12184 http://gar.svn.sourceforge.net/gar/?rev=12184&view=rev Author: dmichelsen Date: 2011-01-05 14:04:25 +0000 (Wed, 05 Jan 2011) Log Message: ----------- gnuplot: Add alternatives Modified Paths: -------------- csw/mgar/pkg/gnuplot/trunk/Makefile Modified: csw/mgar/pkg/gnuplot/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnuplot/trunk/Makefile 2011-01-05 13:09:09 UTC (rev 12183) +++ csw/mgar/pkg/gnuplot/trunk/Makefile 2011-01-05 14:04:25 UTC (rev 12184) @@ -19,42 +19,94 @@ LICENSE = Copyright -RUNTIME_DEP_PKGS_CSWgnuplot += CSWwxwidgetscommon -RUNTIME_DEP_PKGS_CSWgnuplot += CSWlibatk -RUNTIME_DEP_PKGS_CSWgnuplot += CSWpango -RUNTIME_DEP_PKGS_CSWgnuplot += CSWggettextrt +PACKAGES += CSWgnuplot +CATALOGNAME_CSWgnuplot = gnuplot +SPKG_DESC_CSWgnuplot = $(DESCRIPTION) RUNTIME_DEP_PKGS_CSWgnuplot += CSWpng RUNTIME_DEP_PKGS_CSWgnuplot += CSWemacscommon RUNTIME_DEP_PKGS_CSWgnuplot += CSWfconfig -RUNTIME_DEP_PKGS_CSWgnuplot += CSWlibcairo RUNTIME_DEP_PKGS_CSWgnuplot += CSWiconv -RUNTIME_DEP_PKGS_CSWgnuplot += CSWwxwidgetsgtk2 RUNTIME_DEP_PKGS_CSWgnuplot += CSWreadline -RUNTIME_DEP_PKGS_CSWgnuplot += CSWgtk2 RUNTIME_DEP_PKGS_CSWgnuplot += CSWgd RUNTIME_DEP_PKGS_CSWgnuplot += CSWxpm RUNTIME_DEP_PKGS_CSWgnuplot += CSWncurses RUNTIME_DEP_PKGS_CSWgnuplot += CSWlua -RUNTIME_DEP_PKGS_CSWgnuplot += CSWsunmath RUNTIME_DEP_PKGS_CSWgnuplot += CSWftype2 -RUNTIME_DEP_PKGS_CSWgnuplot += CSWglib2 RUNTIME_DEP_PKGS_CSWgnuplot += CSWzlib RUNTIME_DEP_PKGS_CSWgnuplot += CSWjpeg -BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS_CSWgnuplot) +PACKAGES += CSWgnuplot-wx +CATALOGNAME_CSWgnuplot-wx = gnuplot_wx +SPKG_DESC_CSWgnuplot-wx = $(DESCRIPTION) (with WX-Widgets and Pango) +RUNTIME_DEP_PKGS_CSWgnuplot-wx = CSWgnuplot +RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWwxwidgetscommon +RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibatk +RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWpango +RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWggettextrt +RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWpng +RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWfconfig +RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlibcairo +RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWiconv +RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWwxwidgetsgtk2 +RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWreadline +RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWgtk2 +RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWgd +RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWxpm +RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWncurses +RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWlua +RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWsunmath +RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWftype2 +RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWglib2 +RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWzlib +RUNTIME_DEP_PKGS_CSWgnuplot-wx += CSWjpeg +BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS_CSWgnuplot-wx) + +EXTRA_MODULATORS = WXWIDGETS +MODULATIONS_WXWIDGETS = yes no + CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS_wxwidgets-no += --without-cairo +CONFIGURE_ARGS_wxwidgets-no += --disable-wxwidgets +CONFIGURE_ARGS += $(CONFIGURE_ARGS_wxwidgets-$(WXWIDGETS)) + # Preset value until this is fixed: # https://sourceforge.net/tracker/?func=detail&aid=3129839&group_id=2055&atid=102055 CONFIGURE_ARGS += ac_cv_type__Bool=no -#CONFIGURE_ARGS += --with-texdir= - # Make sure we don't run the interactive displays from demo/ EXTRA_TEST_EXPORTS = DISPLAY DISPLAY = TEST_TARGET = check +MERGE_SCRIPTS_isa-default-wxwidgets-yes = copy-all +MERGE_SCRIPTS_isa-default-wxwidgets-no = copy-all + +# These are exactly the differing files between the install-directories +ALTERNATIVE_FILES += /opt/csw/bin/gnuplot +ALTERNATIVE_FILES += /opt/csw/libexec/gnuplot/4.4/gnuplot_x11 +ALTERNATIVE_FILES += /opt/csw/share/emacs/site-lisp/gnuplot-gui.elc +ALTERNATIVE_FILES += /opt/csw/share/emacs/site-lisp/gnuplot.elc +ALTERNATIVE_FILES += /opt/csw/share/gnuplot/4.4/gnuplot.gih + +WXSUFFIX-yes = wx +WXSUFFIX-no = nowx + +EXTRA_PAX_ARGS = $(foreach A,$(ALTERNATIVE_FILES),-s ",^\.\($A\),\1-$(WXSUFFIX-$(WXWIDGETS)),p") + +ALTERNATIVES_CSWgnuplot = basic +ALTERNATIVES_CSWgnuplot-wx = wxwidgets +ALTERNATIVE_basic = $(firstword $(ALTERNATIVE_FILES)) gnuplot $(firstword $(ALTERNATIVE_FILES))-$(WXSUFFIX-no) 100 +ALTERNATIVE_basic += $(foreach A,$(wordlist 2,$(words $(ALTERNATIVE_FILES)),$(ALTERNATIVE_FILES)),$A $(notdir $A) $A-$(WXSUFFIX-no)) +ALTERNATIVE_wxwidgets = $(firstword $(ALTERNATIVE_FILES)) gnuplot $(firstword $(ALTERNATIVE_FILES))-$(WXSUFFIX-yes) 200 +ALTERNATIVE_wxwidgets += $(foreach A,$(wordlist 2,$(words $(ALTERNATIVE_FILES)),$(ALTERNATIVE_FILES)),$A $(notdir $A) $A-$(WXSUFFIX-yes)) + +PKGFILES_CSWgnuplot-wx = $(addsuffix -$(WXSUFFIX-yes),$(ALTERNATIVE_FILES)) + +# "Alternatives" are not properly checked yet +CHECKPKG_OVERRIDES_CSWgnuplot += surplus-dependency|CSWalternatives +CHECKPKG_OVERRIDES_CSWgnuplot-wx += surplus-dependency|CSWalternatives + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Jan 5 15:34:37 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 05 Jan 2011 14:34:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[12185] csw/mgar/gar/v2/categories/rbgems/category.mk Message-ID: Revision: 12185 http://gar.svn.sourceforge.net/gar/?rev=12185&view=rev Author: dmichelsen Date: 2011-01-05 14:34:37 +0000 (Wed, 05 Jan 2011) Log Message: ----------- mGAR v2: Use _ instead of - in Ruby packages Modified Paths: -------------- csw/mgar/gar/v2/categories/rbgems/category.mk Modified: csw/mgar/gar/v2/categories/rbgems/category.mk =================================================================== --- csw/mgar/gar/v2/categories/rbgems/category.mk 2011-01-05 14:04:25 UTC (rev 12184) +++ csw/mgar/gar/v2/categories/rbgems/category.mk 2011-01-05 14:34:37 UTC (rev 12185) @@ -10,7 +10,7 @@ DISTFILES += $(GEMFILE) GEMPKGNAME ?= $(GEMNAME) -GEMCATALOGNAME ?= $(GEMPKGNAME) +GEMCATALOGNAME ?= $(subst -,_,$(GEMPKGNAME)) # PACKAGES ?= CSWgem-$(GEMPKGNAME) CSWgem-$(GEMPKGNAME)-doc PACKAGES ?= CSWgem-$(GEMPKGNAME) 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 Jan 5 15:53:09 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 05 Jan 2011 14:53:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[12186] csw/mgar/pkg/zutils/trunk/Makefile Message-ID: Revision: 12186 http://gar.svn.sourceforge.net/gar/?rev=12186&view=rev Author: dmichelsen Date: 2011-01-05 14:53:09 +0000 (Wed, 05 Jan 2011) Log Message: ----------- zutils: Override false-positive collisions Modified Paths: -------------- csw/mgar/pkg/zutils/trunk/Makefile Modified: csw/mgar/pkg/zutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/zutils/trunk/Makefile 2011-01-05 14:34:37 UTC (rev 12185) +++ csw/mgar/pkg/zutils/trunk/Makefile 2011-01-05 14:53:09 UTC (rev 12186) @@ -44,6 +44,18 @@ EXTRA_PAX_ARGS = -s ",/z,/Z,p" +# These are false positives as lower case 'z' is in CSWgzipextras. +CHECKPKG_OVERRIDES_CSWzutils += file-collision|/opt/csw/bin/Zcmp|CSWgzipextras|CSWzutils +CHECKPKG_OVERRIDES_CSWzutils += file-collision|/opt/csw/share/man/man1/Zcat.1|CSWgzipextras|CSWzutils +CHECKPKG_OVERRIDES_CSWzutils += file-collision|/opt/csw/bin/Zcat|CSWgzipextras|CSWzutils +CHECKPKG_OVERRIDES_CSWzutils += file-collision|/opt/csw/share/man/man1/Zcmp.1|CSWgzipextras|CSWzutils +CHECKPKG_OVERRIDES_CSWzutils += file-collision|/opt/csw/bin/Zgrep|CSWgzipextras|CSWzutils +CHECKPKG_OVERRIDES_CSWzutils += file-collision|/opt/csw/bin/Zegrep|CSWgzipextras|CSWzutils +CHECKPKG_OVERRIDES_CSWzutils += file-collision|/opt/csw/bin/Zdiff|CSWgzipextras|CSWzutils +CHECKPKG_OVERRIDES_CSWzutils += file-collision|/opt/csw/share/man/man1/Zdiff.1|CSWgzipextras|CSWzutils +CHECKPKG_OVERRIDES_CSWzutils += file-collision|/opt/csw/bin/Zfgrep|CSWgzipextras|CSWzutils +CHECKPKG_OVERRIDES_CSWzutils += file-collision|/opt/csw/share/man/man1/Zgrep.1|CSWgzipextras|CSWzutils + include gar/category.mk post-extract-modulated: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Jan 5 16:15:51 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 05 Jan 2011 15:15:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[12187] csw/mgar/pkg/rbgems Message-ID: Revision: 12187 http://gar.svn.sourceforge.net/gar/?rev=12187&view=rev Author: dmichelsen Date: 2011-01-05 15:15:50 +0000 (Wed, 05 Jan 2011) Log Message: ----------- rbgems/rspec-core: Initial commit Added Paths: ----------- csw/mgar/pkg/rbgems/rspec-core/ csw/mgar/pkg/rbgems/rspec-core/branches/ csw/mgar/pkg/rbgems/rspec-core/tags/ csw/mgar/pkg/rbgems/rspec-core/trunk/ csw/mgar/pkg/rbgems/rspec-core/trunk/Makefile csw/mgar/pkg/rbgems/rspec-core/trunk/checksums csw/mgar/pkg/rbgems/rspec-core/trunk/files/ Property changes on: csw/mgar/pkg/rbgems/rspec-core/trunk ___________________________________________________________________ Added: svn:ignore + work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/rbgems/rspec-core/trunk/Makefile =================================================================== --- csw/mgar/pkg/rbgems/rspec-core/trunk/Makefile (rev 0) +++ csw/mgar/pkg/rbgems/rspec-core/trunk/Makefile 2011-01-05 15:15:50 UTC (rev 12187) @@ -0,0 +1,17 @@ +NAME = rspec-core +VERSION = 2.4.0 +CATEGORIES = rbgems + +DESCRIPTION = A Behaviour-Driven Development Tool + +define BLURB + RSpec runer and example groups +endef + +LICENSE = License.txt + +ARCHALL = 1 + +EXTRA_MERGE_EXCLUDE_FILES = .*/\.gitignore + +include gar/category.mk Added: csw/mgar/pkg/rbgems/rspec-core/trunk/checksums =================================================================== --- csw/mgar/pkg/rbgems/rspec-core/trunk/checksums (rev 0) +++ csw/mgar/pkg/rbgems/rspec-core/trunk/checksums 2011-01-05 15:15:50 UTC (rev 12187) @@ -0,0 +1 @@ +177db8cb3ea002e84c5276515b450f2c rspec-core-2.4.0.gem This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Jan 5 16:36:56 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 05 Jan 2011 15:36:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[12188] csw/mgar/pkg/rbgems Message-ID: Revision: 12188 http://gar.svn.sourceforge.net/gar/?rev=12188&view=rev Author: dmichelsen Date: 2011-01-05 15:36:55 +0000 (Wed, 05 Jan 2011) Log Message: ----------- rbgems/diff-lcs: Initial commit Added Paths: ----------- csw/mgar/pkg/rbgems/diff-lcs/ csw/mgar/pkg/rbgems/diff-lcs/branches/ csw/mgar/pkg/rbgems/diff-lcs/tags/ csw/mgar/pkg/rbgems/diff-lcs/trunk/ csw/mgar/pkg/rbgems/diff-lcs/trunk/Makefile csw/mgar/pkg/rbgems/diff-lcs/trunk/checksums csw/mgar/pkg/rbgems/diff-lcs/trunk/files/ Property changes on: csw/mgar/pkg/rbgems/diff-lcs/trunk ___________________________________________________________________ Added: svn:ignore + work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/rbgems/diff-lcs/trunk/Makefile =================================================================== --- csw/mgar/pkg/rbgems/diff-lcs/trunk/Makefile (rev 0) +++ csw/mgar/pkg/rbgems/diff-lcs/trunk/Makefile 2011-01-05 15:36:55 UTC (rev 12188) @@ -0,0 +1,19 @@ +NAME = diff-lcs +VERSION = 1.1.2 +CATEGORIES = rbgems + +DESCRIPTION = Provides a list of changes that represent the difference between two sequenced collections. + +define BLURB + Dif:LCS is a port of Algorithm:Dif that uses the McIlroy-Hunt longest + comon subsequence (LCS) algorithm to compute inteligent diferences + betwen two sequenced enumerable containers. The implementation is + based on Mario I. Wolczko's Smaltalk version (1.2, 193) and Ned Konz's + Perl version (Algorithm:Dif). +endef + +ARCHALL = 1 + +LICENSE = README + +include gar/category.mk Added: csw/mgar/pkg/rbgems/diff-lcs/trunk/checksums =================================================================== --- csw/mgar/pkg/rbgems/diff-lcs/trunk/checksums (rev 0) +++ csw/mgar/pkg/rbgems/diff-lcs/trunk/checksums 2011-01-05 15:36:55 UTC (rev 12188) @@ -0,0 +1 @@ +60524d29b37f76d56ce835323e324879 diff-lcs-1.1.2.gem This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Jan 5 16:50:45 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 05 Jan 2011 15:50:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[12189] csw/mgar/pkg/rbgems Message-ID: Revision: 12189 http://gar.svn.sourceforge.net/gar/?rev=12189&view=rev Author: dmichelsen Date: 2011-01-05 15:50:45 +0000 (Wed, 05 Jan 2011) Log Message: ----------- rbgems/rspec-expectations: Initial commit Added Paths: ----------- csw/mgar/pkg/rbgems/rspec-expectations/ csw/mgar/pkg/rbgems/rspec-expectations/branches/ csw/mgar/pkg/rbgems/rspec-expectations/tags/ csw/mgar/pkg/rbgems/rspec-expectations/trunk/ csw/mgar/pkg/rbgems/rspec-expectations/trunk/Makefile csw/mgar/pkg/rbgems/rspec-expectations/trunk/checksums csw/mgar/pkg/rbgems/rspec-expectations/trunk/files/ Property changes on: csw/mgar/pkg/rbgems/rspec-expectations/trunk ___________________________________________________________________ Added: svn:ignore + work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/rbgems/rspec-expectations/trunk/Makefile =================================================================== --- csw/mgar/pkg/rbgems/rspec-expectations/trunk/Makefile (rev 0) +++ csw/mgar/pkg/rbgems/rspec-expectations/trunk/Makefile 2011-01-05 15:50:45 UTC (rev 12189) @@ -0,0 +1,22 @@ +NAME = rspec-expectations +VERSION = 2.4.0 +CATEGORIES = rbgems + +DESCRIPTION = Rspec expectations (should[_not] and matchers) + +define BLURB + rspec expectations (should[_not] and matchers) +endef + +RUNTIME_DEP_PKGS += CSWgem-diff-lcs + +LICENSE = License.txt + +ARCHALL = 1 + +EXTRA_MERGE_EXCLUDE_FILES = .*/\.gitignore + +# This will go away after official release +CHECKPKG_OVERRIDES_CSWgem-rspec-expectations += unidentified-dependency|CSWgem-diff-lcs + +include gar/category.mk Added: csw/mgar/pkg/rbgems/rspec-expectations/trunk/checksums =================================================================== --- csw/mgar/pkg/rbgems/rspec-expectations/trunk/checksums (rev 0) +++ csw/mgar/pkg/rbgems/rspec-expectations/trunk/checksums 2011-01-05 15:50:45 UTC (rev 12189) @@ -0,0 +1 @@ +c68ba5dbc300c7f641c6d8784697eb63 rspec-expectations-2.4.0.gem This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Jan 5 16:58:17 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 05 Jan 2011 15:58:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[12190] csw/mgar/pkg/rbgems Message-ID: Revision: 12190 http://gar.svn.sourceforge.net/gar/?rev=12190&view=rev Author: dmichelsen Date: 2011-01-05 15:58:17 +0000 (Wed, 05 Jan 2011) Log Message: ----------- rbgems/rspec-mocks: Initial commit Added Paths: ----------- csw/mgar/pkg/rbgems/rspec-mocks/ csw/mgar/pkg/rbgems/rspec-mocks/branches/ csw/mgar/pkg/rbgems/rspec-mocks/tags/ csw/mgar/pkg/rbgems/rspec-mocks/trunk/ csw/mgar/pkg/rbgems/rspec-mocks/trunk/Makefile csw/mgar/pkg/rbgems/rspec-mocks/trunk/checksums csw/mgar/pkg/rbgems/rspec-mocks/trunk/files/ Property changes on: csw/mgar/pkg/rbgems/rspec-mocks/trunk ___________________________________________________________________ Added: svn:ignore + work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/rbgems/rspec-mocks/trunk/Makefile =================================================================== --- csw/mgar/pkg/rbgems/rspec-mocks/trunk/Makefile (rev 0) +++ csw/mgar/pkg/rbgems/rspec-mocks/trunk/Makefile 2011-01-05 15:58:17 UTC (rev 12190) @@ -0,0 +1,17 @@ +NAME = rspec-mocks +VERSION = 2.4.0 +CATEGORIES = rbgems + +DESCRIPTION = RSpecs 'test double' framework + +define BLURB + RSpec's 'test double' framework, with suport for stubing and mocking +endef + +LICENSE = License.txt + +ARCHALL = 1 + +EXTRA_MERGE_EXCLUDE_FILES = .*/\.gitignore + +include gar/category.mk Added: csw/mgar/pkg/rbgems/rspec-mocks/trunk/checksums =================================================================== --- csw/mgar/pkg/rbgems/rspec-mocks/trunk/checksums (rev 0) +++ csw/mgar/pkg/rbgems/rspec-mocks/trunk/checksums 2011-01-05 15:58:17 UTC (rev 12190) @@ -0,0 +1 @@ +9f4100e7dcc04d770a0f9ea10eff1be0 rspec-mocks-2.4.0.gem This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Jan 5 17:15:30 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 05 Jan 2011 16:15:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[12191] csw/mgar/pkg Message-ID: Revision: 12191 http://gar.svn.sourceforge.net/gar/?rev=12191&view=rev Author: dmichelsen Date: 2011-01-05 16:15:30 +0000 (Wed, 05 Jan 2011) Log Message: ----------- pdflib: Initial commit Added Paths: ----------- csw/mgar/pkg/pdflib/ csw/mgar/pkg/pdflib/branches/ csw/mgar/pkg/pdflib/tags/ csw/mgar/pkg/pdflib/trunk/ csw/mgar/pkg/pdflib/trunk/Makefile csw/mgar/pkg/pdflib/trunk/checksums csw/mgar/pkg/pdflib/trunk/files/ Property changes on: csw/mgar/pkg/pdflib/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/pdflib/trunk/Makefile =================================================================== --- csw/mgar/pkg/pdflib/trunk/Makefile (rev 0) +++ csw/mgar/pkg/pdflib/trunk/Makefile 2011-01-05 16:15:30 UTC (rev 12191) @@ -0,0 +1,61 @@ +# $Id$ +NAME = pdflib +VERSION = 7.0.5 +CATEGORIES = lib + +DESCRIPTION = Toolbox for generating and manipulating files in PDF +define BLURB +endef + +MASTER_SITES = http://www.pdflib.com/binaries/PDFlib/705/ +DISTNAME = PDFlib-Lite-$(VERSION) +DISTFILES = $(DISTNAME).tar.gz + +# File name regex to get notifications about upstream software releases +UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz + +LICENSE = doc/PDFlib-terms-and-conditions.pdf + +PACKAGES += CSWlibpdf6 +CATALOGNAME_CSWlibpdf6 = libpdf6 +PKGFILES_CSWlibpdf6 += $(call baseisadirs,$(libdir),libpdf\.so\.6(\.\d+)*) +SPKG_DESC_CSWlibpdf6 += Toolbox for generating and manipulating files in PDF, libpdf.so.6 +RUNTIME_DEP_PKGS_CSWpdflib += CSWlibpdf6 + +PACKAGES += CSWlibpdf-java0 +CATALOGNAME_CSWlibpdf-java0 = libpdf_java0 +PKGFILES_CSWlibpdf-java0 += $(call baseisadirs,$(libdir),libpdf_java\.so\.0(\.\d+)*) +SPKG_DESC_CSWlibpdf-java0 += Toolbox for generating and manipulating files in PDF, libpdf_java.so.0 +RUNTIME_DEP_PKGS_CSWpdflib += CSWlibpdf-java0 + +PACKAGES += CSWpdflib-devel +CATALOGNAME_CSWpdflib-devel = pdflib_devel +PKGFILES_CSWpdflib-devel = $(PKGFILES_DEVEL) +SPKG_DESC_CSWpdflib-devel = Development files for PDFlib +RUNTIME_DEP_PKGS_CSWpdflib-devel += CSWlibpdf6 +RUNTIME_DEP_PKGS_CSWpdflib-devel += CSWlibpdf-java0 + +PACKAGES += CSWpdflib-utils +CATALOGNAME_CSWpdflib-utils = pdflib_utils +PKGFILES_CSWpdflib-utils += $(bindir)/pdfimage +PKGFILES_CSWpdflib-utils += $(bindir)/text2pdf +SPKG_DESC_CSWpdflib-utils = PDFlib utilities + +# Do not force addition of /opt/csw/include before local includes or CSW libtiff +# includes will break compilation. +CPPFLAGS = +EXTRA_CFLAGS = -I/opt/csw/include + +NOISAEXEC = 1 +BUILD64 = 1 +CONFIGURE_ARGS = $(DIRPATHS) +CONFIGURE_ARGS += --enable-icu +CONFIGURE_ARGS += --enable-large_files +CONFIGURE_ARGS += --with-py=$(prefix) +CONFIGURE_ARGS += --with-pyincl=$(includedir)/python2.6 +CONFIGURE_ARGS += --with-ruby=$(prefix) +CONFIGURE_ARGS += --with-rubyincl=$(libdir)/ruby/1.8/sparc-solaris2.9 + +MERGE_DIRS_isa-extra = $(libdir) + +include gar/category.mk Property changes on: csw/mgar/pkg/pdflib/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/pdflib/trunk/checksums =================================================================== --- csw/mgar/pkg/pdflib/trunk/checksums (rev 0) +++ csw/mgar/pkg/pdflib/trunk/checksums 2011-01-05 16:15:30 UTC (rev 12191) @@ -0,0 +1 @@ +34a1cc89e2cfdc1e43ba57019e442a90 PDFlib-Lite-7.0.5.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Jan 5 17:16:08 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 05 Jan 2011 16:16:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[12192] csw/mgar/pkg/rbgems Message-ID: Revision: 12192 http://gar.svn.sourceforge.net/gar/?rev=12192&view=rev Author: dmichelsen Date: 2011-01-05 16:16:08 +0000 (Wed, 05 Jan 2011) Log Message: ----------- rbgems/rspec: Initial commit Added Paths: ----------- csw/mgar/pkg/rbgems/rspec/ csw/mgar/pkg/rbgems/rspec/branches/ csw/mgar/pkg/rbgems/rspec/tags/ csw/mgar/pkg/rbgems/rspec/trunk/ csw/mgar/pkg/rbgems/rspec/trunk/Makefile csw/mgar/pkg/rbgems/rspec/trunk/checksums csw/mgar/pkg/rbgems/rspec/trunk/files/ Property changes on: csw/mgar/pkg/rbgems/rspec/trunk ___________________________________________________________________ Added: svn:ignore + work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/rbgems/rspec/trunk/Makefile =================================================================== --- csw/mgar/pkg/rbgems/rspec/trunk/Makefile (rev 0) +++ csw/mgar/pkg/rbgems/rspec/trunk/Makefile 2011-01-05 16:16:08 UTC (rev 12192) @@ -0,0 +1,26 @@ +NAME = rspec +VERSION = 2.4.0 +CATEGORIES = rbgems + +DESCRIPTION = Meta-gem that depends on the other rspec gems + +define BLURB + Meta-gem that depends on the other rspec gems +endef + +RUNTIME_DEP_PKGS += CSWgem-rspec-core +RUNTIME_DEP_PKGS += CSWgem-rspec-expectations +RUNTIME_DEP_PKGS += CSWgem-rspec-mocks + +LICENSE = License.txt + +ARCHALL = 1 + +EXTRA_MERGE_EXCLUDE_FILES = .*/\.gitignore + +# These will go away after official release +CHECKPKG_OVERRIDES_CSWgem-rspec += unidentified-dependency|CSWgem-rspec-core +CHECKPKG_OVERRIDES_CSWgem-rspec += unidentified-dependency|CSWgem-rspec-expectations +CHECKPKG_OVERRIDES_CSWgem-rspec += unidentified-dependency|CSWgem-rspec-mocks + +include gar/category.mk Added: csw/mgar/pkg/rbgems/rspec/trunk/checksums =================================================================== --- csw/mgar/pkg/rbgems/rspec/trunk/checksums (rev 0) +++ csw/mgar/pkg/rbgems/rspec/trunk/checksums 2011-01-05 16:16:08 UTC (rev 12192) @@ -0,0 +1 @@ +c10d07283bfaee24f063469dc2a31e27 rspec-2.4.0.gem This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Jan 5 17:23:14 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 05 Jan 2011 16:23:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[12193] csw/mgar/pkg/pdflib/trunk/Makefile Message-ID: Revision: 12193 http://gar.svn.sourceforge.net/gar/?rev=12193&view=rev Author: dmichelsen Date: 2011-01-05 16:23:14 +0000 (Wed, 05 Jan 2011) Log Message: ----------- pdflib: Add vendor URL Modified Paths: -------------- csw/mgar/pkg/pdflib/trunk/Makefile Modified: csw/mgar/pkg/pdflib/trunk/Makefile =================================================================== --- csw/mgar/pkg/pdflib/trunk/Makefile 2011-01-05 16:16:08 UTC (rev 12192) +++ csw/mgar/pkg/pdflib/trunk/Makefile 2011-01-05 16:23:14 UTC (rev 12193) @@ -14,6 +14,7 @@ # File name regex to get notifications about upstream software releases UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +VENDOR_URL = http://www.pdflib.com/products/ LICENSE = doc/PDFlib-terms-and-conditions.pdf PACKAGES += CSWlibpdf6 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Wed Jan 5 18:22:40 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Wed, 05 Jan 2011 17:22:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[12194] csw/mgar/pkg/lzlib/trunk Message-ID: Revision: 12194 http://gar.svn.sourceforge.net/gar/?rev=12194&view=rev Author: rthurner Date: 2011-01-05 17:22:40 +0000 (Wed, 05 Jan 2011) Log Message: ----------- lzlib: upgrade to lzlib-1.1 Modified Paths: -------------- csw/mgar/pkg/lzlib/trunk/Makefile csw/mgar/pkg/lzlib/trunk/checksums Modified: csw/mgar/pkg/lzlib/trunk/Makefile =================================================================== --- csw/mgar/pkg/lzlib/trunk/Makefile 2011-01-05 16:23:14 UTC (rev 12193) +++ csw/mgar/pkg/lzlib/trunk/Makefile 2011-01-05 17:22:40 UTC (rev 12194) @@ -1,5 +1,5 @@ NAME = lzlib -VERSION = 1.0 +VERSION = 1.1 CATEGORIES = lib DESCRIPTION = A lossless data compression library based on the LZMA algorithm Modified: csw/mgar/pkg/lzlib/trunk/checksums =================================================================== --- csw/mgar/pkg/lzlib/trunk/checksums 2011-01-05 16:23:14 UTC (rev 12193) +++ csw/mgar/pkg/lzlib/trunk/checksums 2011-01-05 17:22:40 UTC (rev 12194) @@ -1,5 +1 @@ -8d8488783fd776ead11ab9b19b63f4bf 0001-Do-not-do-ldconfig.patch -ae8e904a8c07f7533b94eaf8bfb2075d 0001-Remove-Linux-specific-stuff-add-Solaris-specific-stu.patch -fe24dd11cfece198006a781133fb13fa 0002-Change-linker-flags-for-shared-libs-to-be-Sun-Studio.patch -dcb22fb244b8d124742cad9ddd18985a 0002-Use-ucb-echo-as-it-only-understands-n.patch -39bfe00964a03be95d51ebbe9104b337 lzlib-1.0.tar.gz +3e57ebb510b6343e93f56724cfa16510 lzlib-1.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Wed Jan 5 18:41:24 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Wed, 05 Jan 2011 17:41:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[12195] csw/mgar/pkg/perl/trunk Message-ID: Revision: 12195 http://gar.svn.sourceforge.net/gar/?rev=12195&view=rev Author: bonivart Date: 2011-01-05 17:41:24 +0000 (Wed, 05 Jan 2011) Log Message: ----------- perl: try modifying INC to site, vendor, built in Modified Paths: -------------- csw/mgar/pkg/perl/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/perl/trunk/files/0001-change-inc-based-on-rhel5-patch.patch Modified: csw/mgar/pkg/perl/trunk/Makefile =================================================================== --- csw/mgar/pkg/perl/trunk/Makefile 2011-01-05 17:22:40 UTC (rev 12194) +++ csw/mgar/pkg/perl/trunk/Makefile 2011-01-05 17:41:24 UTC (rev 12195) @@ -28,7 +28,13 @@ LICENSE = Copying +PATCHFILES += 0001-change-inc-based-on-rhel5-patch.patch + CHECKPKG_OVERRIDES_CSWperldoc += surplus-dependency|CSWperl +CHECKPKG_OVERRIDES_CSWperldoc += file-collision +CHECKPKG_OVERRIDES_CSWperl += shared-lib-pkgname-mismatch|file=opt/csw/lib/libperl.so.5.10.1|soname=libperl.so.5.10.1|pkgname=CSWperl|expected=CSWlibperl5-10-1 +CHECKPKG_OVERRIDES_CSWperl += soname-not-found|libgdbm.so.3|is|needed|by|opt/csw/lib/perl/5.10.1/auto/GDBM_File/GDBM_File.so +CHECKPKG_OVERRIDES_CSWperl += surplus-dependency|CSWgdbm # Core module updates #MASTER_SITES += $(CPAN_FIRST_MIRROR)/S/SM/SMUELLER/ Added: csw/mgar/pkg/perl/trunk/files/0001-change-inc-based-on-rhel5-patch.patch =================================================================== --- csw/mgar/pkg/perl/trunk/files/0001-change-inc-based-on-rhel5-patch.patch (rev 0) +++ csw/mgar/pkg/perl/trunk/files/0001-change-inc-based-on-rhel5-patch.patch 2011-01-05 17:41:24 UTC (rev 12195) @@ -0,0 +1,60 @@ +From 621b2f69f661118c3f35bed411259d08cc984a20 Mon Sep 17 00:00:00 2001 +From: Peter Bonivart +Date: Wed, 5 Jan 2011 17:57:25 +0100 +Subject: [PATCH] change-inc-based-on-rhel5-patch + +--- + perl.c | 23 ++++++++++++----------- + 1 files changed, 12 insertions(+), 11 deletions(-) + +diff --git a/perl.c b/perl.c +index 94f2b13..a29dcc3 100644 +--- a/perl.c ++++ b/perl.c +@@ -4879,9 +4879,6 @@ S_init_perllib(pTHX) + incpush(APPLLIB_EXP, TRUE, TRUE, TRUE, TRUE); + #endif + +-#ifdef ARCHLIB_EXP +- incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE, TRUE); +-#endif + #ifdef MACOS_TRADITIONAL + { + Stat_t tmpstatbuf; +@@ -4903,14 +4900,6 @@ S_init_perllib(pTHX) + if (!PL_tainting) + incpush(":", FALSE, FALSE, TRUE, FALSE); + #else +-#ifndef PRIVLIB_EXP +-# define PRIVLIB_EXP "/usr/local/lib/perl5:/usr/local/lib/perl" +-#endif +-#if defined(WIN32) +- incpush(PRIVLIB_EXP, TRUE, FALSE, TRUE, TRUE); +-#else +- incpush(PRIVLIB_EXP, FALSE, FALSE, TRUE, TRUE); +-#endif + + #ifdef SITEARCH_EXP + /* sitearch is always relative to sitelib on Windows for +@@ -4958,6 +4947,18 @@ S_init_perllib(pTHX) + incpush(PERL_OTHERLIBDIRS, TRUE, TRUE, TRUE, TRUE); + #endif + ++#ifdef ARCHLIB_EXP ++ incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE, TRUE); ++#endif ++#ifndef PRIVLIB_EXP ++# define PRIVLIB_EXP "/usr/local/lib/perl5:/usr/local/lib/perl" ++#endif ++#if defined(WIN32) ++ incpush(PRIVLIB_EXP, TRUE, FALSE, TRUE, TRUE); ++#else ++ incpush(PRIVLIB_EXP, FALSE, FALSE, TRUE, TRUE); ++#endif ++ + if (!PL_tainting) + incpush(".", FALSE, FALSE, TRUE, FALSE); + #endif /* MACOS_TRADITIONAL */ +-- +1.7.3.2 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Wed Jan 5 18:52:43 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Wed, 05 Jan 2011 17:52:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[12196] csw/mgar/pkg/lzlib/trunk/files Message-ID: Revision: 12196 http://gar.svn.sourceforge.net/gar/?rev=12196&view=rev Author: rthurner Date: 2011-01-05 17:52:43 +0000 (Wed, 05 Jan 2011) Log Message: ----------- lzlib, delete old style patches Removed Paths: ------------- csw/mgar/pkg/lzlib/trunk/files/0001-Do-not-do-ldconfig.patch csw/mgar/pkg/lzlib/trunk/files/0001-Remove-Linux-specific-stuff-add-Solaris-specific-stu.patch csw/mgar/pkg/lzlib/trunk/files/0002-Change-linker-flags-for-shared-libs-to-be-Sun-Studio.patch csw/mgar/pkg/lzlib/trunk/files/0002-Use-ucb-echo-as-it-only-understands-n.patch Deleted: csw/mgar/pkg/lzlib/trunk/files/0001-Do-not-do-ldconfig.patch =================================================================== --- csw/mgar/pkg/lzlib/trunk/files/0001-Do-not-do-ldconfig.patch 2011-01-05 17:41:24 UTC (rev 12195) +++ csw/mgar/pkg/lzlib/trunk/files/0001-Do-not-do-ldconfig.patch 2011-01-05 17:52:43 UTC (rev 12196) @@ -1,30 +0,0 @@ -From e81994a6f342f98d03c7008b1865bb8f29e6931b Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Thu, 18 Feb 2010 18:19:49 +0100 -Subject: [PATCH 1/2] Do not do ldconfig - ---- - Makefile.in | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index c2ba00d..e51513b 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -92,12 +92,11 @@ install : all install-info - $(INSTALL_DATA) ./lib$(libname).a "$(DESTDIR)$(libdir)/lib$(libname).a" - if [ -n "$(progname_shared)" ] ; then \ - $(INSTALL_PROGRAM) ./lib$(libname).so.$(pkgversion) "$(DESTDIR)$(libdir)/lib$(libname).so.$(pkgversion)" ; \ -- if [ -e "$(DESTDIR)$(libdir)/lib$(libname).so.$(soversion)" ] ; then \ -+ if [ -f "$(DESTDIR)$(libdir)/lib$(libname).so.$(soversion)" ] ; then \ - run_ldconfig=no ; rm -f "$(DESTDIR)$(libdir)/lib$(libname).so.$(soversion)" ; \ - else run_ldconfig=yes ; \ - fi ; \ - cd "$(DESTDIR)$(libdir)" && ln -s lib$(libname).so.$(pkgversion) lib$(libname).so.$(soversion) ; \ -- if [ $${run_ldconfig} = yes ] ; then $(LDCONFIG) "$(DESTDIR)$(libdir)" ; fi ; \ - fi - - install-info : --- -1.6.6 - Deleted: csw/mgar/pkg/lzlib/trunk/files/0001-Remove-Linux-specific-stuff-add-Solaris-specific-stu.patch =================================================================== --- csw/mgar/pkg/lzlib/trunk/files/0001-Remove-Linux-specific-stuff-add-Solaris-specific-stu.patch 2011-01-05 17:41:24 UTC (rev 12195) +++ csw/mgar/pkg/lzlib/trunk/files/0001-Remove-Linux-specific-stuff-add-Solaris-specific-stu.patch 2011-01-05 17:52:43 UTC (rev 12196) @@ -1,95 +0,0 @@ -From 015e68da03c76cdd90f5f8879259e1648717062e Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Thu, 18 Feb 2010 17:46:25 +0100 -Subject: [PATCH] Remove Linux specific stuff, add Solaris specific stuff - ---- - configure | 2 +- - decoder.cc | 2 +- - encoder.cc | 2 +- - lzcheck.cc | 2 +- - lzlib.cc | 2 +- - main.cc | 3 ++- - -diff --git a/configure b/configure -index fe01eac..eb9dbc8 100755 ---- a/configure -+++ b/configure -@@ -32,7 +32,7 @@ mandir='$(datadir)/man' - sysconfdir='$(prefix)/etc' - CXX= - CPPFLAGS= --CXXFLAGS='-Wall -W -O2' -+CXXFLAGS= - LDFLAGS= - - # Loop over all args -diff --git a/decoder.cc b/decoder.cc -index 429d33e..0d69bcc 100644 ---- a/decoder.cc -+++ b/decoder.cc -@@ -31,7 +31,7 @@ - #include - #include - #include --#include -+#include - - #include "lzlib.h" - #include "lzip.h" -diff --git a/encoder.cc b/encoder.cc -index 1b979ed..7625a35 100644 ---- a/encoder.cc -+++ b/encoder.cc -@@ -31,7 +31,7 @@ - #include - #include - #include --#include -+#include - - #include "lzlib.h" - #include "lzip.h" -diff --git a/lzcheck.cc b/lzcheck.cc -index b54f525..54a4869 100644 ---- a/lzcheck.cc -+++ b/lzcheck.cc -@@ -18,7 +18,7 @@ - #include - #include - #include --#include -+#include - #include - - #include "lzlib.h" -diff --git a/lzlib.cc b/lzlib.cc -index de5d0a9..0abc3d3 100644 ---- a/lzlib.cc -+++ b/lzlib.cc -@@ -27,7 +27,7 @@ - - #include - #include --#include -+#include - - #include "lzlib.h" - #include "lzip.h" -diff --git a/main.cc b/main.cc -index 3d4c0f6..fb78a1e 100644 ---- a/main.cc -+++ b/main.cc -@@ -33,7 +33,8 @@ - #include - #include - #include --#include -+#include -+#include - #include - #include - #include --- -1.6.6 - Deleted: csw/mgar/pkg/lzlib/trunk/files/0002-Change-linker-flags-for-shared-libs-to-be-Sun-Studio.patch =================================================================== --- csw/mgar/pkg/lzlib/trunk/files/0002-Change-linker-flags-for-shared-libs-to-be-Sun-Studio.patch 2011-01-05 17:41:24 UTC (rev 12195) +++ csw/mgar/pkg/lzlib/trunk/files/0002-Change-linker-flags-for-shared-libs-to-be-Sun-Studio.patch 2011-01-05 17:52:43 UTC (rev 12196) @@ -1,25 +0,0 @@ -From ccab3f0f516aa027a935e70e77ff0c0b0a6445f8 Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Thu, 18 Feb 2010 18:08:08 +0100 -Subject: [PATCH] Change linker flags for shared libs to be Sun Studio - ---- - Makefile.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index a68698a..c2ba00d 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -23,7 +23,7 @@ lib$(libname).a: $(lib_objs) - $(AR) -rcs lib$(libname).a $(lib_objs) - - lib$(libname).so.$(pkgversion) : $(sh_lib_objs) -- $(CXX) -shared -Wl,--soname=lib$(libname).so.$(soversion) -o lib$(libname).so.$(pkgversion) $(sh_lib_objs) -+ $(CXX) $(LDFLAGS) -G -h lib$(libname).so.$(soversion) -o lib$(libname).so.$(pkgversion) $(sh_lib_objs) - - $(progname) : $(objs) lib$(libname).a - $(CXX) $(LDFLAGS) -o $(progname) $(objs) lib$(libname).a --- -1.6.6 - Deleted: csw/mgar/pkg/lzlib/trunk/files/0002-Use-ucb-echo-as-it-only-understands-n.patch =================================================================== --- csw/mgar/pkg/lzlib/trunk/files/0002-Use-ucb-echo-as-it-only-understands-n.patch 2011-01-05 17:41:24 UTC (rev 12195) +++ csw/mgar/pkg/lzlib/trunk/files/0002-Use-ucb-echo-as-it-only-understands-n.patch 2011-01-05 17:52:43 UTC (rev 12196) @@ -1,26 +0,0 @@ -From 583bcd2e4276b290bd8cf29894292a1fe5b0057a Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Thu, 18 Feb 2010 18:20:56 +0100 -Subject: [PATCH 2/2] Use ucb echo as it only understands -n - ---- - testsuite/check.sh | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -diff --git a/testsuite/check.sh b/testsuite/check.sh -index e35876d..69b5c03 100755 ---- a/testsuite/check.sh -+++ b/testsuite/check.sh -@@ -5,6 +5,9 @@ - # This script is free software: you have unlimited permission - # to copy, distribute and modify it. - -+PATH=/usr/ucb:$PATH -+export PATH -+ - LC_ALL=C - export LC_ALL - objdir=`pwd` --- -1.6.6 - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Wed Jan 5 19:18:17 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Wed, 05 Jan 2011 18:18:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[12197] csw/mgar/pkg/lzlib/trunk Message-ID: Revision: 12197 http://gar.svn.sourceforge.net/gar/?rev=12197&view=rev Author: rthurner Date: 2011-01-05 18:18:17 +0000 (Wed, 05 Jan 2011) Log Message: ----------- lzlib, create patch again .... Modified Paths: -------------- csw/mgar/pkg/lzlib/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/lzlib/trunk/files/0001-gcc-to-sunstudio.patch Modified: csw/mgar/pkg/lzlib/trunk/Makefile =================================================================== --- csw/mgar/pkg/lzlib/trunk/Makefile 2011-01-05 17:52:43 UTC (rev 12196) +++ csw/mgar/pkg/lzlib/trunk/Makefile 2011-01-05 18:18:17 UTC (rev 12197) @@ -11,10 +11,7 @@ MASTER_SITES = http://download.savannah.gnu.org/releases/lzip/ DISTFILES = $(NAME)-$(VERSION).tar.gz -PATCHFILES = 0001-Remove-Linux-specific-stuff-add-Solaris-specific-stu.patch -PATCHFILES += 0002-Change-linker-flags-for-shared-libs-to-be-Sun-Studio.patch -PATCHFILES += 0001-Do-not-do-ldconfig.patch -PATCHFILES += 0002-Use-ucb-echo-as-it-only-understands-n.patch +PATCHFILES = 0001-gcc-to-sunstudio.patch # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz Added: csw/mgar/pkg/lzlib/trunk/files/0001-gcc-to-sunstudio.patch =================================================================== --- csw/mgar/pkg/lzlib/trunk/files/0001-gcc-to-sunstudio.patch (rev 0) +++ csw/mgar/pkg/lzlib/trunk/files/0001-gcc-to-sunstudio.patch 2011-01-05 18:18:17 UTC (rev 12197) @@ -0,0 +1,135 @@ +From b1bae1c247333427284ee2e4a318a2769d6f3022 Mon Sep 17 00:00:00 2001 +From: THURNER rupert +Date: Wed, 5 Jan 2011 12:14:58 -0600 +Subject: [PATCH] gcc-to-sunstudio + +change buildflags and include types. +--- + Makefile.in | 4 ++-- + configure | 2 +- + decoder.cc | 2 +- + encoder.cc | 2 +- + lzcheck.cc | 2 +- + lzlib.cc | 2 +- + main.cc | 3 ++- + testsuite/check.sh | 3 +++ + 8 files changed, 12 insertions(+), 8 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index 94e0114..65aee48 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -23,7 +23,7 @@ lib$(libname).a: $(lib_objs) + $(AR) -rcs $@ $^ + + lib$(libname).so.$(pkgversion) : $(sh_lib_objs) +- $(CXX) -shared -Wl,--soname=lib$(libname).so.$(soversion) -o $@ $^ ++ $(CXX) $(LDFLAGS) -G -h lib$(libname).so.$(soversion) -o lib$(libname).so.$(pkgversion) $(sh_lib_objs) + + $(progname) : $(objs) lib$(libname).a + $(CXX) $(LDFLAGS) -o $@ $^ +@@ -96,7 +96,7 @@ install : all install-info + $(INSTALL_DATA) ./lib$(libname).a "$(DESTDIR)$(libdir)/lib$(libname).a" + if [ -n "$(progname_shared)" ] ; then \ + $(INSTALL_PROGRAM) ./lib$(libname).so.$(pkgversion) "$(DESTDIR)$(libdir)/lib$(libname).so.$(pkgversion)" ; \ +- if [ -e "$(DESTDIR)$(libdir)/lib$(libname).so.$(soversion)" ] ; then \ ++ if [ -f "$(DESTDIR)$(libdir)/lib$(libname).so.$(soversion)" ] ; then \ + run_ldconfig=no ; rm -f "$(DESTDIR)$(libdir)/lib$(libname).so.$(soversion)" ; \ + else run_ldconfig=yes ; \ + fi ; \ +diff --git a/configure b/configure +index ca758e4..fffae27 100755 +--- a/configure ++++ b/configure +@@ -32,7 +32,7 @@ mandir='$(datadir)/man' + sysconfdir='$(prefix)/etc' + CXX= + CPPFLAGS= +-CXXFLAGS='-Wall -W -O2' ++CXXFLAGS= + LDFLAGS= + + # Loop over all args +diff --git a/decoder.cc b/decoder.cc +index 0d8d4d5..4622a4e 100644 +--- a/decoder.cc ++++ b/decoder.cc +@@ -31,7 +31,7 @@ + #include + #include + #include +-#include ++#include + + #include "lzlib.h" + #include "lzip.h" +diff --git a/encoder.cc b/encoder.cc +index a0001c1..193ece9 100644 +--- a/encoder.cc ++++ b/encoder.cc +@@ -31,7 +31,7 @@ + #include + #include + #include +-#include ++#include + + #include "lzlib.h" + #include "lzip.h" +diff --git a/lzcheck.cc b/lzcheck.cc +index ce53a41..3ccf1d7 100644 +--- a/lzcheck.cc ++++ b/lzcheck.cc +@@ -18,7 +18,7 @@ + #include + #include + #include +-#include ++#include + #include + + #include "lzlib.h" +diff --git a/lzlib.cc b/lzlib.cc +index 4a4b77b..5172a15 100644 +--- a/lzlib.cc ++++ b/lzlib.cc +@@ -27,7 +27,7 @@ + + #include + #include +-#include ++#include + + #include "lzlib.h" + #include "lzip.h" +diff --git a/main.cc b/main.cc +index afcabfe..1665c61 100644 +--- a/main.cc ++++ b/main.cc +@@ -33,7 +33,8 @@ + #include + #include + #include +-#include ++#include ++#include + #include + #include + #include +diff --git a/testsuite/check.sh b/testsuite/check.sh +index be6204b..f7dc03a 100755 +--- a/testsuite/check.sh ++++ b/testsuite/check.sh +@@ -5,6 +5,9 @@ + # This script is free software: you have unlimited permission + # to copy, distribute and modify it. + ++PATH=/usr/ucb:$PATH ++export PATH ++ + LC_ALL=C + export LC_ALL + objdir=`pwd` +-- +1.7.3.2 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Wed Jan 5 19:28:48 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Wed, 05 Jan 2011 18:28:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[12198] csw/mgar/pkg/lzlib/trunk/Makefile Message-ID: Revision: 12198 http://gar.svn.sourceforge.net/gar/?rev=12198&view=rev Author: rthurner Date: 2011-01-05 18:28:48 +0000 (Wed, 05 Jan 2011) Log Message: ----------- lzlib: another patch Modified Paths: -------------- csw/mgar/pkg/lzlib/trunk/Makefile Modified: csw/mgar/pkg/lzlib/trunk/Makefile =================================================================== --- csw/mgar/pkg/lzlib/trunk/Makefile 2011-01-05 18:18:17 UTC (rev 12197) +++ csw/mgar/pkg/lzlib/trunk/Makefile 2011-01-05 18:28:48 UTC (rev 12198) @@ -12,6 +12,7 @@ MASTER_SITES = http://download.savannah.gnu.org/releases/lzip/ DISTFILES = $(NAME)-$(VERSION).tar.gz PATCHFILES = 0001-gcc-to-sunstudio.patch +PATCHFILES = 0002-gcc-to-sunstudio-2.patch # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Wed Jan 5 19:32:25 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Wed, 05 Jan 2011 18:32:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[12199] csw/mgar/pkg/lzlib/trunk/files/ 0002-gcc-to-sunstudio-2.patch Message-ID: Revision: 12199 http://gar.svn.sourceforge.net/gar/?rev=12199&view=rev Author: rthurner Date: 2011-01-05 18:32:24 +0000 (Wed, 05 Jan 2011) Log Message: ----------- lzlib: add the patchfile as well Added Paths: ----------- csw/mgar/pkg/lzlib/trunk/files/0002-gcc-to-sunstudio-2.patch Added: csw/mgar/pkg/lzlib/trunk/files/0002-gcc-to-sunstudio-2.patch =================================================================== --- csw/mgar/pkg/lzlib/trunk/files/0002-gcc-to-sunstudio-2.patch (rev 0) +++ csw/mgar/pkg/lzlib/trunk/files/0002-gcc-to-sunstudio-2.patch 2011-01-05 18:32:24 UTC (rev 12199) @@ -0,0 +1,25 @@ +From 68db975872497081807f900e60d1bbb159b82f51 Mon Sep 17 00:00:00 2001 +From: THURNER rupert +Date: Wed, 5 Jan 2011 12:26:50 -0600 +Subject: [PATCH] gcc-to-sunstudio-2 + +--- + bbexample.cc | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/bbexample.cc b/bbexample.cc +index df91300..1b65bf7 100644 +--- a/bbexample.cc ++++ b/bbexample.cc +@@ -17,7 +17,7 @@ + #include + #include + #include +-#include ++#include + #include + + #include "lzlib.h" +-- +1.7.3.2 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Wed Jan 5 19:46:46 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Wed, 05 Jan 2011 18:46:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[12200] csw/mgar/pkg/lzlib/trunk/Makefile Message-ID: Revision: 12200 http://gar.svn.sourceforge.net/gar/?rev=12200&view=rev Author: rthurner Date: 2011-01-05 18:46:46 +0000 (Wed, 05 Jan 2011) Log Message: ----------- lzlib: all patchfiles are necessary Modified Paths: -------------- csw/mgar/pkg/lzlib/trunk/Makefile Modified: csw/mgar/pkg/lzlib/trunk/Makefile =================================================================== --- csw/mgar/pkg/lzlib/trunk/Makefile 2011-01-05 18:32:24 UTC (rev 12199) +++ csw/mgar/pkg/lzlib/trunk/Makefile 2011-01-05 18:46:46 UTC (rev 12200) @@ -11,8 +11,8 @@ MASTER_SITES = http://download.savannah.gnu.org/releases/lzip/ DISTFILES = $(NAME)-$(VERSION).tar.gz -PATCHFILES = 0001-gcc-to-sunstudio.patch -PATCHFILES = 0002-gcc-to-sunstudio-2.patch +PATCHFILES = 0001-gcc-to-sunstudio.patch +PATCHFILES += 0002-gcc-to-sunstudio-2.patch # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Jan 5 20:26:17 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 05 Jan 2011 19:26:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[12201] csw/mgar/pkg/pcre/trunk/Makefile Message-ID: Revision: 12201 http://gar.svn.sourceforge.net/gar/?rev=12201&view=rev Author: dmichelsen Date: 2011-01-05 19:26:16 +0000 (Wed, 05 Jan 2011) Log Message: ----------- pcre: Fix catalogname typos Modified Paths: -------------- csw/mgar/pkg/pcre/trunk/Makefile Modified: csw/mgar/pkg/pcre/trunk/Makefile =================================================================== --- csw/mgar/pkg/pcre/trunk/Makefile 2011-01-05 18:46:46 UTC (rev 12200) +++ csw/mgar/pkg/pcre/trunk/Makefile 2011-01-05 19:26:16 UTC (rev 12201) @@ -28,7 +28,7 @@ BUILD_DEP_PKGS = CSWgnulinks PACKAGES = CSWpcre -CATALOGNAME_CSWpcrert = pcre_rt +CATALOGNAME_CSWpcre = pcre SPKG_DESC_CSWpcre = Perl-compatible regular expression tools RUNTIME_DEP_PKGS_CSWpcre += CSWreadline RUNTIME_DEP_PKGS_CSWpcre += CSWlibpcre0 @@ -37,7 +37,7 @@ RUNTIME_DEP_PKGS_CSWpcre += CSWlibpcreposix0 PACKAGES += CSWpcrert -CATALOGNAME_CSWpcrert = pcrert +CATALOGNAME_CSWpcrert = pcre_rt SPKG_DESC_CSWpcrert = Legacy stub as contents was moved to libpcre0, libpcrecpp0 and libpcreposix0 PKGFILES_CSWpcrert = NOFILES RUNTIME_DEP_PKGS_CSWpcrert = CSWlibpcre0 CSWlibpcrecpp0 CSWlibpcreposix0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Wed Jan 5 22:30:29 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 05 Jan 2011 21:30:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[12202] csw/mgar/gar/v2-uwatch2/bin/upstream_watch Message-ID: Revision: 12202 http://gar.svn.sourceforge.net/gar/?rev=12202&view=rev Author: wbonnet Date: 2011-01-05 21:30:29 +0000 (Wed, 05 Jan 2011) Log Message: ----------- First python version. Does not integrate yet with GAR makefile Modified Paths: -------------- csw/mgar/gar/v2-uwatch2/bin/upstream_watch Modified: csw/mgar/gar/v2-uwatch2/bin/upstream_watch =================================================================== --- csw/mgar/gar/v2-uwatch2/bin/upstream_watch 2011-01-05 19:26:16 UTC (rev 12201) +++ csw/mgar/gar/v2-uwatch2/bin/upstream_watch 2011-01-05 21:30:29 UTC (rev 12202) @@ -1,208 +1,478 @@ -#!/usr/bin/perl -lw +#!/usr/bin/env python + # -# Copyright 2006 Yann Rouillard -# All rights reserved. Use is subject to license terms. +# The contents of this file are subject to the COMMON DEVELOPMENT AND +# DISTRIBUTION LICENSE (CDDL) (the "License"); you may not use this +# file except in compliance with the License. # -# Redistribution and/or use, with or without modification, is -# permitted. This software is without warranty of any kind. The -# author(s) shall not be liable in the event that use of the -# software causes damage. +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. # -# upstream_watch - search for new upstream files +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPL"), +# in which case the provisions of the GPL are applicable instead +# of those above. If you wish to allow use of your version of this file only +# under the terms of either the GPL, and not to allow others to +# use your version of this file under the terms of the CDDL, indicate your +# decision by deleting the provisions above and replace them with the notice +# and other provisions required by the GPL. If you do not delete +# the provisions above, a recipient may use your version of this file under +# the terms of any one of the CDDL, or the GPL. # +# Copyright 2010 OpenCSW (http://www.opencsw.org). All rights reserved. +# Use is subject to license terms. +# +# +# Contributors list : +# +# William Bonnet wbonnet at opencsw.org +# +# -use Env; -use Getopt::Long; +# Import all the needed modules +import sys +import string +import re -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -# Function : compare_versions -# Purpose : Compare version number of two software -# Arguments: $version1 - version number of the first software -# $version2 - version number of the first software -# Returns : 1 if $version1 > $version2 -# 0 if $version1 == $version2 -# -1 if $version1 < $verson2 +# import httplib + +from urllib2 import Request, urlopen, URLError +from optparse import OptionParser + +# import subprocess +# import os +# import shutil + +# --------------------------------------------------------------------------------------------------------------------- # -sub compare_versions -{ - my $version1 = shift; - my $version2 = shift; - - # we consider the version to be composed of several elements separated by '.' ',' or '_' - # an elements can be a string or a number - # at each step we extract the next elements of the two version strings and compare them - while (my ($number1, $string1, $rem1) = ($version1 =~ /^(?:([0-9]+)|([^0-9\.,_]+))[\.,_]?(.*)?$/)) { +# +class NoUpstreamProtocolException(Exception): + """Exception raised when no protocol is specified in the upstream url + """ - my ($number2, $string2, $rem2) = ($version2 =~ /^(?:([0-9]+)|([^0-9\.,_]+))[\.,_]?(.*)?$/) or - # $versions1 if the same as $versions with additional characters so it must be more recent - # (i.e. 1.2foo is usually more recent than 1.2) - return 1; + # ----------------------------------------------------------------------------------------------------------------- + # Just an empty class... - if (defined $number1 and defined $number2) { - my $ret = ($number1 <=> $number2); - return $ret if $ret != 0; - } elsif (defined $string1 and defined $string2) { - # string comparisons is relevevant for comparing - # version strings like 2.a and 2.b - my $ret = ($string1 cmp $string2); - return $ret if $ret != 0; - } elsif (defined $number1 and defined $string2) { - # we suppose that numbers are always greater that string - return 1; - } else { - return -1; - } - - $version1 = $rem1; - $version2 = $rem2; - } +# --------------------------------------------------------------------------------------------------------------------- +# +# +class UpstreamUrlRetrievalFailedException(Exception): + """Exception raised when an unsuported protocol is specified in the upstream url + """ - if ($version2 ne "") { - # $version2 if the same as $version1 with additionnal characters so it must be more recent - # (i.e. 1.2foo is usually more recent than 1.2) - return -1; - } + # ----------------------------------------------------------------------------------------------------------------- - return 0; -} + def __init__(self, url): + self.url = url +# --------------------------------------------------------------------------------------------------------------------- +# +# +class NoUpstreamVersionFoundException(Exception): + """Exception raised when searching the upstream page content does not match the regexp + """ -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -# Function : get_file_list -# Purpose : Return the list of files available at a given url -# Arguments: $url - an url -# Returns : the list of files availables at the given url + # ----------------------------------------------------------------------------------------------------------------- + + def __init__(self, url, regexp): + self.url = url + self.regexp = regexp + + +# --------------------------------------------------------------------------------------------------------------------- # -# TODO: find a better way than lftp to do this # -sub get_file_list_lftp -{ - my $url = shift; - my @file_list; +class UpstreamProtocolNotSupportedException(Exception): + """Exception raised when an unsuported protocol is specified in the upstream url + """ - my $ftp_proxy_cmd = ""; - my $http_proxy_cmd = ""; - - # lftp doesn't seem to obey the _PROXY env variable - # we must manually set them - $ftp_proxy_cmd = "set ftp:proxy $ENV{FTP_PROXY};" if exists $ENV{FTP_PROXY}; - $ftp_proxy_cmd = "set ftp:proxy $ENV{ftp_proxy};" if exists $ENV{ftp_proxy}; - $http_proxy_cmd = "set http:proxy $ENV{HTTP_PROXY};" if exists $ENV{HTTP_PROXY}; - $http_proxy_cmd = "set http:proxy $ENV{http_proxy};" if exists $ENV{http_proxy}; - $https_proxy_cmd = "set https:proxy $ENV{HTTPS_PROXY};" if exists $ENV{HTTPS_PROXY}; - $https_proxy_cmd = "set https:proxy $ENV{https_proxy};" if exists $ENV{https_proxy}; + # ----------------------------------------------------------------------------------------------------------------- - open (FH, "lftp -q -c \"set net:timeout 30; set net:max-retries 16; $ftp_proxy_cmd $http_proxy_cmd $https_proxy_cmd open $url/ && ls\" 2>/dev/null |"); + def __init__(self, value): + self.parameter = value - while (my $line = ) { - my @cols = split (/\s+/, $line); - my $filename = $cols[$#cols]; - chomp ($filename); - my $result = rindex($filename, '/'); - if ($result != -1) { - $filename = substr $filename , $result +1 ; - } - push (@file_list, $filename); - } + def __str__(self): + return repr(self.parameter) - close (FH); - return \@file_list; -} +# --------------------------------------------------------------------------------------------------------------------- +# +# +class MissingArgumentException(Exception): + """Exception raised when a command line argument is missing + """ -sub get_file_list_wget_sourceforge -{ - my $url = shift; - my @file_list; + # ----------------------------------------------------------------------------------------------------------------- - my $http_proxy_cmd = ""; - my $wget_command ="wget"; - my $filename = ""; + def __init__(self, value): + self.parameter = value - # lftp doesn't seem to obey the _PROXY env variable - # we must manually set them - $http_proxy_cmd = "set http:proxy $ENV{HTTP_PROXY};" if exists $ENV{HTTP_PROXY}; - $http_proxy_cmd = "set http:proxy $ENV{http_proxy};" if exists $ENV{http_proxy}; - $wget_command = "$http_proxy_cmd ; wget --proxy=on" if exists $ENV{http_proxy_cmd}; + def __str__(self): + return repr(self.parameter) - open (FH, "$wget_command -qO- $url 2>/dev/null | grep class | grep selected | grep li | grep Download | "); - if (my $line = ) { - my @cols = split (/"/, $line); - $filename = $cols[3]; - chomp ($filename); - } - else { - close (FH); - return \@file_list; - } +# --------------------------------------------------------------------------------------------------------------------- +# +# +class CommandLineParser(object): + """This class is used to parse command line. It process only options. Command verb is parsed by the main procedure + """ - close (FH); + # ----------------------------------------------------------------------------------------------------------------- - $url = "http://downloads.sourceforge.net" . $filename; - open (FH, "$wget_command -qO- $url 2>/dev/null | grep $filename | grep package_id= | grep release_id | "); + def __init__(self): + # Create the parser object + self.parser = OptionParser() - while (my $line = ) { - my @cols = split (/>/, $line); - my $filename = $cols[2]; - chomp ($filename); - @cols = split (/ \$help, - "s|use_sf=i" => \$use_sf, - "u|url=s@" => \@urls); + # ----------------------------------------------------------------------------------------------------------------- -if ($help) { - print < 0) { - $newest_version = $1; - $newest_file = $file; - } - } - } - } - printf "$newest_file " if $newest_version; -} -printf "\n"; + # ----------------------------------------------------------------------------------------------------------------- + + def __init__(self): + + # Initialize all variables to None. Even if useless, the purpose of this to keep up to date the list + self._verbose = None + self._current_version = None + self._regexp = None + self._upstream_url = None + + # ----------------------------------------------------------------------------------------------------------------- + + def getCurrentVersion(self): + return self._current_version + + + # ----------------------------------------------------------------------------------------------------------------- + + def getRegexp(self): + return self._regexp + + + # ----------------------------------------------------------------------------------------------------------------- + + def getUpstreamURL(self): + return self._upstream_url + + # ----------------------------------------------------------------------------------------------------------------- + + def getVerbose(self): + return self._verbose + +# --------------------------------------------------------------------------------------------------------------------- +# +# +class AbstractCommand(object): + """Base class for command implementation. You should create a derived class per command to implemente. + A "command" represent a concrete action verb given to the program. + """ + + # ----------------------------------------------------------------------------------------------------------------- + + def __init__(self, name): + self.configParser = ConfigurationParser() + self.name = name + + # ----------------------------------------------------------------------------------------------------------------- + + def getName(self): + return self.name + + # ----------------------------------------------------------------------------------------------------------------- + + def execute(self, opts, arguments): + print "TODO Generate and error instead of this message\n" + print self.name, "\n" + +# --------------------------------------------------------------------------------------------------------------------- +# +# +class CheckUpstreamCommand(AbstractCommand): + """CheckUpstream command. This command retrieve the upstream web page and search for a new version. Version check is + done by matching the regexp from the makefile on the page. Results are sorted to get the highest available and + compared to current version + """ + + # ----------------------------------------------------------------------------------------------------------------- + + def __init__(self, name): + super(CheckUpstreamCommand, self).__init__(name) + + # ----------------------------------------------------------------------------------------------------------------- + + def checkArgument(self): + + # Variable used to flag that we have a missing argument + argsValid = True + + # Current version is mandatory + if self.configParser.getCurrentVersion() == None: + print "Error : Current version is not defined. Please use --current-version flag, or --help to display help" + argsValid = False + + # Regexp is mandatory + if self.configParser.getRegexp() == None: + print "Error : Regexp is not defined. Please use --regexp flag, or --help to display help" + argsValid = False + + # UpstreamURL is mandatory + if self.configParser.getUpstreamURL() == None: + print "Error : Upstream version page URL is not defined. Please use --upstream-url flag, or --help to display help" + argsValid = False + + # If arguments are not valid raise an exception + if argsValid == False: + raise MissingArgumentException("Some mandatory arguments are missing. Unable to continue.") + + # ----------------------------------------------------------------------------------------------------------------- + + def UrlContentRetrieve(self, url): + + try: + # Request the upstream URL and open it + req = Request(url) + response = urlopen(req) + + except URLError, e: + if hasattr(e, 'reason'): + print 'We failed to reach a server during retrieval of : ' + url + print 'Reason: ', e.reason + elif hasattr(e, 'code'): + print 'The server couldn\'t fulfill the request during retrieval of : ' + url + print 'Error code: ', e.code + + # Check for response code value. We should get a 200 + raise UpstreamUrlRetrievalFailedException(url) + + else: + # everything is fine, retrieve the page content + return response.read() + + + # ----------------------------------------------------------------------------------------------------------------- + + def GetNewestVersion(self, version1, version2): + + # we consider the version to be composed of several elements separated by '.' ',' '-' or '_' + # an elements can be a string or a number + # at each step we extract the next elements of the two version strings and compare them + + # Retrieve the tokens from both version. Use . - , and _ as splitters + splittingRegExp = "(?:[\.,_-]?)" + tokens1 = re.split(splittingRegExp, version1) + tokens2 = re.split(splittingRegExp, version2) + + if self.configParser.getVerbose(): + print "Comparing " + version1 + " and " + version2 + + # Iterates the toeksn of version 1, pop tokens one by one and compare to the token at same + # in version 2 + while len(tokens1) > 0: + # If we still have tokens in version 1 and version 2 is empty, then version 1 is newer + # TODO: may have to deal with beta suffixes... + if len(tokens2) == 0: + return version1 + + # Convert both elements to integer + # TODO : handles chars in versions + elem1 = tokens1.pop(0) + elem2 = tokens2.pop(0) + + # If both elements are integer, then convert to int before comparison, otherwise compare strings + try: + elem1 = int(elem1) + elem2 = int(elem2) + except: + elem1 = str(elem1) + elem2 = str(elem2) + # print "Doing string comparison" + + # print "Comparing %(elem1)s and %(elem2)s" % { 'elem1' : elem1 , 'elem2' : elem2 } + + # if elements are the same continue the loop + if elem1 == elem2: + continue + + # Test if elem1 is more recent + if elem1 > elem2: + # print "%(elem1)s > %(elem2)s" % { 'elem1' : elem1 , 'elem2' : elem2 } + return version1 + else: + # print "%(elem1)s < %(elem2)s" % { 'elem1' : elem1 , 'elem2' : elem2 } + return version2 + + return version1 + + # ----------------------------------------------------------------------------------------------------------------- + + def execute(self, opts, args): + + try: + + # Initialize configuration + self.configParser.initialize(opts) + + # Need a way to check that all options needed are available + self.checkArgument() + + # Call the method in charge of retrieving upstream content + content = self.UrlContentRetrieve(self.configParser.getUpstreamURL()) + + # Search the strings matching the regexp passed through command line arguments + p = re.compile(self.configParser.getRegexp()) + matches = p.findall(content) + + # Check if we have found some results + if len(matches) == 0: + raise NoUpstreamVersionFoundException(self.configParser.getUpstreamURL(), self.configParser.getRegexp()) + print "No match found, we should trigger some error since even current version has not been found" + return False + else: + newestVersion = self.configParser.getCurrentVersion() + while len(matches) > 0: + newestVersion = self.GetNewestVersion(newestVersion, matches.pop(0)) + + # At the end of the processing loop, test if we have a newer version avail, if yes output it + if newestVersion <> self.configParser.getCurrentVersion(): + print newestVersion + + # Exit after processing, eveythin gis ok, return true to the command processor + return True + + except MissingArgumentException, (instance): + + # Display a cool error message :) + print instance.parameter + + # Exits through exception handling, thus return false to the command processor + return False + + except UpstreamProtocolNotSupportedException, (instance): + + # Display a cool error message :) + print "Protocol " + instance.parameter + " is not supportd by upstream_watch" + + # Exits through exception handling, thus return false to the command processor + return False + + except UpstreamUrlRetrievalFailedException, (instance): + + # Exits through exception handling, thus return false to the command processor + return False + + except NoUpstreamVersionFoundException, (instance): + + # Exits through exception handling, thus return false to the command processor + return False + + +# --------------------------------------------------------------------------------------------------------------------- +# +# +class CommandProcessor(object): + """This class receive commands from the main loop and forward call to concrete command. + """ + + # ----------------------------------------------------------------------------------------------------------------- + + def __init__(self): + """Initialize the objects in charge of concrete command processing. Each object instance are stored in a + map using a key which is the action verb used on the command line. + """ + + # Defines the map storing the concrete commands + self.commandArray = {} + + # Creates all the concrete commands + cmd = CheckUpstreamCommand("check-upstream") + self.commandArray[cmd.getName()] = cmd + + # ----------------------------------------------------------------------------------------------------------------- + + def execute(self, opts, arguments): + """Cette methode teste les differents arguments et appelle la methode execute sur l'objet en charge du traitement + L'ordre de declaration des tests est important. En effet certains flags declanchent des actions, d'autres des options. + """ + + # Check that an action verb is supplied. If none an error is returned + if len(arguments) == 0: + print "Error : no action supplied" + return 1 + + # The first element in the arguments array is the action verb. Retrieve the command + # using action verb as key + if self.commandArray.has_key(arguments[0]): + return self.commandArray[arguments[0]].execute(opts, arguments) + else: + print "Error : %(action)s action is not supported" % { 'action' : arguments[0] } + return 2 + +# --------------------------------------------------------------------------------------------------------------------- +# +# Fonction principale +# +def main(): + """Program main loop. Process args and call concrete command action. + """ + + # Create the command processor object + commandProcessor = CommandProcessor() + + # Parse command line arguments + cliParser = CommandLineParser() + + # Call the command line parser + (opts, args) = cliParser.parse() + + # Call the execute method on the command processor. This method is in charge to find the concrete command + return commandProcessor.execute(opts, args) + +# On sort en rendant le code de retour de main +if __name__ == '__main__': + sys.exit(main()) + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Wed Jan 5 23:47:19 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Wed, 05 Jan 2011 22:47:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[12203] csw/mgar/gar/v2-uwatch2/bin/upstream_watch Message-ID: Revision: 12203 http://gar.svn.sourceforge.net/gar/?rev=12203&view=rev Author: wbonnet Date: 2011-01-05 22:47:19 +0000 (Wed, 05 Jan 2011) Log Message: ----------- Add get-upstream-latest-version command Modified Paths: -------------- csw/mgar/gar/v2-uwatch2/bin/upstream_watch Modified: csw/mgar/gar/v2-uwatch2/bin/upstream_watch =================================================================== --- csw/mgar/gar/v2-uwatch2/bin/upstream_watch 2011-01-05 21:30:29 UTC (rev 12202) +++ csw/mgar/gar/v2-uwatch2/bin/upstream_watch 2011-01-05 22:47:19 UTC (rev 12203) @@ -1,9 +1,9 @@ #!/usr/bin/env python # -# The contents of this file are subject to the COMMON DEVELOPMENT AND -# DISTRIBUTION LICENSE (CDDL) (the "License"); you may not use this -# file except in compliance with the License. +# The contents of this file are subject to the COMMON DEVELOPMENT AND +# DISTRIBUTION LICENSE (CDDL) (the "License"); you may not use this +# file except in compliance with the License. # # Software distributed under the License is distributed on an "AS IS" basis, # WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License @@ -49,7 +49,7 @@ # # class NoUpstreamProtocolException(Exception): - """Exception raised when no protocol is specified in the upstream url + """Exception raised when no protocol is specified in the upstream url """ # ----------------------------------------------------------------------------------------------------------------- @@ -59,7 +59,7 @@ # # class UpstreamUrlRetrievalFailedException(Exception): - """Exception raised when an unsuported protocol is specified in the upstream url + """Exception raised when an unsuported protocol is specified in the upstream url """ # ----------------------------------------------------------------------------------------------------------------- @@ -85,7 +85,7 @@ # # class UpstreamProtocolNotSupportedException(Exception): - """Exception raised when an unsuported protocol is specified in the upstream url + """Exception raised when an unsuported protocol is specified in the upstream url """ # ----------------------------------------------------------------------------------------------------------------- @@ -127,10 +127,10 @@ self.parser = OptionParser() # Add options to parser - self.parser.add_option("-V", "--verbose", help="Activate verbose mode", action="store_true", dest="verbose") - self.parser.add_option("-c", "--current-version", help="Current package version", action="store", dest="current_version") - self.parser.add_option("-r", "--regexp", help="Version matching regular expression", action="store", dest="regexp") - self.parser.add_option("-u", "--upstream-url", help="Upstream version page url", action="store", dest="upstream_url") + self.parser.add_option("-V", "--verbose", help="Activate verbose mode", action="store_true", dest="verbose") + self.parser.add_option("-c", "--current-version", help="Current package version", action="store", dest="current_version") + self.parser.add_option("-r", "--regexp", help="Version matching regular expression", action="store", dest="regexp") + self.parser.add_option("-u", "--upstream-url", help="Upstream version page url", action="store", dest="upstream_url") # ----------------------------------------------------------------------------------------------------------------- @@ -142,14 +142,14 @@ # # class ConfigurationParser(object): - """This handles parameters retrieved either from command line or configuration file. + """This handles parameters retrieved either from command line or configuration file. """ # ----------------------------------------------------------------------------------------------------------------- def initialize(self, args): """Initialize configuration object. If configurations contains files reference, values from the files are - read and copied into this object. Next attempts to retrieve files stored information will read values from + read and copied into this object. Next attempts to retrieve files stored information will read values from this object. """ @@ -175,7 +175,7 @@ # ----------------------------------------------------------------------------------------------------------------- def __init__(self): - + # Initialize all variables to None. Even if useless, the purpose of this to keep up to date the list self._verbose = None self._current_version = None @@ -232,45 +232,18 @@ # --------------------------------------------------------------------------------------------------------------------- # # -class CheckUpstreamCommand(AbstractCommand): - """CheckUpstream command. This command retrieve the upstream web page and search for a new version. Version check is - done by matching the regexp from the makefile on the page. Results are sorted to get the highest available and - compared to current version +class UpstreamWatchCommand(AbstractCommand): + """UpstreamWatch command. This command is the base class used for all upstream watch commands. It provides argument checking + url content retrieving, version comparison, etc. """ # ----------------------------------------------------------------------------------------------------------------- def __init__(self, name): - super(CheckUpstreamCommand, self).__init__(name) + super(UpstreamWatchCommand, self).__init__(name) # ----------------------------------------------------------------------------------------------------------------- - def checkArgument(self): - - # Variable used to flag that we have a missing argument - argsValid = True - - # Current version is mandatory - if self.configParser.getCurrentVersion() == None: - print "Error : Current version is not defined. Please use --current-version flag, or --help to display help" - argsValid = False - - # Regexp is mandatory - if self.configParser.getRegexp() == None: - print "Error : Regexp is not defined. Please use --regexp flag, or --help to display help" - argsValid = False - - # UpstreamURL is mandatory - if self.configParser.getUpstreamURL() == None: - print "Error : Upstream version page URL is not defined. Please use --upstream-url flag, or --help to display help" - argsValid = False - - # If arguments are not valid raise an exception - if argsValid == False: - raise MissingArgumentException("Some mandatory arguments are missing. Unable to continue.") - - # ----------------------------------------------------------------------------------------------------------------- - def UrlContentRetrieve(self, url): try: @@ -285,7 +258,7 @@ elif hasattr(e, 'code'): print 'The server couldn\'t fulfill the request during retrieval of : ' + url print 'Error code: ', e.code - + # Check for response code value. We should get a 200 raise UpstreamUrlRetrievalFailedException(url) @@ -296,19 +269,19 @@ # ----------------------------------------------------------------------------------------------------------------- - def GetNewestVersion(self, version1, version2): + def CompareVersionAndGetNewest(self, version1, version2): # we consider the version to be composed of several elements separated by '.' ',' '-' or '_' # an elements can be a string or a number # at each step we extract the next elements of the two version strings and compare them # Retrieve the tokens from both version. Use . - , and _ as splitters - splittingRegExp = "(?:[\.,_-]?)" + splittingRegExp = "(?:[\.,_-])" tokens1 = re.split(splittingRegExp, version1) tokens2 = re.split(splittingRegExp, version2) if self.configParser.getVerbose(): - print "Comparing " + version1 + " and " + version2 + print "Comparing " + version1 + " and " + version2 # Iterates the toeksn of version 1, pop tokens one by one and compare to the token at same # in version 2 @@ -331,9 +304,9 @@ elem1 = str(elem1) elem2 = str(elem2) # print "Doing string comparison" - - # print "Comparing %(elem1)s and %(elem2)s" % { 'elem1' : elem1 , 'elem2' : elem2 } + # print "Comparing %(elem1)s and %(elem2)s" % { 'elem1' : elem1 , 'elem2' : elem2 } + # if elements are the same continue the loop if elem1 == elem2: continue @@ -345,28 +318,68 @@ else: # print "%(elem1)s < %(elem2)s" % { 'elem1' : elem1 , 'elem2' : elem2 } return version2 - + return version1 +# --------------------------------------------------------------------------------------------------------------------- +# +# +class CheckUpstreamCommand(UpstreamWatchCommand): + """CheckUpstream command. This command retrieve the upstream web page and search for a new version. Version check is + done by matching the regexp from the makefile on the page. Results are sorted to get the highest available and + compared to current version + """ + # ----------------------------------------------------------------------------------------------------------------- + def __init__(self, name): + super(CheckUpstreamCommand, self).__init__(name) + + # ----------------------------------------------------------------------------------------------------------------- + + def checkArgument(self): + + # Variable used to flag that we have a missing argument + argsValid = True + + # Current version is mandatory + if self.configParser.getCurrentVersion() == None: + print "Error : Current version is not defined. Please use --current-version flag, or --help to display help" + argsValid = False + + # Regexp is mandatory + if self.configParser.getRegexp() == None: + print "Error : Regexp is not defined. Please use --regexp flag, or --help to display help" + argsValid = False + + # UpstreamURL is mandatory + if self.configParser.getUpstreamURL() == None: + print "Error : Upstream version page URL is not defined. Please use --upstream-url flag, or --help to display help" + argsValid = False + + # If arguments are not valid raise an exception + if argsValid == False: + raise MissingArgumentException("Some mandatory arguments are missing. Unable to continue.") + + # ----------------------------------------------------------------------------------------------------------------- + def execute(self, opts, args): - + try: # Initialize configuration self.configParser.initialize(opts) - + # Need a way to check that all options needed are available self.checkArgument() - + # Call the method in charge of retrieving upstream content content = self.UrlContentRetrieve(self.configParser.getUpstreamURL()) # Search the strings matching the regexp passed through command line arguments p = re.compile(self.configParser.getRegexp()) matches = p.findall(content) - + # Check if we have found some results if len(matches) == 0: raise NoUpstreamVersionFoundException(self.configParser.getUpstreamURL(), self.configParser.getRegexp()) @@ -375,12 +388,12 @@ else: newestVersion = self.configParser.getCurrentVersion() while len(matches) > 0: - newestVersion = self.GetNewestVersion(newestVersion, matches.pop(0)) + newestVersion = self.CompareVersionAndGetNewest(newestVersion, matches.pop(0)) # At the end of the processing loop, test if we have a newer version avail, if yes output it if newestVersion <> self.configParser.getCurrentVersion(): print newestVersion - + # Exit after processing, eveythin gis ok, return true to the command processor return True @@ -388,7 +401,7 @@ # Display a cool error message :) print instance.parameter - + # Exits through exception handling, thus return false to the command processor return False @@ -396,7 +409,7 @@ # Display a cool error message :) print "Protocol " + instance.parameter + " is not supportd by upstream_watch" - + # Exits through exception handling, thus return false to the command processor return False @@ -414,6 +427,102 @@ # --------------------------------------------------------------------------------------------------------------------- # # +class GetUpstreamLatestVersionCommand(UpstreamWatchCommand): + """GetUpstreamLatestVersion command. This command retrieve the upstream web page and search for the latest version. + Version check is done by matching the regexp from the makefile on the page. Results are sorted to get the newest version + """ + + # ----------------------------------------------------------------------------------------------------------------- + + def __init__(self, name): + super(GetUpstreamLatestVersionCommand, self).__init__(name) + + # ----------------------------------------------------------------------------------------------------------------- + + def checkArgument(self): + + # Variable used to flag that we have a missing argument + argsValid = True + + # Regexp is mandatory + if self.configParser.getRegexp() == None: + print "Error : Regexp is not defined. Please use --regexp flag, or --help to display help" + argsValid = False + + # UpstreamURL is mandatory + if self.configParser.getUpstreamURL() == None: + print "Error : Upstream version page URL is not defined. Please use --upstream-url flag, or --help to display help" + argsValid = False + + # If arguments are not valid raise an exception + if argsValid == False: + raise MissingArgumentException("Some mandatory arguments are missing. Unable to continue.") + + # ----------------------------------------------------------------------------------------------------------------- + + def execute(self, opts, args): + + try: + + # Initialize configuration + self.configParser.initialize(opts) + + # Need a way to check that all options needed are available + self.checkArgument() + + # Call the method in charge of retrieving upstream content + content = self.UrlContentRetrieve(self.configParser.getUpstreamURL()) + + # Search the strings matching the regexp passed through command line arguments + p = re.compile(self.configParser.getRegexp()) + matches = p.findall(content) + + # Check if we have found some results + if len(matches) == 0: + raise NoUpstreamVersionFoundException(self.configParser.getUpstreamURL(), self.configParser.getRegexp()) + print "No match found, we should trigger some error since even current version has not been found" + return False + else: + newestVersion = matches.pop(0) + while len(matches) > 0: + newestVersion = self.CompareVersionAndGetNewest(newestVersion, matches.pop(0)) + + # At the end of the processing loop, we print the version + print newestVersion + + # Exit after processing, eveythin gis ok, return true to the command processor + return True + + except MissingArgumentException, (instance): + + # Display a cool error message :) + print instance.parameter + + # Exits through exception handling, thus return false to the command processor + return False + + except UpstreamProtocolNotSupportedException, (instance): + + # Display a cool error message :) + print "Protocol " + instance.parameter + " is not supportd by upstream_watch" + + # Exits through exception handling, thus return false to the command processor + return False + + except UpstreamUrlRetrievalFailedException, (instance): + + # Exits through exception handling, thus return false to the command processor + return False + + except NoUpstreamVersionFoundException, (instance): + + # Exits through exception handling, thus return false to the command processor + return False + + +# --------------------------------------------------------------------------------------------------------------------- +# +# class CommandProcessor(object): """This class receive commands from the main loop and forward call to concrete command. """ @@ -421,7 +530,7 @@ # ----------------------------------------------------------------------------------------------------------------- def __init__(self): - """Initialize the objects in charge of concrete command processing. Each object instance are stored in a + """Initialize the objects in charge of concrete command processing. Each object instance are stored in a map using a key which is the action verb used on the command line. """ @@ -432,6 +541,9 @@ cmd = CheckUpstreamCommand("check-upstream") self.commandArray[cmd.getName()] = cmd + cmd = GetUpstreamLatestVersionCommand("get-upstream-latest-version") + self.commandArray[cmd.getName()] = cmd + # ----------------------------------------------------------------------------------------------------------------- def execute(self, opts, arguments): @@ -443,7 +555,7 @@ if len(arguments) == 0: print "Error : no action supplied" return 1 - + # The first element in the arguments array is the action verb. Retrieve the command # using action verb as key if self.commandArray.has_key(arguments[0]): @@ -451,11 +563,11 @@ else: print "Error : %(action)s action is not supported" % { 'action' : arguments[0] } return 2 - + # --------------------------------------------------------------------------------------------------------------------- # # Fonction principale -# +# def main(): """Program main loop. Process args and call concrete command action. """ @@ -463,13 +575,13 @@ # Create the command processor object commandProcessor = CommandProcessor() - # Parse command line arguments + # Parse command line arguments cliParser = CommandLineParser() # Call the command line parser (opts, args) = cliParser.parse() - - # Call the execute method on the command processor. This method is in charge to find the concrete command + + # Call the execute method on the command processor. This method is in charge to find the concrete command return commandProcessor.execute(opts, args) # On sort en rendant le code de retour de main This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Jan 6 11:13:45 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 06 Jan 2011 10:13:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[12204] csw/mgar/pkg/rbgems Message-ID: Revision: 12204 http://gar.svn.sourceforge.net/gar/?rev=12204&view=rev Author: dmichelsen Date: 2011-01-06 10:13:45 +0000 (Thu, 06 Jan 2011) Log Message: ----------- rbgems/comma: Initial commit Added Paths: ----------- csw/mgar/pkg/rbgems/comma/ csw/mgar/pkg/rbgems/comma/branches/ csw/mgar/pkg/rbgems/comma/tags/ csw/mgar/pkg/rbgems/comma/trunk/ csw/mgar/pkg/rbgems/comma/trunk/Makefile csw/mgar/pkg/rbgems/comma/trunk/checksums csw/mgar/pkg/rbgems/comma/trunk/files/ Property changes on: csw/mgar/pkg/rbgems/comma/trunk ___________________________________________________________________ Added: svn:ignore + work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/rbgems/comma/trunk/Makefile =================================================================== --- csw/mgar/pkg/rbgems/comma/trunk/Makefile (rev 0) +++ csw/mgar/pkg/rbgems/comma/trunk/Makefile 2011-01-06 10:13:45 UTC (rev 12204) @@ -0,0 +1,22 @@ +NAME = comma +VERSION = 0.4.1 +CATEGORIES = rbgems + +DESCRIPTION = Ruby Comma Seperated Values generation library + +define BLURB + Ruby Coma Seperated Values generation library +endef + +RUNTIME_DEP_PKGS += CSWgem-rspec +RUNTIME_DEP_PKGS += CSWgem-activesupport + +ARCHALL = 1 + +EXTRA_MERGE_EXCLUDE_FILES = .*/\.gitignore + +# These will go away when the packages have been released. +CHECKPKG_OVERRIDES_CSWgem-comma += unidentified-dependency|CSWgem-rspec +CHECKPKG_OVERRIDES_CSWgem-comma += unidentified-dependency|CSWgem-activesupport + +include gar/category.mk Added: csw/mgar/pkg/rbgems/comma/trunk/checksums =================================================================== --- csw/mgar/pkg/rbgems/comma/trunk/checksums (rev 0) +++ csw/mgar/pkg/rbgems/comma/trunk/checksums 2011-01-06 10:13:45 UTC (rev 12204) @@ -0,0 +1 @@ +0e68c70aaf7f1a4b1990dbdf61b4ea11 comma-0.4.1.gem This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Jan 6 12:37:41 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 06 Jan 2011 11:37:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[12205] csw/mgar/pkg/nasm/trunk Message-ID: Revision: 12205 http://gar.svn.sourceforge.net/gar/?rev=12205&view=rev Author: dmichelsen Date: 2011-01-06 11:37:41 +0000 (Thu, 06 Jan 2011) Log Message: ----------- nasm: Update to 2.09.04 Modified Paths: -------------- csw/mgar/pkg/nasm/trunk/Makefile csw/mgar/pkg/nasm/trunk/checksums Modified: csw/mgar/pkg/nasm/trunk/Makefile =================================================================== --- csw/mgar/pkg/nasm/trunk/Makefile 2011-01-06 10:13:45 UTC (rev 12204) +++ csw/mgar/pkg/nasm/trunk/Makefile 2011-01-06 11:37:41 UTC (rev 12205) @@ -1,6 +1,6 @@ # : Makefile 9089 2010-03-11 08:34:46Z wahwah $ NAME = nasm -VERSION = 2.08.01 +VERSION = 2.09.04 CATEGORIES = utils DESCRIPTION = The Netwide Assembler Modified: csw/mgar/pkg/nasm/trunk/checksums =================================================================== --- csw/mgar/pkg/nasm/trunk/checksums 2011-01-06 10:13:45 UTC (rev 12204) +++ csw/mgar/pkg/nasm/trunk/checksums 2011-01-06 11:37:41 UTC (rev 12205) @@ -1 +1 @@ -1e3ebc1289c2be5963571c0937b7a211 nasm-2.08.01.tar.bz2 +c11f083a501adae843d0bc3e7c106c73 nasm-2.09.04.tar.bz2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Jan 6 12:58:41 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 06 Jan 2011 11:58:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[12206] csw/mgar/pkg Message-ID: Revision: 12206 http://gar.svn.sourceforge.net/gar/?rev=12206&view=rev Author: dmichelsen Date: 2011-01-06 11:58:41 +0000 (Thu, 06 Jan 2011) Log Message: ----------- tor: Initial commit Added Paths: ----------- csw/mgar/pkg/tor/ csw/mgar/pkg/tor/branches/ csw/mgar/pkg/tor/tags/ csw/mgar/pkg/tor/trunk/ csw/mgar/pkg/tor/trunk/Makefile csw/mgar/pkg/tor/trunk/checksums csw/mgar/pkg/tor/trunk/files/ Property changes on: csw/mgar/pkg/tor/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/tor/trunk/Makefile =================================================================== --- csw/mgar/pkg/tor/trunk/Makefile (rev 0) +++ csw/mgar/pkg/tor/trunk/Makefile 2011-01-06 11:58:41 UTC (rev 12206) @@ -0,0 +1,34 @@ +# $Id$ +NAME = tor +VERSION = 0.2.1.28 +CATEGORIES = net + +DESCRIPTION = Secure network traffic router +define BLURB +endef + +MASTER_SITES = http://www.torproject.org/dist/ +DISTFILES = $(DISTNAME).tar.gz + +# File name regex to get notifications about upstream software releases +UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz + +VENDOR_URL = http://www.torproject.org +LICENSE = LICENSE + +RUNTIME_DEP_PKGS_CSWtor += CSWosslrt +RUNTIME_DEP_PKGS_CSWtor += CSWlibevent +RUNTIME_DEP_PKGS_CSWtor += CSWzlib + +sysconfdir = /etc/opt/csw +CONFIGURE_ARGS = $(DIRPATHS) + +EXTRA_PAX_ARGS = -s ',/torrc\.sample,/torrc.CSW,p' + +PRESERVECONF += $(sysconfdir)/tor/tor-tsocks.conf +PRESERVECONF += $(sysconfdir)/tor/torrc + +MIGRATE_FILES += tor/tor-tsocks.conf +MIGRATE_FILES += tor/torrc + +include gar/category.mk Property changes on: csw/mgar/pkg/tor/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/tor/trunk/checksums =================================================================== --- csw/mgar/pkg/tor/trunk/checksums (rev 0) +++ csw/mgar/pkg/tor/trunk/checksums 2011-01-06 11:58:41 UTC (rev 12206) @@ -0,0 +1 @@ +11e8384414623b50fe50ba7da85893db tor-0.2.1.28.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Jan 6 13:00:09 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 06 Jan 2011 12:00:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[12207] csw/mgar/gar/v2/lib/python/package_checks_test.py Message-ID: Revision: 12207 http://gar.svn.sourceforge.net/gar/?rev=12207&view=rev Author: wahwah Date: 2011-01-06 12:00:09 +0000 (Thu, 06 Jan 2011) Log Message: ----------- checkpkg: Mocks specific for indiv/set tests Set tests need to be mocked with a different class than individual package tests. Also, using some mox meta magic to avoid boilerplate code. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package_checks_test.py Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks_test.py 2011-01-06 11:58:41 UTC (rev 12206) +++ csw/mgar/gar/v2/lib/python/package_checks_test.py 2011-01-06 12:00:09 UTC (rev 12207) @@ -33,6 +33,8 @@ class CheckpkgUnitTestHelper(object): """Wraps common components of checkpkg tests.""" + __metaclass__ = mox.MoxMetaTestBase + def setUp(self): super(CheckpkgUnitTestHelper, self).setUp() self.mox = mox.Mox() @@ -60,7 +62,6 @@ self.error_mgr_mock, self.logger_mock, self.messenger) - self.mox.VerifyAll() class TestMultipleDepends(CheckpkgUnitTestHelper, unittest.TestCase): This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Jan 6 13:01:44 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 06 Jan 2011 12:01:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[12208] csw/mgar/pkg/libevent/branches/libevent-2.0.x Message-ID: Revision: 12208 http://gar.svn.sourceforge.net/gar/?rev=12208&view=rev Author: dmichelsen Date: 2011-01-06 12:01:43 +0000 (Thu, 06 Jan 2011) Log Message: ----------- libevent/libevent-2.0.x: Adjust package names Modified Paths: -------------- csw/mgar/pkg/libevent/branches/libevent-2.0.x/Makefile csw/mgar/pkg/libevent/branches/libevent-2.0.x/checksums Modified: csw/mgar/pkg/libevent/branches/libevent-2.0.x/Makefile =================================================================== --- csw/mgar/pkg/libevent/branches/libevent-2.0.x/Makefile 2011-01-06 12:00:09 UTC (rev 12207) +++ csw/mgar/pkg/libevent/branches/libevent-2.0.x/Makefile 2011-01-06 12:01:43 UTC (rev 12208) @@ -1,17 +1,7 @@ NAME = libevent -VERSION = 2.0.7 +VERSION = 2.0.10 CATEGORIES = lib -EXTRA_MODULATORS = VERSION -#MODULATIONS_VERSION = 1.1a 1.4.14b 2.0.7 -MODULATIONS_VERSION = 2.0.7 - -SKIP_MODULATIONS = isa-sparcv9-garversion-1.1a -SKIP_MODULATIONS += isa-amd64-garversion-1.1a - -DISTVERSION-1.1a = 1.1a -DISTVERSION-2.0.7 = 2.0.7-rc - DESCRIPTION = Event notification library define BLURB The libevent API provides a mechanism to execute a callback function when a @@ -21,33 +11,31 @@ endef MASTER_SITES = http://www.monkey.org/~provos/ -SOURCEFILES = $(foreach V,$(MODULATIONS_VERSION),$(NAME)-$(DISTVERSION-$V).tar.gz) -DISTFILES += $(SOURCEFILES) +DISTNAME = $(NAME)-$(VERSION)-stable +DISTFILES += $(DISTNAME).tar.gz -DISTNAME = $(NAME)-$(DISTVERSION-$(VERSION)) - # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*)-alpha.tar.gz +UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*)-stable.tar.gz -# PATCHFILES += 0001-Detect-broken-unsetenv-at-unit-test-runtime.patch -# PATCHFILES += 0001-Fix-getaddrinfo-with-protocol-unset-on-Solaris-9.patch +PACKAGES += CSWlibevent2-0-5 +CATALOGNAME_CSWlibevent2-0-5 = libevent2_0_5 +SPKG_DESC_CSWlibevent2-0-5 = Event notification library 2.0, libevent*-2.0.so.5 +RUNTIME_DEP_PKGS_CSWlibevent2-0-5 += CSWosslrt -NOEXTRACT = $(filter-out $(NAME)-$(DISTVERSION-$(VERSION)).tar.gz,$(SOURCEFILES)) -LICENSE = LICENSE - -PACKAGES = CSWlibevent CSWlibevent-devel - -RUNTIME_DEP_PKGS_CSWlibevent += CSWosslrt -RUNTIME_DEP_PKGS_CSWlibevent-devel = CSWlibevent - -CATALOGNAME_CSWlibevent = libevent +PACKAGES += CSWlibevent-devel CATALOGNAME_CSWlibevent-devel = libevent_devel +SPKG_DESC_CSWlibevent-devel = Development files for libevent 2.0 +RUNTIME_DEP_PKGS_CSWlibevent-devel += CSWlibevent2-0-5 +RUNTIME_DEP_PKGS_CSWlibevent-devel += CSWpython -SPKG_DESC_CSWlibevent = Event notification library -SPKG_DESC_CSWlibevent-devel = Event notification library header files +VENDOR_URL = http://www.monkey.org/~provos/libevent/ +LICENSE = LICENSE -SPKG_SOURCEURL = http://www.monkey.org/~provos/libevent/ +# We don't need it and if defined the test breaks +NOISALIST = 1 +LD_OPTIONS = +EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS) BUILD64 = 1 NOISAEXEC = 1 @@ -55,25 +43,16 @@ TEST_TARGET = verify -MERGE_SCRIPTS_isa-default-garversion-1.1a = copy-only -MERGE_DIRS_isa-default-garversion-1.1a = $(libdir) -MERGE_SCRIPTS_isa-extra-garversion-1.1a = copy-relocated-only -MERGE_DIRS_isa-extra-garversion-1.1a = $(libdir) +PKGFILES_CSWlibevent2-0-5 = $(PKGFILES_RT) -MERGE_SCRIPTS_isa-default-garversion-2.0.7 = copy-all -MERGE_SCRIPTS_isa-extra-garversion-2.0.7 = copy-relocated-only -MERGE_DIRS_isa-extra-garversion-2.0.7 = $(libdir) +# These will go away after package release as the files have been moved from CSWlibevent to *-devel +CHECKPKG_OVERRIDES_CSWlibevent-devel += file-collision -PKGFILES_CSWlibevent-devel = $(PKGFILES_DEVEL) -PKGFILES_CSWlibevent-devel += $(bindir)/.* +# The package name guessing has a bug, overwrite for now. +CHECKPKG_OVERRIDES_CSWlibevent2-0-5 += shared-lib-pkgname-mismatch -CHECKPKG_OVERRIDES_CSWlibevent-devel += missing-dependency|CSWpython -CHECKPKG_OVERRIDES_CSWlibevent-devel += surplus-dependency|CSWlibevent - include gar/category.mk post-extract-modulated: -test -f $(WORKSRC)/test/test.sh && perl -pi -e 's,#!/bin/sh,#!/bin/bash,' $(WORKSRC)/test/test.sh @$(MAKECOOKIE) - - Modified: csw/mgar/pkg/libevent/branches/libevent-2.0.x/checksums =================================================================== --- csw/mgar/pkg/libevent/branches/libevent-2.0.x/checksums 2011-01-06 12:00:09 UTC (rev 12207) +++ csw/mgar/pkg/libevent/branches/libevent-2.0.x/checksums 2011-01-06 12:01:43 UTC (rev 12208) @@ -1 +1 @@ -c14d4cf6e7b0d94fe69b88a977214432 libevent-2.0.7-rc.tar.gz +a37401d26cbbf28185211d582741a3d4 libevent-2.0.10-stable.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Jan 6 13:03:50 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 06 Jan 2011 12:03:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[12209] csw/mgar/gar/v2/lib/python/package_checks_test.py Message-ID: Revision: 12209 http://gar.svn.sourceforge.net/gar/?rev=12209&view=rev Author: wahwah Date: 2011-01-06 12:03:50 +0000 (Thu, 06 Jan 2011) Log Message: ----------- checkpkg: Removing the MoxMetaTestBase magic And using a more effective way to disable a package. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package_checks_test.py Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks_test.py 2011-01-06 12:01:43 UTC (rev 12208) +++ csw/mgar/gar/v2/lib/python/package_checks_test.py 2011-01-06 12:03:50 UTC (rev 12209) @@ -33,8 +33,6 @@ class CheckpkgUnitTestHelper(object): """Wraps common components of checkpkg tests.""" - __metaclass__ = mox.MoxMetaTestBase - def setUp(self): super(CheckpkgUnitTestHelper, self).setUp() self.mox = mox.Mox() @@ -62,6 +60,7 @@ self.error_mgr_mock, self.logger_mock, self.messenger) + self.mox.VerifyAll() class TestMultipleDepends(CheckpkgUnitTestHelper, unittest.TestCase): This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Jan 6 13:04:35 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 06 Jan 2011 12:04:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[12210] csw/mgar/gar/v2/lib/python/checkpkg_lib.py Message-ID: Revision: 12210 http://gar.svn.sourceforge.net/gar/?rev=12210&view=rev Author: wahwah Date: 2011-01-06 12:04:35 +0000 (Thu, 06 Jan 2011) Log Message: ----------- checkpkg: Update for the db grants script Modified Paths: -------------- csw/mgar/gar/v2/lib/python/checkpkg_lib.py Modified: csw/mgar/gar/v2/lib/python/checkpkg_lib.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg_lib.py 2011-01-06 12:03:50 UTC (rev 12209) +++ csw/mgar/gar/v2/lib/python/checkpkg_lib.py 2011-01-06 12:04:35 UTC (rev 12210) @@ -342,7 +342,6 @@ paths.append(pkg) return paths_and_pkgs - def GetPkgByPath(self, file_path): """Proxies calls to self.system_pkgmap.""" pkgs_in_catalog = self.catalog.GetPkgByPath( This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Jan 6 13:05:12 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 06 Jan 2011 12:05:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[12211] csw/mgar/gar/v2/lib/python/testdata/neon_stats.py Message-ID: Revision: 12211 http://gar.svn.sourceforge.net/gar/?rev=12211&view=rev Author: wahwah Date: 2011-01-06 12:05:12 +0000 (Thu, 06 Jan 2011) Log Message: ----------- checkpkg: Add 'target' to pkgmap in neon test data Modified Paths: -------------- csw/mgar/gar/v2/lib/python/testdata/neon_stats.py Modified: csw/mgar/gar/v2/lib/python/testdata/neon_stats.py =================================================================== --- csw/mgar/gar/v2/lib/python/testdata/neon_stats.py 2011-01-06 12:04:35 UTC (rev 12210) +++ csw/mgar/gar/v2/lib/python/testdata/neon_stats.py 2011-01-06 12:05:12 UTC (rev 12211) @@ -189,6 +189,7 @@ 'line': ': 1 1763', 'mode': None, 'path': None, + 'target': None, 'type': '1', 'user': None}, {'class': 'none', @@ -196,6 +197,7 @@ 'line': '1 s none /opt/csw/lib/libneon.so=libneon.so.27.2.0', 'mode': None, 'path': '/opt/csw/lib/libneon.so', + 'target': '/opt/csw/lib/libneon.so.27.2.3', 'type': 's', 'user': None}, {'class': 'none', @@ -203,6 +205,7 @@ 'line': '1 s none /opt/csw/lib/libneon.so.26=libneon.so.26.0.4', 'mode': None, 'path': '/opt/csw/lib/libneon.so.26', + 'target': '/opt/csw/lib/libneon.so.26.0.4', 'type': 's', 'user': None}, {'class': 'none', @@ -217,6 +220,7 @@ 'line': '1 s none /opt/csw/lib/libneon.so.27=libneon.so.27.2.0', 'mode': None, 'path': '/opt/csw/lib/libneon.so.27', + 'target': '/opt/csw/lib/libneon.so.27.2.3', 'type': 's', 'user': None}, {'class': 'none', @@ -231,6 +235,7 @@ 'line': '1 s none /opt/csw/lib/sparcv9/libneon.so=libneon.so.27.2.0', 'mode': None, 'path': '/opt/csw/lib/sparcv9/libneon.so', + 'target': '/opt/csw/lib/sparcv9/libneon.so.27.2.3', 'type': 's', 'user': None}, {'class': 'none', @@ -238,6 +243,7 @@ 'line': '1 s none /opt/csw/lib/sparcv9/libneon.so.26=libneon.so.26.0.4', 'mode': None, 'path': '/opt/csw/lib/sparcv9/libneon.so.26', + 'target': '/opt/csw/lib/sparcv9/libneon.so.26.0.4', 'type': 's', 'user': None}, {'class': 'none', @@ -252,6 +258,7 @@ 'line': '1 s none /opt/csw/lib/sparcv9/libneon.so.27=libneon.so.27.2.0', 'mode': None, 'path': '/opt/csw/lib/sparcv9/libneon.so.27', + 'target': '/opt/csw/lib/sparcv9/libneon.so.27.2.3', 'type': 's', 'user': None}, {'class': 'none', This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Jan 6 13:05:48 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 06 Jan 2011 12:05:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[12212] csw/mgar/gar/v2/lib/python/database.py Message-ID: Revision: 12212 http://gar.svn.sourceforge.net/gar/?rev=12212&view=rev Author: wahwah Date: 2011-01-06 12:05:48 +0000 (Thu, 06 Jan 2011) Log Message: ----------- checkpkg: Better error messages on bad schema Depending on which is newer, suggest either updating the application sources, or the database. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/database.py Modified: csw/mgar/gar/v2/lib/python/database.py =================================================================== --- csw/mgar/gar/v2/lib/python/database.py 2011-01-06 12:05:12 UTC (rev 12211) +++ csw/mgar/gar/v2/lib/python/database.py 2011-01-06 12:05:48 UTC (rev 12212) @@ -82,12 +82,17 @@ ldm.InitialDataImport() ldm.SetDatabaseSchemaVersion() else: - raise DatabaseError( + msg = ( "Database schema does not match the application. " "Database contains: %s, " "the application expects: %s. " - "Make sure your application sources are up to date." % (ldm.GetDatabaseSchemaVersion(), DB_SCHEMA_VERSION)) + if DB_SCHEMA_VERSION < ldm.GetDatabaseSchemaVersion(): + msg += "Make sure your application sources are up to date." + elif DB_SCHEMA_VERSION > ldm.GetDatabaseSchemaVersion(): + msg += ("Make sure your database is up to date. " + "Re-create it if necessary.") + raise DatabaseError(msg) def _CheckAndMaybeFixFreshness(self, auto_fix): ldm = LocalDatabaseManager() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Jan 6 13:06:19 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 06 Jan 2011 12:06:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[12213] csw/mgar/gar/v2/lib/python/package_checks.py Message-ID: Revision: 12213 http://gar.svn.sourceforge.net/gar/?rev=12213&view=rev Author: wahwah Date: 2011-01-06 12:06:19 +0000 (Thu, 06 Jan 2011) Log Message: ----------- checkpkg: Log the list of linkable libraries As a side note, we might start thinking about logging to a file instead the screen. With the current amount of output, I log to a file anyway. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package_checks.py Modified: csw/mgar/gar/v2/lib/python/package_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks.py 2011-01-06 12:05:48 UTC (rev 12212) +++ csw/mgar/gar/v2/lib/python/package_checks.py 2011-01-06 12:06:19 UTC (rev 12213) @@ -968,6 +968,9 @@ soname = os.path.split(binary_info["path"])[1] linkable_shared_libs.append((soname, binary_info)) check_names = True + logging.debug("CheckSharedLibraryNamingPolicy(): " + "linkable shared libs of %s: %s" + % (pkgname, linkable_shared_libs)) if len(linkable_shared_libs) > 1: sonames = sorted(set([x[0] for x in linkable_shared_libs])) tmp = su.MakePackageNameBySonameCollection(sonames) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Jan 6 13:06:53 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 06 Jan 2011 12:06:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[12214] csw/mgar/gar/v2/lib/python/checkpkg_lib.py Message-ID: Revision: 12214 http://gar.svn.sourceforge.net/gar/?rev=12214&view=rev Author: wahwah Date: 2011-01-06 12:06:53 +0000 (Thu, 06 Jan 2011) Log Message: ----------- checkpkg: Removing an unused function Modified Paths: -------------- csw/mgar/gar/v2/lib/python/checkpkg_lib.py Modified: csw/mgar/gar/v2/lib/python/checkpkg_lib.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg_lib.py 2011-01-06 12:06:19 UTC (rev 12213) +++ csw/mgar/gar/v2/lib/python/checkpkg_lib.py 2011-01-06 12:06:53 UTC (rev 12214) @@ -155,10 +155,6 @@ return super(CheckpkgManagerBase, self).GetSqlobjectTriad( self.osrel, self.arch, self.catrel) - def GetPackageStatsList(self): - raise RuntimeError("Please don't use this function as it violates " - "the Law of Demeter.") - def FormatReports(self, errors, messages, gar_lines): namespace = { "name": self.name, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Jan 6 13:07:24 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 06 Jan 2011 12:07:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[12215] csw/mgar/gar/v2/lib/python/package_checks.py Message-ID: Revision: 12215 http://gar.svn.sourceforge.net/gar/?rev=12215&view=rev Author: wahwah Date: 2011-01-06 12:07:24 +0000 (Thu, 06 Jan 2011) Log Message: ----------- checkpkg: Two comments for package_checks Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package_checks.py Modified: csw/mgar/gar/v2/lib/python/package_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks.py 2011-01-06 12:06:53 UTC (rev 12214) +++ csw/mgar/gar/v2/lib/python/package_checks.py 2011-01-06 12:07:24 UTC (rev 12215) @@ -962,6 +962,8 @@ if binary_info["path"] in shared_libs: if su.IsLibraryLinkable(binary_info["path"]): # It is a shared library and other projects might link to it. + # Some libraries don't declare a soname; compile time linker defaults + # to their file name. if "soname" in binary_info and binary_info["soname"]: soname = binary_info["soname"] else: @@ -1011,7 +1013,7 @@ pkgname) check_names = False - else: + else: # len(linkable_shared_libs) > 1 if pkgname not in multilib_pkgnames: error_mgr.ReportError( "shared-lib-pkgname-mismatch", This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Jan 6 13:07:55 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 06 Jan 2011 12:07:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[12216] csw/mgar/gar/v2/lib/sh/db_privileges.sh Message-ID: Revision: 12216 http://gar.svn.sourceforge.net/gar/?rev=12216&view=rev Author: wahwah Date: 2011-01-06 12:07:55 +0000 (Thu, 06 Jan 2011) Log Message: ----------- db_permissions: maintainers table The maintainers table needs to be modifiable by the release manager. Modified Paths: -------------- csw/mgar/gar/v2/lib/sh/db_privileges.sh Modified: csw/mgar/gar/v2/lib/sh/db_privileges.sh =================================================================== --- csw/mgar/gar/v2/lib/sh/db_privileges.sh 2011-01-06 12:07:24 UTC (rev 12215) +++ csw/mgar/gar/v2/lib/sh/db_privileges.sh 2011-01-06 12:07:55 UTC (rev 12216) @@ -32,12 +32,12 @@ csw_config data_source host - maintainer os_release ) TABLES_REL_MGR=( srv4_file_in_catalog csw_file + maintainer ) TABLES_REGULAR=( pkginst This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Jan 6 13:24:20 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 06 Jan 2011 12:24:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[12217] csw/mgar/pkg/tor/trunk/Makefile Message-ID: Revision: 12217 http://gar.svn.sourceforge.net/gar/?rev=12217&view=rev Author: dmichelsen Date: 2011-01-06 12:24:20 +0000 (Thu, 06 Jan 2011) Log Message: ----------- tor: Add fixes for binding against new libevent2_0_5 Modified Paths: -------------- csw/mgar/pkg/tor/trunk/Makefile Modified: csw/mgar/pkg/tor/trunk/Makefile =================================================================== --- csw/mgar/pkg/tor/trunk/Makefile 2011-01-06 12:07:55 UTC (rev 12216) +++ csw/mgar/pkg/tor/trunk/Makefile 2011-01-06 12:24:20 UTC (rev 12217) @@ -17,7 +17,7 @@ LICENSE = LICENSE RUNTIME_DEP_PKGS_CSWtor += CSWosslrt -RUNTIME_DEP_PKGS_CSWtor += CSWlibevent +RUNTIME_DEP_PKGS_CSWtor += CSWlibevent2-0-5 RUNTIME_DEP_PKGS_CSWtor += CSWzlib sysconfdir = /etc/opt/csw @@ -31,4 +31,11 @@ MIGRATE_FILES += tor/tor-tsocks.conf MIGRATE_FILES += tor/torrc +# New libevent has not been released +CHECKPKG_OVERRIDES_CSWtor += soname-not-found|libevent-2.0.so.5|is|needed|by|opt/csw/bin/tor +CHECKPKG_OVERRIDES_CSWtor += soname-not-found|libevent-2.0.so.5|is|needed|by|opt/csw/bin/tor-resolve +CHECKPKG_OVERRIDES_CSWtor += soname-not-found|libevent-2.0.so.5|is|needed|by|opt/csw/bin/tor-gencert +CHECKPKG_OVERRIDES_CSWtor += unidentified-dependency|CSWlibevent2-0-5 +CHECKPKG_OVERRIDES_CSWtor += surplus-dependency|CSWlibevent2-0-5 + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Jan 6 13:28:51 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 06 Jan 2011 12:28:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[12218] csw/mgar/pkg/tmux/trunk Message-ID: Revision: 12218 http://gar.svn.sourceforge.net/gar/?rev=12218&view=rev Author: dmichelsen Date: 2011-01-06 12:28:51 +0000 (Thu, 06 Jan 2011) Log Message: ----------- tmux: Update to 1.4 and adjust to new libevent2_0_5 Modified Paths: -------------- csw/mgar/pkg/tmux/trunk/Makefile csw/mgar/pkg/tmux/trunk/checksums Added Paths: ----------- csw/mgar/pkg/tmux/trunk/files/0001-Use-inttypes.h-if-stdint.h-is-not-available.patch Removed Paths: ------------- csw/mgar/pkg/tmux/trunk/files/0001-old-style-patch-0000-stdint.patch csw/mgar/pkg/tmux/trunk/files/0002-Fix-one-more-inttypes.h.patch csw/mgar/pkg/tmux/trunk/files/0003-Add-fix-for-missing-MAXHOSTNAMELEN.patch csw/mgar/pkg/tmux/trunk/files/COPYING Modified: csw/mgar/pkg/tmux/trunk/Makefile =================================================================== --- csw/mgar/pkg/tmux/trunk/Makefile 2011-01-06 12:24:20 UTC (rev 12217) +++ csw/mgar/pkg/tmux/trunk/Makefile 2011-01-06 12:28:51 UTC (rev 12218) @@ -1,17 +1,15 @@ NAME = tmux -VERSION = 1.3 +VERSION = 1.4 CATEGORIES = apps DESCRIPTION = Terminal Multiplexer -SF_PROJ = $(NAME) MASTER_SITES = $(SF_MIRRORS) DISTFILES = $(NAME)-$(VERSION).tar.gz -DISTFILES += COPYING -PATCHFILES = 0001-old-style-patch-0000-stdint.patch -PATCHFILES += 0002-Fix-one-more-inttypes.h.patch -PATCHFILES += 0003-Add-fix-for-missing-MAXHOSTNAMELEN.patch +# Use patch unless this is fixed: +# https://sourceforge.net/tracker/?func=detail&aid=3152389&group_id=200378&atid=973264 +PATCHFILES = 0001-Use-inttypes.h-if-stdint.h-is-not-available.patch # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz @@ -19,6 +17,9 @@ RUNTIME_DEP_PKGS = CSWlibevent BUILD_DEP_PKGS = CSWlibevent-devel +LICENSE = NOTES +VENDOR_URL = http://tmux.sourceforge.net + CONFIGURE_ARGS = EXTRA_CPPFLAGS = -D__inline=inline @@ -28,6 +29,10 @@ INSTALL_SCRIPTS = custom +# New libevent2_0_5 has not been released, remove after release +CHECKPKG_OVERRIDES_CSWtmux += soname-not-found|libevent-2.0.so.5|is|needed|by|opt/csw/bin/tmux +CHECKPKG_OVERRIDES_CSWtmux += surplus-dependency|CSWlibevent + include gar/category.mk PATH := /opt/csw/gnu:$(PATH) Modified: csw/mgar/pkg/tmux/trunk/checksums =================================================================== --- csw/mgar/pkg/tmux/trunk/checksums 2011-01-06 12:24:20 UTC (rev 12217) +++ csw/mgar/pkg/tmux/trunk/checksums 2011-01-06 12:28:51 UTC (rev 12218) @@ -1,5 +1 @@ -58b41f4648140297ed218db06a023450 0001-old-style-patch-0000-stdint.patch -6d6be91f763e1b4c15ec8145efbda66e 0002-Fix-one-more-inttypes.h.patch -2a87ff8258d61d719a3b046a6d68d2d2 0003-Add-fix-for-missing-MAXHOSTNAMELEN.patch -8ad333c4590c5ed45f1b4d0218ede7a7 COPYING -96e60cb206de2db0610b9fb6a64c2251 tmux-1.3.tar.gz +0bfc7dd9a5bab192406167589c716a21 tmux-1.4.tar.gz Added: 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 (rev 0) +++ csw/mgar/pkg/tmux/trunk/files/0001-Use-inttypes.h-if-stdint.h-is-not-available.patch 2011-01-06 12:28:51 UTC (rev 12218) @@ -0,0 +1,28 @@ +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 + Deleted: csw/mgar/pkg/tmux/trunk/files/0001-old-style-patch-0000-stdint.patch =================================================================== --- csw/mgar/pkg/tmux/trunk/files/0001-old-style-patch-0000-stdint.patch 2011-01-06 12:24:20 UTC (rev 12217) +++ csw/mgar/pkg/tmux/trunk/files/0001-old-style-patch-0000-stdint.patch 2011-01-06 12:28:51 UTC (rev 12218) @@ -1,81 +0,0 @@ -From a2255d651e3a64c0133d56533d934260b71d1cc5 Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Wed, 12 May 2010 10:21:45 +0200 -Subject: [PATCH 1/3] old style patch: 0000-stdint.patch - ---- - input-keys.c | 2 +- - osdep-freebsd.c | 2 +- - tmux.h | 2 +- - window.c | 2 +- - xmalloc.c | 2 +- - 5 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/input-keys.c b/input-keys.c -index 1e2b18e..afcecaa 100644 ---- a/input-keys.c -+++ b/input-keys.c -@@ -18,7 +18,7 @@ - - #include - --#include -+#include - #include - #include - -diff --git a/osdep-freebsd.c b/osdep-freebsd.c -index ddd865e..4dad659 100644 ---- a/osdep-freebsd.c -+++ b/osdep-freebsd.c -@@ -24,7 +24,7 @@ - - #include - #include --#include -+#include - #include - #include - #include -diff --git a/tmux.h b/tmux.h -index c8b48f3..d78b46e 100644 ---- a/tmux.h -+++ b/tmux.h -@@ -31,7 +31,7 @@ - #include - #include - #include --#include -+#include - #include - #include - -diff --git a/window.c b/window.c -index 13439c9..e1506a5 100644 ---- a/window.c -+++ b/window.c -@@ -24,7 +24,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include -diff --git a/xmalloc.c b/xmalloc.c -index e9f96a1..96b59f7 100644 ---- a/xmalloc.c -+++ b/xmalloc.c -@@ -20,7 +20,7 @@ - - #include - #include --#include -+#include - #include - #include - --- -1.7.1 - Deleted: csw/mgar/pkg/tmux/trunk/files/0002-Fix-one-more-inttypes.h.patch =================================================================== --- csw/mgar/pkg/tmux/trunk/files/0002-Fix-one-more-inttypes.h.patch 2011-01-06 12:24:20 UTC (rev 12217) +++ csw/mgar/pkg/tmux/trunk/files/0002-Fix-one-more-inttypes.h.patch 2011-01-06 12:28:51 UTC (rev 12218) @@ -1,25 +0,0 @@ -From 5b87d0623c11043f670ec4e2d11197a9030edda1 Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Wed, 12 May 2010 14:38:28 +0200 -Subject: [PATCH 2/3] Fix one more inttypes.h - ---- - compat/asprintf.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/compat/asprintf.c b/compat/asprintf.c -index cb5282b..66b73d5 100644 ---- a/compat/asprintf.c -+++ b/compat/asprintf.c -@@ -18,7 +18,7 @@ - - #include - #include --#include -+#include - #include - - #include "tmux.h" --- -1.7.1 - Deleted: csw/mgar/pkg/tmux/trunk/files/0003-Add-fix-for-missing-MAXHOSTNAMELEN.patch =================================================================== --- csw/mgar/pkg/tmux/trunk/files/0003-Add-fix-for-missing-MAXHOSTNAMELEN.patch 2011-01-06 12:24:20 UTC (rev 12217) +++ csw/mgar/pkg/tmux/trunk/files/0003-Add-fix-for-missing-MAXHOSTNAMELEN.patch 2011-01-06 12:28:51 UTC (rev 12218) @@ -1,26 +0,0 @@ -From 374b542205a8ebee89c123f203600c627a1bdd45 Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen -Date: Fri, 23 Jul 2010 11:25:22 +0200 -Subject: [PATCH 3/3] Add fix for missing MAXHOSTNAMELEN - ---- - screen.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -diff --git a/screen.c b/screen.c -index e6d56c9..ee36024 100644 ---- a/screen.c -+++ b/screen.c -@@ -22,6 +22,9 @@ - #include - #include - -+/* For MAXHOSTNAMELEN */ -+#include -+ - #include "tmux.h" - - void screen_resize_x(struct screen *, u_int); --- -1.7.1 - Deleted: csw/mgar/pkg/tmux/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/tmux/trunk/files/COPYING 2011-01-06 12:24:20 UTC (rev 12217) +++ csw/mgar/pkg/tmux/trunk/files/COPYING 2011-01-06 12:28:51 UTC (rev 12218) @@ -1,8 +0,0 @@ -This file and the CHANGES, FAQ and TODO files are licensed under the ISC -license. Files under examples/ remain copyright their authors unless otherwise -stated in the file but permission has been received to distribute them with -tmux. All other files have a license and copyright notice at their -start. Please contact me with any queries. - --- Nicholas Marriott - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Jan 6 13:36:48 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 06 Jan 2011 12:36:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[12219] csw/mgar/pkg/cpan/Event-Lib/trunk/Makefile Message-ID: Revision: 12219 http://gar.svn.sourceforge.net/gar/?rev=12219&view=rev Author: dmichelsen Date: 2011-01-06 12:36:48 +0000 (Thu, 06 Jan 2011) Log Message: ----------- cpan/Event-Lib: Change dependency to new CSWlibevent2-0-5 Modified Paths: -------------- csw/mgar/pkg/cpan/Event-Lib/trunk/Makefile Modified: csw/mgar/pkg/cpan/Event-Lib/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Event-Lib/trunk/Makefile 2011-01-06 12:28:51 UTC (rev 12218) +++ csw/mgar/pkg/cpan/Event-Lib/trunk/Makefile 2011-01-06 12:36:48 UTC (rev 12219) @@ -14,8 +14,10 @@ PACKAGES = CSWpmeventlib CATALOGNAME = pm_eventlib +LICENSE = README + BUILD_DEP_PKGS = CSWlibevent-devel -RUNTIME_DEP_PKGS = CSWlibevent +RUNTIME_DEP_PKGS = CSWlibevent2-0-5 # Sun cc inline function patch PATCHFILES = inline.diff @@ -28,4 +30,8 @@ # https://rt.cpan.org/Ticket/Display.html?id=51129 SKIPTEST = 1 +# These can be removed after release of libevent2_0_5 +CHECKPKG_OVERRIDES_CSWpmeventlib += unidentified-dependency|CSWlibevent2-0-5 +CHECKPKG_OVERRIDES_CSWpmeventlib += soname-not-found|libevent-2.0.so.5|is|needed|by|opt/csw/lib/perl/csw/auto/Event/Lib/Lib.so + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Jan 6 14:12:53 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 06 Jan 2011 13:12:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[12220] csw/mgar/pkg/tmux/trunk/Makefile Message-ID: Revision: 12220 http://gar.svn.sourceforge.net/gar/?rev=12220&view=rev Author: dmichelsen Date: 2011-01-06 13:12:52 +0000 (Thu, 06 Jan 2011) Log Message: ----------- tmux: Change dependency to new libevent Modified Paths: -------------- csw/mgar/pkg/tmux/trunk/Makefile Modified: csw/mgar/pkg/tmux/trunk/Makefile =================================================================== --- csw/mgar/pkg/tmux/trunk/Makefile 2011-01-06 12:36:48 UTC (rev 12219) +++ csw/mgar/pkg/tmux/trunk/Makefile 2011-01-06 13:12:52 UTC (rev 12220) @@ -14,7 +14,7 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz -RUNTIME_DEP_PKGS = CSWlibevent +RUNTIME_DEP_PKGS = CSWlibevent2-0-5 BUILD_DEP_PKGS = CSWlibevent-devel LICENSE = NOTES @@ -31,7 +31,8 @@ # New libevent2_0_5 has not been released, remove after release CHECKPKG_OVERRIDES_CSWtmux += soname-not-found|libevent-2.0.so.5|is|needed|by|opt/csw/bin/tmux -CHECKPKG_OVERRIDES_CSWtmux += surplus-dependency|CSWlibevent +CHECKPKG_OVERRIDES_CSWtmux += surplus-dependency|CSWlibevent2-0-5 +CHECKPKG_OVERRIDES_CSWtmux += unidentified-dependency|CSWlibevent2-0-5 include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Thu Jan 6 14:19:15 2011 From: maciej at opencsw.org (Maciej (Matchek) Blizinski) Date: Thu, 6 Jan 2011 13:19:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[12207] csw/mgar/gar/v2/lib/python/package_checks_test.py In-Reply-To: References: Message-ID: In this commit, the description does not match the actual change. I'm blaming git-svn. There is a matching description in another change. From dmichelsen at users.sourceforge.net Thu Jan 6 14:20:01 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 06 Jan 2011 13:20:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[12221] csw/mgar/pkg/libevent/trunk Message-ID: Revision: 12221 http://gar.svn.sourceforge.net/gar/?rev=12221&view=rev Author: dmichelsen Date: 2011-01-06 13:20:01 +0000 (Thu, 06 Jan 2011) Log Message: ----------- libevent: Remove 1.1a and version modulation, make CSWlibevent stub to legacy version as 2.0 is out Modified Paths: -------------- csw/mgar/pkg/libevent/trunk/Makefile csw/mgar/pkg/libevent/trunk/checksums Modified: csw/mgar/pkg/libevent/trunk/Makefile =================================================================== --- csw/mgar/pkg/libevent/trunk/Makefile 2011-01-06 13:12:52 UTC (rev 12220) +++ csw/mgar/pkg/libevent/trunk/Makefile 2011-01-06 13:20:01 UTC (rev 12221) @@ -2,15 +2,6 @@ VERSION = 1.4.14b CATEGORIES = lib -EXTRA_MODULATORS = VERSION -MODULATIONS_VERSION = 1.1a 1.4.14b - -SKIP_MODULATIONS = isa-sparcv9-garversion-1.1a -SKIP_MODULATIONS += isa-amd64-garversion-1.1a - -DISTVERSION-1.1a = 1.1a -DISTVERSION-1.4.14b = 1.4.14b-stable - DESCRIPTION = Event notification library define BLURB The libevent API provides a mechanism to execute a callback function when a @@ -20,60 +11,44 @@ endef MASTER_SITES = http://www.monkey.org/~provos/ -SOURCEFILES = $(foreach V,$(MODULATIONS_VERSION),$(NAME)-$(DISTVERSION-$V).tar.gz) -DISTFILES += $(SOURCEFILES) +DISTNAME = $(NAME)-$(VERSION)-stable +DISTFILES = $(DISTNAME).tar.gz # From http://www.monkey.org/~provos/libevent/LICENSE DISTFILES += LICENSE LICENSE = LICENSE -NOEXTRACT = $(filter-out $(NAME)-$(DISTVERSION-$(VERSION)).tar.gz,$(SOURCEFILES)) +PACKAGES += CSWlibevent1-4-2 +CATALOGNAME_CSWlibevent1-4-2 = libevent1_4_2 +SPKG_DESC_CSWlibevent1-4-2 = Event notification library, libevent-1.4.so.2 +PKGFILES_CSWlibevent1-4-2 = $(PKGFILES_RT) -PACKAGES = CSWlibevent CSWlibevent-devel - -RUNTIME_DEP_PKGS_CSWlibevent-devel = CSWlibevent - +PACKAGES += CSWlibevent CATALOGNAME_CSWlibevent = libevent -CATALOGNAME_CSWlibevent-devel = libevent_devel +SPKG_DESC_CSWlibevent = Legacy package as contents moved to soname-specific packages +RUNTIME_DEP_PKGS_CSWlibevent = CSWlibevent1-4-2 +ARCHALL_CSWlibevent = 1 +PKGFILES_CSWlibevent = NOFILES -SPKG_DESC_CSWlibevent = Event notification library -SPKG_DESC_CSWlibevent-devel = Event notification library header files - # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*)-stable.tar.gz SPKG_SOURCEURL = http://www.monkey.org/~provos/libevent/ -WORKSRC = $(WORKDIR)/$(NAME)-$(DISTVERSION-$(VERSION)) - BUILD64 = 1 NOISAEXEC = 1 CONFIGURE_ARGS = $(DIRPATHS) TEST_TARGET = verify -MERGE_SCRIPTS_isa-default-garversion-1.1a = copy-only -MERGE_DIRS_isa-default-garversion-1.1a = $(libdir) -MERGE_SCRIPTS_isa-extra-garversion-1.1a = copy-relocated-only -MERGE_DIRS_isa-extra-garversion-1.1a = $(libdir) +# This is a legacy dependancy +CHECKPKG_OVERRIDES_CSWlibevent += surplus-dependency|CSWlibevent1-4-2 -MERGE_SCRIPTS_isa-default-garversion-1.4.14b = copy-all -MERGE_SCRIPTS_isa-extra-garversion-1.4.14b = copy-relocated-only -MERGE_DIRS_isa-extra-garversion-1.4.14b = $(libdir) +# This is a bug in checkpkg, remove after fixing +CHECKPKG_OVERRIDES_CSWlibevent1-4-2 += shared-lib-pkgname-mismatch -PKGFILES_CSWlibevent-devel = $(PKGFILES_DEVEL) -PKGFILES_CSWlibevent-devel += $(bindir)/.* - -# This is just for the rpcgen -CHECKPKG_OVERRIDES_CSWlibevent-devel += missing-dependency|CSWpython - -CHECKPKG_OVERRIDES_CSWlibevent-devel += surplus-dependency|CSWlibevent - include gar/category.mk -#LIBS += -lresolv -lnsl -#export LIBS - post-extract-modulated: -test -f $(WORKSRC)/test/test.sh && perl -pi -e 's,#!/bin/sh,#!/bin/bash,' $(WORKSRC)/test/test.sh @$(MAKECOOKIE) Modified: csw/mgar/pkg/libevent/trunk/checksums =================================================================== --- csw/mgar/pkg/libevent/trunk/checksums 2011-01-06 13:12:52 UTC (rev 12220) +++ csw/mgar/pkg/libevent/trunk/checksums 2011-01-06 13:20:01 UTC (rev 12221) @@ -1,3 +1 @@ -4d8463a40469ce2e4dfd89b9657fd993 LICENSE -6cc776458ecaf9247550863702a44d7c libevent-1.1a.tar.gz a00e037e4d3f9e4fe9893e8a2d27918c libevent-1.4.14b-stable.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Thu Jan 6 15:22:07 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Thu, 06 Jan 2011 14:22:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[12222] csw/mgar/pkg/yaz/trunk Message-ID: Revision: 12222 http://gar.svn.sourceforge.net/gar/?rev=12222&view=rev Author: dmichelsen Date: 2011-01-06 14:22:07 +0000 (Thu, 06 Jan 2011) Log Message: ----------- yaz: Update to 4.1.2 and package split Modified Paths: -------------- csw/mgar/pkg/yaz/trunk/Makefile csw/mgar/pkg/yaz/trunk/checksums Modified: csw/mgar/pkg/yaz/trunk/Makefile =================================================================== --- csw/mgar/pkg/yaz/trunk/Makefile 2011-01-06 13:20:01 UTC (rev 12221) +++ csw/mgar/pkg/yaz/trunk/Makefile 2011-01-06 14:22:07 UTC (rev 12222) @@ -1,5 +1,5 @@ NAME = yaz -VERSION = 4.0.9 +VERSION = 4.1.2 CATEGORIES = utils DESCRIPTION = Toolkit for Z39.50/SRW/SRU clients and servers @@ -13,10 +13,62 @@ # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz +VENDOR_URL = https://www.indexdata.com/yaz LICENSE = LICENSE -DEP_PKGS = CSWgcrypt CSWgnutls CSWreadline CSWncurses CSWlibxslt CSWgpgerr CSWiconv CSWlibxml2 CSWzlib CSWlibicu +# File splitting taken from yaz.spec +PACKAGES += CSWlibyaz4 +CATALOGNAME_CSWlibyaz4 = libyaz4 +SPKG_DESC_CSWlibyaz4 = Toolkit for Z39.50/SRW/SRU clients and servers, libyaz.so.4 +PKGFILES_CSWlibyaz4 = $(call baseisadirs,$(libdir),libyaz.*\.so\.4(\.\d+)*) +RUNTIME_DEP_PKGS_CSWlibyaz4 += CSWzlib +RUNTIME_DEP_PKGS_CSWlibyaz4 += CSWlibxml2 +RUNTIME_DEP_PKGS_CSWlibyaz4 += CSWgcrypt +RUNTIME_DEP_PKGS_CSWlibyaz4 += CSWlibicu46 +RUNTIME_DEP_PKGS_CSWlibyaz4 += CSWlibxslt +RUNTIME_DEP_PKGS_CSWlibyaz4 += CSWiconv +RUNTIME_DEP_PKGS_CSWlibyaz4 += CSWgnutls +RUNTIME_DEP_PKGS_CSWlibyaz4 += CSWgpgerr + +PACKAGES += CSWlibyaz-devel +CATALOGNAME_CSWlibyaz-devel = libyaz_devel +SPKG_DESC_CSWlibyaz-devel = Development files for libyaz +PKGFILES_CSWlibyaz-devel += $(PKGFILES_DEVEL) +PKGFILES_CSWlibyaz-devel += $(bindir)/yaz-asncomp +PKGFILES_CSWlibyaz-devel += $(sharedstatedir)/yaz/.* +PKGFILES_CSWlibyaz-devel += $(docdir)/yaz/.* +PKGFILES_CSWlibyaz-devel += $(mandir)/man7/.* +RUNTIME_DEP_PKGS_CSWlibyaz-devel += CSWlibyaz4 + +# %{_bindir}/yaz-config +# %{_bindir}/yaz-asncomp +# %{_includedir}/yaz +# %{_libdir}/pkgconfig/yaz.pc +# %{_libdir}/*.so +# %{_libdir}/*.a +# %{_datadir}/aclocal/yaz.m4 +# %{_mandir}/man1/yaz-asncomp.* +# %{_mandir}/man7/yaz.* +# %{_mandir}/man?/yaz-config.* +# %{_datadir}/doc/yaz +# %{_datadir}/yaz + +PACKAGES += CSWyaz +CATALOGNAME_CSWyaz = yaz +SPKG_DESC_CSWyaz = Toolkit for Z39.50/SRW/SRU clients and servers +RUNTIME_DEP_PKGS_CSWyaz += CSWlibyaz4 +RUNTIME_DEP_PKGS_CSWyaz += CSWiconv +RUNTIME_DEP_PKGS_CSWyaz += CSWgnutls +RUNTIME_DEP_PKGS_CSWyaz += CSWgpgerr +RUNTIME_DEP_PKGS_CSWyaz += CSWncurses +RUNTIME_DEP_PKGS_CSWyaz += CSWlibxslt +RUNTIME_DEP_PKGS_CSWyaz += CSWzlib +RUNTIME_DEP_PKGS_CSWyaz += CSWlibxml2 +RUNTIME_DEP_PKGS_CSWyaz += CSWreadline +RUNTIME_DEP_PKGS_CSWyaz += CSWgcrypt +RUNTIME_DEP_PKGS_CSWyaz += CSWlibicu46 + BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) @@ -24,8 +76,19 @@ MERGE_SCRIPTS_isa-extra = copy-relocated-only copy-config-only MERGE_DIRS_isa-extra = $(libdir) -CHECKPKG_OVERRIDES_CSWyaz += soname-not-found|libm.so.2|is|needed|by|opt/csw/lib/amd64/libyaz_icu.so.4.0.0 -CHECKPKG_OVERRIDES_CSWyaz += soname-not-found|libm.so.2|is|needed|by|opt/csw/lib/amd64/libyaz_server.so.4.0.0 -CHECKPKG_OVERRIDES_CSWyaz += soname-not-found|libm.so.2|is|needed|by|opt/csw/lib/amd64/libyaz.so.4.0.0 +# This is a bug in checkpkg +CHECKPKG_OVERRIDES_CSWlibyaz4 += shared-lib-pkgname-mismatch +CHECKPKG_OVERRIDES_CSWlibyaz-devel += wrong-docdir|expected=/opt/csw/shared/doc/libyaz_devel/...|in-package=/opt/csw/share/doc/yaz/license.html +# These can go away after CSWlibicu46 has been officially released +CHECKPKG_OVERRIDES_CSWlibyaz4 += soname-not-found +CHECKPKG_OVERRIDES_CSWlibyaz4 += unidentified-dependency|CSWlibicu46 +CHECKPKG_OVERRIDES_CSWlibyaz4 += surplus-dependency|CSWlibicu46 +CHECKPKG_OVERRIDES_CSWyaz-icu += soname-not-found +CHECKPKG_OVERRIDES_CSWyaz-icu += unidentified-dependency|CSWlibicu46 +CHECKPKG_OVERRIDES_CSWyaz-icu += surplus-dependency|CSWlibicu46 +CHECKPKG_OVERRIDES_CSWyaz += soname-not-found +CHECKPKG_OVERRIDES_CSWyaz += unidentified-dependency|CSWlibicu46 +CHECKPKG_OVERRIDES_CSWyaz += surplus-dependency|CSWlibicu46 + include gar/category.mk Modified: csw/mgar/pkg/yaz/trunk/checksums =================================================================== --- csw/mgar/pkg/yaz/trunk/checksums 2011-01-06 13:20:01 UTC (rev 12221) +++ csw/mgar/pkg/yaz/trunk/checksums 2011-01-06 14:22:07 UTC (rev 12222) @@ -1 +1 @@ -de6a8285e5691d5089971975994210a3 yaz-4.0.9.tar.gz +54e76ff8ee6f460d68678df298e7da71 yaz-4.1.2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Jan 6 15:38:52 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 06 Jan 2011 14:38:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[12223] csw/mgar/gar/v2/lib/python Message-ID: Revision: 12223 http://gar.svn.sourceforge.net/gar/?rev=12223&view=rev Author: wahwah Date: 2011-01-06 14:38:52 +0000 (Thu, 06 Jan 2011) Log Message: ----------- checkpkg: Allow a file names license${suffix} If a package has a file named 'license.html', allow it. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package_checks.py csw/mgar/gar/v2/lib/python/package_checks_test.py Modified: csw/mgar/gar/v2/lib/python/package_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks.py 2011-01-06 14:22:07 UTC (rev 12222) +++ csw/mgar/gar/v2/lib/python/package_checks.py 2011-01-06 14:38:52 UTC (rev 12223) @@ -1141,9 +1141,9 @@ % (binary_info["soname"], binary_info["base_name"])) -def CheckDocDir(pkg_data, error_mgr, logger, messenger): +def CheckLicenseFilePlacement(pkg_data, error_mgr, logger, messenger): pkgname = pkg_data["basic_stats"]["pkgname"] - docpath_re = re.compile(r"/opt/csw/share/doc/(?P[^/]+)/license") + docpath_re = re.compile(r"/opt/csw/share/doc/(?P[^/]+)/license$") for pkgmap_entry in pkg_data["pkgmap"]: if "path" not in pkgmap_entry: continue if not pkgmap_entry["path"]: continue Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks_test.py 2011-01-06 14:22:07 UTC (rev 12222) +++ csw/mgar/gar/v2/lib/python/package_checks_test.py 2011-01-06 14:38:52 UTC (rev 12223) @@ -1444,8 +1444,9 @@ 'soname=libneon.so.27 filename=foo.so.1') -class TestCheckDocDirLicense(CheckpkgUnitTestHelper, unittest.TestCase): - FUNCTION_NAME = 'CheckDocDir' +class TestCheckLicenseFilePlacementLicense(CheckpkgUnitTestHelper, + unittest.TestCase): + FUNCTION_NAME = 'CheckLicenseFilePlacement' def CheckpkgTest(self): self.pkg_data = copy.deepcopy(neon_stats[0]) self.pkg_data["pkgmap"].append({ @@ -1459,9 +1460,23 @@ 'in-package=/opt/csw/share/doc/alien/license') -class TestCheckDocDirRandomFile(CheckpkgUnitTestHelper, unittest.TestCase): +class TestCheckLicenseFilePlacementLicenseDifferentSuffix( + CheckpkgUnitTestHelper, unittest.TestCase): + """A differently suffixed file should not trigger an error.""" + FUNCTION_NAME = 'CheckLicenseFilePlacement' + def CheckpkgTest(self): + self.pkg_data = copy.deepcopy(neon_stats[0]) + self.pkg_data["pkgmap"].append({ + "class": "none", "type": "f", "line": "", + "user": "root", "group": "bin", "mode": '0755', + "path": "/opt/csw/share/doc/alien/license.html", + }) + + +class TestCheckLicenseFilePlacementRandomFile( + CheckpkgUnitTestHelper, unittest.TestCase): "A random file should not trigger the message; only license files." - FUNCTION_NAME = 'CheckDocDir' + FUNCTION_NAME = 'CheckLicenseFilePlacement' def CheckpkgTest(self): self.pkg_data = copy.deepcopy(neon_stats[0]) self.pkg_data["pkgmap"].append({ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Thu Jan 6 16:00:01 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Thu, 06 Jan 2011 15:00:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[12224] csw/mgar/gar/v2/lib/python/opencsw.py Message-ID: Revision: 12224 http://gar.svn.sourceforge.net/gar/?rev=12224&view=rev Author: wahwah Date: 2011-01-06 15:00:01 +0000 (Thu, 06 Jan 2011) Log Message: ----------- checkpkg: Don't stop on a missing package 15:42 <@Dagobert> opencsw.PackageError: Could not find 'README' in '/home/experimental/dam-submit' 15:42 <@Dagobert> zsh: 8683 exit 1 ~/mgar/gar/v2/bin/submitpkg * 15:42 <@Dagobert> dam at login [login]:/home/experimental/libicu > ls -l ../dam-submit/README 15:42 <@Dagobert> -rw-r--r-- 1 dam csw 111 Jan 6 15:41 ../dam-submit/README 15:43 <@Dagobert> IMHO it should print a warning about stuff it can't parse and ignore it Modified Paths: -------------- csw/mgar/gar/v2/lib/python/opencsw.py Modified: csw/mgar/gar/v2/lib/python/opencsw.py =================================================================== --- csw/mgar/gar/v2/lib/python/opencsw.py 2011-01-06 14:38:52 UTC (rev 12223) +++ csw/mgar/gar/v2/lib/python/opencsw.py 2011-01-06 15:00:01 UTC (rev 12224) @@ -306,8 +306,9 @@ if relevant_pkgs: package_files.append(relevant_pkgs[-1]) if not package_files: - raise PackageError("Could not find %s in %s" - % (repr(software), repr(self.dir_path))) + logging.warning( + "Could not find any %s-* packages in %s", + repr(software), repr(self.dir_path)) logging.debug("The latest packages %s in %s are %s", repr(software), repr(self.dir_path), This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Thu Jan 6 21:01:53 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 06 Jan 2011 20:01:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[12225] csw/mgar/pkg/cpan/Compress-Raw-Bzip2/trunk Message-ID: Revision: 12225 http://gar.svn.sourceforge.net/gar/?rev=12225&view=rev Author: bonivart Date: 2011-01-06 20:01:52 +0000 (Thu, 06 Jan 2011) Log Message: ----------- pm_compressrawbz2: update to 2.032 Modified Paths: -------------- csw/mgar/pkg/cpan/Compress-Raw-Bzip2/trunk/Makefile csw/mgar/pkg/cpan/Compress-Raw-Bzip2/trunk/checksums Modified: csw/mgar/pkg/cpan/Compress-Raw-Bzip2/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Compress-Raw-Bzip2/trunk/Makefile 2011-01-06 15:00:01 UTC (rev 12224) +++ csw/mgar/pkg/cpan/Compress-Raw-Bzip2/trunk/Makefile 2011-01-06 20:01:52 UTC (rev 12225) @@ -1,5 +1,5 @@ NAME = Compress-Raw-Bzip2 -VERSION = 2.031 +VERSION = 2.032 CATEGORIES = cpan AUTHOR = PMQS Modified: csw/mgar/pkg/cpan/Compress-Raw-Bzip2/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Compress-Raw-Bzip2/trunk/checksums 2011-01-06 15:00:01 UTC (rev 12224) +++ csw/mgar/pkg/cpan/Compress-Raw-Bzip2/trunk/checksums 2011-01-06 20:01:52 UTC (rev 12225) @@ -1 +1 @@ -40d5c14d43e5615a820d054af55f4d25 Compress-Raw-Bzip2-2.031.tar.gz +08df41206303b12e556d473ba1d74d4f Compress-Raw-Bzip2-2.032.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Thu Jan 6 21:06:29 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 06 Jan 2011 20:06:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[12226] csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk Message-ID: Revision: 12226 http://gar.svn.sourceforge.net/gar/?rev=12226&view=rev Author: bonivart Date: 2011-01-06 20:06:29 +0000 (Thu, 06 Jan 2011) Log Message: ----------- pm_compressrawzlib: update to 2.032 Modified Paths: -------------- csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/Makefile csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/checksums Modified: csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/Makefile 2011-01-06 20:01:52 UTC (rev 12225) +++ csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/Makefile 2011-01-06 20:06:29 UTC (rev 12226) @@ -1,5 +1,5 @@ NAME = Compress-Raw-Zlib -VERSION = 2.030 +VERSION = 2.032 CATEGORIES = cpan AUTHOR = PMQS Modified: csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/checksums 2011-01-06 20:01:52 UTC (rev 12225) +++ csw/mgar/pkg/cpan/Compress-Raw-Zlib/trunk/checksums 2011-01-06 20:06:29 UTC (rev 12226) @@ -1 +1 @@ -35111348ee481deef95aaf804b8fbd4b Compress-Raw-Zlib-2.030.tar.gz +b440004f7ee7b901382cf9bf0ee9e433 Compress-Raw-Zlib-2.032.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Thu Jan 6 22:13:28 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 06 Jan 2011 21:13:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[12227] csw/mgar/pkg/cpan/IO-Compress/trunk Message-ID: Revision: 12227 http://gar.svn.sourceforge.net/gar/?rev=12227&view=rev Author: bonivart Date: 2011-01-06 21:13:28 +0000 (Thu, 06 Jan 2011) Log Message: ----------- pm_iocompress: update to 2.032, declared incompatible with pm_iocompressbase and pm_iocompresszlib, remove man pages colliding with perldoc Modified Paths: -------------- csw/mgar/pkg/cpan/IO-Compress/trunk/Makefile csw/mgar/pkg/cpan/IO-Compress/trunk/checksums Modified: csw/mgar/pkg/cpan/IO-Compress/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/IO-Compress/trunk/Makefile 2011-01-06 20:06:29 UTC (rev 12226) +++ csw/mgar/pkg/cpan/IO-Compress/trunk/Makefile 2011-01-06 21:13:28 UTC (rev 12227) @@ -1,5 +1,5 @@ NAME = IO-Compress -VERSION = 2.020 +VERSION = 2.032 CATEGORIES = cpan AUTHOR = PMQS @@ -21,17 +21,21 @@ endef +DISTFILES += COPYING + RUNTIME_DEP_PKGS = CSWpmcompressrawzlib RUNTIME_DEP_PKGS += CSWpmcompressrawbz2 # Uncomment if all packages who depend on these have switched to depend on this package #INCOMPATIBLE_PKGS = CSWpmcompresszlib -#INCOMPATIBLE_PKGS += CSWpmiocompressbase -#INCOMPATIBLE_PKGS += CSWpmiocompresszlib +INCOMPATIBLE_PKGS += CSWpmiocompressbase +INCOMPATIBLE_PKGS += CSWpmiocompresszlib PACKAGES = CSWpmiocompress CATALOGNAME = pm_iocompress ARCHALL = 1 +EXTRA_MERGE_EXCLUDE_FILES = .*\/man\/man3.* .*\/man\/man1.* + include gar/category.mk Modified: csw/mgar/pkg/cpan/IO-Compress/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/IO-Compress/trunk/checksums 2011-01-06 20:06:29 UTC (rev 12226) +++ csw/mgar/pkg/cpan/IO-Compress/trunk/checksums 2011-01-06 21:13:28 UTC (rev 12227) @@ -1 +1 @@ -2cf377fb8d2ac2d28473f65768f1d179 download/IO-Compress-2.020.tar.gz +b16ac9f5fbb3b5c67294df3b39ce920d IO-Compress-2.032.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Thu Jan 6 22:15:22 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Thu, 06 Jan 2011 21:15:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[12228] csw/mgar/pkg/cpan/IO-Compress/trunk/files/COPYING Message-ID: Revision: 12228 http://gar.svn.sourceforge.net/gar/?rev=12228&view=rev Author: bonivart Date: 2011-01-06 21:15:22 +0000 (Thu, 06 Jan 2011) Log Message: ----------- pm_iocompress: add license Added Paths: ----------- csw/mgar/pkg/cpan/IO-Compress/trunk/files/COPYING Added: csw/mgar/pkg/cpan/IO-Compress/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/IO-Compress/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/IO-Compress/trunk/files/COPYING 2011-01-06 21:15:22 UTC (rev 12228) @@ -0,0 +1,3 @@ + Copyright (c) 1995-2011 Paul Marquess. All rights reserved. + This program is free software; you can redistribute it + and/or modify it under the same terms as Perl itself. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Jan 7 02:53:01 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 07 Jan 2011 01:53:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[12229] csw/mgar/pkg/postgresql/branches/postgresql-9.0/ Makefile Message-ID: Revision: 12229 http://gar.svn.sourceforge.net/gar/?rev=12229&view=rev Author: wahwah Date: 2011-01-07 01:53:01 +0000 (Fri, 07 Jan 2011) Log Message: ----------- postgresql-9.0: libpq and libpq-devel Modified Paths: -------------- csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile 2011-01-06 21:15:22 UTC (rev 12228) +++ csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile 2011-01-07 01:53:01 UTC (rev 12229) @@ -66,44 +66,24 @@ DISTFILES += CSWpostgresql-$(BASE_VERSION_G).postinstall PACKAGES += CSWpostgresql -PACKAGES += CSWlibpq5 -PACKAGES += CSWlibpq-devel -PACKAGES += CSWpostgresql-$(BASE_VERSION_G) -PACKAGES += CSWpostgresql-$(BASE_VERSION_G)-dev PACKAGES += CSWpostgresql-$(BASE_VERSION_G)-doc -CATALOGNAME_CSWpostgresql-$(BASE_VERSION_G) = postgresql_$(BASE_VERSION_G) CATALOGNAME_CSWpostgresql-$(BASE_VERSION_G)-doc = postgresql_$(BASE_VERSION_G)_doc -CATALOGNAME_CSWpostgresql-$(BASE_VERSION_G)-dev = postgresql_$(BASE_VERSION_G)_devel -CATALOGNAME_CSWlibpq5 = libpq -CATALOGNAME_CSWlibpq-devel = libpq_devel CATALOGNAME_CSWpostgresql = postgresql SPKG_DESC_CSWpostgresql = An advanced open source database -SPKG_DESC_CSWpostgresql-$(BASE_VERSION_G) = PostgreSQL, version $(BASE_VERSION).x SPKG_DESC_CSWpostgresql-$(BASE_VERSION_G)-doc = PostgreSQL $(BASE_VERSION).x Documentation -SPKG_DESC_CSWpostgresql-$(BASE_VERSION_G)-dev = PostgreSQL $(BASE_VERSION).x Developer Files -SPKG_DESC_CSWlibpq5 = PostgreSQL C client library (built from $(BASE_VERSION).x sources) -SPKG_DESC_CSWlibpq-devel = PostgreSQL C client headers (built from $(BASE_VERSION).x sources) -# RUNTIME_DEP_PKGS_CSWpostgresql = CSWpostgresql-$(BASE_VERSION_G) -# RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G) += CSWkrb5lib -# RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G) += CSWlibgnugetopt -# RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G) += CSWlibpq5 -# RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G) += CSWlibxml2 -# RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G) += CSWlibxslt -# RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G) += CSWosslrt -# RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G) += CSWreadline -# RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G) += CSWzlib -# RUNTIME_DEP_PKGS_CSWlibpq5 += CSWkrb5lib -# RUNTIME_DEP_PKGS_CSWlibpq5 += CSWlibxml2 -# RUNTIME_DEP_PKGS_CSWlibpq5 += CSWlibxslt -# RUNTIME_DEP_PKGS_CSWlibpq5 += CSWosslrt -# RUNTIME_DEP_PKGS_CSWlibpq5 += CSWzlib -# RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G)-dev = CSWpostgresql-$(BASE_VERSION_G) +RUNTIME_DEP_PKGS_CSWpostgresql-90 += CSWlibxslt +RUNTIME_DEP_PKGS_CSWpostgresql-90 += CSWlibgnugetopt +RUNTIME_DEP_PKGS_CSWpostgresql-90 += CSWzlib +RUNTIME_DEP_PKGS_CSWpostgresql-90 += CSWlibxml2 +RUNTIME_DEP_PKGS_CSWpostgresql-90 += CSWreadline +RUNTIME_DEP_PKGS_CSWpostgresql-90 += CSWkrb5lib +RUNTIME_DEP_PKGS_CSWpostgresql-90 += CSWosslrt +RUNTIME_DEP_PKGS_CSWpostgresql-90 += CSWlibpq5 CHECKPKG_OVERRIDES_CSWpostgresql += surplus-dependency|CSWpostgresql-90 -CHECKPKG_OVERRIDES_CSWpostgresql-90-dev += surplus-dependency|CSWpostgresql-90 ARCHALL_CSWpostgresql = 1 ARCHALL_CSWpostgresql-$(BASE_VERSION_G)-doc = 1 @@ -158,28 +138,8 @@ PKGFILES_CSWpostgresql = NOFILES PKGFILES_CSWpostgresql-$(BASE_VERSION_G)-doc = $(PKGFILES_DOC) -PKGFILES_CSWpostgresql-$(BASE_VERSION_G)-dev = $(PKGFILES_DEVEL) -PKGFILES_CSWlibpq5 = $(call baseisadirs,$(libdir),libpq\.so(\.\d+)+) -PKGFILES_CSWlibpq5 += $(call baseisadirs,$(libpath_install),libpq\.so(\.\d+)+) -PKGFILES_CSWlibpq5 += $(libdir)/64 -# libpq-devel files -PKGFILES_CSWlibpq-devel += $(prefix)/include/postgresql/internal/.* -PKGFILES_CSWlibpq-devel += $(prefix)/include/postgresql/libpq-fe.h -PKGFILES_CSWlibpq-devel += $(prefix)/include/postgresql/libpq-events.h -PKGFILES_CSWlibpq-devel += $(prefix)/include/postgresql/libpq/libpq-fs.h -PKGFILES_CSWlibpq-devel += $(prefix)/include/postgresql/pg_config.*.h -PKGFILES_CSWlibpq-devel += $(prefix)/include/postgresql/postgres_ext.h -PKGFILES_CSWlibpq-devel += $(prefix)/include/postgresql/mb/pg_wchar.h -PKGFILES_CSWlibpq-devel += $(prefix)/lib/libpq.so -# PKGFILES_CSWlibpq-devel += $(prefix)/lib/postgresql/8.4/bin/pg_config usr/bin -# Needs to be moved -PKGFILES_CSWlibpq-devel += $(prefix)/bin/pg_config -PKGFILES_CSWlibpq-devel += $(prefix)/share/postgresql/8.4/man/man1/pg_config.1 -PKGFILES_CSWlibpq-devel += $(prefix)/share/locale/*/LC_MESSAGES/pg_config-8.4.mo - - # initscript_base_name = cswpostgres_$(subst .,_,$(BASE_VERSION)) initscript_base_name = cswpostgres_$(VERSION_NODOT) INITSMF = /etc$(prefix)/init\.d/$(initscript_base_name) @@ -240,6 +200,64 @@ # checkpkg does not detect this dependency automatically CHECKPKG_OVERRIDES_CSWpostgresql-$(BASE_VERSION_G) += surplus-dependency|CSWalternatives +PACKAGES += CSWlibpq5 +CATALOGNAME_CSWlibpq5 = libpq5 +SPKG_DESC_CSWlibpq5 = PostgreSQL C client library (built from $(BASE_VERSION).x sources) +PKGFILES_CSWlibpq5 = $(call baseisadirs,$(libdir),libpq\.so(\.\d+)+) +PKGFILES_CSWlibpq5 += $(call baseisadirs,$(libpath_install),libpq\.so(\.\d+)+) +RUNTIME_DEP_PKGS_CSWlibpq5 += CSWosslrt +RUNTIME_DEP_PKGS_CSWlibpq5 += CSWkrb5lib + +PACKAGES += CSWlibecpg6 +CATALOGNAME_CSWlibecpg6 = libecpg6 +SPKG_DESC_CSWlibecpg6 = Embedded PostgreSQL for C library (built from $(BASE_VERSION).x sources) +PKGFILES_CSWlibecpg6 = $(call baseisadirs,$(libdir),libecpg\.so(\.\d+)+) +PKGFILES_CSWlibecpg6 += $(call baseisadirs,$(libpath_install),libecpg\.so(\.\d+)+) +RUNTIME_DEP_PKGS_CSWlibecpg6 += CSWlibpgtypes3 +RUNTIME_DEP_PKGS_CSWlibecpg6 += CSWlibpq5 + +PACKAGES += CSWlibecpg-compat3 +CATALOGNAME_CSWlibecpg-compat3 = libecpg_compat3 +SPKG_DESC_CSWlibecpg-compat3 = Older version of run-time library for ECPG programs (built from $(BASE_VERSION).x sources) +PKGFILES_CSWlibecpg-compat3 = $(call baseisadirs,$(libdir),libecpg_compat\.so(\.\d+)+) +PKGFILES_CSWlibecpg-compat3 += $(call baseisadirs,$(libpath_install),libecpg_compat\.so(\.\d+)+) +RUNTIME_DEP_PKGS_CSWlibecpg-compat3 += CSWlibecpg6 +RUNTIME_DEP_PKGS_CSWlibecpg-compat3 += CSWlibpgtypes3 +RUNTIME_DEP_PKGS_CSWlibecpg-compat3 += CSWlibpq5 + +PACKAGES += CSWlibpgtypes3 +CATALOGNAME_CSWlibpgtypes3 = libpgtypes3 +SPKG_DESC_CSWlibpgtypes3 = Used by programs built with ecpg (Embedded PostgreSQL for C, built from $(BASE_VERSION).x sources) +PKGFILES_CSWlibpgtypes3 = $(call baseisadirs,$(libdir),libpgtypes\.so(\.\d+)+) +PKGFILES_CSWlibpgtypes3 += $(call baseisadirs,$(libpath_install),libpgtypes\.so(\.\d+)+) + +PACKAGES += CSWlibpq-dev +CATALOGNAME_CSWlibpq-dev = libpq_dev +SPKG_DESC_CSWlibpq-dev = PostgreSQL C client headers (built from $(BASE_VERSION).x sources) +RUNTIME_DEP_PKGS_CSWlibpq-dev += CSWlibxslt +RUNTIME_DEP_PKGS_CSWlibpq-dev += CSWlibxml2 +RUNTIME_DEP_PKGS_CSWlibpq-dev += CSWosslrt +RUNTIME_DEP_PKGS_CSWlibpq-dev += CSWreadline +RUNTIME_DEP_PKGS_CSWlibpq-dev += CSWkrb5lib +RUNTIME_DEP_PKGS_CSWlibpq-dev += CSWlibgnugetopt +RUNTIME_DEP_PKGS_CSWlibpq-dev += CSWzlib +PKGFILES_CSWlibpq-dev += $(prefix)/include/postgresql.* +PKGFILES_CSWlibpq-dev += $(prefix)/lib/.*libpq.so +PKGFILES_CSWlibpq-dev += $(prefix)/lib/.*libecpg.so +PKGFILES_CSWlibpq-dev += $(prefix)/lib/.*libecpg_compat.so +PKGFILES_CSWlibpq-dev += $(prefix)/lib/.*libpgtypes.so +PKGFILES_CSWlibpq-dev += $(prefix)/bin/.*pg_config.* +PKGFILES_CSWlibpq-dev += $(prefix)/share/postgresql/8.4/man/man1/pg_config.1 +PKGFILES_CSWlibpq-dev += $(prefix)/share/locale/*/LC_MESSAGES/pg_config.*\.mo +RUNTIME_DEP_PKGS_CSWlibpq-dev += CSWlibpq5 +RUNTIME_DEP_PKGS_CSWlibpq-dev += CSWlibecpg6 +RUNTIME_DEP_PKGS_CSWlibpq-dev += CSWlibecpg-compat3 + +PACKAGES += CSWpostgresql-$(BASE_VERSION_G) +CATALOGNAME_CSWpostgresql-$(BASE_VERSION_G) = postgresql_$(BASE_VERSION_G) +SPKG_DESC_CSWpostgresql-$(BASE_VERSION_G) = PostgreSQL, version $(BASE_VERSION).x +RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G) += CSWlibpgtypes3 + include gar/category.mk CFLAGS := $(filter-out -I%,$(CFLAGS)) @@ -291,11 +309,19 @@ # done ginstall -d $(PKGROOT)$(PGDATA) gln -s $(ISA_DEFAULT64) $(PKGROOT)$(libdir)/64 - for L in $(notdir $(wildcard $(PKGROOT)$(libdir)/libpq.*)); do \ - gln -s $(pgsubdir)/$$L $(PKGROOT)$(libpath_install)/$$L; \ + # for L in $(notdir $(wildcard $(PKGROOT)$(libdir)/libpq.*)); do \ + # gln -s $(pgsubdir)/$$L $(PKGROOT)$(libpath_install)/$$L; \ + # done + # mkdir -p $(PKGROOT)$(libpath_install)/$(ISA_DEFAULT64) + # for L in $(notdir $(wildcard $(PKGROOT)$(libdir)/$(ISA_DEFAULT64)/libpq.*)); do \ + # gln -s ../$(pgsubdir)/$(ISA_DEFAULT64)/$$L $(PKGROOT)$(libpath_install)/$(ISA_DEFAULT64)/$$L; \ + # done + mkdir -p $(PKGROOT)$(prefix)/lib + mkdir -p $(PKGROOT)$(prefix)/lib/$(ISA_DEFAULT64) + for libname in libpq libecpg libecpg_compat libpgtypes; do \ + mv $(PKGROOT)$(libdir)/$${libname}.so $(PKGROOT)$(prefix)/lib; \ + mv $(PKGROOT)$(libdir)/$(ISA_DEFAULT64)/$${libname}.so $(PKGROOT)$(prefix)/lib/$(ISA_DEFAULT64); \ + mv $(PKGROOT)$(libdir)/$${libname}.so.* $(PKGROOT)$(prefix)/lib; \ + mv $(PKGROOT)$(libdir)/$(ISA_DEFAULT64)/$${libname}.so.* $(PKGROOT)$(prefix)/lib/$(ISA_DEFAULT64); \ done - mkdir -p $(PKGROOT)$(libpath_install)/$(ISA_DEFAULT64) - for L in $(notdir $(wildcard $(PKGROOT)$(libdir)/$(ISA_DEFAULT64)/libpq.*)); do \ - gln -s ../$(pgsubdir)/$(ISA_DEFAULT64)/$$L $(PKGROOT)$(libpath_install)/$(ISA_DEFAULT64)/$$L; \ - done @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Jan 7 03:35:53 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 07 Jan 2011 02:35:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[12230] csw/mgar/pkg/postgresql/branches/postgresql-9.0/ Makefile Message-ID: Revision: 12230 http://gar.svn.sourceforge.net/gar/?rev=12230&view=rev Author: wahwah Date: 2011-01-07 02:35:53 +0000 (Fri, 07 Jan 2011) Log Message: ----------- postgresql-9.0: Switching a dependency Modified Paths: -------------- csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile 2011-01-07 01:53:01 UTC (rev 12229) +++ csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile 2011-01-07 02:35:53 UTC (rev 12230) @@ -252,11 +252,11 @@ RUNTIME_DEP_PKGS_CSWlibpq-dev += CSWlibpq5 RUNTIME_DEP_PKGS_CSWlibpq-dev += CSWlibecpg6 RUNTIME_DEP_PKGS_CSWlibpq-dev += CSWlibecpg-compat3 +RUNTIME_DEP_PKGS_CSWlibpq-dev += CSWlibpgtypes3 PACKAGES += CSWpostgresql-$(BASE_VERSION_G) CATALOGNAME_CSWpostgresql-$(BASE_VERSION_G) = postgresql_$(BASE_VERSION_G) SPKG_DESC_CSWpostgresql-$(BASE_VERSION_G) = PostgreSQL, version $(BASE_VERSION).x -RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G) += CSWlibpgtypes3 include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Fri Jan 7 12:40:13 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 07 Jan 2011 11:40:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[12231] csw/mgar/pkg/cpan/IO-Zlib/trunk/Makefile Message-ID: Revision: 12231 http://gar.svn.sourceforge.net/gar/?rev=12231&view=rev Author: bonivart Date: 2011-01-07 11:40:13 +0000 (Fri, 07 Jan 2011) Log Message: ----------- pm_iozlib: change dep to pm_iocompress, remove man page Modified Paths: -------------- csw/mgar/pkg/cpan/IO-Zlib/trunk/Makefile Modified: csw/mgar/pkg/cpan/IO-Zlib/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/IO-Zlib/trunk/Makefile 2011-01-07 02:35:53 UTC (rev 12230) +++ csw/mgar/pkg/cpan/IO-Zlib/trunk/Makefile 2011-01-07 11:40:13 UTC (rev 12231) @@ -10,11 +10,15 @@ IO::Handle interface. endef -RUNTIME_DEP_PKGS = CSWpmcompresszlib +DISTFILES += COPYING +RUNTIME_DEP_PKGS = CSWpmiocompress + PACKAGES = CSWpmiozlib CATALOGNAME = pm_iozlib ARCHALL = 1 +EXTRA_MERGE_EXCLUDE_FILES = \/opt\/csw\/share\/man.* + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Fri Jan 7 12:41:15 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 07 Jan 2011 11:41:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[12232] csw/mgar/pkg/cpan/IO-Zlib/trunk/files/COPYING Message-ID: Revision: 12232 http://gar.svn.sourceforge.net/gar/?rev=12232&view=rev Author: bonivart Date: 2011-01-07 11:41:15 +0000 (Fri, 07 Jan 2011) Log Message: ----------- pm_iozlib: add license file to SVN Added Paths: ----------- csw/mgar/pkg/cpan/IO-Zlib/trunk/files/COPYING Added: csw/mgar/pkg/cpan/IO-Zlib/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/IO-Zlib/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/IO-Zlib/trunk/files/COPYING 2011-01-07 11:41:15 UTC (rev 12232) @@ -0,0 +1,4 @@ +Copyright (c) Tom Hughes . + +All rights reserved. This program is free software; you can +redistribute it and/or modify it under the same terms as Perl itself. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Fri Jan 7 13:15:18 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Fri, 07 Jan 2011 12:15:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[12233] csw/mgar/pkg/cpan/Archive-Extract/trunk Message-ID: Revision: 12233 http://gar.svn.sourceforge.net/gar/?rev=12233&view=rev Author: bonivart Date: 2011-01-07 12:15:17 +0000 (Fri, 07 Jan 2011) Log Message: ----------- pm_archiveextract: update to 0.46, remove man page Modified Paths: -------------- csw/mgar/pkg/cpan/Archive-Extract/trunk/Makefile csw/mgar/pkg/cpan/Archive-Extract/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/Archive-Extract/trunk/files/COPYING Removed Paths: ------------- csw/mgar/pkg/cpan/Archive-Extract/trunk/files/CSWpmarchiveextract.depend csw/mgar/pkg/cpan/Archive-Extract/trunk/files/CSWpmarchiveextract.gspec csw/mgar/pkg/cpan/Archive-Extract/trunk/files/CSWpmarchiveextract.prototype Property Changed: ---------------- csw/mgar/pkg/cpan/Archive-Extract/trunk/ Property changes on: csw/mgar/pkg/cpan/Archive-Extract/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/cpan/Archive-Extract/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Archive-Extract/trunk/Makefile 2011-01-07 11:41:15 UTC (rev 12232) +++ csw/mgar/pkg/cpan/Archive-Extract/trunk/Makefile 2011-01-07 12:15:17 UTC (rev 12233) @@ -1,7 +1,7 @@ NAME = Archive-Extract -VERSION = 0.16 +VERSION = 0.46 CATEGORIES = cpan -AUTHOR = KANE +AUTHOR = BINGOS DESCRIPTION = A generic archive extracting mechanism define BLURB @@ -12,12 +12,15 @@ on your system. endef -DISTFILES += $(call admfiles,CSWpmarchiveextract,depend prototype) +DISTFILES += COPYING -DEPENDS += cpan/IPC-Cmd -DEPENDS += cpan/Params-Check -DEPENDS += cpan/Module-Load-Conditional -DEPENDS += cpan/Locale-Maketext-Simple +PACKAGES = CSWpmarchiveextract +CATALOGNAME = pm_archiveextract +ARCHALL = 1 +RUNTIME_DEP_PKGS += CSWpmipccmd CSWpmlclemktxtsimple CSWpmmodloadcond CSWpmprmscheck + +EXTRA_MERGE_EXCLUDE_FILES = \/opt\/csw\/share\/man.* + include gar/category.mk Modified: csw/mgar/pkg/cpan/Archive-Extract/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Archive-Extract/trunk/checksums 2011-01-07 11:41:15 UTC (rev 12232) +++ csw/mgar/pkg/cpan/Archive-Extract/trunk/checksums 2011-01-07 12:15:17 UTC (rev 12233) @@ -1,4 +1 @@ -71684aba07f9c169bc5300c71f26b72a download/CSWpmarchiveextract.gspec -7cd4a916ca7f866a53ae312d53f25694 download/CSWpmarchiveextract.depend -2e9095df726f273b3e9203ad54955605 download/CSWpmarchiveextract.prototype -d800e684865d38f36ccae7a40dbf13b3 download/Archive-Extract-0.16.tar.gz +ce99b25fa0dacb584574a6c27b1f0e24 Archive-Extract-0.46.tar.gz Added: csw/mgar/pkg/cpan/Archive-Extract/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/Archive-Extract/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/Archive-Extract/trunk/files/COPYING 2011-01-07 12:15:17 UTC (rev 12233) @@ -0,0 +1,6 @@ +COPYRIGHT + This module is copyright (c) 2002 Jos Boumans . All + rights reserved. + + This library is free software; you may redistribute and/or modify it + under the same terms as Perl itself. Deleted: csw/mgar/pkg/cpan/Archive-Extract/trunk/files/CSWpmarchiveextract.depend =================================================================== --- csw/mgar/pkg/cpan/Archive-Extract/trunk/files/CSWpmarchiveextract.depend 2011-01-07 11:41:15 UTC (rev 12232) +++ csw/mgar/pkg/cpan/Archive-Extract/trunk/files/CSWpmarchiveextract.depend 2011-01-07 12:15:17 UTC (rev 12233) @@ -1,4 +0,0 @@ -P CSWpmipccmd pm_ipccmd - Finding and running system commands made easy -P CSWpmlclemktxtsimple pm_lclemktxtsimple - simple interface to Locale::Maketext::Lexicon -P CSWpmmodloadcond pm_modloadcond - Query module information and load at runtime -P CSWpmprmscheck pm_prmscheck - A generic input parsing/checking mechanism. Deleted: csw/mgar/pkg/cpan/Archive-Extract/trunk/files/CSWpmarchiveextract.gspec =================================================================== --- csw/mgar/pkg/cpan/Archive-Extract/trunk/files/CSWpmarchiveextract.gspec 2011-01-07 11:41:15 UTC (rev 12232) +++ csw/mgar/pkg/cpan/Archive-Extract/trunk/files/CSWpmarchiveextract.gspec 2011-01-07 12:15:17 UTC (rev 12233) @@ -1,10 +0,0 @@ -%var bitname pm_archiveextract -%var pkgname CSWpmarchiveextract -%var arch all -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -This module is copyright (c) 2002 Jos Boumans . All -rights reserved. - -This library is free software; you may redistribute and/or modify it -under the same terms as Perl itself. Deleted: csw/mgar/pkg/cpan/Archive-Extract/trunk/files/CSWpmarchiveextract.prototype =================================================================== --- csw/mgar/pkg/cpan/Archive-Extract/trunk/files/CSWpmarchiveextract.prototype 2011-01-07 11:41:15 UTC (rev 12232) +++ csw/mgar/pkg/cpan/Archive-Extract/trunk/files/CSWpmarchiveextract.prototype 2011-01-07 12:15:17 UTC (rev 12233) @@ -1,15 +0,0 @@ -d none /opt/csw/lib 0755 root bin -d none /opt/csw/lib/perl 0755 root bin -d none /opt/csw/lib/perl/csw 0755 root bin -d none /opt/csw/lib/perl/csw/auto 0755 root bin -d none /opt/csw/lib/perl/csw/auto/Archive 0755 root bin -d none /opt/csw/lib/perl/csw/auto/Archive/Extract 0755 root bin -f none /opt/csw/lib/perl/csw/auto/Archive/Extract/.packlist 0644 root bin -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man3 0755 root bin -f none /opt/csw/share/man/man3/Archive::Extract.3perl 0444 root bin -d none /opt/csw/share/perl 0755 root bin -d none /opt/csw/share/perl/csw 0755 root bin -d none /opt/csw/share/perl/csw/Archive 0755 root bin -f none /opt/csw/share/perl/csw/Archive/Extract.pm 0444 root bin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Fri Jan 7 14:10:01 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Fri, 07 Jan 2011 13:10:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[12234] csw/mgar/pkg/cpan/PDF-API2/trunk/Makefile Message-ID: Revision: 12234 http://gar.svn.sourceforge.net/gar/?rev=12234&view=rev Author: wbonnet Date: 2011-01-07 13:10:01 +0000 (Fri, 07 Jan 2011) Log Message: ----------- Fix bug 4662 Modified Paths: -------------- csw/mgar/pkg/cpan/PDF-API2/trunk/Makefile Modified: csw/mgar/pkg/cpan/PDF-API2/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/PDF-API2/trunk/Makefile 2011-01-07 12:15:17 UTC (rev 12233) +++ csw/mgar/pkg/cpan/PDF-API2/trunk/Makefile 2011-01-07 13:10:01 UTC (rev 12234) @@ -9,7 +9,7 @@ High-Quality "Portable Document Format (aka. PDF)" Files. endef -RUNTIME_DEP_PKGS = CSWiocompress +RUNTIME_DEP_PKGS = CSWpmiocompress PACKAGES = CSWpmpdfapi2 CATALOGNAME = pm_pdfapi2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Jan 7 14:56:17 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 07 Jan 2011 13:56:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[12235] csw/mgar/pkg Message-ID: Revision: 12235 http://gar.svn.sourceforge.net/gar/?rev=12235&view=rev Author: dmichelsen Date: 2011-01-07 13:56:17 +0000 (Fri, 07 Jan 2011) Log Message: ----------- bzflag: Initial commit Added Paths: ----------- csw/mgar/pkg/bzflag/ csw/mgar/pkg/bzflag/branches/ csw/mgar/pkg/bzflag/tags/ csw/mgar/pkg/bzflag/trunk/ csw/mgar/pkg/bzflag/trunk/Makefile csw/mgar/pkg/bzflag/trunk/checksums csw/mgar/pkg/bzflag/trunk/files/ csw/mgar/pkg/bzflag/trunk/files/0001-Fix-ambiguity-between-double-and-long-double.patch csw/mgar/pkg/bzflag/trunk/files/0002-Make-function-location-explicit.patch csw/mgar/pkg/bzflag/trunk/files/0003-Force-inclusion-of-glew.h-before-gl.h.patch csw/mgar/pkg/bzflag/trunk/files/0004-Do-not-use-const-as-non-const-is-required-at-some-pl.patch csw/mgar/pkg/bzflag/trunk/files/0005-Make-arguments-constant-as-required.patch Property changes on: csw/mgar/pkg/bzflag/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/bzflag/trunk/Makefile =================================================================== --- csw/mgar/pkg/bzflag/trunk/Makefile (rev 0) +++ csw/mgar/pkg/bzflag/trunk/Makefile 2011-01-07 13:56:17 UTC (rev 12235) @@ -0,0 +1,37 @@ +# $Id$ +NAME = bzflag +VERSION = 2.0.16 +CATEGORIES = apps + +DESCRIPTION = A free multiplayer multiplatform 3D tank battle game +define BLURB +endef + +MASTER_SITES = $(SF_MIRROR) +DISTFILES = $(DISTNAME).tar.bz2 + +PATCHFILES += 0001-Fix-ambiguity-between-double-and-long-double.patch +PATCHFILES += 0002-Make-function-location-explicit.patch +PATCHFILES += 0003-Force-inclusion-of-glew.h-before-gl.h.patch +PATCHFILES += 0004-Do-not-use-const-as-non-const-is-required-at-some-pl.patch +PATCHFILES += 0005-Make-arguments-constant-as-required.patch + +# File name regex to get notifications about upstream software releases +UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2 + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +RUNTIME_DEP_PKGS_CSWbzflag += CSWglew +RUNTIME_DEP_PKGS_CSWbzflag += CSWlibsdl +RUNTIME_DEP_PKGS_CSWbzflag += CSWcurlrt +RUNTIME_DEP_PKGS_CSWbzflag += CSWlibidn +RUNTIME_DEP_PKGS_CSWbzflag += CSWzlib +RUNTIME_DEP_PKGS_CSWbzflag += CSWmesa +RUNTIME_DEP_PKGS_CSWbzflag += CSWlibcares +RUNTIME_DEP_PKGS_CSWbzflag += CSWnas +RUNTIME_DEP_PKGS_CSWbzflag += CSWosslrt +RUNTIME_DEP_PKGS_CSWbzflag += CSWoldaprt + +include gar/category.mk Property changes on: csw/mgar/pkg/bzflag/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/bzflag/trunk/checksums =================================================================== --- csw/mgar/pkg/bzflag/trunk/checksums (rev 0) +++ csw/mgar/pkg/bzflag/trunk/checksums 2011-01-07 13:56:17 UTC (rev 12235) @@ -0,0 +1 @@ +161b973bee586d43ebff4695dfb8c359 bzflag-2.0.16.tar.bz2 Added: csw/mgar/pkg/bzflag/trunk/files/0001-Fix-ambiguity-between-double-and-long-double.patch =================================================================== --- csw/mgar/pkg/bzflag/trunk/files/0001-Fix-ambiguity-between-double-and-long-double.patch (rev 0) +++ csw/mgar/pkg/bzflag/trunk/files/0001-Fix-ambiguity-between-double-and-long-double.patch 2011-01-07 13:56:17 UTC (rev 12235) @@ -0,0 +1,25 @@ +From 87ea1e52b98d43252aecc3911ff96d3a6444dbe3 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Fri, 7 Jan 2011 13:43:07 +0100 +Subject: [PATCH 1/5] Fix ambiguity between double and long double + +--- + src/bzflag/ServerMenu.cxx | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/bzflag/ServerMenu.cxx b/src/bzflag/ServerMenu.cxx +index ebd00f2..f5db381 100644 +--- a/src/bzflag/ServerMenu.cxx ++++ b/src/bzflag/ServerMenu.cxx +@@ -354,7 +354,7 @@ void ServerMenu::setSelected(int index, bool forcerefresh) + } + else { + // colorize servers: many shots->red, jumping->green, CTF->blue +- const float rf = std::min(1.0f, logf(server.ping.maxShots) / logf(20.0f)); ++ const float rf = std::min(1.0f, logf( (double) server.ping.maxShots) / logf( (double) 20.0f)); + const float gf = gameStyle & JumpingGameStyle ? 1.0f : 0.0f; + const float bf = gameStyle & TeamFlagGameStyle ? 1.0f : 0.0f; + label->setColor(0.5f + rf * 0.5f, 0.5f + gf * 0.5f, 0.5f + bf * 0.5f); +-- +1.7.3.2 + Added: csw/mgar/pkg/bzflag/trunk/files/0002-Make-function-location-explicit.patch =================================================================== --- csw/mgar/pkg/bzflag/trunk/files/0002-Make-function-location-explicit.patch (rev 0) +++ csw/mgar/pkg/bzflag/trunk/files/0002-Make-function-location-explicit.patch 2011-01-07 13:56:17 UTC (rev 12235) @@ -0,0 +1,43 @@ +From d116c7dabfe30093c09b151f9344fbc296716a05 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Fri, 7 Jan 2011 13:47:21 +0100 +Subject: [PATCH 2/5] Make function location explicit + +--- + src/common/WordFilter.cxx | 6 +++--- + 1 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/common/WordFilter.cxx b/src/common/WordFilter.cxx +index 2d65dc2..fe62f4d 100644 +--- a/src/common/WordFilter.cxx ++++ b/src/common/WordFilter.cxx +@@ -49,7 +49,7 @@ bool WordFilter::simpleFilter(char *input) const + + word = line.substr(startPosition, endPosition-startPosition); + // transform to lowercase +- transform (word.begin(), word.end(), word.begin(), tolower); ++ std::transform (word.begin(), word.end(), word.begin(), tolower); + + findWord.word = word; + firstchar = (unsigned char)word[0]; +@@ -778,7 +778,7 @@ unsigned int WordFilter::loadFromFile(const std::string &fileName, bool verbose) + } + + // convert the word to lowercase +- transform (filterWord.begin(),filterWord.end(), filterWord.begin(), tolower); ++ std::transform (filterWord.begin(),filterWord.end(), filterWord.begin(), tolower); + + bool added = addToFilter(filterWord, std::string("")); + if ((!added) && (verbose)) { +@@ -800,7 +800,7 @@ unsigned int WordFilter::loadFromFile(const std::string &fileName, bool verbose) + * pattern match (default) catching hundreds of variations per filter + * word or using a simple exact word match technique (original). + */ +-bool WordFilter::filter(char *input, bool simple) const ++bool WordFilter::filter(char *input, const bool simple) const + { + #ifdef DEBUG + TimeKeeper before = TimeKeeper::getCurrent(); +-- +1.7.3.2 + Added: csw/mgar/pkg/bzflag/trunk/files/0003-Force-inclusion-of-glew.h-before-gl.h.patch =================================================================== --- csw/mgar/pkg/bzflag/trunk/files/0003-Force-inclusion-of-glew.h-before-gl.h.patch (rev 0) +++ csw/mgar/pkg/bzflag/trunk/files/0003-Force-inclusion-of-glew.h-before-gl.h.patch 2011-01-07 13:56:17 UTC (rev 12235) @@ -0,0 +1,24 @@ +From 0d728c7a76f0a0e37e88262059fce9d850963242 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Fri, 7 Jan 2011 13:47:41 +0100 +Subject: [PATCH 3/5] Force inclusion of glew.h before gl.h + +--- + src/platform/XWindow.cxx | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/src/platform/XWindow.cxx b/src/platform/XWindow.cxx +index 3c56476..c802bf8 100644 +--- a/src/platform/XWindow.cxx ++++ b/src/platform/XWindow.cxx +@@ -10,6 +10,7 @@ + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. + */ + ++#include "GL/glew.h" + #include "XWindow.h" + #include "XVisual.h" + #include "OpenGLGState.h" +-- +1.7.3.2 + Added: csw/mgar/pkg/bzflag/trunk/files/0004-Do-not-use-const-as-non-const-is-required-at-some-pl.patch =================================================================== --- csw/mgar/pkg/bzflag/trunk/files/0004-Do-not-use-const-as-non-const-is-required-at-some-pl.patch (rev 0) +++ csw/mgar/pkg/bzflag/trunk/files/0004-Do-not-use-const-as-non-const-is-required-at-some-pl.patch 2011-01-07 13:56:17 UTC (rev 12235) @@ -0,0 +1,25 @@ +From 8516009f9e7d257c396a7e9729be468089bd3da0 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Fri, 7 Jan 2011 13:48:16 +0100 +Subject: [PATCH 4/5] Do not use const as non-const is required at some place + +--- + src/bzflag/HUDuiList.cxx | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/bzflag/HUDuiList.cxx b/src/bzflag/HUDuiList.cxx +index 201a711..77afc01 100644 +--- a/src/bzflag/HUDuiList.cxx ++++ b/src/bzflag/HUDuiList.cxx +@@ -57,7 +57,7 @@ void HUDuiList::update() + setIndex(index); + } + +-void HUDuiList::createSlider(const int numValues) ++void HUDuiList::createSlider(int numValues) + { + // create a slider with numValues options + /* createSlider(4) does the equivalent of +-- +1.7.3.2 + Added: csw/mgar/pkg/bzflag/trunk/files/0005-Make-arguments-constant-as-required.patch =================================================================== --- csw/mgar/pkg/bzflag/trunk/files/0005-Make-arguments-constant-as-required.patch (rev 0) +++ csw/mgar/pkg/bzflag/trunk/files/0005-Make-arguments-constant-as-required.patch 2011-01-07 13:56:17 UTC (rev 12235) @@ -0,0 +1,25 @@ +From 6b65d1feeec8c055edafb80172beff75e617abac Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Fri, 7 Jan 2011 13:48:46 +0100 +Subject: [PATCH 5/5] Make arguments constant as required + +--- + src/common/VotingBooth.cxx | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/common/VotingBooth.cxx b/src/common/VotingBooth.cxx +index e36f446..29f9238 100644 +--- a/src/common/VotingBooth.cxx ++++ b/src/common/VotingBooth.cxx +@@ -85,7 +85,7 @@ bool VotingBooth::hasVoted(const std::string voterName) const + } + + +-bool VotingBooth::vote(std::string voterName, std::string response) ++bool VotingBooth::vote(const std::string voterName, const std::string response) + { + if (this->hasVoted(voterName)) { + /* voters are not allowed to vote multiple times */ +-- +1.7.3.2 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Jan 7 15:46:32 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 07 Jan 2011 14:46:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[12236] csw/mgar/pkg Message-ID: Revision: 12236 http://gar.svn.sourceforge.net/gar/?rev=12236&view=rev Author: dmichelsen Date: 2011-01-07 14:46:32 +0000 (Fri, 07 Jan 2011) Log Message: ----------- gbc: Initial commit of GNU bc Added Paths: ----------- csw/mgar/pkg/gbc/ csw/mgar/pkg/gbc/branches/ csw/mgar/pkg/gbc/tags/ csw/mgar/pkg/gbc/trunk/ csw/mgar/pkg/gbc/trunk/Makefile csw/mgar/pkg/gbc/trunk/checksums csw/mgar/pkg/gbc/trunk/files/ csw/mgar/pkg/gbc/trunk/files/0001-Do-not-use-Wall.patch Property changes on: csw/mgar/pkg/gbc/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/gbc/trunk/Makefile =================================================================== --- csw/mgar/pkg/gbc/trunk/Makefile (rev 0) +++ csw/mgar/pkg/gbc/trunk/Makefile 2011-01-07 14:46:32 UTC (rev 12236) @@ -0,0 +1,25 @@ +# $Id$ +NAME = bc +VERSION = 1.06 +CATEGORIES = utils + +DESCRIPTION = An interactive algebraic language with arbitrary precision which follows the POSIX 1003.2 +define BLURB +endef + +MASTER_SITES = $(GNU_MIRROR) +DISTFILES = $(DISTNAME).tar.gz + +PATCHFILES = 0001-Do-not-use-Wall.patch + +# File name regex to get notifications about upstream software releases +UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz + +PACKAGES = CSWgbc +CATALOGNAME = gbc + +CONFIGURE_ARGS = $(DIRPATHS) + +TEST_TARGET = check + +include gar/category.mk Property changes on: csw/mgar/pkg/gbc/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/gbc/trunk/checksums =================================================================== --- csw/mgar/pkg/gbc/trunk/checksums (rev 0) +++ csw/mgar/pkg/gbc/trunk/checksums 2011-01-07 14:46:32 UTC (rev 12236) @@ -0,0 +1 @@ +d44b5dddebd8a7a7309aea6c36fda117 bc-1.06.tar.gz Added: csw/mgar/pkg/gbc/trunk/files/0001-Do-not-use-Wall.patch =================================================================== --- csw/mgar/pkg/gbc/trunk/files/0001-Do-not-use-Wall.patch (rev 0) +++ csw/mgar/pkg/gbc/trunk/files/0001-Do-not-use-Wall.patch 2011-01-07 14:46:32 UTC (rev 12236) @@ -0,0 +1,94 @@ +From 64e569e3ca2c4d4604a3dca5046364862e7bcf91 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Fri, 7 Jan 2011 15:41:01 +0100 +Subject: [PATCH] Do not use -Wall + +--- + bc/Makefile.am | 2 +- + bc/Makefile.in | 2 +- + dc/Makefile.am | 2 +- + dc/Makefile.in | 2 +- + lib/Makefile.am | 2 +- + lib/Makefile.in | 2 +- + 6 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/bc/Makefile.am b/bc/Makefile.am +index 9187339..735bb39 100644 +--- a/bc/Makefile.am ++++ b/bc/Makefile.am +@@ -18,7 +18,7 @@ LDADD = $(LIBBC) $(LIBL) @READLINELIB@ + + YFLAGS = -d + +-CFLAGS = @CFLAGS@ -Wall -funsigned-char ++# CFLAGS = @CFLAGS@ -Wall -funsigned-char + + $(PROGRAMS): $(LIBBC) + +diff --git a/bc/Makefile.in b/bc/Makefile.in +index 18ebce0..2aae747 100644 +--- a/bc/Makefile.in ++++ b/bc/Makefile.in +@@ -85,7 +85,7 @@ LDADD = $(LIBBC) $(LIBL) @READLINELIB@ + + YFLAGS = -d + +-CFLAGS = @CFLAGS@ -Wall -funsigned-char ++# CFLAGS = @CFLAGS@ -Wall -funsigned-char + + fbcOBJ = main.o bc.o scan.o execute.o global.o load.o storage.o util.o + +diff --git a/dc/Makefile.am b/dc/Makefile.am +index 99164ba..558e4da 100644 +--- a/dc/Makefile.am ++++ b/dc/Makefile.am +@@ -9,6 +9,6 @@ LDADD = ../lib/libbc.a + + MAINTAINERCLEANFILES = Makefile.in + +-CFLAGS = @CFLAGS@ -Wall -funsigned-char ++# CFLAGS = @CFLAGS@ -Wall -funsigned-char + + $(PROGRAMS): $(LDADD) +diff --git a/dc/Makefile.in b/dc/Makefile.in +index 0772dd6..3733a2e 100644 +--- a/dc/Makefile.in ++++ b/dc/Makefile.in +@@ -76,7 +76,7 @@ LDADD = ../lib/libbc.a + + MAINTAINERCLEANFILES = Makefile.in + +-CFLAGS = @CFLAGS@ -Wall -funsigned-char ++# CFLAGS = @CFLAGS@ -Wall -funsigned-char + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../config.h + CONFIG_CLEAN_FILES = +diff --git a/lib/Makefile.am b/lib/Makefile.am +index 6f74b4d..41ea3fd 100644 +--- a/lib/Makefile.am ++++ b/lib/Makefile.am +@@ -7,7 +7,7 @@ libbc_a_SOURCES = getopt.c getopt1.c vfprintf.c number.c + + DEFS = @DEFS@ $(DEFSADD) + +-CFLAGS = @CFLAGS@ -Wall -funsigned-char ++# CFLAGS = @CFLAGS@ -Wall -funsigned-char + + MAINTAINERCLEANFILES = Makefile.in number.c + +diff --git a/lib/Makefile.in b/lib/Makefile.in +index 5ffa593..71d5d59 100644 +--- a/lib/Makefile.in ++++ b/lib/Makefile.in +@@ -74,7 +74,7 @@ libbc_a_SOURCES = getopt.c getopt1.c vfprintf.c number.c + + DEFS = @DEFS@ $(DEFSADD) + +-CFLAGS = @CFLAGS@ -Wall -funsigned-char ++# CFLAGS = @CFLAGS@ -Wall -funsigned-char + + MAINTAINERCLEANFILES = Makefile.in number.c + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +-- +1.7.3.2 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Fri Jan 7 16:14:16 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Fri, 07 Jan 2011 15:14:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[12237] csw/mgar/pkg/cvsproxy/trunk Message-ID: Revision: 12237 http://gar.svn.sourceforge.net/gar/?rev=12237&view=rev Author: dmichelsen Date: 2011-01-07 15:14:16 +0000 (Fri, 07 Jan 2011) Log Message: ----------- cvsproxy: Relocate directly to libexec/ Modified Paths: -------------- csw/mgar/pkg/cvsproxy/trunk/Makefile csw/mgar/pkg/cvsproxy/trunk/files/inetd.conf Modified: csw/mgar/pkg/cvsproxy/trunk/Makefile =================================================================== --- csw/mgar/pkg/cvsproxy/trunk/Makefile 2011-01-07 14:46:32 UTC (rev 12236) +++ csw/mgar/pkg/cvsproxy/trunk/Makefile 2011-01-07 15:14:16 UTC (rev 12237) @@ -10,8 +10,8 @@ MASTER_SITES = http://www.sra.co.jp/people/m-kasahr/cvsproxy/src/ DISTFILES = $(NAME)-$(VERSION).tar.gz +VENDOR_URL = http://www.sra.co.jp/people/m-kasahr/cvsproxy RUNTIME_DEP_PKGS = CSWtcpwrap -SPKG_SOURCEURL = http://www.sra.co.jp/people/m-kasahr/cvsproxy # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz @@ -23,6 +23,9 @@ ETCSERVICES = /opt/csw/etc/pkg/$(NAME)/services INETDCONF = /opt/csw/etc/pkg/$(NAME)/inetd.conf +# We use tcpd from TCPwrappers, this is ok. +CHECKPKG_OVERRIDES_CSWcvsproxy += surplus-dependency|CSWtcpwrap + include gar/category.mk post-install-modulated: @@ -31,9 +34,6 @@ @cp $(WORKSRC)/README $(DESTDIR)$(docdir)/$(NAME) @cp $(WORKSRC)/NEWS $(DESTDIR)$(docdir)/$(NAME) @cp $(WORKSRC)/ChangeLog $(DESTDIR)$(docdir)/$(NAME) - @mv $(DESTDIR)/opt/csw/libexec/cvsproxy $(DESTDIR)/opt/csw/libexec/cvsproxy.tmp - @ginstall -d -m 755 $(DESTDIR)/opt/csw/libexec/$(NAME) - @mv $(DESTDIR)/opt/csw/libexec/cvsproxy.tmp $(DESTDIR)/opt/csw/libexec/$(NAME)/cvsproxy @ginstall -d -m 755 $(DESTDIR)/opt/csw/etc/pkg/$(NAME) @cp $(FILEDIR)/services $(DESTDIR)/opt/csw/etc/pkg/$(NAME) @cp $(FILEDIR)/inetd.conf $(DESTDIR)/opt/csw/etc/pkg/$(NAME) Modified: csw/mgar/pkg/cvsproxy/trunk/files/inetd.conf =================================================================== --- csw/mgar/pkg/cvsproxy/trunk/files/inetd.conf 2011-01-07 14:46:32 UTC (rev 12236) +++ csw/mgar/pkg/cvsproxy/trunk/files/inetd.conf 2011-01-07 15:14:16 UTC (rev 12237) @@ -1 +1 @@ -cvsproxy stream tcp nowait nobody /opt/csw/libexec/tcpd /opt/csw/libexec/cvsproxy/cvsproxy +cvsproxy stream tcp nowait nobody /opt/csw/libexec/tcpd /opt/csw/libexec/cvsproxy This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Fri Jan 7 17:10:54 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Fri, 07 Jan 2011 16:10:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[12238] csw/mgar/pkg/cpan/Object-Accessor/trunk Message-ID: Revision: 12238 http://gar.svn.sourceforge.net/gar/?rev=12238&view=rev Author: wbonnet Date: 2011-01-07 16:10:54 +0000 (Fri, 07 Jan 2011) Log Message: ----------- Fix bug 4569. Upgrade to 0.36 Modified Paths: -------------- csw/mgar/pkg/cpan/Object-Accessor/trunk/Makefile csw/mgar/pkg/cpan/Object-Accessor/trunk/checksums Modified: csw/mgar/pkg/cpan/Object-Accessor/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Object-Accessor/trunk/Makefile 2011-01-07 15:14:16 UTC (rev 12237) +++ csw/mgar/pkg/cpan/Object-Accessor/trunk/Makefile 2011-01-07 16:10:54 UTC (rev 12238) @@ -1,7 +1,7 @@ NAME = Object-Accessor -VERSION = 0.34 +VERSION = 0.36 CATEGORIES = cpan -AUTHOR = KANE +AUTHOR = BINGOS DESCRIPTION = An interface to create per object accessors define BLURB @@ -18,6 +18,8 @@ LICENSE = README +EXTRA_MERGE_EXCLUDE_FILES = .*\/man\/man3\/.* .*\/man\/man1\/.* + include gar/category.mk post-extract: Modified: csw/mgar/pkg/cpan/Object-Accessor/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Object-Accessor/trunk/checksums 2011-01-07 15:14:16 UTC (rev 12237) +++ csw/mgar/pkg/cpan/Object-Accessor/trunk/checksums 2011-01-07 16:10:54 UTC (rev 12238) @@ -1 +1 @@ -b3cbb7e37d060d6af599c4daf154bfba download/Object-Accessor-0.34.tar.gz +405c62b7ee2ece70744f72b2eee230c6 Object-Accessor-0.36.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Jan 7 19:44:52 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 07 Jan 2011 18:44:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[12239] csw/mgar/pkg/postgresql/branches/postgresql-9.0 Message-ID: Revision: 12239 http://gar.svn.sourceforge.net/gar/?rev=12239&view=rev Author: wahwah Date: 2011-01-07 18:44:52 +0000 (Fri, 07 Jan 2011) Log Message: ----------- postgresql-9.0: shared libraries Shared libraries have been reworked to be installed under /opt/csw/lib. CSWlibpq has been turned into a backward compatibility package. Old binaries have been checked in binary form. The number of files in the updated CSWlibpq is smaller than in the previous revision of CSWlibpq, because some of the files from CSWlibpq were not necessary and they have been removed. For example: libpgtypes.so.1 -> libpgtyles.so.1.2 libpgtypes.so.1.1 libpgtypes.so.1.2 In this scenario, libpgtypes.so.1.1 will be never used and can be removed. Modified Paths: -------------- csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile Added Paths: ----------- csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/libecpg.so.4-i386-libecpg.so.4.2 csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/libecpg.so.4-sparcv8-libecpg.so.4.2 csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/libecpg.so.4-sparcv9-libecpg.so.4.2 csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/libecpg.so.5-i386-libecpg.so.5.2 csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/libecpg.so.5-sparcv8-libecpg.so.5.2 csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/libecpg.so.5-sparcv9-libecpg.so.5.2 csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/libecpg_compat.so.2-i386-libecpg_compat.so.2.2 csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/libecpg_compat.so.2-sparcv8-libecpg_compat.so.2.2 csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/libecpg_compat.so.2-sparcv9-libecpg_compat.so.2.2 csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/libpgtypes.so.1-i386-libpgtypes.so.1.2 csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/libpgtypes.so.1-sparcv8-libpgtypes.so.1.2 csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/libpgtypes.so.1-sparcv9-libpgtypes.so.1.2 csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/libpgtypes.so.2-i386-libpgtypes.so.2.2 csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/libpgtypes.so.2-sparcv8-libpgtypes.so.2.2 csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/libpgtypes.so.2-sparcv9-libpgtypes.so.2.2 csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/libpq.so.3-i386-libpq.so.3.2 csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/libpq.so.3-sparcv8-libpq.so.3.2 csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/libpq.so.3-sparcv9-libpq.so.3.2 csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/libpq.so.4-i386-libpq.so.4.1 csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/libpq.so.4-sparcv8-libpq.so.4.1 csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/libpq.so.4-sparcv9-libpq.so.4.1 csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/merge_legacy_libs.sh Property Changed: ---------------- csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/README-CSW.txt csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/cswpostgres.tmpl Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile 2011-01-07 16:10:54 UTC (rev 12238) +++ csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile 2011-01-07 18:44:52 UTC (rev 12239) @@ -83,8 +83,6 @@ RUNTIME_DEP_PKGS_CSWpostgresql-90 += CSWosslrt RUNTIME_DEP_PKGS_CSWpostgresql-90 += CSWlibpq5 -CHECKPKG_OVERRIDES_CSWpostgresql += surplus-dependency|CSWpostgresql-90 - ARCHALL_CSWpostgresql = 1 ARCHALL_CSWpostgresql-$(BASE_VERSION_G)-doc = 1 @@ -202,35 +200,40 @@ PACKAGES += CSWlibpq5 CATALOGNAME_CSWlibpq5 = libpq5 -SPKG_DESC_CSWlibpq5 = PostgreSQL C client library (built from $(BASE_VERSION).x sources) -PKGFILES_CSWlibpq5 = $(call baseisadirs,$(libdir),libpq\.so(\.\d+)+) -PKGFILES_CSWlibpq5 += $(call baseisadirs,$(libpath_install),libpq\.so(\.\d+)+) +PKGFILES_CSWlibpq5 += $(call baseisadirs,$(prefix)/lib,libpq\.so\.5\.3) +PKGFILES_CSWlibpq5 += $(call baseisadirs,$(prefix)/lib,libpq\.so\.5(\.\d+)*) +SPKG_DESC_CSWlibpq5 += PostgreSQL C client library (built from $(BASE_VERSION).x sources), libpq.so.5 RUNTIME_DEP_PKGS_CSWlibpq5 += CSWosslrt RUNTIME_DEP_PKGS_CSWlibpq5 += CSWkrb5lib PACKAGES += CSWlibecpg6 CATALOGNAME_CSWlibecpg6 = libecpg6 -SPKG_DESC_CSWlibecpg6 = Embedded PostgreSQL for C library (built from $(BASE_VERSION).x sources) -PKGFILES_CSWlibecpg6 = $(call baseisadirs,$(libdir),libecpg\.so(\.\d+)+) -PKGFILES_CSWlibecpg6 += $(call baseisadirs,$(libpath_install),libecpg\.so(\.\d+)+) +PKGFILES_CSWlibecpg6 += $(call baseisadirs,$(prefix)/lib,libecpg\.so\.6\.0) +PKGFILES_CSWlibecpg6 += $(call baseisadirs,$(prefix)/lib,libecpg\.so\.6(\.\d+)*) +SPKG_DESC_CSWlibecpg6 += Embedded PostgreSQL for C library (built from $(BASE_VERSION).x sources), libecpg.so.6 +RUNTIME_DEP_PKGS_CSWlibpq += CSWlibecpg6 RUNTIME_DEP_PKGS_CSWlibecpg6 += CSWlibpgtypes3 RUNTIME_DEP_PKGS_CSWlibecpg6 += CSWlibpq5 PACKAGES += CSWlibecpg-compat3 CATALOGNAME_CSWlibecpg-compat3 = libecpg_compat3 -SPKG_DESC_CSWlibecpg-compat3 = Older version of run-time library for ECPG programs (built from $(BASE_VERSION).x sources) -PKGFILES_CSWlibecpg-compat3 = $(call baseisadirs,$(libdir),libecpg_compat\.so(\.\d+)+) -PKGFILES_CSWlibecpg-compat3 += $(call baseisadirs,$(libpath_install),libecpg_compat\.so(\.\d+)+) +PKGFILES_CSWlibecpg-compat3 += $(call baseisadirs,$(prefix)/lib,libecpg_compat\.so\.3\.2) +PKGFILES_CSWlibecpg-compat3 += $(call baseisadirs,$(prefix)/lib,libecpg_compat\.so\.3(\.\d+)*) +SPKG_DESC_CSWlibecpg-compat3 += Older version of run-time library for ECPG programs (built from $(BASE_VERSION).x sources), libecpg_compat.so.3 +RUNTIME_DEP_PKGS_CSWlibpq += CSWlibecpg-compat3 RUNTIME_DEP_PKGS_CSWlibecpg-compat3 += CSWlibecpg6 RUNTIME_DEP_PKGS_CSWlibecpg-compat3 += CSWlibpgtypes3 RUNTIME_DEP_PKGS_CSWlibecpg-compat3 += CSWlibpq5 PACKAGES += CSWlibpgtypes3 CATALOGNAME_CSWlibpgtypes3 = libpgtypes3 -SPKG_DESC_CSWlibpgtypes3 = Used by programs built with ecpg (Embedded PostgreSQL for C, built from $(BASE_VERSION).x sources) -PKGFILES_CSWlibpgtypes3 = $(call baseisadirs,$(libdir),libpgtypes\.so(\.\d+)+) -PKGFILES_CSWlibpgtypes3 += $(call baseisadirs,$(libpath_install),libpgtypes\.so(\.\d+)+) +PKGFILES_CSWlibpgtypes3 += $(call baseisadirs,$(prefix)/lib,libpgtypes\.so\.3\.0) +PKGFILES_CSWlibpgtypes3 += $(call baseisadirs,$(prefix)/lib,libpgtypes\.so\.3(\.\d+)*) +SPKG_DESC_CSWlibpgtypes3 += Used by programs built with ecpg (Embedded PostgreSQL for C, from $(BASE_VERSION).x sources), libpgtypes.so.3 +RUNTIME_DEP_PKGS_CSWlibpq += CSWlibpgtypes3 + + PACKAGES += CSWlibpq-dev CATALOGNAME_CSWlibpq-dev = libpq_dev SPKG_DESC_CSWlibpq-dev = PostgreSQL C client headers (built from $(BASE_VERSION).x sources) @@ -258,6 +261,72 @@ CATALOGNAME_CSWpostgresql-$(BASE_VERSION_G) = postgresql_$(BASE_VERSION_G) SPKG_DESC_CSWpostgresql-$(BASE_VERSION_G) = PostgreSQL, version $(BASE_VERSION).x +# Legacy libraries +PACKAGES += CSWlibpq3 +CATALOGNAME_CSWlibpq3 = libpq3 +PKGFILES_CSWlibpq3 += $(call baseisadirs,$(prefix)/lib,libpq\.so\.3\.2) +PKGFILES_CSWlibpq3 += $(call baseisadirs,$(prefix)/lib,libpq\.so\.3(\.\d+)*) +SPKG_DESC_CSWlibpq3 += PostgreSQL C client library, libpq.so.3 +RUNTIME_DEP_PKGS_CSWlibpq += CSWlibpq3 +RUNTIME_DEP_PKGS_CSWlibpq3 += CSWosslrt + +PACKAGES += CSWlibpq4 +CATALOGNAME_CSWlibpq4 = libpq4 +PKGFILES_CSWlibpq4 += $(call baseisadirs,$(prefix)/lib,libpq\.so\.4\.1) +PKGFILES_CSWlibpq4 += $(call baseisadirs,$(prefix)/lib,libpq\.so\.4(\.\d+)*) +SPKG_DESC_CSWlibpq4 += PostgreSQL C client library, libpq.so.4 +RUNTIME_DEP_PKGS_CSWlibpq += CSWlibpq4 +RUNTIME_DEP_PKGS_CSWlibpq4 += CSWosslrt + +PACKAGES += CSWlibpgtypes1 +CATALOGNAME_CSWlibpgtypes1 = libpgtypes1 +PKGFILES_CSWlibpgtypes1 += $(call baseisadirs,$(prefix)/lib,libpgtypes\.so\.1\.2) +PKGFILES_CSWlibpgtypes1 += $(call baseisadirs,$(prefix)/lib,libpgtypes\.so\.1(\.\d+)*) +SPKG_DESC_CSWlibpgtypes1 += Used by programs built with ecpg (Embedded PostgreSQL for C), libpgtypes.so.1 +RUNTIME_DEP_PKGS_CSWlibpq += CSWlibpgtypes1 + +PACKAGES += CSWlibpgtypes2 +CATALOGNAME_CSWlibpgtypes2 = libpgtypes2 +PKGFILES_CSWlibpgtypes2 += $(call baseisadirs,$(prefix)/lib,libpgtypes\.so\.2\.2) +PKGFILES_CSWlibpgtypes2 += $(call baseisadirs,$(prefix)/lib,libpgtypes\.so\.2(\.\d+)*) +SPKG_DESC_CSWlibpgtypes2 += Used by programs built with ecpg (Embedded PostgreSQL for C), libpgtypes.so.2 +RUNTIME_DEP_PKGS_CSWlibpq += CSWlibpgtypes2 + +PACKAGES += CSWlibecpg4 +CATALOGNAME_CSWlibecpg4 = libecpg4 +PKGFILES_CSWlibecpg4 += $(call baseisadirs,$(prefix)/lib,libecpg\.so\.4\.2) +PKGFILES_CSWlibecpg4 += $(call baseisadirs,$(prefix)/lib,libecpg\.so\.4(\.\d+)*) +SPKG_DESC_CSWlibecpg4 += Embedded PostgreSQL for C library, libecpg.so.4 +RUNTIME_DEP_PKGS_CSWlibpq += CSWlibecpg4 +RUNTIME_DEP_PKGS_CSWlibecpg4 += CSWlibpgtypes1 +RUNTIME_DEP_PKGS_CSWlibecpg4 += CSWosslrt +RUNTIME_DEP_PKGS_CSWlibecpg4 += CSWlibpq3 + +PACKAGES += CSWlibecpg5 +CATALOGNAME_CSWlibecpg5 = libecpg5 +PKGFILES_CSWlibecpg5 += $(call baseisadirs,$(prefix)/lib,libecpg\.so\.5\.2) +PKGFILES_CSWlibecpg5 += $(call baseisadirs,$(prefix)/lib,libecpg\.so\.5(\.\d+)*) +SPKG_DESC_CSWlibecpg5 += Embedded PostgreSQL for C library, libecpg.so.5 +RUNTIME_DEP_PKGS_CSWlibpq += CSWlibecpg5 +RUNTIME_DEP_PKGS_CSWlibecpg5 += CSWlibpgtypes2 +RUNTIME_DEP_PKGS_CSWlibecpg5 += CSWlibpq5 + +PACKAGES += CSWlibecpg-compat2 +CATALOGNAME_CSWlibecpg-compat2 = libecpg_compat2 +PKGFILES_CSWlibecpg-compat2 += $(call baseisadirs,$(prefix)/lib,libecpg_compat\.so\.2\.2) +PKGFILES_CSWlibecpg-compat2 += $(call baseisadirs,$(prefix)/lib,libecpg_compat\.so\.2(\.\d+)*) +SPKG_DESC_CSWlibecpg-compat2 += Older version of run-time library for ECPG programs (built from 9.0.x sources), libecpg_compat.so.2 +RUNTIME_DEP_PKGS_CSWlibpq += CSWlibecpg-compat2 +RUNTIME_DEP_PKGS_CSWlibecpg-compat2 += CSWlibpgtypes2 +RUNTIME_DEP_PKGS_CSWlibecpg-compat2 += CSWlibecpg5 +RUNTIME_DEP_PKGS_CSWlibecpg-compat2 += CSWlibpq5 + +# The horrible transitional package +PACKAGES += CSWlibpq +PKGFILES_CSWlibpq += $(prefix)/postgresql.* +SPKG_DESC_CSWlibpq = Transitional package for PostgreSQL shared libraries +RUNTIME_DEP_PKGS_CSWlibpq += CSWlibpq5 + include gar/category.mk CFLAGS := $(filter-out -I%,$(CFLAGS)) @@ -271,18 +340,7 @@ ginstall -d -m 755 $(DESTDIR)$(prefix)/bin [ -r $(DESTDIR)$(bindir)/pg_config ] && \ gmv -v $(DESTDIR)$(bindir)/pg_config $(DESTDIR)$(prefix)/bin || true - # ginstall -d -m 755 $(DESTDIR)/include/postgresql/utils - # for f in elog.h errcodes.h palloc.h; do \ - # [ -r $(DESTDIR)$(includedir)/utils/$${f} ] && \ - # gmv -v $(DESTDIR)$(includedir)/utils/$${f} \ - # $(DESTDIR)$(prefix)/include/postgresql/utils/ || true; \ - # done - # for f in c.h pg_config.h pg_config_manual.h pg_config_os,port.h pg_trace.h ; do \ - # [ -f $(DESTDIR)$(prefix)/include/postgresql/8.4/server/$${f} ] && \ - # gmv -v $(DESTDIR)$(prefix)/include/postgresql/8.4/server/$${f} \ - # $(DESTDIR)/$(prefix)/include/postgresql/ || true; \ - # done - # @$(MAKECOOKIE) + @$(MAKECOOKIE) post-merge: ginstall -d $(PKGROOT)/etc$(prefix)/init.d @@ -309,13 +367,6 @@ # done ginstall -d $(PKGROOT)$(PGDATA) gln -s $(ISA_DEFAULT64) $(PKGROOT)$(libdir)/64 - # for L in $(notdir $(wildcard $(PKGROOT)$(libdir)/libpq.*)); do \ - # gln -s $(pgsubdir)/$$L $(PKGROOT)$(libpath_install)/$$L; \ - # done - # mkdir -p $(PKGROOT)$(libpath_install)/$(ISA_DEFAULT64) - # for L in $(notdir $(wildcard $(PKGROOT)$(libdir)/$(ISA_DEFAULT64)/libpq.*)); do \ - # gln -s ../$(pgsubdir)/$(ISA_DEFAULT64)/$$L $(PKGROOT)$(libpath_install)/$(ISA_DEFAULT64)/$$L; \ - # done mkdir -p $(PKGROOT)$(prefix)/lib mkdir -p $(PKGROOT)$(prefix)/lib/$(ISA_DEFAULT64) for libname in libpq libecpg libecpg_compat libpgtypes; do \ @@ -324,4 +375,22 @@ mv $(PKGROOT)$(libdir)/$${libname}.so.* $(PKGROOT)$(prefix)/lib; \ mv $(PKGROOT)$(libdir)/$(ISA_DEFAULT64)/$${libname}.so.* $(PKGROOT)$(prefix)/lib/$(ISA_DEFAULT64); \ done + $(FILEDIR)/merge_legacy_libs.sh $(GARCH) $(FILEDIR) $(PKGROOT)/$(prefix)/lib + + # Backward compatibility provided by CSWlibpq + mkdir -p $(PKGROOT)$(prefix)/postgresql/lib + mkdir -p $(PKGROOT)$(prefix)/postgresql/lib/$(ISA_DEFAULT64) + gln -s . $(PKGROOT)$(prefix)/postgresql/lib/$(ISA_DEFAULT) + gln -s $(ISA_DEFAULT64) $(PKGROOT)$(prefix)/postgresql/lib/64 + gln -s $(ISA_DEFAULT) $(PKGROOT)$(prefix)/postgresql/lib/32 + for f in $(PKGROOT)$(prefix)/lib/*.so.*; do \ + ln -s \ + ../../lib/`basename $${f}` \ + $(PKGROOT)$(prefix)/postgresql/lib; \ + done + for f in $(PKGROOT)$(prefix)/lib/$(ISA_DEFAULT64)/lib*.so.*; do \ + ln -s \ + ../../lib/$(ISA_DEFAULT64)/`basename $${f}` \ + $(PKGROOT)$(prefix)/postgresql/lib/$(ISA_DEFAULT64); \ + done @$(MAKECOOKIE) Property changes on: csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/README-CSW.txt ___________________________________________________________________ Deleted: svn:executable - * Property changes on: csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/cswpostgres.tmpl ___________________________________________________________________ Deleted: svn:executable - * Added: csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/libecpg.so.4-i386-libecpg.so.4.2 =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/libecpg.so.4-i386-libecpg.so.4.2 ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/libecpg.so.4-sparcv8-libecpg.so.4.2 =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/libecpg.so.4-sparcv8-libecpg.so.4.2 ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/libecpg.so.4-sparcv9-libecpg.so.4.2 =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/libecpg.so.4-sparcv9-libecpg.so.4.2 ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/libecpg.so.5-i386-libecpg.so.5.2 =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/libecpg.so.5-i386-libecpg.so.5.2 ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/libecpg.so.5-sparcv8-libecpg.so.5.2 =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/libecpg.so.5-sparcv8-libecpg.so.5.2 ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/libecpg.so.5-sparcv9-libecpg.so.5.2 =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/libecpg.so.5-sparcv9-libecpg.so.5.2 ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/libecpg_compat.so.2-i386-libecpg_compat.so.2.2 =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/libecpg_compat.so.2-i386-libecpg_compat.so.2.2 ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/libecpg_compat.so.2-sparcv8-libecpg_compat.so.2.2 =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/libecpg_compat.so.2-sparcv8-libecpg_compat.so.2.2 ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/libecpg_compat.so.2-sparcv9-libecpg_compat.so.2.2 =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/libecpg_compat.so.2-sparcv9-libecpg_compat.so.2.2 ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/libpgtypes.so.1-i386-libpgtypes.so.1.2 =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/libpgtypes.so.1-i386-libpgtypes.so.1.2 ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/libpgtypes.so.1-sparcv8-libpgtypes.so.1.2 =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/libpgtypes.so.1-sparcv8-libpgtypes.so.1.2 ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/libpgtypes.so.1-sparcv9-libpgtypes.so.1.2 =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/libpgtypes.so.1-sparcv9-libpgtypes.so.1.2 ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/libpgtypes.so.2-i386-libpgtypes.so.2.2 =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/libpgtypes.so.2-i386-libpgtypes.so.2.2 ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/libpgtypes.so.2-sparcv8-libpgtypes.so.2.2 =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/libpgtypes.so.2-sparcv8-libpgtypes.so.2.2 ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/libpgtypes.so.2-sparcv9-libpgtypes.so.2.2 =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/libpgtypes.so.2-sparcv9-libpgtypes.so.2.2 ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/libpq.so.3-i386-libpq.so.3.2 =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/libpq.so.3-i386-libpq.so.3.2 ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/libpq.so.3-sparcv8-libpq.so.3.2 =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/libpq.so.3-sparcv8-libpq.so.3.2 ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/libpq.so.3-sparcv9-libpq.so.3.2 =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/libpq.so.3-sparcv9-libpq.so.3.2 ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/libpq.so.4-i386-libpq.so.4.1 =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/libpq.so.4-i386-libpq.so.4.1 ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/libpq.so.4-sparcv8-libpq.so.4.1 =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/libpq.so.4-sparcv8-libpq.so.4.1 ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/libpq.so.4-sparcv9-libpq.so.4.1 =================================================================== (Binary files differ) Property changes on: csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/libpq.so.4-sparcv9-libpq.so.4.1 ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/merge_legacy_libs.sh =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/merge_legacy_libs.sh (rev 0) +++ csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/merge_legacy_libs.sh 2011-01-07 18:44:52 UTC (rev 12239) @@ -0,0 +1,41 @@ +#!/opt/csw/bin/bash +# $Id$ + +set -u +set -e +set -x + +declare -r ARCH=$1 +declare -r SOURCE_DIR=$2 +declare -r TARGET_DIR=$3 + +if [[ "${ARCH}" = "i386" ]]; then + archs="i386 amd64" +elif [[ "${ARCH}" = "sparc" ]]; then + archs="sparcv8 sparcv9" +else + echo "Wrong arch: ${ARCH}" + exit 1 +fi + +for arch in ${archs}; do + files=${SOURCE_DIR}/lib*-${arch}-* + for f in $files; do + if [[ -r ${f} ]]; then + bn=$(basename ${f}) + soname=$(echo $bn | cut -d- -f1) + filename=$(echo $bn | cut -d- -f3) + echo + ${bn} + if [[ "${arch}" = "sparcv8" || "${arch}" = "i386" ]]; then + gcp ${SOURCE_DIR}/${bn} ${TARGET_DIR}/${filename} + gln -s ${filename} ${TARGET_DIR}/${soname} + else + mkdir -p ${TARGET_DIR}/${arch} + gcp ${SOURCE_DIR}/${bn} ${TARGET_DIR}/${arch}/${filename} + gln -s ${filename} ${TARGET_DIR}/${arch}/${soname} + fi + else + echo - ${f} + fi + done +done Property changes on: csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/merge_legacy_libs.sh ___________________________________________________________________ Added: svn:executable + * Added: svn:keywords + Id This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Fri Jan 7 22:54:37 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Fri, 07 Jan 2011 21:54:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[12240] csw/mgar/gar/v2-uwatch2/bin/upstream_watch Message-ID: Revision: 12240 http://gar.svn.sourceforge.net/gar/?rev=12240&view=rev Author: wbonnet Date: 2011-01-07 21:54:37 +0000 (Fri, 07 Jan 2011) Log Message: ----------- Add upgrade to version command Modified Paths: -------------- csw/mgar/gar/v2-uwatch2/bin/upstream_watch Modified: csw/mgar/gar/v2-uwatch2/bin/upstream_watch =================================================================== --- csw/mgar/gar/v2-uwatch2/bin/upstream_watch 2011-01-07 18:44:52 UTC (rev 12239) +++ csw/mgar/gar/v2-uwatch2/bin/upstream_watch 2011-01-07 21:54:37 UTC (rev 12240) @@ -35,29 +35,54 @@ import sys import string import re +import os +import shutil +import subprocess +import pysvn -# import httplib - from urllib2 import Request, urlopen, URLError from optparse import OptionParser -# import subprocess -# import os -# import shutil +# --------------------------------------------------------------------------------------------------------------------- +# +# +class InvalidSourceDirectoryContentException(Exception): + """Exception raised when a method is called on the Abstract command class + """ + # ----------------------------------------------------------------------------------------------------------------- + + def __init__(self, message): + self.message = message + + # --------------------------------------------------------------------------------------------------------------------- # # -class NoUpstreamProtocolException(Exception): - """Exception raised when no protocol is specified in the upstream url +class AbstractCommandMethodCallException(Exception): + """Exception raised when a method is called on the Abstract command class """ # ----------------------------------------------------------------------------------------------------------------- - # Just an empty class... + def __init__(self, message): + self.message = message + # --------------------------------------------------------------------------------------------------------------------- # # +class SvnClientException(Exception): + """Exception raised when an error occur while using svnClient + """ + + # ----------------------------------------------------------------------------------------------------------------- + + def __init__(self, message): + self.message = message + +# --------------------------------------------------------------------------------------------------------------------- +# +# class UpstreamUrlRetrievalFailedException(Exception): """Exception raised when an unsuported protocol is specified in the upstream url """ @@ -84,22 +109,6 @@ # --------------------------------------------------------------------------------------------------------------------- # # -class UpstreamProtocolNotSupportedException(Exception): - """Exception raised when an unsuported protocol is specified in the upstream url - """ - - # ----------------------------------------------------------------------------------------------------------------- - - def __init__(self, value): - self.parameter = value - - def __str__(self): - return repr(self.parameter) - - -# --------------------------------------------------------------------------------------------------------------------- -# -# class MissingArgumentException(Exception): """Exception raised when a command line argument is missing """ @@ -129,7 +138,10 @@ # Add options to parser self.parser.add_option("-V", "--verbose", help="Activate verbose mode", action="store_true", dest="verbose") self.parser.add_option("-c", "--current-version", help="Current package version", action="store", dest="current_version") + self.parser.add_option("-d", "--target-location", help="Target location. This is the directory in which the branch will be created (parent of the branch directory). Default value is ../branches", action="store", dest="target_location") self.parser.add_option("-r", "--regexp", help="Version matching regular expression", action="store", dest="regexp") + self.parser.add_option("-s", "--source-directory", help="Source directory (place from where the build is copied). Default value is current directory", action="store", dest="source_directory") + self.parser.add_option("-t", "--target-version", help="Package target version", action="store", dest="target_version") self.parser.add_option("-u", "--upstream-url", help="Upstream version page url", action="store", dest="upstream_url") # ----------------------------------------------------------------------------------------------------------------- @@ -171,7 +183,18 @@ if args.upstream_url != None: self._upstream_url = args.upstream_url + # This member variable defines the target version of the package during upgrade + if args.target_version != None: + self._target_version = args.target_version + # This member variable defines the target directory of the package during upgrade. This is the location of the new branch + if args.target_location != None: + self._target_location = args.target_location + + # This member variable defines the source directory of the package during upgrade. This is the location of the trunk (most of the time) + if args.source_directory != None: + self._source_directory = args.source_directory + # ----------------------------------------------------------------------------------------------------------------- def __init__(self): @@ -181,19 +204,20 @@ self._current_version = None self._regexp = None self._upstream_url = None + self._target_version = None + self._source_directory = "." + self._target_location = "../branches" # ----------------------------------------------------------------------------------------------------------------- def getCurrentVersion(self): return self._current_version - # ----------------------------------------------------------------------------------------------------------------- def getRegexp(self): return self._regexp - # ----------------------------------------------------------------------------------------------------------------- def getUpstreamURL(self): @@ -204,6 +228,21 @@ def getVerbose(self): return self._verbose + # ----------------------------------------------------------------------------------------------------------------- + + def getSourceDirectory(self): + return self._source_directory + + # ----------------------------------------------------------------------------------------------------------------- + + def getTargetLocation(self): + return self._target_location + + # ----------------------------------------------------------------------------------------------------------------- + + def getTargetVersion(self): + return self._target_version + # --------------------------------------------------------------------------------------------------------------------- # # @@ -226,8 +265,8 @@ # ----------------------------------------------------------------------------------------------------------------- def execute(self, opts, arguments): - print "TODO Generate and error instead of this message\n" - print self.name, "\n" + print "Internal error : Abstract command method called\n" + raise AbstractCommandMethodCallException("execute") # --------------------------------------------------------------------------------------------------------------------- # @@ -405,14 +444,6 @@ # Exits through exception handling, thus return false to the command processor return False - except UpstreamProtocolNotSupportedException, (instance): - - # Display a cool error message :) - print "Protocol " + instance.parameter + " is not supportd by upstream_watch" - - # Exits through exception handling, thus return false to the command processor - return False - except UpstreamUrlRetrievalFailedException, (instance): # Exits through exception handling, thus return false to the command processor @@ -501,25 +532,272 @@ # Exits through exception handling, thus return false to the command processor return False - except UpstreamProtocolNotSupportedException, (instance): + except UpstreamUrlRetrievalFailedException, (instance): + # Exits through exception handling, thus return false to the command processor + return False + + except NoUpstreamVersionFoundException, (instance): + + # Exits through exception handling, thus return false to the command processor + return False + + +# --------------------------------------------------------------------------------------------------------------------- +# +# +class UpgradeToVersionCommand(UpstreamWatchCommand): + """UpgradeToVersion command. This command upgrade the build description from a version to another. + Current files in trunk are copied to a new branch. Branch is named accord to the following pattern : + PKG/branches/upgrade_from_CURRENTVERSION_to_DESTVERSION. After copy, version in the Makefile is modified. + An optional argument can be passed to commit after branch creation. + + """ + + # ----------------------------------------------------------------------------------------------------------------- + + def __init__(self, name): + super(UpgradeToVersionCommand, self).__init__(name) + + # ----------------------------------------------------------------------------------------------------------------- + + def checkArgument(self): + + # Variable used to flag that we have a missing argument + argsValid = True + + # FromVersion is mandatory + if self.configParser.getCurrentVersion() == None: + print "Error : Current version is not defined. Please use --current-version flag, or --help to display help" + argsValid = False + + # ToVersion is mandatory + if self.configParser.getTargetVersion() == None: + print "Error : Target version is not defined. Please use --target-version flag, or --help to display help" + argsValid = False + + # ToVersion is mandatory + if self.configParser.getTargetLocation() == None: + print "Error : Target directory is not defined. Please use --target-location flag, or --help to display help" + argsValid = False + + # If arguments are not valid raise an exception + if argsValid == False: + raise MissingArgumentException("Some mandatory arguments are missing. Unable to continue.") + + # ----------------------------------------------------------------------------------------------------------------- + + def checkWorkingDirectory(self): + """ This method checks that the command is executed from a valid working directory. A valid working directory + is a directory in which we find a package buildDescription that means a Makefile and a gar directory or symlink + """ + + # Check that the Makefile exist + if os.path.isfile(self.configParser.getSourceDirectory() + "/Makefile") == False: + # No it does not exist, thus generate an error message + msg = "Error : there is no Makefile under %(src)s" % { "src" : os.path.abspath(self.configParser.getSourceDirectory()) } + + # Then raise an exception + raise InvalidSourceDirectoryContentException(msg) + + # Check that the gar directory exists (can be a directory or symlink) + if os.path.isdir(self.configParser.getSourceDirectory() + "/gar") == False: + # No it does not exist, thus generate an error message + msg = "Error : there is no gar directory under %(src)s" % { "src" : os.path.abspath(self.configParser.getSourceDirectory()) } + + # Then raise an exception + raise InvalidSourceDirectoryContentException(msg) + + # ----------------------------------------------------------------------------------------------------------------- + + def getGarRelativeTargetDirectory(self): + """ This method return None if gar directory is an actual directory, or a relative path if gar is a symlink to + a real directory. In case of a symlink pointing to another symlink, we do not try to get the absolute path + having one level of indirection is enough. + The target directory is a relative path. This path is adjusted to be consistent from the target directory. It + has to be modified since it is basically a relative path from the source directory. + """ + + # Get the newgar information + garDir = self.configParser.getSourceDirectory() + "/gar" + if os.path.islink(garDir): + garTarget = os.path.relpath(os.path.abspath(os.readlink(garDir)), os.path.abspath(targetDir)) + else: + garTarget = None + + # ----------------------------------------------------------------------------------------------------------------- + + def getGarRelativeTargetDirectory(self): + """ This method return None if gar directory is an actual directory, or a relative path if gar is a symlink to + a real directory. In case of a symlink pointing to another symlink, we do not try to get the absolute path + having one level of indirection is enough. + The target directory is a relative path. This path is adjusted to be consistent from the target directory. It + has to be modified since it is basically a relative path from the source directory. + """ + + # Get the newgar information + garDir = self.configParser.getSourceDirectory() + "/gar" + if os.path.islink(garDir): + garTarget = os.path.relpath(os.path.abspath(os.readlink(garDir)), os.path.abspath(self.getTargetDirectory())) + else: + garTarget = None + + return garTarget + + # ----------------------------------------------------------------------------------------------------------------- + + def getTargetDirectory(self): + """ This method return the target directory which is a computed value based on target location, current version + and target version + """ + + return self.configParser.getTargetLocation() + "/upgrade_from_" + self.configParser.getCurrentVersion() + "_to_" + self.configParser.getTargetVersion() + + # ----------------------------------------------------------------------------------------------------------------- + + def copySvnSourceToTarget(self, garRelativeTarget): + """ This method copy sources from the working copy to the target in the same working copy. If garRelativeTarget is not + None, it means gar directory is a symlink. Then once copy is done it is deleted in the target directory and + recreated to point to the new relative directory + """ + + try: + # Create a new svn client + svnClient = pysvn.Client() + + # Do the actual copy in the svn working copy + svnClient.copy(os.path.abspath(self.configParser.getSourceDirectory()), self.getTargetDirectory()) + + # Backup the current directory + curDir = os.getcwd() + + # Change to target directory + os.chdir(self.getTargetDirectory()) + + # Test if gar relative path is defined + if garRelativeTarget: + # Test if gar directory is a symlink and + if os.path.islink("./gar"): + os.remove("./gar") + os.symlink(garRelativeTarget, "./gar") + # No ... :( This a "should not happen error" since it was a symlink before the copy. Exit + else: + print "Internal error : gar is not a symlink but garRelativeTarget is defined" + return False + # No else but ... If gar relative path is not defined, we have copied a real directory. Nothing to do in this case + + # Restore the working directory + os.chdir(curDir) + + # SVN client exception handling + except pysvn.ClientError , e: + # Generate a cool error message + msg = "SVN Client error : " + e.args[0] + "\n" + "Error occured when executing command svnClient.copy(%(src)s, %(dest)s)" \ + % { 'src' : os.path.abspath(self.configParser.getSourceDirectory()), 'dest' : self.getTargetDirectory() } + + # Then raise the exception + raise SvnClientException(msg) + + # ----------------------------------------------------------------------------------------------------------------- + + def modifyVersion(self): + """ This method modifies the version in the Makefile. It replaces current version by new version. + Version has to be defined on a single line strting by VERSION, having some spaces or tabs then + and egal sign = then some tabs or spaces and the version vaue to finish the line + """ + + # Backup the current directory + curDir = os.getcwd() + + # Change to target directory + os.chdir(self.getTargetDirectory()) + + # Array storing the Makefile lines + lines = [] + + # Iterate each line in the file + for line in open("./Makefile", 'r'): + # Match the file line by line + m = re.match(r"\s*VERSION\s*=\s*(?P.*)", line) + + # Test if this is a match + if m == None: + # No, thus output the current line without modifications + lines.append(line) + else: + # Yes it is a match, thus output the modified line + lines.append("VERSION = " + self.configParser.getTargetVersion() + "\n") + + # Open the new Makefile for output + f = open("./Makefile", 'w') + + # Iterates the array of lines and write each one to the Makefile + for element in lines: + f.write(element) + + # Close the Makefile + f.close() + + # Restore the working directory + os.chdir(curDir) + + # ----------------------------------------------------------------------------------------------------------------- + + def execute(self, opts, args): + + try: + + # Initialize configuration + self.configParser.initialize(opts) + + # Need a way to check that all options needed are available + self.checkArgument() + + # Check that the command is launched from a valid directory + self.checkWorkingDirectory() + + # Generates the target directory + self.getTargetDirectory() + + # Get the new gar information + garRelativeTarget = self.getGarRelativeTargetDirectory() + + # Copy target directory to destination + self.copySvnSourceToTarget(garRelativeTarget) + + # Modify the version inside the Makefile + self.modifyVersion() + + # Exit after processing, eveythin gis ok, return true to the command processor + return True + + # Handles exception that occurs when arguments are incorrect + except MissingArgumentException, instance: + # Display a cool error message :) - print "Protocol " + instance.parameter + " is not supportd by upstream_watch" + print instance.parameter # Exits through exception handling, thus return false to the command processor return False - except UpstreamUrlRetrievalFailedException, (instance): + # Handles SVN client exception + except SvnClientException , e: + + # Display a cool error message :) + print e.message # Exits through exception handling, thus return false to the command processor return False - except NoUpstreamVersionFoundException, (instance): + # Handles exceptions which might occur while checking source directory content + except InvalidSourceDirectoryContentException , e: + + # Display a cool error message :) + print e.message # Exits through exception handling, thus return false to the command processor return False - # --------------------------------------------------------------------------------------------------------------------- # # @@ -544,11 +822,13 @@ cmd = GetUpstreamLatestVersionCommand("get-upstream-latest-version") self.commandArray[cmd.getName()] = cmd + cmd = UpgradeToVersionCommand("upgrade-to-version") + self.commandArray[cmd.getName()] = cmd + # ----------------------------------------------------------------------------------------------------------------- def execute(self, opts, arguments): - """Cette methode teste les differents arguments et appelle la methode execute sur l'objet en charge du traitement - L'ordre de declaration des tests est important. En effet certains flags declanchent des actions, d'autres des options. + """This method checks that an action is supplied and call the action handler """ # Check that an action verb is supplied. If none an error is returned @@ -584,7 +864,7 @@ # Call the execute method on the command processor. This method is in charge to find the concrete command return commandProcessor.execute(opts, args) -# On sort en rendant le code de retour de main +# Exit with main return code if __name__ == '__main__': sys.exit(main()) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Fri Jan 7 22:56:19 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Fri, 07 Jan 2011 21:56:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[12241] csw/mgar/gar/v2-uwatch2/bin/upstream_watch Message-ID: Revision: 12241 http://gar.svn.sourceforge.net/gar/?rev=12241&view=rev Author: wbonnet Date: 2011-01-07 21:56:19 +0000 (Fri, 07 Jan 2011) Log Message: ----------- Fix interpreter Modified Paths: -------------- csw/mgar/gar/v2-uwatch2/bin/upstream_watch Modified: csw/mgar/gar/v2-uwatch2/bin/upstream_watch =================================================================== --- csw/mgar/gar/v2-uwatch2/bin/upstream_watch 2011-01-07 21:54:37 UTC (rev 12240) +++ csw/mgar/gar/v2-uwatch2/bin/upstream_watch 2011-01-07 21:56:19 UTC (rev 12241) @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/opt/csw/bin/python # # The contents of this file are subject to the COMMON DEVELOPMENT AND This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Fri Jan 7 23:00:00 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Fri, 07 Jan 2011 22:00:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[12242] csw/mgar/gar/v2/lib/python/pkgdb.py Message-ID: Revision: 12242 http://gar.svn.sourceforge.net/gar/?rev=12242&view=rev Author: wahwah Date: 2011-01-07 22:00:00 +0000 (Fri, 07 Jan 2011) Log Message: ----------- pkgdb: pkg search shows packages from catalogs When searching for packages using 'pkgdb pkg search', show packages registered in catalogs only. By default it's SunOS5.9, sparc, current. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/pkgdb.py Modified: csw/mgar/gar/v2/lib/python/pkgdb.py =================================================================== --- csw/mgar/gar/v2/lib/python/pkgdb.py 2011-01-07 21:56:19 UTC (rev 12241) +++ csw/mgar/gar/v2/lib/python/pkgdb.py 2011-01-07 22:00:00 UTC (rev 12242) @@ -459,14 +459,26 @@ importer.ImportFromFile(infile_fd, show_progress=True) elif (command, subcommand) == ('pkg', 'search'): logging.debug("Searching for %s", args) + sqo_osrel = m.OsRelease.selectBy(short_name=options.osrel).getOne() + sqo_arch = m.Architecture.selectBy(name=options.arch).getOne() + sqo_catrel = m.CatalogRelease.selectBy(name=options.catrel).getOne() if len(args) < 1: logging.fatal("Wrong number of arguments: %s", len(args)) raise SystemExit for catalogname in args: + join = [ + sqlbuilder.INNERJOINOn(None, + m.Srv4FileInCatalog, + m.Srv4FileInCatalog.q.srv4file==m.Srv4FileStats.q.id), + ] res = m.Srv4FileStats.select( sqlobject.AND( + m.Srv4FileInCatalog.q.osrel==sqo_osrel, + m.Srv4FileInCatalog.q.arch==sqo_arch, + m.Srv4FileInCatalog.q.catrel==sqo_catrel, m.Srv4FileStats.q.catalogname.contains(catalogname), - m.Srv4FileStats.q.use_to_generate_catalogs==True) + m.Srv4FileStats.q.use_to_generate_catalogs==True), + join=join, ).orderBy("catalogname") for sqo_srv4 in res: print "%s %s" % (sqo_srv4.basename, sqo_srv4.md5_sum) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sat Jan 8 00:56:42 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Fri, 07 Jan 2011 23:56:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[12243] csw/mgar/gar/v2-uwatch2/bin/upstream_watch Message-ID: Revision: 12243 http://gar.svn.sourceforge.net/gar/?rev=12243&view=rev Author: wbonnet Date: 2011-01-07 23:56:42 +0000 (Fri, 07 Jan 2011) Log Message: ----------- Add get-upstream-version-list command Modified Paths: -------------- csw/mgar/gar/v2-uwatch2/bin/upstream_watch Modified: csw/mgar/gar/v2-uwatch2/bin/upstream_watch =================================================================== --- csw/mgar/gar/v2-uwatch2/bin/upstream_watch 2011-01-07 22:00:00 UTC (rev 12242) +++ csw/mgar/gar/v2-uwatch2/bin/upstream_watch 2011-01-07 23:56:42 UTC (rev 12243) @@ -1,4 +1,4 @@ -#!/opt/csw/bin/python +#!/usr/bin/env python # # The contents of this file are subject to the COMMON DEVELOPMENT AND @@ -542,7 +542,91 @@ # Exits through exception handling, thus return false to the command processor return False +# --------------------------------------------------------------------------------------------------------------------- +# +# +class GetUpstreamVersionListCommand(UpstreamWatchCommand): + """GetUpstreamVersionList command. This command retrieve the upstream web page and search for all the versions. + Version check is done by matching the regexp from the makefile on the page. + """ + # ----------------------------------------------------------------------------------------------------------------- + + def __init__(self, name): + super(GetUpstreamVersionListCommand, self).__init__(name) + + # ----------------------------------------------------------------------------------------------------------------- + + def checkArgument(self): + + # Variable used to flag that we have a missing argument + argsValid = True + + # Regexp is mandatory + if self.configParser.getRegexp() == None: + print "Error : Regexp is not defined. Please use --regexp flag, or --help to display help" + argsValid = False + + # UpstreamURL is mandatory + if self.configParser.getUpstreamURL() == None: + print "Error : Upstream version page URL is not defined. Please use --upstream-url flag, or --help to display help" + argsValid = False + + # If arguments are not valid raise an exception + if argsValid == False: + raise MissingArgumentException("Some mandatory arguments are missing. Unable to continue.") + + # ----------------------------------------------------------------------------------------------------------------- + + def execute(self, opts, args): + + try: + + # Initialize configuration + self.configParser.initialize(opts) + + # Need a way to check that all options needed are available + self.checkArgument() + + # Call the method in charge of retrieving upstream content + content = self.UrlContentRetrieve(self.configParser.getUpstreamURL()) + + # Search the strings matching the regexp passed through command line arguments + p = re.compile(self.configParser.getRegexp()) + matches = p.findall(content) + + # Check if we have found some results + if len(matches) == 0: + raise NoUpstreamVersionFoundException(self.configParser.getUpstreamURL(), self.configParser.getRegexp()) + print "No match found, we should trigger some error since even current version has not been found" + return False + else: + # Print every version in the list + for version in matches: + print version + + # Exit after processing, eveythin gis ok, return true to the command processor + return True + + except MissingArgumentException, (instance): + + # Display a cool error message :) + print instance.parameter + + # Exits through exception handling, thus return false to the command processor + return False + + except UpstreamUrlRetrievalFailedException, (instance): + + # Exits through exception handling, thus return false to the command processor + return False + + except NoUpstreamVersionFoundException, (instance): + + # Exits through exception handling, thus return false to the command processor + return False + + # --------------------------------------------------------------------------------------------------------------------- # # @@ -822,6 +906,9 @@ cmd = GetUpstreamLatestVersionCommand("get-upstream-latest-version") self.commandArray[cmd.getName()] = cmd + cmd = GetUpstreamVersionListCommand("get-upstream-version-list") + self.commandArray[cmd.getName()] = cmd + cmd = UpgradeToVersionCommand("upgrade-to-version") self.commandArray[cmd.getName()] = cmd This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sat Jan 8 00:57:47 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Fri, 07 Jan 2011 23:57:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[12244] csw/mgar/gar/v2-uwatch2/gar.lib.mk Message-ID: Revision: 12244 http://gar.svn.sourceforge.net/gar/?rev=12244&view=rev Author: wbonnet Date: 2011-01-07 23:57:46 +0000 (Fri, 07 Jan 2011) Log Message: ----------- First attempt to make uwatch2 integration in GAR The following target are availables : gmake check-upstream gmake get-upstream-latest-version gmake get-upstream-version-list Modified Paths: -------------- csw/mgar/gar/v2-uwatch2/gar.lib.mk Modified: csw/mgar/gar/v2-uwatch2/gar.lib.mk =================================================================== --- csw/mgar/gar/v2-uwatch2/gar.lib.mk 2011-01-07 23:56:42 UTC (rev 12243) +++ csw/mgar/gar/v2-uwatch2/gar.lib.mk 2011-01-07 23:57:46 UTC (rev 12244) @@ -180,116 +180,93 @@ #################### CHECKNEW RULES #################### -UPSTREAM_MASTER_SITES ?= $(MASTER_SITES) -UW_ARGS = $(addprefix -u ,$(UPSTREAM_MASTER_SITES)) -SF_ARGS = $(addprefix -s ,$(UPSTREAM_USE_SF)) -define files2check -$(if $(UFILES_REGEX),$(shell http_proxy=$(http_proxy) ftp_proxy=$(ftp_proxy) $(GARBIN)/upstream_watch $(UW_ARGS) $(SF_ARGS) $(addsuffix ',$(addprefix ',$(UFILES_REGEX))))) +################### UWATCH VARIABLES ################### +UPSTREAM_MASTER_SITES ?= $(MASTER_SITES) +UW_ARGS = $(addsuffix ',$(addprefix --upstream-url=',$(UPSTREAM_MASTER_SITES))) +REGEXP_ARGS = $(addsuffix ',$(addprefix --regexp=',$(UFILES_REGEX))) +VERSION_ARGS = $(addsuffix ',$(addprefix --current-version=',$(VERSION))) +define versionlist + $(if $(UFILES_REGEX),$(shell htp_proxy=$(http_proxy) ftp_proxy=$(ftp_proxy) $(GARBIN)/upstream_watch get-upstream-version-list $(UW_ARGS) $(REGEXP_ARGS))) endef -check-upstream-and-mail: FILES2CHECK = $(call files2check) -check-upstream-and-mail: - @if [ -n '$(FILES2CHECK)' ]; then \ - NEW_FILES=""; \ - PACKAGE_UP_TO_DATE=0; \ - for FILE in $(FILES2CHECK) ""; do \ - [ -n "$$FILE" ] || continue; \ - if test -f $(COOKIEDIR)/checknew-$$FILE ; then \ - PACKAGE_UP_TO_DATE=1; \ - else \ - if echo $(DISTFILES) | grep -w $$FILE >/dev/null; then \ - PACKAGE_UP_TO_DATE=1; \ - echo "$(NAME) : Package is up-to-date. Current version is $$FILE" ; \ - else \ - NEW_FILES="$$FILE $$NEW_FILES"; \ - fi; \ - fi; \ - $(MAKE) checknew-$$FILE >/dev/null; \ - done; \ - if test -z "$$NEW_FILES" ; then \ - if [ ! -n '$(UFILES_REGEX)' ]; then \ - echo "$(NAME) : Warning UFILES_REGEX is not set : $(UFILES_REGEX)" ; \ -# { echo ""; \ -# echo "Hello dear $(NAME) maintainer,"; \ -# echo ""; \ -# echo "The upstream notification job has detected that $(NAME) is not configured for automatic upstream file update detection."; \ -# echo ""; \ -# echo "Please consider updating your package. Documentation is available from this link : http://www.opencsw.org" ; \ -# echo ""; \ -# echo "Questions, problem report or help should be sent to mailto:maintainers at lists.opencsw.org"; \ -# echo ""; \ -# echo "--"; \ -# echo "Kindest regards"; \ -# echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -s '[svn] $(NAME) upstream update notification' $(NAME); \ - else \ - if [ "$$PACKAGE_UP_TO_DATE" -eq "0" ]; then \ - echo "$(NAME) : Warning no files to check ! $(FILES2CHECK)" ; \ - echo "$(NAME) : UPSTREAM_MASTER_SITES is $(UPSTREAM_MASTER_SITES)" ; \ - echo "$(NAME) : DISTNAME is $(DISTNAME)" ; \ - echo "$(NAME) : UFILES_REGEX is : $(UFILES_REGEX)" ; \ - echo "$(NAME) : Please check configuration" ; \ - fi; \ - fi; \ - else \ - echo "$(NAME) : new upstream files available: $$NEW_FILES"; \ - { echo ""; \ - echo "Hello dear $(NAME) maintainer,"; \ - echo ""; \ - echo "The upstream notification job has detected the availability of new files for $(NAME)."; \ - echo ""; \ - echo "The following upstream file(s):"; \ - echo " $$NEW_FILES"; \ - echo ""; \ - echo "is/are available at the following url(s):"; \ - echo " $(UPSTREAM_MASTER_SITES)"; \ - echo ""; \ - echo "Please consider updating your package." ; \ - echo ""; \ - echo "Questions, problem report or help should be sent to mailto:maintainers at lists.opencsw.org"; \ - echo ""; \ - echo "--"; \ - echo "Kindest regards"; \ - echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -s '[svn] $(NAME) upstream update notification' $(NAME); \ - fi; \ - fi +######################################################## +# Retrieve the list of upstream versions +# +get-upstream-version-list:VERSIONLIST = $(call versionlist) +get-upstream-version-list: + @if [ ! -n '$(UFILES_REGEX)' ]; then \ + echo "$(NAME) : Error UFILES_REGEX is not set" ; \ + false; \ + fi; \ + if [ ! -n '$(UPSTREAM_MASTER_SITES)' ]; then \ + echo "$(NAME) : Error UPSTREAM_MASTER_SITES is not set" ; \ + false; \ + fi; \ + if [ ! -n '$(VERSION)' ]; then \ + echo "$(NAME) : Error VERSION is not set" ; \ + false; \ + fi; \ + if [ -n "$(VERSIONLIST)" ] ; then \ + for VERSION in $(VERSIONLIST) ""; do \ + echo $$VERSION ; \ + done ; \ + else \ + echo "No version found. Please check UPSTREAM_MASTER_SITES and UFILES_REGEX variables in the Makefile" ; \ + fi ; -check-upstream: FILES2CHECK = $(call files2check) -check-upstream: - @if [ -n '$(FILES2CHECK)' ]; then \ - NEW_FILES=""; \ - PACKAGE_UP_TO_DATE=0; \ - for FILE in $(FILES2CHECK) ""; do \ - [ -n "$$FILE" ] || continue; \ - if test -f $(COOKIEDIR)/checknew-$$FILE ; then \ - PACKAGE_UP_TO_DATE=1; \ - else \ - if echo $(DISTFILES) | grep -w $$FILE >/dev/null; then \ - PACKAGE_UP_TO_DATE=1; \ - echo "$(NAME) : Package is up-to-date. Current version is $$FILE" ; \ - else \ - NEW_FILES="$$FILE $$NEW_FILES"; \ - fi; \ - fi; \ - $(MAKE) checknew-$$FILE >/dev/null; \ - done; \ - if test -z "$$NEW_FILES" ; then \ - if [ ! -n '$(UFILES_REGEX)' ]; then \ - echo "$(NAME) : Warning UFILES_REGEX is not set : $(UFILES_REGEX)" ; \ - else \ - if [ "$$PACKAGE_UP_TO_DATE" -eq "0" ]; then \ - echo "$(NAME) : Warning no files to check ! $(FILES2CHECK)" ; \ - echo "$(NAME) : UPSTREAM_MASTER_SITES is $(UPSTREAM_MASTER_SITES)" ; \ - echo "$(NAME) : DISTNAME is $(DISTNAME)" ; \ - echo "$(NAME) : UFILES_REGEX is : $(UFILES_REGEX)" ; \ - echo "$(NAME) : Please check configuration" ; \ - fi; \ - fi; \ - else \ - echo "$(NAME) : new upstream files available: $$NEW_FILES"; \ - fi; \ +######################################################## +# Retrieve the newest upstream version +# +get-upstream-latest-version: + @if [ ! -n '$(UFILES_REGEX)' ]; then \ + echo "$(NAME) : Error UFILES_REGEX is not set" ; \ + false; \ + fi; \ + if [ ! -n '$(UPSTREAM_MASTER_SITES)' ]; then \ + echo "$(NAME) : Error UPSTREAM_MASTER_SITES is not set" ; \ + false; \ + fi; \ + if [ ! -n '$(VERSION)' ]; then \ + echo "$(NAME) : Error VERSION is not set" ; \ + false; \ + fi; \ + LATESTVERSION=$(shell http_proxy=$(http_proxy) ftp_proxy=$(ftp_proxy) $(GARBIN)/upstream_watch get-upstream-latest-version $(UW_ARGS) $(REGEXP_ARGS)); \ + if [ -n "$$LATESTVERSION" ] ; then \ + echo $$LATESTVERSION ; \ + else \ + echo "No version found. Please check UPSTREAM_MASTER_SITES and UFILES_REGEX variables in the Makefile" ; \ + fi ; + +######################################################## +# Compare local and upstream versions +# +check-upstream: + @if [ ! -n '$(UFILES_REGEX)' ]; then \ + echo "$(NAME) : Error UFILES_REGEX is not set" ; \ + false; \ + fi; \ + if [ ! -n '$(UPSTREAM_MASTER_SITES)' ]; then \ + echo "$(NAME) : Error UPSTREAM_MASTER_SITES is not set" ; \ + false; \ + fi; \ + if [ ! -n '$(VERSION)' ]; then \ + echo "$(NAME) : Error VERSION is not set" ; \ + false; \ + fi; \ + LATESTVERSION=$(shell http_proxy=$(http_proxy) ftp_proxy=$(ftp_proxy) $(GARBIN)/upstream_watch check-upstream $(UW_ARGS) $(REGEXP_ARGS) $(VERSION_ARGS)); \ + if [ -n "$$LATESTVERSION" ] ; then \ + if test ! -f $(COOKIEDIR)/checknew-$$LATESTVERSION ; then \ + echo "$(NAME) : a new version of upstream files is available : $$LATESTVERSION"; \ + $(MAKE) checknew-$$LATESTVERSION > /dev/null ; \ + fi ; \ + else \ + if test ! -f $(COOKIEDIR)/checknew-$(VERSION) ; then \ + echo "$(NAME) : Package is up-to-date. Current version is $(VERSION)" ; \ + $(MAKE) checknew-$(VERSION) > /dev/null ; \ + fi ; \ fi - + checknew-%: @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sat Jan 8 01:25:28 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sat, 08 Jan 2011 00:25:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[12245] csw/mgar/gar/v2-uwatch2/bin/upstream_watch Message-ID: Revision: 12245 http://gar.svn.sourceforge.net/gar/?rev=12245&view=rev Author: wbonnet Date: 2011-01-08 00:25:27 +0000 (Sat, 08 Jan 2011) Log Message: ----------- Sort version list and remove duplicated entries Modified Paths: -------------- csw/mgar/gar/v2-uwatch2/bin/upstream_watch Modified: csw/mgar/gar/v2-uwatch2/bin/upstream_watch =================================================================== --- csw/mgar/gar/v2-uwatch2/bin/upstream_watch 2011-01-07 23:57:46 UTC (rev 12244) +++ csw/mgar/gar/v2-uwatch2/bin/upstream_watch 2011-01-08 00:25:27 UTC (rev 12245) @@ -578,6 +578,19 @@ # ----------------------------------------------------------------------------------------------------------------- + def compareAndSortVersion(self, a, b): + """This function is a wrapper to the comparison function. CompareVersionAndGetNewest returns the string containing + the newest version of the two arguments. Since sort method used on list need to have an integer return value, this + wrapper do the call to CompareVersionAndGetNewest and returns an int + """ + + if self.CompareVersionAndGetNewest(a,b) == a: + return 1 + else: + return -1 + + # ----------------------------------------------------------------------------------------------------------------- + def execute(self, opts, args): try: @@ -601,8 +614,15 @@ print "No match found, we should trigger some error since even current version has not been found" return False else: + # Remove duplicated entries + myList = [] + for version in matches: + myList.append(version) + l = list(set(myList)) + l.sort(self.compareAndSortVersion) + # Print every version in the list - for version in matches: + for version in l: print version # Exit after processing, eveythin gis ok, return true to the command processor This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sat Jan 8 01:39:48 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sat, 08 Jan 2011 00:39:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[12246] csw/mgar/gar/v2-uwatch2/gar.lib.mk Message-ID: Revision: 12246 http://gar.svn.sourceforge.net/gar/?rev=12246&view=rev Author: wbonnet Date: 2011-01-08 00:39:47 +0000 (Sat, 08 Jan 2011) Log Message: ----------- Add target : gmake get-current-version This trget only output VERSION variable. PRovided for convienence Modified Paths: -------------- csw/mgar/gar/v2-uwatch2/gar.lib.mk Modified: csw/mgar/gar/v2-uwatch2/gar.lib.mk =================================================================== --- csw/mgar/gar/v2-uwatch2/gar.lib.mk 2011-01-08 00:25:27 UTC (rev 12245) +++ csw/mgar/gar/v2-uwatch2/gar.lib.mk 2011-01-08 00:39:47 UTC (rev 12246) @@ -191,6 +191,17 @@ endef ######################################################## +# Retrieve the current version +# +get-current-version: + @if [ ! -n '$(VERSION)' ]; then \ + echo "$(NAME) : VERSION is not defined" ; \ + false; \ + else \ + echo "$(NAME) : Current version is $(VERSION)" ; \ + fi ; + +######################################################## # Retrieve the list of upstream versions # get-upstream-version-list:VERSIONLIST = $(call versionlist) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sat Jan 8 02:13:42 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sat, 08 Jan 2011 01:13:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[12247] csw/mgar/gar/v2-uwatch2/gar.lib.mk Message-ID: Revision: 12247 http://gar.svn.sourceforge.net/gar/?rev=12247&view=rev Author: wbonnet Date: 2011-01-08 01:13:41 +0000 (Sat, 08 Jan 2011) Log Message: ----------- Add target gmake get-uwatch-configuration This target displays parameters set for uwatch, if uwatch is enabled Modified Paths: -------------- csw/mgar/gar/v2-uwatch2/gar.lib.mk Modified: csw/mgar/gar/v2-uwatch2/gar.lib.mk =================================================================== --- csw/mgar/gar/v2-uwatch2/gar.lib.mk 2011-01-08 00:39:47 UTC (rev 12246) +++ csw/mgar/gar/v2-uwatch2/gar.lib.mk 2011-01-08 01:13:41 UTC (rev 12247) @@ -183,6 +183,8 @@ ################### UWATCH VARIABLES ################### UPSTREAM_MASTER_SITES ?= $(MASTER_SITES) +ENABLE_UPSTREAM_WATCH ?= 1 + UW_ARGS = $(addsuffix ',$(addprefix --upstream-url=',$(UPSTREAM_MASTER_SITES))) REGEXP_ARGS = $(addsuffix ',$(addprefix --regexp=',$(UFILES_REGEX))) VERSION_ARGS = $(addsuffix ',$(addprefix --current-version=',$(VERSION))) @@ -191,14 +193,39 @@ endef ######################################################## +# Display uwatch informations +# +get-uwatch-configuration: + @if [ '$(ENABLE_UPSTREAM_WATCH)' -ne '1' ] ; then \ + echo "$(NAME) - Upstream Watch is disabled" ; \ + else \ + echo "$(NAME) - Upstream Watch is enabled is enabled" ; \ + if [ ! -n '$(UFILES_REGEX)' ]; then \ + echo "$(NAME) - UFILES_REGEX is not set" ; \ + else \ + echo "$(NAME) - UFILES_REGEX is : $(UFILES_REGEX)" ; \ + fi; \ + if [ ! -n '$(UPSTREAM_MASTER_SITES)' ]; then \ + echo "$(NAME) - UPSTREAM_MASTER_SITES is not set" ; \ + else \ + echo "$(NAME) - UPSTREAM_MASTER_SITES is : $(UPSTREAM_MASTER_SITES)" ; \ + fi; \ + if [ ! -n '$(VERSION)' ]; then \ + echo "$(NAME) - VERSION is not set" ; \ + else \ + echo "$(NAME) - Current version is : $(VERSION)" ; \ + fi ; \ + fi ; + +######################################################## # Retrieve the current version # get-current-version: @if [ ! -n '$(VERSION)' ]; then \ - echo "$(NAME) : VERSION is not defined" ; \ + echo "$(NAME) - VERSION is not defined" ; \ false; \ else \ - echo "$(NAME) : Current version is $(VERSION)" ; \ + echo "$(NAME) - Current version is $(VERSION)" ; \ fi ; ######################################################## @@ -207,15 +234,15 @@ get-upstream-version-list:VERSIONLIST = $(call versionlist) get-upstream-version-list: @if [ ! -n '$(UFILES_REGEX)' ]; then \ - echo "$(NAME) : Error UFILES_REGEX is not set" ; \ + echo "$(NAME) - Error UFILES_REGEX is not set" ; \ false; \ fi; \ if [ ! -n '$(UPSTREAM_MASTER_SITES)' ]; then \ - echo "$(NAME) : Error UPSTREAM_MASTER_SITES is not set" ; \ + echo "$(NAME) - Error UPSTREAM_MASTER_SITES is not set" ; \ false; \ fi; \ if [ ! -n '$(VERSION)' ]; then \ - echo "$(NAME) : Error VERSION is not set" ; \ + echo "$(NAME) - Error VERSION is not set" ; \ false; \ fi; \ if [ -n "$(VERSIONLIST)" ] ; then \ @@ -231,15 +258,15 @@ # get-upstream-latest-version: @if [ ! -n '$(UFILES_REGEX)' ]; then \ - echo "$(NAME) : Error UFILES_REGEX is not set" ; \ + echo "$(NAME) - Error UFILES_REGEX is not set" ; \ false; \ fi; \ if [ ! -n '$(UPSTREAM_MASTER_SITES)' ]; then \ - echo "$(NAME) : Error UPSTREAM_MASTER_SITES is not set" ; \ + echo "$(NAME) - Error UPSTREAM_MASTER_SITES is not set" ; \ false; \ fi; \ if [ ! -n '$(VERSION)' ]; then \ - echo "$(NAME) : Error VERSION is not set" ; \ + echo "$(NAME) - Error VERSION is not set" ; \ false; \ fi; \ LATESTVERSION=$(shell http_proxy=$(http_proxy) ftp_proxy=$(ftp_proxy) $(GARBIN)/upstream_watch get-upstream-latest-version $(UW_ARGS) $(REGEXP_ARGS)); \ @@ -254,15 +281,15 @@ # check-upstream: @if [ ! -n '$(UFILES_REGEX)' ]; then \ - echo "$(NAME) : Error UFILES_REGEX is not set" ; \ + echo "$(NAME) - Error UFILES_REGEX is not set" ; \ false; \ fi; \ if [ ! -n '$(UPSTREAM_MASTER_SITES)' ]; then \ - echo "$(NAME) : Error UPSTREAM_MASTER_SITES is not set" ; \ + echo "$(NAME) - Error UPSTREAM_MASTER_SITES is not set" ; \ false; \ fi; \ if [ ! -n '$(VERSION)' ]; then \ - echo "$(NAME) : Error VERSION is not set" ; \ + echo "$(NAME) - Error VERSION is not set" ; \ false; \ fi; \ LATESTVERSION=$(shell http_proxy=$(http_proxy) ftp_proxy=$(ftp_proxy) $(GARBIN)/upstream_watch check-upstream $(UW_ARGS) $(REGEXP_ARGS) $(VERSION_ARGS)); \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sat Jan 8 02:22:40 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sat, 08 Jan 2011 01:22:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[12248] csw/mgar/gar/v2-uwatch2/gar.lib.mk Message-ID: Revision: 12248 http://gar.svn.sourceforge.net/gar/?rev=12248&view=rev Author: wbonnet Date: 2011-01-08 01:22:40 +0000 (Sat, 08 Jan 2011) Log Message: ----------- Add ENABLE_UPSTREAM_WATCH flag in Makefile Default value is 1 (this has to be discussed...) If ENABLE_UPSTREAM_WATCH = 1 then Upstream watch is enabled for the packages defined in this Makefile Any other value disables Upstream watch for this Makefile Modified Paths: -------------- csw/mgar/gar/v2-uwatch2/gar.lib.mk Modified: csw/mgar/gar/v2-uwatch2/gar.lib.mk =================================================================== --- csw/mgar/gar/v2-uwatch2/gar.lib.mk 2011-01-08 01:13:41 UTC (rev 12247) +++ csw/mgar/gar/v2-uwatch2/gar.lib.mk 2011-01-08 01:22:40 UTC (rev 12248) @@ -233,75 +233,87 @@ # get-upstream-version-list:VERSIONLIST = $(call versionlist) get-upstream-version-list: - @if [ ! -n '$(UFILES_REGEX)' ]; then \ - echo "$(NAME) - Error UFILES_REGEX is not set" ; \ - false; \ - fi; \ - if [ ! -n '$(UPSTREAM_MASTER_SITES)' ]; then \ - echo "$(NAME) - Error UPSTREAM_MASTER_SITES is not set" ; \ - false; \ - fi; \ - if [ ! -n '$(VERSION)' ]; then \ - echo "$(NAME) - Error VERSION is not set" ; \ - false; \ - fi; \ - if [ -n "$(VERSIONLIST)" ] ; then \ - for VERSION in $(VERSIONLIST) ""; do \ - echo $$VERSION ; \ - done ; \ + @if [ '$(ENABLE_UPSTREAM_WATCH)' -ne '1' ] ; then \ + echo "$(NAME) - Upstream Watch is disabled" ; \ else \ - echo "No version found. Please check UPSTREAM_MASTER_SITES and UFILES_REGEX variables in the Makefile" ; \ + if [ ! -n '$(UFILES_REGEX)' ]; then \ + echo "$(NAME) - Error UFILES_REGEX is not set" ; \ + false; \ + fi; \ + if [ ! -n '$(UPSTREAM_MASTER_SITES)' ]; then \ + echo "$(NAME) - Error UPSTREAM_MASTER_SITES is not set" ; \ + false; \ + fi; \ + if [ ! -n '$(VERSION)' ]; then \ + echo "$(NAME) - Error VERSION is not set" ; \ + false; \ + fi; \ + if [ -n "$(VERSIONLIST)" ] ; then \ + for VERSION in $(VERSIONLIST) ""; do \ + echo $$VERSION ; \ + done ; \ + else \ + echo "No version found. Please check UPSTREAM_MASTER_SITES and UFILES_REGEX variables in the Makefile" ; \ + fi ; \ fi ; ######################################################## # Retrieve the newest upstream version # get-upstream-latest-version: - @if [ ! -n '$(UFILES_REGEX)' ]; then \ - echo "$(NAME) - Error UFILES_REGEX is not set" ; \ - false; \ - fi; \ - if [ ! -n '$(UPSTREAM_MASTER_SITES)' ]; then \ - echo "$(NAME) - Error UPSTREAM_MASTER_SITES is not set" ; \ - false; \ - fi; \ - if [ ! -n '$(VERSION)' ]; then \ - echo "$(NAME) - Error VERSION is not set" ; \ - false; \ - fi; \ - LATESTVERSION=$(shell http_proxy=$(http_proxy) ftp_proxy=$(ftp_proxy) $(GARBIN)/upstream_watch get-upstream-latest-version $(UW_ARGS) $(REGEXP_ARGS)); \ - if [ -n "$$LATESTVERSION" ] ; then \ - echo $$LATESTVERSION ; \ + @if [ '$(ENABLE_UPSTREAM_WATCH)' -ne '1' ] ; then \ + echo "$(NAME) - Upstream Watch is disabled" ; \ else \ - echo "No version found. Please check UPSTREAM_MASTER_SITES and UFILES_REGEX variables in the Makefile" ; \ + if [ ! -n '$(UFILES_REGEX)' ]; then \ + echo "$(NAME) - Error UFILES_REGEX is not set" ; \ + false; \ + fi; \ + if [ ! -n '$(UPSTREAM_MASTER_SITES)' ]; then \ + echo "$(NAME) - Error UPSTREAM_MASTER_SITES is not set" ; \ + false; \ + fi; \ + if [ ! -n '$(VERSION)' ]; then \ + echo "$(NAME) - Error VERSION is not set" ; \ + false; \ + fi; \ + LATESTVERSION=$(shell http_proxy=$(http_proxy) ftp_proxy=$(ftp_proxy) $(GARBIN)/upstream_watch get-upstream-latest-version $(UW_ARGS) $(REGEXP_ARGS)); \ + if [ -n "$$LATESTVERSION" ] ; then \ + echo $$LATESTVERSION ; \ + else \ + echo "No version found. Please check UPSTREAM_MASTER_SITES and UFILES_REGEX variables in the Makefile" ; \ + fi ; \ fi ; ######################################################## # Compare local and upstream versions # check-upstream: - @if [ ! -n '$(UFILES_REGEX)' ]; then \ - echo "$(NAME) - Error UFILES_REGEX is not set" ; \ - false; \ - fi; \ - if [ ! -n '$(UPSTREAM_MASTER_SITES)' ]; then \ - echo "$(NAME) - Error UPSTREAM_MASTER_SITES is not set" ; \ - false; \ - fi; \ - if [ ! -n '$(VERSION)' ]; then \ - echo "$(NAME) - Error VERSION is not set" ; \ - false; \ - fi; \ - LATESTVERSION=$(shell http_proxy=$(http_proxy) ftp_proxy=$(ftp_proxy) $(GARBIN)/upstream_watch check-upstream $(UW_ARGS) $(REGEXP_ARGS) $(VERSION_ARGS)); \ - if [ -n "$$LATESTVERSION" ] ; then \ - if test ! -f $(COOKIEDIR)/checknew-$$LATESTVERSION ; then \ - echo "$(NAME) : a new version of upstream files is available : $$LATESTVERSION"; \ - $(MAKE) checknew-$$LATESTVERSION > /dev/null ; \ - fi ; \ + @if [ '$(ENABLE_UPSTREAM_WATCH)' -ne '1' ] ; then \ + echo "$(NAME) - Upstream Watch is disabled" ; \ else \ - if test ! -f $(COOKIEDIR)/checknew-$(VERSION) ; then \ - echo "$(NAME) : Package is up-to-date. Current version is $(VERSION)" ; \ - $(MAKE) checknew-$(VERSION) > /dev/null ; \ + if [ ! -n '$(UFILES_REGEX)' ]; then \ + echo "$(NAME) - Error UFILES_REGEX is not set" ; \ + false; \ + fi; \ + if [ ! -n '$(UPSTREAM_MASTER_SITES)' ]; then \ + echo "$(NAME) - Error UPSTREAM_MASTER_SITES is not set" ; \ + false; \ + fi; \ + if [ ! -n '$(VERSION)' ]; then \ + echo "$(NAME) - Error VERSION is not set" ; \ + false; \ + fi; \ + LATESTVERSION=$(shell http_proxy=$(http_proxy) ftp_proxy=$(ftp_proxy) $(GARBIN)/upstream_watch check-upstream $(UW_ARGS) $(REGEXP_ARGS) $(VERSION_ARGS)); \ + if [ -n "$$LATESTVERSION" ] ; then \ + if test ! -f $(COOKIEDIR)/checknew-$$LATESTVERSION ; then \ + echo "$(NAME) : a new version of upstream files is available : $$LATESTVERSION"; \ + $(MAKE) checknew-$$LATESTVERSION > /dev/null ; \ + fi ; \ + else \ + if test ! -f $(COOKIEDIR)/checknew-$(VERSION) ; then \ + echo "$(NAME) : Package is up-to-date. Current version is $(VERSION)" ; \ + $(MAKE) checknew-$(VERSION) > /dev/null ; \ + fi ; \ fi ; \ fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From gmarler at users.sourceforge.net Sat Jan 8 09:05:53 2011 From: gmarler at users.sourceforge.net (gmarler at users.sourceforge.net) Date: Sat, 08 Jan 2011 08:05:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[12249] csw/mgar/pkg/cpan/IO-Digest/trunk Message-ID: Revision: 12249 http://gar.svn.sourceforge.net/gar/?rev=12249&view=rev Author: gmarler Date: 2011-01-08 08:05:53 +0000 (Sat, 08 Jan 2011) Log Message: ----------- - Add license - Remove dependency on pm_perlioviadyn, as this is no longer a module but a core feature - Eliminate man pages Modified Paths: -------------- csw/mgar/pkg/cpan/IO-Digest/trunk/Makefile csw/mgar/pkg/cpan/IO-Digest/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/IO-Digest/trunk/files/COPYING Modified: csw/mgar/pkg/cpan/IO-Digest/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/IO-Digest/trunk/Makefile 2011-01-08 01:22:40 UTC (rev 12248) +++ csw/mgar/pkg/cpan/IO-Digest/trunk/Makefile 2011-01-08 08:05:53 UTC (rev 12249) @@ -10,11 +10,13 @@ the digests after written a file. endef -RUNTIME_DEP_PKGS = pm_perlioviadyn +DISTFILES += COPYING +CATALOGNAME = pm_iodigest PACKAGES = CSWpmiodigest -CATALOGNAME = pm_iodigest ARCHALL = 1 +EXTRA_MERGE_EXCLUDE_FILES = \/opt\/csw\/share\/man.* + include gar/category.mk Modified: csw/mgar/pkg/cpan/IO-Digest/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/IO-Digest/trunk/checksums 2011-01-08 01:22:40 UTC (rev 12248) +++ csw/mgar/pkg/cpan/IO-Digest/trunk/checksums 2011-01-08 08:05:53 UTC (rev 12249) @@ -1 +1 @@ -0448841e0559c2c19c7e8001ef087e26 download/IO-Digest-0.10.tar.gz +0448841e0559c2c19c7e8001ef087e26 IO-Digest-0.10.tar.gz Added: csw/mgar/pkg/cpan/IO-Digest/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/IO-Digest/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/IO-Digest/trunk/files/COPYING 2011-01-08 08:05:53 UTC (rev 12249) @@ -0,0 +1,8 @@ +Perl5 is Copyright (C) 1993-2005, by Larry Wall and others. + +It is free software; you can redistribute it and/or modify it under the terms of either: + +a) the GNU General Public License as published by the Free Software Foundation; either + version 1, or (at your option) any later version, or + +b) the "Artistic License". This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From gmarler at users.sourceforge.net Sat Jan 8 09:06:40 2011 From: gmarler at users.sourceforge.net (gmarler at users.sourceforge.net) Date: Sat, 08 Jan 2011 08:06:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[12250] csw/mgar/pkg/cpan/IO-Digest/tags/IO-Digest-0.10, REV =2011.01.08/ Message-ID: Revision: 12250 http://gar.svn.sourceforge.net/gar/?rev=12250&view=rev Author: gmarler Date: 2011-01-08 08:06:40 +0000 (Sat, 08 Jan 2011) Log Message: ----------- IO-Digest: Tag as release 0.10,REV=2011.01.08 Added Paths: ----------- csw/mgar/pkg/cpan/IO-Digest/tags/IO-Digest-0.10,REV=2011.01.08/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Jan 8 10:13:02 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 08 Jan 2011 09:13:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[12251] csw/mgar/pkg/postgresql/branches/postgresql-9.0/ Makefile Message-ID: Revision: 12251 http://gar.svn.sourceforge.net/gar/?rev=12251&view=rev Author: wahwah Date: 2011-01-08 09:13:02 +0000 (Sat, 08 Jan 2011) Log Message: ----------- postgresql-9.0: Moving CSWlibpq dependencies in one place Modified Paths: -------------- csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile 2011-01-08 08:06:40 UTC (rev 12250) +++ csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile 2011-01-08 09:13:02 UTC (rev 12251) @@ -24,6 +24,8 @@ VERSION = $(BASE_VERSION).$(PATCHLEVEL) CATEGORIES = apps +SHELL = /opt/csw/bin/bash + # Useful when making a series of builds on the same day # GARFLAVOR ?= DBG @@ -211,7 +213,6 @@ PKGFILES_CSWlibecpg6 += $(call baseisadirs,$(prefix)/lib,libecpg\.so\.6\.0) PKGFILES_CSWlibecpg6 += $(call baseisadirs,$(prefix)/lib,libecpg\.so\.6(\.\d+)*) SPKG_DESC_CSWlibecpg6 += Embedded PostgreSQL for C library (built from $(BASE_VERSION).x sources), libecpg.so.6 -RUNTIME_DEP_PKGS_CSWlibpq += CSWlibecpg6 RUNTIME_DEP_PKGS_CSWlibecpg6 += CSWlibpgtypes3 RUNTIME_DEP_PKGS_CSWlibecpg6 += CSWlibpq5 @@ -220,7 +221,6 @@ PKGFILES_CSWlibecpg-compat3 += $(call baseisadirs,$(prefix)/lib,libecpg_compat\.so\.3\.2) PKGFILES_CSWlibecpg-compat3 += $(call baseisadirs,$(prefix)/lib,libecpg_compat\.so\.3(\.\d+)*) SPKG_DESC_CSWlibecpg-compat3 += Older version of run-time library for ECPG programs (built from $(BASE_VERSION).x sources), libecpg_compat.so.3 -RUNTIME_DEP_PKGS_CSWlibpq += CSWlibecpg-compat3 RUNTIME_DEP_PKGS_CSWlibecpg-compat3 += CSWlibecpg6 RUNTIME_DEP_PKGS_CSWlibecpg-compat3 += CSWlibpgtypes3 RUNTIME_DEP_PKGS_CSWlibecpg-compat3 += CSWlibpq5 @@ -230,10 +230,7 @@ PKGFILES_CSWlibpgtypes3 += $(call baseisadirs,$(prefix)/lib,libpgtypes\.so\.3\.0) PKGFILES_CSWlibpgtypes3 += $(call baseisadirs,$(prefix)/lib,libpgtypes\.so\.3(\.\d+)*) SPKG_DESC_CSWlibpgtypes3 += Used by programs built with ecpg (Embedded PostgreSQL for C, from $(BASE_VERSION).x sources), libpgtypes.so.3 -RUNTIME_DEP_PKGS_CSWlibpq += CSWlibpgtypes3 - - PACKAGES += CSWlibpq-dev CATALOGNAME_CSWlibpq-dev = libpq_dev SPKG_DESC_CSWlibpq-dev = PostgreSQL C client headers (built from $(BASE_VERSION).x sources) @@ -267,7 +264,6 @@ PKGFILES_CSWlibpq3 += $(call baseisadirs,$(prefix)/lib,libpq\.so\.3\.2) PKGFILES_CSWlibpq3 += $(call baseisadirs,$(prefix)/lib,libpq\.so\.3(\.\d+)*) SPKG_DESC_CSWlibpq3 += PostgreSQL C client library, libpq.so.3 -RUNTIME_DEP_PKGS_CSWlibpq += CSWlibpq3 RUNTIME_DEP_PKGS_CSWlibpq3 += CSWosslrt PACKAGES += CSWlibpq4 @@ -275,7 +271,6 @@ PKGFILES_CSWlibpq4 += $(call baseisadirs,$(prefix)/lib,libpq\.so\.4\.1) PKGFILES_CSWlibpq4 += $(call baseisadirs,$(prefix)/lib,libpq\.so\.4(\.\d+)*) SPKG_DESC_CSWlibpq4 += PostgreSQL C client library, libpq.so.4 -RUNTIME_DEP_PKGS_CSWlibpq += CSWlibpq4 RUNTIME_DEP_PKGS_CSWlibpq4 += CSWosslrt PACKAGES += CSWlibpgtypes1 @@ -283,21 +278,18 @@ PKGFILES_CSWlibpgtypes1 += $(call baseisadirs,$(prefix)/lib,libpgtypes\.so\.1\.2) PKGFILES_CSWlibpgtypes1 += $(call baseisadirs,$(prefix)/lib,libpgtypes\.so\.1(\.\d+)*) SPKG_DESC_CSWlibpgtypes1 += Used by programs built with ecpg (Embedded PostgreSQL for C), libpgtypes.so.1 -RUNTIME_DEP_PKGS_CSWlibpq += CSWlibpgtypes1 PACKAGES += CSWlibpgtypes2 CATALOGNAME_CSWlibpgtypes2 = libpgtypes2 PKGFILES_CSWlibpgtypes2 += $(call baseisadirs,$(prefix)/lib,libpgtypes\.so\.2\.2) PKGFILES_CSWlibpgtypes2 += $(call baseisadirs,$(prefix)/lib,libpgtypes\.so\.2(\.\d+)*) SPKG_DESC_CSWlibpgtypes2 += Used by programs built with ecpg (Embedded PostgreSQL for C), libpgtypes.so.2 -RUNTIME_DEP_PKGS_CSWlibpq += CSWlibpgtypes2 PACKAGES += CSWlibecpg4 CATALOGNAME_CSWlibecpg4 = libecpg4 PKGFILES_CSWlibecpg4 += $(call baseisadirs,$(prefix)/lib,libecpg\.so\.4\.2) PKGFILES_CSWlibecpg4 += $(call baseisadirs,$(prefix)/lib,libecpg\.so\.4(\.\d+)*) SPKG_DESC_CSWlibecpg4 += Embedded PostgreSQL for C library, libecpg.so.4 -RUNTIME_DEP_PKGS_CSWlibpq += CSWlibecpg4 RUNTIME_DEP_PKGS_CSWlibecpg4 += CSWlibpgtypes1 RUNTIME_DEP_PKGS_CSWlibecpg4 += CSWosslrt RUNTIME_DEP_PKGS_CSWlibecpg4 += CSWlibpq3 @@ -307,7 +299,6 @@ PKGFILES_CSWlibecpg5 += $(call baseisadirs,$(prefix)/lib,libecpg\.so\.5\.2) PKGFILES_CSWlibecpg5 += $(call baseisadirs,$(prefix)/lib,libecpg\.so\.5(\.\d+)*) SPKG_DESC_CSWlibecpg5 += Embedded PostgreSQL for C library, libecpg.so.5 -RUNTIME_DEP_PKGS_CSWlibpq += CSWlibecpg5 RUNTIME_DEP_PKGS_CSWlibecpg5 += CSWlibpgtypes2 RUNTIME_DEP_PKGS_CSWlibecpg5 += CSWlibpq5 @@ -315,8 +306,7 @@ CATALOGNAME_CSWlibecpg-compat2 = libecpg_compat2 PKGFILES_CSWlibecpg-compat2 += $(call baseisadirs,$(prefix)/lib,libecpg_compat\.so\.2\.2) PKGFILES_CSWlibecpg-compat2 += $(call baseisadirs,$(prefix)/lib,libecpg_compat\.so\.2(\.\d+)*) -SPKG_DESC_CSWlibecpg-compat2 += Older version of run-time library for ECPG programs (built from 9.0.x sources), libecpg_compat.so.2 -RUNTIME_DEP_PKGS_CSWlibpq += CSWlibecpg-compat2 +SPKG_DESC_CSWlibecpg-compat2 += Older version of run-time library for ECPG programs, libecpg_compat.so.2 RUNTIME_DEP_PKGS_CSWlibecpg-compat2 += CSWlibpgtypes2 RUNTIME_DEP_PKGS_CSWlibecpg-compat2 += CSWlibecpg5 RUNTIME_DEP_PKGS_CSWlibecpg-compat2 += CSWlibpq5 @@ -325,6 +315,16 @@ PACKAGES += CSWlibpq PKGFILES_CSWlibpq += $(prefix)/postgresql.* SPKG_DESC_CSWlibpq = Transitional package for PostgreSQL shared libraries +RUNTIME_DEP_PKGS_CSWlibpq += CSWlibecpg-compat2 +RUNTIME_DEP_PKGS_CSWlibpq += CSWlibecpg-compat3 +RUNTIME_DEP_PKGS_CSWlibpq += CSWlibecpg4 +RUNTIME_DEP_PKGS_CSWlibpq += CSWlibecpg5 +RUNTIME_DEP_PKGS_CSWlibpq += CSWlibecpg6 +RUNTIME_DEP_PKGS_CSWlibpq += CSWlibpgtypes1 +RUNTIME_DEP_PKGS_CSWlibpq += CSWlibpgtypes2 +RUNTIME_DEP_PKGS_CSWlibpq += CSWlibpgtypes3 +RUNTIME_DEP_PKGS_CSWlibpq += CSWlibpq3 +RUNTIME_DEP_PKGS_CSWlibpq += CSWlibpq4 RUNTIME_DEP_PKGS_CSWlibpq += CSWlibpq5 include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Jan 8 11:51:44 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 08 Jan 2011 10:51:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[12252] csw/mgar/pkg/postgresql/branches/postgresql-8.3/ Message-ID: Revision: 12252 http://gar.svn.sourceforge.net/gar/?rev=12252&view=rev Author: wahwah Date: 2011-01-08 10:51:44 +0000 (Sat, 08 Jan 2011) Log Message: ----------- postgresql-8.3: Creating a branch to build deep layout Added Paths: ----------- csw/mgar/pkg/postgresql/branches/postgresql-8.3/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sat Jan 8 12:00:29 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sat, 08 Jan 2011 11:00:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[12253] csw/mgar/pkg/dhcp/trunk Message-ID: Revision: 12253 http://gar.svn.sourceforge.net/gar/?rev=12253&view=rev Author: bonivart Date: 2011-01-08 11:00:28 +0000 (Sat, 08 Jan 2011) Log Message: ----------- dhcp: update to 4.2.0-P2 Modified Paths: -------------- csw/mgar/pkg/dhcp/trunk/Makefile csw/mgar/pkg/dhcp/trunk/checksums Modified: csw/mgar/pkg/dhcp/trunk/Makefile =================================================================== --- csw/mgar/pkg/dhcp/trunk/Makefile 2011-01-08 10:51:44 UTC (rev 12252) +++ csw/mgar/pkg/dhcp/trunk/Makefile 2011-01-08 11:00:28 UTC (rev 12253) @@ -1,6 +1,6 @@ NAME = dhcp VERSION = 4.2.0 -RELEASE = P1 +RELEASE = P2 DISTVERSION = $(VERSION)-$(RELEASE) SPKG_VERSION = $(VERSION)$(RELEASE) DISTNAME = $(NAME)-$(VERSION)-$(RELEASE) Modified: csw/mgar/pkg/dhcp/trunk/checksums =================================================================== --- csw/mgar/pkg/dhcp/trunk/checksums 2011-01-08 10:51:44 UTC (rev 12252) +++ csw/mgar/pkg/dhcp/trunk/checksums 2011-01-08 11:00:28 UTC (rev 12253) @@ -1 +1 @@ -1c268a2368b2565252b5f9d7255d3c72 dhcp-4.2.0-P1.tar.gz +a98f4ce3ca651e7e28a5a1ae6398689e dhcp-4.2.0-P2.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at opencsw.org Sat Jan 8 12:09:43 2011 From: bonivart at opencsw.org (Peter Bonivart) Date: Sat, 8 Jan 2011 12:09:43 +0100 Subject: [csw-devel] SF.net SVN: gar:[12249] csw/mgar/pkg/cpan/IO-Digest/trunk In-Reply-To: References: Message-ID: On Sat, Jan 8, 2011 at 9:05 AM, wrote: > Revision: 12249 > ? ? ? ? ?http://gar.svn.sourceforge.net/gar/?rev=12249&view=rev > Author: ? gmarler > Date: ? ? 2011-01-08 08:05:53 +0000 (Sat, 08 Jan 2011) > > Log Message: > ----------- > - Add license > - Remove dependency on pm_perlioviadyn, as this is no longer a module but > ?a core feature > - Eliminate man pages Why did you remove the man page? We have removed the man page from some modules where we get collisions with CSWperldoc but this shouldn't collide, right? /peter From wahwah at users.sourceforge.net Sat Jan 8 14:54:35 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 08 Jan 2011 13:54:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[12254] csw/mgar/pkg/postgresql/branches/postgresql-8.3 Message-ID: Revision: 12254 http://gar.svn.sourceforge.net/gar/?rev=12254&view=rev Author: wahwah Date: 2011-01-08 13:54:35 +0000 (Sat, 08 Jan 2011) Log Message: ----------- postgresql-8.3: Backport of the build description Backported 9.0 stuff into 8.3. Modified Paths: -------------- csw/mgar/pkg/postgresql/branches/postgresql-8.3/Makefile csw/mgar/pkg/postgresql/branches/postgresql-8.3/checksums Added Paths: ----------- csw/mgar/pkg/postgresql/branches/postgresql-8.3/files/CSWpostgresql-83.postinstall Removed Paths: ------------- csw/mgar/pkg/postgresql/branches/postgresql-8.3/files/CSWpostgresql-90.postinstall Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.3/Makefile =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.3/Makefile 2011-01-08 11:00:28 UTC (rev 12253) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.3/Makefile 2011-01-08 13:54:35 UTC (rev 12254) @@ -16,16 +16,14 @@ # example of it. (gmake repackage may produce the right output) NAME = postgresql -BASE_VERSION = 9.0 +BASE_VERSION = 8.3 # How to make one automatically? -VERSION_NODOT = 9_0 -BASE_VERSION_G = 90 -PATCHLEVEL = 0 +VERSION_NODOT = 8_3 +BASE_VERSION_G = 83 +PATCHLEVEL = 13 VERSION = $(BASE_VERSION).$(PATCHLEVEL) CATEGORIES = apps -SHELL = /opt/csw/bin/bash - # Useful when making a series of builds on the same day # GARFLAVOR ?= DBG @@ -76,14 +74,14 @@ SPKG_DESC_CSWpostgresql = An advanced open source database SPKG_DESC_CSWpostgresql-$(BASE_VERSION_G)-doc = PostgreSQL $(BASE_VERSION).x Documentation -RUNTIME_DEP_PKGS_CSWpostgresql-90 += CSWlibxslt -RUNTIME_DEP_PKGS_CSWpostgresql-90 += CSWlibgnugetopt -RUNTIME_DEP_PKGS_CSWpostgresql-90 += CSWzlib -RUNTIME_DEP_PKGS_CSWpostgresql-90 += CSWlibxml2 -RUNTIME_DEP_PKGS_CSWpostgresql-90 += CSWreadline -RUNTIME_DEP_PKGS_CSWpostgresql-90 += CSWkrb5lib -RUNTIME_DEP_PKGS_CSWpostgresql-90 += CSWosslrt -RUNTIME_DEP_PKGS_CSWpostgresql-90 += CSWlibpq5 +RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G) += CSWlibxslt +RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G) += CSWlibgnugetopt +RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G) += CSWzlib +RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G) += CSWlibxml2 +RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G) += CSWreadline +RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G) += CSWkrb5lib +RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G) += CSWosslrt +RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G) += CSWlibpq5 ARCHALL_CSWpostgresql = 1 ARCHALL_CSWpostgresql-$(BASE_VERSION_G)-doc = 1 @@ -202,7 +200,6 @@ PACKAGES += CSWlibpq5 CATALOGNAME_CSWlibpq5 = libpq5 -PKGFILES_CSWlibpq5 += $(call baseisadirs,$(prefix)/lib,libpq\.so\.5\.3) PKGFILES_CSWlibpq5 += $(call baseisadirs,$(prefix)/lib,libpq\.so\.5(\.\d+)*) SPKG_DESC_CSWlibpq5 += PostgreSQL C client library (built from $(BASE_VERSION).x sources), libpq.so.5 RUNTIME_DEP_PKGS_CSWlibpq5 += CSWosslrt @@ -210,7 +207,6 @@ PACKAGES += CSWlibecpg6 CATALOGNAME_CSWlibecpg6 = libecpg6 -PKGFILES_CSWlibecpg6 += $(call baseisadirs,$(prefix)/lib,libecpg\.so\.6\.0) PKGFILES_CSWlibecpg6 += $(call baseisadirs,$(prefix)/lib,libecpg\.so\.6(\.\d+)*) SPKG_DESC_CSWlibecpg6 += Embedded PostgreSQL for C library (built from $(BASE_VERSION).x sources), libecpg.so.6 RUNTIME_DEP_PKGS_CSWlibecpg6 += CSWlibpgtypes3 @@ -218,7 +214,6 @@ PACKAGES += CSWlibecpg-compat3 CATALOGNAME_CSWlibecpg-compat3 = libecpg_compat3 -PKGFILES_CSWlibecpg-compat3 += $(call baseisadirs,$(prefix)/lib,libecpg_compat\.so\.3\.2) PKGFILES_CSWlibecpg-compat3 += $(call baseisadirs,$(prefix)/lib,libecpg_compat\.so\.3(\.\d+)*) SPKG_DESC_CSWlibecpg-compat3 += Older version of run-time library for ECPG programs (built from $(BASE_VERSION).x sources), libecpg_compat.so.3 RUNTIME_DEP_PKGS_CSWlibecpg-compat3 += CSWlibecpg6 @@ -258,36 +253,34 @@ CATALOGNAME_CSWpostgresql-$(BASE_VERSION_G) = postgresql_$(BASE_VERSION_G) SPKG_DESC_CSWpostgresql-$(BASE_VERSION_G) = PostgreSQL, version $(BASE_VERSION).x +# Private shared libraries have sonames, which triggers this error. +CHECKPKG_OVERRIDES_CSWpostgresql-$(BASE_VERSION_G) += soname-not-part-of-filename + # Legacy libraries PACKAGES += CSWlibpq3 CATALOGNAME_CSWlibpq3 = libpq3 -PKGFILES_CSWlibpq3 += $(call baseisadirs,$(prefix)/lib,libpq\.so\.3\.2) PKGFILES_CSWlibpq3 += $(call baseisadirs,$(prefix)/lib,libpq\.so\.3(\.\d+)*) SPKG_DESC_CSWlibpq3 += PostgreSQL C client library, libpq.so.3 RUNTIME_DEP_PKGS_CSWlibpq3 += CSWosslrt PACKAGES += CSWlibpq4 CATALOGNAME_CSWlibpq4 = libpq4 -PKGFILES_CSWlibpq4 += $(call baseisadirs,$(prefix)/lib,libpq\.so\.4\.1) PKGFILES_CSWlibpq4 += $(call baseisadirs,$(prefix)/lib,libpq\.so\.4(\.\d+)*) SPKG_DESC_CSWlibpq4 += PostgreSQL C client library, libpq.so.4 RUNTIME_DEP_PKGS_CSWlibpq4 += CSWosslrt PACKAGES += CSWlibpgtypes1 CATALOGNAME_CSWlibpgtypes1 = libpgtypes1 -PKGFILES_CSWlibpgtypes1 += $(call baseisadirs,$(prefix)/lib,libpgtypes\.so\.1\.2) PKGFILES_CSWlibpgtypes1 += $(call baseisadirs,$(prefix)/lib,libpgtypes\.so\.1(\.\d+)*) SPKG_DESC_CSWlibpgtypes1 += Used by programs built with ecpg (Embedded PostgreSQL for C), libpgtypes.so.1 PACKAGES += CSWlibpgtypes2 CATALOGNAME_CSWlibpgtypes2 = libpgtypes2 -PKGFILES_CSWlibpgtypes2 += $(call baseisadirs,$(prefix)/lib,libpgtypes\.so\.2\.2) PKGFILES_CSWlibpgtypes2 += $(call baseisadirs,$(prefix)/lib,libpgtypes\.so\.2(\.\d+)*) SPKG_DESC_CSWlibpgtypes2 += Used by programs built with ecpg (Embedded PostgreSQL for C), libpgtypes.so.2 PACKAGES += CSWlibecpg4 CATALOGNAME_CSWlibecpg4 = libecpg4 -PKGFILES_CSWlibecpg4 += $(call baseisadirs,$(prefix)/lib,libecpg\.so\.4\.2) PKGFILES_CSWlibecpg4 += $(call baseisadirs,$(prefix)/lib,libecpg\.so\.4(\.\d+)*) SPKG_DESC_CSWlibecpg4 += Embedded PostgreSQL for C library, libecpg.so.4 RUNTIME_DEP_PKGS_CSWlibecpg4 += CSWlibpgtypes1 @@ -296,7 +289,6 @@ PACKAGES += CSWlibecpg5 CATALOGNAME_CSWlibecpg5 = libecpg5 -PKGFILES_CSWlibecpg5 += $(call baseisadirs,$(prefix)/lib,libecpg\.so\.5\.2) PKGFILES_CSWlibecpg5 += $(call baseisadirs,$(prefix)/lib,libecpg\.so\.5(\.\d+)*) SPKG_DESC_CSWlibecpg5 += Embedded PostgreSQL for C library, libecpg.so.5 RUNTIME_DEP_PKGS_CSWlibecpg5 += CSWlibpgtypes2 @@ -304,7 +296,6 @@ PACKAGES += CSWlibecpg-compat2 CATALOGNAME_CSWlibecpg-compat2 = libecpg_compat2 -PKGFILES_CSWlibecpg-compat2 += $(call baseisadirs,$(prefix)/lib,libecpg_compat\.so\.2\.2) PKGFILES_CSWlibecpg-compat2 += $(call baseisadirs,$(prefix)/lib,libecpg_compat\.so\.2(\.\d+)*) SPKG_DESC_CSWlibecpg-compat2 += Older version of run-time library for ECPG programs, libecpg_compat.so.2 RUNTIME_DEP_PKGS_CSWlibecpg-compat2 += CSWlibpgtypes2 Modified: csw/mgar/pkg/postgresql/branches/postgresql-8.3/checksums =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.3/checksums 2011-01-08 11:00:28 UTC (rev 12253) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.3/checksums 2011-01-08 13:54:35 UTC (rev 12254) @@ -1 +1 @@ -14c2122cc322e69ab2ab702ed7714bbe postgresql-9.0.0.tar.bz2 +56e8796510afb6a268d512f0ca262ddf postgresql-8.3.13.tar.bz2 Copied: csw/mgar/pkg/postgresql/branches/postgresql-8.3/files/CSWpostgresql-83.postinstall (from rev 12252, csw/mgar/pkg/postgresql/branches/postgresql-8.3/files/CSWpostgresql-90.postinstall) =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.3/files/CSWpostgresql-83.postinstall (rev 0) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.3/files/CSWpostgresql-83.postinstall 2011-01-08 13:54:35 UTC (rev 12254) @@ -0,0 +1,39 @@ +#!/bin/sh +# vim:set ft=sh: +# +# $Id$ +# +# Initialize the database cluster if it hasn't been initialized before. + +# Read in the user configuration file +[ -s /opt/csw/etc/postgresql.conf ] && . /opt/csw/etc/postgresql.conf +[ -s @sysconfdir@/postgresql.conf ] && . @sysconfdir@/postgresql.conf + +PGDATA=@PGDATA@ +PGINIT=@bindir@/initdb + +initialize_cluster() { + chown postgres "${PGDATA}" + chmod 0700 "${PGDATA}" + echo "Initializing PostgreSQL database..." + su postgres -c "\"${PGINIT}\" -D \"${PGDATA}\" -E utf-8" +} + +if [ `ls -l ${PGDATA} 2>/dev/null | wc -l` -eq 1 ]; then + initialize_cluster +else + echo "The database cluster seems to be initialized already." +fi + +if [ -x /usr/sbin/svcadm ]; then + fmri="cswpostgres_ at VERSION_NODOT@" + echo "Enabling the ${fmri} service in SMF" + svcadm clear "${fmri}" + svcadm enable "${fmri}" +else + initscript="/etc/opt/csw/init.d/cswpostgres_ at VERSION_NODOT@" + echo "Issuing ${initscript} start" + "${initscript}" start +fi + +exit 0 Deleted: csw/mgar/pkg/postgresql/branches/postgresql-8.3/files/CSWpostgresql-90.postinstall =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-8.3/files/CSWpostgresql-90.postinstall 2011-01-08 11:00:28 UTC (rev 12253) +++ csw/mgar/pkg/postgresql/branches/postgresql-8.3/files/CSWpostgresql-90.postinstall 2011-01-08 13:54:35 UTC (rev 12254) @@ -1,39 +0,0 @@ -#!/bin/sh -# vim:set ft=sh: -# -# $Id$ -# -# Initialize the database cluster if it hasn't been initialized before. - -# Read in the user configuration file -[ -s /opt/csw/etc/postgresql.conf ] && . /opt/csw/etc/postgresql.conf -[ -s @sysconfdir@/postgresql.conf ] && . @sysconfdir@/postgresql.conf - -PGDATA=@PGDATA@ -PGINIT=@bindir@/initdb - -initialize_cluster() { - chown postgres "${PGDATA}" - chmod 0700 "${PGDATA}" - echo "Initializing PostgreSQL database..." - su postgres -c "\"${PGINIT}\" -D \"${PGDATA}\" -E utf-8" -} - -if [ `ls -l ${PGDATA} 2>/dev/null | wc -l` -eq 1 ]; then - initialize_cluster -else - echo "The database cluster seems to be initialized already." -fi - -if [ -x /usr/sbin/svcadm ]; then - fmri="cswpostgres_ at VERSION_NODOT@" - echo "Enabling the ${fmri} service in SMF" - svcadm clear "${fmri}" - svcadm enable "${fmri}" -else - initscript="/etc/opt/csw/init.d/cswpostgres_ at VERSION_NODOT@" - echo "Issuing ${initscript} start" - "${initscript}" start -fi - -exit 0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sat Jan 8 15:31:42 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sat, 08 Jan 2011 14:31:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[12255] csw/mgar/pkg/cpan/Exception-Class/trunk Message-ID: Revision: 12255 http://gar.svn.sourceforge.net/gar/?rev=12255&view=rev Author: bonivart Date: 2011-01-08 14:31:42 +0000 (Sat, 08 Jan 2011) Log Message: ----------- pm_exceptcls: update to 1.32 Modified Paths: -------------- csw/mgar/pkg/cpan/Exception-Class/trunk/Makefile csw/mgar/pkg/cpan/Exception-Class/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/cpan/Exception-Class/trunk/files/CSWpmexceptcls.depend csw/mgar/pkg/cpan/Exception-Class/trunk/files/CSWpmexceptcls.gspec Property Changed: ---------------- csw/mgar/pkg/cpan/Exception-Class/trunk/ Property changes on: csw/mgar/pkg/cpan/Exception-Class/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/cpan/Exception-Class/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Exception-Class/trunk/Makefile 2011-01-08 13:54:35 UTC (rev 12254) +++ csw/mgar/pkg/cpan/Exception-Class/trunk/Makefile 2011-01-08 14:31:42 UTC (rev 12255) @@ -1,9 +1,9 @@ NAME = Exception-Class -VERSION = 1.23 +VERSION = 1.32 CATEGORIES = cpan AUTHOR = DROLSKY -DESCRIPTION = declare real exception classes in Perl +DESCRIPTION = Declare real exception classes in Perl define BLURB Exception::Class allows you to declare exception hierarchies in your modules in a "Java-esque" manner. It features a simple interface allowing @@ -11,8 +11,12 @@ base exception class, Exception::Class::Base, that can be easily extended. endef -DISTFILES += CSWpmexceptcls.gspec CSWpmexceptcls.depend +PACKAGES = CSWpmexceptcls +CATALOGNAME = pm_exceptcls +ARCHALL = 1 -DEPENDS += cpan/Class-Data-Inheritable cpan/Devel-StackTrace +LICENSE = LICENSE +RUNTIME_DEP_PKGS += CSWpmclsdtainherit CSWpmdevstacktrace + include gar/category.mk Modified: csw/mgar/pkg/cpan/Exception-Class/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Exception-Class/trunk/checksums 2011-01-08 13:54:35 UTC (rev 12254) +++ csw/mgar/pkg/cpan/Exception-Class/trunk/checksums 2011-01-08 14:31:42 UTC (rev 12255) @@ -1,3 +1 @@ -98e52aaa8b4cebaff73c1f1c32ea88da download/CSWpmexceptcls.gspec -75492de9ce3e8c767833b9d018fc00ef download/CSWpmexceptcls.depend -560b42c0cf8b795bdc793459edb7ec13 download/Exception-Class-1.23.tar.gz +83788ad5a2c5e946877e4ec362e19622 Exception-Class-1.32.tar.gz Deleted: csw/mgar/pkg/cpan/Exception-Class/trunk/files/CSWpmexceptcls.depend =================================================================== --- csw/mgar/pkg/cpan/Exception-Class/trunk/files/CSWpmexceptcls.depend 2011-01-08 13:54:35 UTC (rev 12254) +++ csw/mgar/pkg/cpan/Exception-Class/trunk/files/CSWpmexceptcls.depend 2011-01-08 14:31:42 UTC (rev 12255) @@ -1,2 +0,0 @@ -P CSWpmclsdtainherit pm_clsdtainherit - inheritable, overridable class data -P CSWpmtempl pm_template - stack trace and stack trace frame objects Deleted: csw/mgar/pkg/cpan/Exception-Class/trunk/files/CSWpmexceptcls.gspec =================================================================== --- csw/mgar/pkg/cpan/Exception-Class/trunk/files/CSWpmexceptcls.gspec 2011-01-08 13:54:35 UTC (rev 12254) +++ csw/mgar/pkg/cpan/Exception-Class/trunk/files/CSWpmexceptcls.gspec 2011-01-08 14:31:42 UTC (rev 12255) @@ -1,5 +0,0 @@ -%var bitname pm_exceptcls -%var pkgname CSWpmexceptcls -%var arch all -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright url file://%{WORKSRC}/LICENSE This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sat Jan 8 15:46:45 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sat, 08 Jan 2011 14:46:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[12256] csw/mgar/pkg/cpan/Font-AFM/trunk Message-ID: Revision: 12256 http://gar.svn.sourceforge.net/gar/?rev=12256&view=rev Author: bonivart Date: 2011-01-08 14:46:44 +0000 (Sat, 08 Jan 2011) Log Message: ----------- pm_fontadm: update to 1.20 Modified Paths: -------------- csw/mgar/pkg/cpan/Font-AFM/trunk/Makefile csw/mgar/pkg/cpan/Font-AFM/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/Font-AFM/trunk/files/COPYING Removed Paths: ------------- csw/mgar/pkg/cpan/Font-AFM/trunk/files/CSWpmfontafm.depend csw/mgar/pkg/cpan/Font-AFM/trunk/files/CSWpmfontafm.gspec csw/mgar/pkg/cpan/Font-AFM/trunk/files/CSWpmfontafm.prototype Property Changed: ---------------- csw/mgar/pkg/cpan/Font-AFM/trunk/ Property changes on: csw/mgar/pkg/cpan/Font-AFM/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/cpan/Font-AFM/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Font-AFM/trunk/Makefile 2011-01-08 14:31:42 UTC (rev 12255) +++ csw/mgar/pkg/cpan/Font-AFM/trunk/Makefile 2011-01-08 14:46:44 UTC (rev 12256) @@ -1,15 +1,19 @@ NAME = Font-AFM -VERSION = 1.19 +VERSION = 1.20 CATEGORIES = cpan AUTHOR = GAAS -DESCRIPTION = interface to Adobe Font Metrics files +DESCRIPTION = Interface to Adobe Font Metrics files define BLURB This module implements the Font::AFM class. Objects of this class are initialised from an AFM-file and allows you to obtain information about the font and the metrics of the various glyphs in the font. endef -DISTFILES = $(call admfiles,CSWpmfontafm,depend prototype) +DISTFILES += COPYING +PACKAGES = CSWpmfontafm +CATALOGNAME = pm_fontafm +ARCHALL = 1 + include gar/category.mk Modified: csw/mgar/pkg/cpan/Font-AFM/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Font-AFM/trunk/checksums 2011-01-08 14:31:42 UTC (rev 12255) +++ csw/mgar/pkg/cpan/Font-AFM/trunk/checksums 2011-01-08 14:46:44 UTC (rev 12256) @@ -1,4 +1 @@ -cf7c5f6eef789b9583a2641f6438144a download/CSWpmfontafm.gspec -6e0d583c86d7f74b43769810714242aa download/CSWpmfontafm.depend -1ad312d9d74152b0c6273c6a582ffa8e download/CSWpmfontafm.prototype -f72a12a20656c41b29a79c985bd231c9 download/Font-AFM-1.19.tar.gz +b14ecf4dc4edbd63940aa354eb13c499 Font-AFM-1.20.tar.gz Added: csw/mgar/pkg/cpan/Font-AFM/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/Font-AFM/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/Font-AFM/trunk/files/COPYING 2011-01-08 14:46:44 UTC (rev 12256) @@ -0,0 +1,5 @@ +COPYRIGHT + Copyright 1995-1998 Gisle Aas. All rights reserved. + + This program is free software; you can redistribute it and/or + modify it under the same terms as Perl itself. Deleted: csw/mgar/pkg/cpan/Font-AFM/trunk/files/CSWpmfontafm.depend =================================================================== Deleted: csw/mgar/pkg/cpan/Font-AFM/trunk/files/CSWpmfontafm.gspec =================================================================== --- csw/mgar/pkg/cpan/Font-AFM/trunk/files/CSWpmfontafm.gspec 2011-01-08 14:31:42 UTC (rev 12255) +++ csw/mgar/pkg/cpan/Font-AFM/trunk/files/CSWpmfontafm.gspec 2011-01-08 14:46:44 UTC (rev 12256) @@ -1,9 +0,0 @@ -%var bitname pm_fontafm -%var pkgname CSWpmfontafm -%var arch all -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -Copyright 1995-1998 Gisle Aas. All rights reserved. - -This program is free software; you can redistribute it and/or -modify it under the same terms as Perl itself. Deleted: csw/mgar/pkg/cpan/Font-AFM/trunk/files/CSWpmfontafm.prototype =================================================================== --- csw/mgar/pkg/cpan/Font-AFM/trunk/files/CSWpmfontafm.prototype 2011-01-08 14:31:42 UTC (rev 12255) +++ csw/mgar/pkg/cpan/Font-AFM/trunk/files/CSWpmfontafm.prototype 2011-01-08 14:46:44 UTC (rev 12256) @@ -1,28 +0,0 @@ -d none /opt/csw/lib 0755 root bin -d none /opt/csw/lib/perl 0755 root bin -d none /opt/csw/lib/perl/csw 0755 root bin -d none /opt/csw/lib/perl/csw/auto 0755 root bin -d none /opt/csw/lib/perl/csw/auto/Font 0755 root bin -d none /opt/csw/lib/perl/csw/auto/Font/AFM 0755 root bin -f none /opt/csw/lib/perl/csw/auto/Font/AFM/.packlist 0644 root bin -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man3 0755 root bin -f none /opt/csw/share/man/man3/Font::AFM.3perl 0444 root bin -d none /opt/csw/share/perl 0755 root bin -d none /opt/csw/share/perl/csw 0755 root bin -d none /opt/csw/share/perl/csw/Font 0755 root bin -f none /opt/csw/share/perl/csw/Font/AFM.pm 0444 root bin -d none /opt/csw/share/perl/csw/Font/Metrics 0755 root bin -f none /opt/csw/share/perl/csw/Font/Metrics/Courier.pm 0444 root bin -f none /opt/csw/share/perl/csw/Font/Metrics/CourierBold.pm 0444 root bin -f none /opt/csw/share/perl/csw/Font/Metrics/CourierBoldOblique.pm 0444 root bin -f none /opt/csw/share/perl/csw/Font/Metrics/CourierOblique.pm 0444 root bin -f none /opt/csw/share/perl/csw/Font/Metrics/Helvetica.pm 0444 root bin -f none /opt/csw/share/perl/csw/Font/Metrics/HelveticaBold.pm 0444 root bin -f none /opt/csw/share/perl/csw/Font/Metrics/HelveticaBoldOblique.pm 0444 root bin -f none /opt/csw/share/perl/csw/Font/Metrics/HelveticaOblique.pm 0444 root bin -f none /opt/csw/share/perl/csw/Font/Metrics/TimesBold.pm 0444 root bin -f none /opt/csw/share/perl/csw/Font/Metrics/TimesBoldItalic.pm 0444 root bin -f none /opt/csw/share/perl/csw/Font/Metrics/TimesItalic.pm 0444 root bin -f none /opt/csw/share/perl/csw/Font/Metrics/TimesRoman.pm 0444 root bin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sat Jan 8 15:59:21 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sat, 08 Jan 2011 14:59:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[12257] csw/mgar/pkg/cpan Message-ID: Revision: 12257 http://gar.svn.sourceforge.net/gar/?rev=12257&view=rev Author: bonivart Date: 2011-01-08 14:59:20 +0000 (Sat, 08 Jan 2011) Log Message: ----------- pm_hooklexwrap: update to 0.24 Added Paths: ----------- csw/mgar/pkg/cpan/Hook-LexWrap/ csw/mgar/pkg/cpan/Hook-LexWrap/branches/ csw/mgar/pkg/cpan/Hook-LexWrap/tags/ csw/mgar/pkg/cpan/Hook-LexWrap/trunk/ csw/mgar/pkg/cpan/Hook-LexWrap/trunk/Makefile csw/mgar/pkg/cpan/Hook-LexWrap/trunk/checksums csw/mgar/pkg/cpan/Hook-LexWrap/trunk/files/ csw/mgar/pkg/cpan/Hook-LexWrap/trunk/files/COPYING Property changes on: csw/mgar/pkg/cpan/Hook-LexWrap/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/cpan/Hook-LexWrap/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Hook-LexWrap/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Hook-LexWrap/trunk/Makefile 2011-01-08 14:59:20 UTC (rev 12257) @@ -0,0 +1,17 @@ +NAME = Hook-LexWrap +VERSION = 0.24 +CATEGORIES = cpan +AUTHOR = CHORNY + +DESCRIPTION = Lexically scoped subroutine wrappers +define BLURB + Lexically scoped subroutine wrappers +endef + +DISTFILES += COPYING + +PACKAGES = CSWpmhooklexwrap +CATALOGNAME = pm_hooklexwrap +ARCHALL = 1 + +include gar/category.mk Added: csw/mgar/pkg/cpan/Hook-LexWrap/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Hook-LexWrap/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Hook-LexWrap/trunk/checksums 2011-01-08 14:59:20 UTC (rev 12257) @@ -0,0 +1 @@ +3c08c1f388c529c532f71422d33913d1 Hook-LexWrap-0.24.tar.gz Added: csw/mgar/pkg/cpan/Hook-LexWrap/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/Hook-LexWrap/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/Hook-LexWrap/trunk/files/COPYING 2011-01-08 14:59:20 UTC (rev 12257) @@ -0,0 +1,3 @@ + Copyright (c) 2001, Damian Conway. All Rights Reserved. + This module is free software. It may be used, redistributed + and/or modified under the same terms as Perl itself. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sat Jan 8 16:21:33 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sat, 08 Jan 2011 15:21:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[12258] csw/mgar/pkg/cpan/HTML-Template-Pro/trunk Message-ID: Revision: 12258 http://gar.svn.sourceforge.net/gar/?rev=12258&view=rev Author: bonivart Date: 2011-01-08 15:21:33 +0000 (Sat, 08 Jan 2011) Log Message: ----------- pm_htmltemplatepro: update to 0.9504, change dep from pcre_rt to libpcre0 Modified Paths: -------------- csw/mgar/pkg/cpan/HTML-Template-Pro/trunk/Makefile csw/mgar/pkg/cpan/HTML-Template-Pro/trunk/checksums Modified: csw/mgar/pkg/cpan/HTML-Template-Pro/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/HTML-Template-Pro/trunk/Makefile 2011-01-08 14:59:20 UTC (rev 12257) +++ csw/mgar/pkg/cpan/HTML-Template-Pro/trunk/Makefile 2011-01-08 15:21:33 UTC (rev 12258) @@ -1,5 +1,5 @@ NAME = HTML-Template-Pro -VERSION = 0.95 +VERSION = 0.9504 CATEGORIES = cpan AUTHOR = VIY @@ -13,6 +13,6 @@ PACKAGES = CSWpmhtmltemplatepro CATALOGNAME = pm_htmltemplatepro -RUNTIME_DEP_PKGS_CSWpmhtmltemplatepro += CSWpcrert CSWpmjson +RUNTIME_DEP_PKGS_CSWpmhtmltemplatepro += CSWpmjson CSWlibpcre0 include gar/category.mk Modified: csw/mgar/pkg/cpan/HTML-Template-Pro/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/HTML-Template-Pro/trunk/checksums 2011-01-08 14:59:20 UTC (rev 12257) +++ csw/mgar/pkg/cpan/HTML-Template-Pro/trunk/checksums 2011-01-08 15:21:33 UTC (rev 12258) @@ -1,2 +1 @@ -27d5934dd5564c6c2cbf6f3fb4b26ad9 COPYING -b2b76284417473c36ec2c3f6446b82f5 HTML-Template-Pro-0.95.tar.gz +845b51f0f0c0c1a0b10f99d6631b3321 HTML-Template-Pro-0.9504.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From theferret at users.sourceforge.net Sat Jan 8 16:38:37 2011 From: theferret at users.sourceforge.net (theferret at users.sourceforge.net) Date: Sat, 08 Jan 2011 15:38:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[12259] csw/mgar/pkg/cswclassutils/trunk/files/ CSWcswclassutils.i.cswcptemplates Message-ID: Revision: 12259 http://gar.svn.sourceforge.net/gar/?rev=12259&view=rev Author: theferret Date: 2011-01-08 15:38:37 +0000 (Sat, 08 Jan 2011) Log Message: ----------- minor bugfix+improvement to cswcptemplates Modified Paths: -------------- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswcptemplates Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswcptemplates =================================================================== --- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswcptemplates 2011-01-08 15:21:33 UTC (rev 12258) +++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswcptemplates 2011-01-08 15:38:37 UTC (rev 12259) @@ -106,11 +106,11 @@ ##overridedir=`sed -n 's/.*CSWDESTDIR=\([^ ]*\).*/\1/p' $src` - if [ -f $preservedconf ] ; then + if [ -f $confdest ] ; then + echo $confdest already exists. Not overwriting + elif [ -f $preservedconf ] ; then echo Restoring $preservedconf - cp -p $preservedconf $confdest - elif [ -f $confdest ] ; then - echo $confdest already exists. Not overwriting + cp -p $preservedconf $confdest && rm $preservedconf else echo Copying $TEMPLATEDIR/$template to $confdest cp $template $confdest This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sat Jan 8 16:59:32 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sat, 08 Jan 2011 15:59:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[12260] csw/mgar/gar/v2/lib/python/checkpkg2.py Message-ID: Revision: 12260 http://gar.svn.sourceforge.net/gar/?rev=12260&view=rev Author: wahwah Date: 2011-01-08 15:59:32 +0000 (Sat, 08 Jan 2011) Log Message: ----------- checkpkg: Use 'current' as the default catalog Also, display 'current' in the --help message. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/checkpkg2.py Modified: csw/mgar/gar/v2/lib/python/checkpkg2.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg2.py 2011-01-08 15:38:37 UTC (rev 12259) +++ csw/mgar/gar/v2/lib/python/checkpkg2.py 2011-01-08 15:59:32 UTC (rev 12260) @@ -59,8 +59,8 @@ help="Display less messages") parser.add_option("--catalog-release", dest="catrel", - default="unstable", - help="A catalog release: experimental, unstable, testing, stable.") + default="current", + help="A catalog release: current, unstable, testing, stable.") parser.add_option("-r", "--os-releases", dest="osrel_commas", help=("Comma separated list of ['SunOS5.9', 'SunOS5.10'], " This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From theferret at users.sourceforge.net Sat Jan 8 17:01:56 2011 From: theferret at users.sourceforge.net (theferret at users.sourceforge.net) Date: Sat, 08 Jan 2011 16:01:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[12261] csw/mgar/gar/v2/gar.pkg.mk Message-ID: Revision: 12261 http://gar.svn.sourceforge.net/gar/?rev=12261&view=rev Author: theferret Date: 2011-01-08 16:01:55 +0000 (Sat, 08 Jan 2011) Log Message: ----------- gar.pkg.mk: attempt to blindly add CPTEMPLATES support (cswcptemplates 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 2011-01-08 15:59:32 UTC (rev 12260) +++ csw/mgar/gar/v2/gar.pkg.mk 2011-01-08 16:01:55 UTC (rev 12261) @@ -195,6 +195,7 @@ # - set class for all config files _CSWCLASS_FILTER = | perl -ane '\ + $(foreach FILE,$(CPTEMPLATES),$$F[1] = "cswcptemplates" if( $$F[2] =~ m(^$(FILE)$$) );)\ $(foreach FILE,$(MIGRATECONF),$$F[1] = "cswmigrateconf" if( $$F[2] =~ m(^$(FILE)$$) );)\ $(foreach FILE,$(SAMPLECONF:%\.CSW=%),$$F[1] = "cswcpsampleconf" if ( $$F[2] =~ m(^$(FILE)\.CSW$$) );)\ $(foreach FILE,$(PRESERVECONF:%\.CSW=%),$$F[1] = "cswpreserveconf" if( $$F[2] =~ m(^$(FILE)\.CSW$$) );)\ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bwalton at opencsw.org Sat Jan 8 18:10:41 2011 From: bwalton at opencsw.org (Ben Walton) Date: Sat, 08 Jan 2011 12:10:41 -0500 Subject: [csw-devel] SF.net SVN: gar:[12261] csw/mgar/gar/v2/gar.pkg.mk In-Reply-To: References: Message-ID: <1294506543-sup-1757@pinkfloyd.chass.utoronto.ca> Excerpts from theferret's message of Sat Jan 08 11:01:56 -0500 2011: Hi Phil, > gar.pkg.mk: attempt to blindly add CPTEMPLATES support > (cswcptemplates CAS) Don't do things to GAR 'blindly.' If it doesn't work, you affect all GAR users. While I'm not willing to do all the work for you on this issue, I'm certainly willing to provide guidance on doing it correctly. I'm sure Dago and others that have worked with GAR would also lend support. Thanks -Ben -- Ben Walton Systems Programmer - CHASS University of Toronto C:416.407.5610 | W:416.978.4302 From bonivart at users.sourceforge.net Sat Jan 8 21:05:39 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sat, 08 Jan 2011 20:05:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[12262] csw/mgar/pkg/cpan/Module-Versions-Report/trunk Message-ID: Revision: 12262 http://gar.svn.sourceforge.net/gar/?rev=12262&view=rev Author: bonivart Date: 2011-01-08 20:05:39 +0000 (Sat, 08 Jan 2011) Log Message: ----------- pm_modversrpt: update to 1.06 Modified Paths: -------------- csw/mgar/pkg/cpan/Module-Versions-Report/trunk/Makefile csw/mgar/pkg/cpan/Module-Versions-Report/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/Module-Versions-Report/trunk/files/COPYING Removed Paths: ------------- csw/mgar/pkg/cpan/Module-Versions-Report/trunk/files/CSWpmmodversrpt.gspec Property Changed: ---------------- csw/mgar/pkg/cpan/Module-Versions-Report/trunk/ Property changes on: csw/mgar/pkg/cpan/Module-Versions-Report/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/cpan/Module-Versions-Report/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Module-Versions-Report/trunk/Makefile 2011-01-08 16:01:55 UTC (rev 12261) +++ csw/mgar/pkg/cpan/Module-Versions-Report/trunk/Makefile 2011-01-08 20:05:39 UTC (rev 12262) @@ -1,9 +1,9 @@ NAME = Module-Versions-Report -VERSION = 1.02 +VERSION = 1.06 CATEGORIES = cpan -AUTHOR = SBURKE +AUTHOR = JESSE -DESCRIPTION = report versions of all modules in memory +DESCRIPTION = Report versions of all modules in memory define BLURB I often get email from someone reporting a bug in a module I've written. I email back, asking what version of the module it is, what version of Perl on @@ -24,6 +24,10 @@ least). endef -DISTFILES += CSWpmmodversrpt.gspec +DISTFILES += COPYING +PACKAGES = CSWpmmodversrpt +CATALOGNAME = pm_modversrpt +ARCHALL = 1 + include gar/category.mk Modified: csw/mgar/pkg/cpan/Module-Versions-Report/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Module-Versions-Report/trunk/checksums 2011-01-08 16:01:55 UTC (rev 12261) +++ csw/mgar/pkg/cpan/Module-Versions-Report/trunk/checksums 2011-01-08 20:05:39 UTC (rev 12262) @@ -1,2 +1 @@ -a89e5a46b44a731322234899dae317e3 download/CSWpmmodversrpt.gspec -a2ef9353386df4c4e49c7e4031c45bd3 download/Module-Versions-Report-1.02.tar.gz +9c7efaa4c3dd8eecceb8e5d17476479b Module-Versions-Report-1.06.tar.gz Added: csw/mgar/pkg/cpan/Module-Versions-Report/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/Module-Versions-Report/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/Module-Versions-Report/trunk/files/COPYING 2011-01-08 20:05:39 UTC (rev 12262) @@ -0,0 +1,3 @@ +Copyright 2001-2003, Sean M. Burke , all rights +reserved. This program is free software; you can redistribute it +and/or modify it under the same terms as Perl itself. Deleted: csw/mgar/pkg/cpan/Module-Versions-Report/trunk/files/CSWpmmodversrpt.gspec =================================================================== --- csw/mgar/pkg/cpan/Module-Versions-Report/trunk/files/CSWpmmodversrpt.gspec 2011-01-08 16:01:55 UTC (rev 12261) +++ csw/mgar/pkg/cpan/Module-Versions-Report/trunk/files/CSWpmmodversrpt.gspec 2011-01-08 20:05:39 UTC (rev 12262) @@ -1,12 +0,0 @@ -%var bitname pm_modversrpt -%var pkgname CSWpmmodversrpt -%var arch all -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -Copyright 2001-2003 Sean M. Burke. This library is free software; you -can redistribute it and/or modify it under the same terms as Perl -itself. - -This program is distributed in the hope that it will be useful, but -without any warranty; without even the implied warranty of -merchantability or fitness for a particular purpose. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sat Jan 8 21:20:27 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sat, 08 Jan 2011 20:20:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[12263] csw/mgar/pkg/cpan Message-ID: Revision: 12263 http://gar.svn.sourceforge.net/gar/?rev=12263&view=rev Author: bonivart Date: 2011-01-08 20:20:27 +0000 (Sat, 08 Jan 2011) Log Message: ----------- pm_netsnmp: update 6.0.1 Added Paths: ----------- csw/mgar/pkg/cpan/Net-SNMP/ csw/mgar/pkg/cpan/Net-SNMP/branches/ csw/mgar/pkg/cpan/Net-SNMP/tags/ csw/mgar/pkg/cpan/Net-SNMP/trunk/ csw/mgar/pkg/cpan/Net-SNMP/trunk/Makefile csw/mgar/pkg/cpan/Net-SNMP/trunk/checksums csw/mgar/pkg/cpan/Net-SNMP/trunk/files/ Property changes on: csw/mgar/pkg/cpan/Net-SNMP/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/cpan/Net-SNMP/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Net-SNMP/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Net-SNMP/trunk/Makefile 2011-01-08 20:20:27 UTC (rev 12263) @@ -0,0 +1,17 @@ +NAME = Net-SNMP +VERSION = v6.0.1 +CATEGORIES = cpan +AUTHOR = DTOWN + +DESCRIPTION = Object oriented interface to SNMP +define BLURB + Object oriented interface to SNMP +endef + +LICENSE = LICENSE + +PACKAGES = CSWpmnetsnmp +CATALOGNAME = pm_netsnmp +ARCHALL = 1 + +include gar/category.mk Added: csw/mgar/pkg/cpan/Net-SNMP/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Net-SNMP/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Net-SNMP/trunk/checksums 2011-01-08 20:20:27 UTC (rev 12263) @@ -0,0 +1 @@ +6137f04f9942d703f66179f890e3d096 Net-SNMP-v6.0.1.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sat Jan 8 22:38:05 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sat, 08 Jan 2011 21:38:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[12264] csw/mgar/pkg/cpan/WWW-Mechanize/trunk Message-ID: Revision: 12264 http://gar.svn.sourceforge.net/gar/?rev=12264&view=rev Author: bonivart Date: 2011-01-08 21:38:05 +0000 (Sat, 08 Jan 2011) Log Message: ----------- pm_wwwmechanize: update to 1.66 Modified Paths: -------------- csw/mgar/pkg/cpan/WWW-Mechanize/trunk/Makefile csw/mgar/pkg/cpan/WWW-Mechanize/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/WWW-Mechanize/trunk/files/COPYING Removed Paths: ------------- csw/mgar/pkg/cpan/WWW-Mechanize/trunk/files/CSWpmwwwmechanize.depend csw/mgar/pkg/cpan/WWW-Mechanize/trunk/files/CSWpmwwwmechanize.gspec Property Changed: ---------------- csw/mgar/pkg/cpan/WWW-Mechanize/trunk/ Property changes on: csw/mgar/pkg/cpan/WWW-Mechanize/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/cpan/WWW-Mechanize/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/WWW-Mechanize/trunk/Makefile 2011-01-08 20:20:27 UTC (rev 12263) +++ csw/mgar/pkg/cpan/WWW-Mechanize/trunk/Makefile 2011-01-08 21:38:05 UTC (rev 12264) @@ -1,5 +1,5 @@ NAME = WWW-Mechanize -VERSION = 1.22 +VERSION = 1.66 CATEGORIES = cpan AUTHOR = PETDANCE @@ -13,16 +13,17 @@ of the URLs you've visited, which can be queried and revisited. endef -DISTFILES += $(call admfiles,CSWpmwwwmechanize,depend) +DISTFILES += COPYING -DEPENDS += cpan/libwww-perl -DEPENDS += cpan/HTML-Parser +PACKAGES = CSWpmwwwmechanize +CATALOGNAME = pm_wwwmechanize +ARCHALL = 1 -BUILDDEPS += cpan/Test-LongString -BUILDDEPS += cpan/Test-Warn -BUILDDEPS += cpan/Test-Pod -BUILDDEPS += cpan/Test-Memory-Cycle +RUNTIME_DEP_PKGS += CSWpmhtmlparser +RUNTIME_DEP_PKGS += CSWpmhttpsvrsimp +RUNTIME_DEP_PKGS += CSWpmlibwww +RUNTIME_DEP_PKGS += CSWpmuri -CONFIGURE_ARGS = -n +CONFIGURE_ARGS = -nolive -nolocal include gar/category.mk Modified: csw/mgar/pkg/cpan/WWW-Mechanize/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/WWW-Mechanize/trunk/checksums 2011-01-08 20:20:27 UTC (rev 12263) +++ csw/mgar/pkg/cpan/WWW-Mechanize/trunk/checksums 2011-01-08 21:38:05 UTC (rev 12264) @@ -1,3 +1 @@ -19a549a6fa392e95df9fb404d1af13c0 download/CSWpmwwwmechanize.gspec -da0ed851b1ae1161bf4e0fbe08e66592 download/CSWpmwwwmechanize.depend -f25ab5a33248354038307303e8450881 download/WWW-Mechanize-1.22.tar.gz +40690ba4cd93b8c3b931582acf87eeac WWW-Mechanize-1.66.tar.gz Added: csw/mgar/pkg/cpan/WWW-Mechanize/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/WWW-Mechanize/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/WWW-Mechanize/trunk/files/COPYING 2011-01-08 21:38:05 UTC (rev 12264) @@ -0,0 +1,3 @@ +Copyright (c) 2005-2010 Andy Lester. All rights reserved. This program is +free software; you can redistribute it and/or modify it under the same +terms as Perl itself. Deleted: csw/mgar/pkg/cpan/WWW-Mechanize/trunk/files/CSWpmwwwmechanize.depend =================================================================== --- csw/mgar/pkg/cpan/WWW-Mechanize/trunk/files/CSWpmwwwmechanize.depend 2011-01-08 20:20:27 UTC (rev 12263) +++ csw/mgar/pkg/cpan/WWW-Mechanize/trunk/files/CSWpmwwwmechanize.depend 2011-01-08 21:38:05 UTC (rev 12264) @@ -1 +0,0 @@ -P CSWpmlibwww pm_libwww - a general-purpose Web API for Perl, based on W3C libwww. Deleted: csw/mgar/pkg/cpan/WWW-Mechanize/trunk/files/CSWpmwwwmechanize.gspec =================================================================== --- csw/mgar/pkg/cpan/WWW-Mechanize/trunk/files/CSWpmwwwmechanize.gspec 2011-01-08 20:20:27 UTC (rev 12263) +++ csw/mgar/pkg/cpan/WWW-Mechanize/trunk/files/CSWpmwwwmechanize.gspec 2011-01-08 21:38:05 UTC (rev 12264) @@ -1,9 +0,0 @@ -%var bitname pm_wwwmechanize -%var pkgname CSWpmwwwmechanize -%var arch all -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -Copyright 2004 Andy Lester - -Released under the Artistic License. Based on Kirrily Robert's excellent -L package. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From gmarler at users.sourceforge.net Sat Jan 8 22:42:48 2011 From: gmarler at users.sourceforge.net (gmarler at users.sourceforge.net) Date: Sat, 08 Jan 2011 21:42:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[12265] csw/mgar/pkg/cpan/IO-Digest/tags/IO-Digest-0.10, REV =2011.01.08/trunk/ Message-ID: Revision: 12265 http://gar.svn.sourceforge.net/gar/?rev=12265&view=rev Author: gmarler Date: 2011-01-08 21:42:47 +0000 (Sat, 08 Jan 2011) Log Message: ----------- IO-Digest: Tag as release 0.10,REV=2011.01.08 Added Paths: ----------- csw/mgar/pkg/cpan/IO-Digest/tags/IO-Digest-0.10,REV=2011.01.08/trunk/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sat Jan 8 22:54:32 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sat, 08 Jan 2011 21:54:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[12266] csw/mgar/pkg/cpan Message-ID: Revision: 12266 http://gar.svn.sourceforge.net/gar/?rev=12266&view=rev Author: bonivart Date: 2011-01-08 21:54:32 +0000 (Sat, 08 Jan 2011) Log Message: ----------- pm_httpsvrsimp: update to 0.43 Added Paths: ----------- csw/mgar/pkg/cpan/HTTP-Server-Simple/ csw/mgar/pkg/cpan/HTTP-Server-Simple/branches/ csw/mgar/pkg/cpan/HTTP-Server-Simple/tags/ csw/mgar/pkg/cpan/HTTP-Server-Simple/trunk/ csw/mgar/pkg/cpan/HTTP-Server-Simple/trunk/Makefile csw/mgar/pkg/cpan/HTTP-Server-Simple/trunk/checksums csw/mgar/pkg/cpan/HTTP-Server-Simple/trunk/files/ csw/mgar/pkg/cpan/HTTP-Server-Simple/trunk/files/COPYING Property changes on: csw/mgar/pkg/cpan/HTTP-Server-Simple/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/cpan/HTTP-Server-Simple/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/HTTP-Server-Simple/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/HTTP-Server-Simple/trunk/Makefile 2011-01-08 21:54:32 UTC (rev 12266) @@ -0,0 +1,17 @@ +NAME = HTTP-Server-Simple +VERSION = 0.43 +CATEGORIES = cpan +AUTHOR = JESSE + +DESCRIPTION = Lightweight HTTP server +define BLURB + Lightweight HTTP server +endef + +DISTFILES += COPYING + +PACKAGES = CSWpmhttpsvrsimp +CATALOGNAME = pm_httpsvrsimp +ARCHALL = 1 + +include gar/category.mk Added: csw/mgar/pkg/cpan/HTTP-Server-Simple/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/HTTP-Server-Simple/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/HTTP-Server-Simple/trunk/checksums 2011-01-08 21:54:32 UTC (rev 12266) @@ -0,0 +1 @@ +8f430708ab7b4c2b3a4e48c549c7185e HTTP-Server-Simple-0.43.tar.gz Added: csw/mgar/pkg/cpan/HTTP-Server-Simple/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/HTTP-Server-Simple/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/HTTP-Server-Simple/trunk/files/COPYING 2011-01-08 21:54:32 UTC (rev 12266) @@ -0,0 +1,2 @@ +This library is free software; you can redistribute it and/or modify +it under the same terms as Perl itself. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 00:00:23 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sat, 08 Jan 2011 23:00:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[12267] csw/mgar/gar/v2-uwatch2/gar.lib.mk Message-ID: Revision: 12267 http://gar.svn.sourceforge.net/gar/?rev=12267&view=rev Author: wbonnet Date: 2011-01-08 23:00:23 +0000 (Sat, 08 Jan 2011) Log Message: ----------- Add target gmake upgrade-to-latest-upstream This target create a new branch based upon trunk code and modify VERSION variable in the Makefile. The new VERSION value is retrieved from the upstream site. Modified Paths: -------------- csw/mgar/gar/v2-uwatch2/gar.lib.mk Modified: csw/mgar/gar/v2-uwatch2/gar.lib.mk =================================================================== --- csw/mgar/gar/v2-uwatch2/gar.lib.mk 2011-01-08 21:54:32 UTC (rev 12266) +++ csw/mgar/gar/v2-uwatch2/gar.lib.mk 2011-01-08 23:00:23 UTC (rev 12267) @@ -189,7 +189,7 @@ REGEXP_ARGS = $(addsuffix ',$(addprefix --regexp=',$(UFILES_REGEX))) VERSION_ARGS = $(addsuffix ',$(addprefix --current-version=',$(VERSION))) define versionlist - $(if $(UFILES_REGEX),$(shell htp_proxy=$(http_proxy) ftp_proxy=$(ftp_proxy) $(GARBIN)/upstream_watch get-upstream-version-list $(UW_ARGS) $(REGEXP_ARGS))) + $(if $(UFILES_REGEX),$(shell http_proxy=$(http_proxy) ftp_proxy=$(ftp_proxy) $(GARBIN)/upstream_watch get-upstream-version-list $(UW_ARGS) $(REGEXP_ARGS))) endef ######################################################## @@ -218,17 +218,6 @@ fi ; ######################################################## -# Retrieve the current version -# -get-current-version: - @if [ ! -n '$(VERSION)' ]; then \ - echo "$(NAME) - VERSION is not defined" ; \ - false; \ - else \ - echo "$(NAME) - Current version is $(VERSION)" ; \ - fi ; - -######################################################## # Retrieve the list of upstream versions # get-upstream-version-list:VERSIONLIST = $(call versionlist) @@ -276,7 +265,7 @@ echo "$(NAME) - Error VERSION is not set" ; \ false; \ fi; \ - LATESTVERSION=$(shell http_proxy=$(http_proxy) ftp_proxy=$(ftp_proxy) $(GARBIN)/upstream_watch get-upstream-latest-version $(UW_ARGS) $(REGEXP_ARGS)); \ + LATESTVERSION:=$(shell http_proxy=$(http_proxy) ftp_proxy=$(ftp_proxy) $(GARBIN)/upstream_watch get-upstream-latest-version $(UW_ARGS) $(REGEXP_ARGS)); \ if [ -n "$$LATESTVERSION" ] ; then \ echo $$LATESTVERSION ; \ else \ @@ -287,6 +276,7 @@ ######################################################## # Compare local and upstream versions # +CHECKUPSTREAMVERSION=$(shell http_proxy=$(http_proxy) ftp_proxy=$(ftp_proxy) $(GARBIN)/upstream_watch check-upstream $(UW_ARGS) $(REGEXP_ARGS) $(VERSION_ARGS) ) check-upstream: @if [ '$(ENABLE_UPSTREAM_WATCH)' -ne '1' ] ; then \ echo "$(NAME) - Upstream Watch is disabled" ; \ @@ -303,21 +293,67 @@ echo "$(NAME) - Error VERSION is not set" ; \ false; \ fi; \ - LATESTVERSION=$(shell http_proxy=$(http_proxy) ftp_proxy=$(ftp_proxy) $(GARBIN)/upstream_watch check-upstream $(UW_ARGS) $(REGEXP_ARGS) $(VERSION_ARGS)); \ - if [ -n "$$LATESTVERSION" ] ; then \ - if test ! -f $(COOKIEDIR)/checknew-$$LATESTVERSION ; then \ - echo "$(NAME) : a new version of upstream files is available : $$LATESTVERSION"; \ - $(MAKE) checknew-$$LATESTVERSION > /dev/null ; \ + LATEST=$(CHECKUPSTREAMVERSION) ; \ + if [ -n "$$LATEST" ] ; then \ + echo "$(NAME) : a new version of upstream files is available : $$LATEST"; \ + else \ + echo "$(NAME) : Package is up-to-date. Current version is $(VERSION)" ; \ + fi ; \ + fi + + +######################################################## +# Create upgrade branch from current to latest upstream +# +upgrade-to-latest-upstream: + if [ '$(ENABLE_UPSTREAM_WATCH)' -ne '1' ] ; then \ + echo "$(NAME) - Upstream Watch is disabled" ; \ + else \ + if [ ! -n '$(UFILES_REGEX)' ]; then \ + echo "$(NAME) - Error UFILES_REGEX is not set" ; \ + false; \ + fi; \ + if [ ! -n '$(UPSTREAM_MASTER_SITES)' ]; then \ + echo "$(NAME) - Error UPSTREAM_MASTER_SITES is not set" ; \ + false; \ + fi; \ + if [ ! -n '$(VERSION)' ]; then \ + echo "$(NAME) - Error VERSION is not set" ; \ + false; \ + fi; \ + LATEST=$(CHECKUPSTREAMVERSION) ; \ + if [ ! -f "$(COOKIEDIR)/upgrade-to-latest-upstream-$$LATEST" ] ; then \ + if [ ! -d "../branches/upgrade_from_$(VERSION)_to_$$LATEST" ] ; then \ + echo "Not a dir : ../branches/upgrade_from_$(VERSION)_to_$$LATEST" ; \ + if [ -n "$$LATEST" ] ; then \ + echo "$(NAME) : a new version of upstream files is available. Creating upgrade branch from version $(VERSION) to $$LATEST"; \ + VERSIONUPGRADE="$(shell http_proxy=$(http_proxy) ftp_proxy=$(ftp_proxy) $(GARBIN)/upstream_watch upgrade-to-version --current-version=$(VERSION) --target-version=$(CHECKUPSTREAMVERSION))" ; \ + if [ -n "$$VERSIONUPGRADE" ] ; then \ + echo $$VERSIONUPGRADE ; \ + fi ; \ + else \ + echo "$(NAME) : Package is up-to-date. Upstream site has no version newer than $(VERSION)" ; \ + fi ; \ + else \ + echo "Upgrade branch from version $(VERSION) to version $$LATEST already exist" ; \ fi ; \ + $(MAKE) upgrade-to-latest-upstream-$$LATEST >/dev/null; \ else \ - if test ! -f $(COOKIEDIR)/checknew-$(VERSION) ; then \ - echo "$(NAME) : Package is up-to-date. Current version is $(VERSION)" ; \ - $(MAKE) checknew-$(VERSION) > /dev/null ; \ - fi ; \ + echo "Upgrade branch to version $$LATEST already created by upstream_watch" ; \ fi ; \ fi -checknew-%: +######################################################## +# +get-current-version: + @if [ ! -n '$(VERSION)' ]; then \ + echo "$(NAME) - VERSION is not defined" ; \ + false; \ + else \ + echo "$(NAME) - Current version is $(VERSION)" ; \ + fi ; + +upgrade-to-latest-upstream-%: @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 00:01:38 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sat, 08 Jan 2011 23:01:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[12268] csw/mgar/gar/v2-uwatch2/gar.lib.mk Message-ID: Revision: 12268 http://gar.svn.sourceforge.net/gar/?rev=12268&view=rev Author: wbonnet Date: 2011-01-08 23:01:38 +0000 (Sat, 08 Jan 2011) Log Message: ----------- add missing @ Modified Paths: -------------- csw/mgar/gar/v2-uwatch2/gar.lib.mk Modified: csw/mgar/gar/v2-uwatch2/gar.lib.mk =================================================================== --- csw/mgar/gar/v2-uwatch2/gar.lib.mk 2011-01-08 23:00:23 UTC (rev 12267) +++ csw/mgar/gar/v2-uwatch2/gar.lib.mk 2011-01-08 23:01:38 UTC (rev 12268) @@ -306,7 +306,7 @@ # Create upgrade branch from current to latest upstream # upgrade-to-latest-upstream: - if [ '$(ENABLE_UPSTREAM_WATCH)' -ne '1' ] ; then \ + @if [ '$(ENABLE_UPSTREAM_WATCH)' -ne '1' ] ; then \ echo "$(NAME) - Upstream Watch is disabled" ; \ else \ if [ ! -n '$(UFILES_REGEX)' ]; then \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 00:13:49 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sat, 08 Jan 2011 23:13:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[12269] csw/mgar/gar/v2-uwatch2/gar.lib.mk Message-ID: Revision: 12269 http://gar.svn.sourceforge.net/gar/?rev=12269&view=rev Author: wbonnet Date: 2011-01-08 23:13:48 +0000 (Sat, 08 Jan 2011) Log Message: ----------- Rename target get-current-version to get-gar-version. It's logical since displayed version is version from local build description. Modified Paths: -------------- csw/mgar/gar/v2-uwatch2/gar.lib.mk Modified: csw/mgar/gar/v2-uwatch2/gar.lib.mk =================================================================== --- csw/mgar/gar/v2-uwatch2/gar.lib.mk 2011-01-08 23:01:38 UTC (rev 12268) +++ csw/mgar/gar/v2-uwatch2/gar.lib.mk 2011-01-08 23:13:48 UTC (rev 12269) @@ -249,6 +249,7 @@ ######################################################## # Retrieve the newest upstream version # +LATESTVERSION:=$(shell http_proxy=$(http_proxy) ftp_proxy=$(ftp_proxy) $(GARBIN)/upstream_watch get-upstream-latest-version $(UW_ARGS) $(REGEXP_ARGS)) get-upstream-latest-version: @if [ '$(ENABLE_UPSTREAM_WATCH)' -ne '1' ] ; then \ echo "$(NAME) - Upstream Watch is disabled" ; \ @@ -265,9 +266,9 @@ echo "$(NAME) - Error VERSION is not set" ; \ false; \ fi; \ - LATESTVERSION:=$(shell http_proxy=$(http_proxy) ftp_proxy=$(ftp_proxy) $(GARBIN)/upstream_watch get-upstream-latest-version $(UW_ARGS) $(REGEXP_ARGS)); \ - if [ -n "$$LATESTVERSION" ] ; then \ - echo $$LATESTVERSION ; \ + LATEST=$(LATESTVERSION) ; \ + if [ -n "$$LATEST" ] ; then \ + echo $$LATEST ; \ else \ echo "No version found. Please check UPSTREAM_MASTER_SITES and UFILES_REGEX variables in the Makefile" ; \ fi ; \ @@ -345,12 +346,12 @@ ######################################################## # -get-current-version: +get-gar-version: @if [ ! -n '$(VERSION)' ]; then \ echo "$(NAME) - VERSION is not defined" ; \ false; \ else \ - echo "$(NAME) - Current version is $(VERSION)" ; \ + echo "$(NAME) - GAR version is $(VERSION)" ; \ fi ; upgrade-to-latest-upstream-%: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 00:48:47 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sat, 08 Jan 2011 23:48:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[12270] csw/mgar/gar/v2-uwatch2 Message-ID: Revision: 12270 http://gar.svn.sourceforge.net/gar/?rev=12270&view=rev Author: wbonnet Date: 2011-01-08 23:48:47 +0000 (Sat, 08 Jan 2011) Log Message: ----------- Remove extra empty line in get-upstream-version-list Modified Paths: -------------- csw/mgar/gar/v2-uwatch2/bin/upstream_watch csw/mgar/gar/v2-uwatch2/gar.lib.mk Modified: csw/mgar/gar/v2-uwatch2/bin/upstream_watch =================================================================== --- csw/mgar/gar/v2-uwatch2/bin/upstream_watch 2011-01-08 23:13:48 UTC (rev 12269) +++ csw/mgar/gar/v2-uwatch2/bin/upstream_watch 2011-01-08 23:48:47 UTC (rev 12270) @@ -618,6 +618,7 @@ myList = [] for version in matches: myList.append(version) + l = list(set(myList)) l.sort(self.compareAndSortVersion) Modified: csw/mgar/gar/v2-uwatch2/gar.lib.mk =================================================================== --- csw/mgar/gar/v2-uwatch2/gar.lib.mk 2011-01-08 23:13:48 UTC (rev 12269) +++ csw/mgar/gar/v2-uwatch2/gar.lib.mk 2011-01-08 23:48:47 UTC (rev 12270) @@ -220,7 +220,7 @@ ######################################################## # Retrieve the list of upstream versions # -get-upstream-version-list:VERSIONLIST = $(call versionlist) +get-upstream-version-list: VERSIONLIST = $(call versionlist) get-upstream-version-list: @if [ '$(ENABLE_UPSTREAM_WATCH)' -ne '1' ] ; then \ echo "$(NAME) - Upstream Watch is disabled" ; \ @@ -239,7 +239,9 @@ fi; \ if [ -n "$(VERSIONLIST)" ] ; then \ for VERSION in $(VERSIONLIST) ""; do \ - echo $$VERSION ; \ + if [ ! "$$VERSION" -eq "" ] ; then \ + echo "$$VERSION" ; \ + fi ; \ done ; \ else \ echo "No version found. Please check UPSTREAM_MASTER_SITES and UFILES_REGEX variables in the Makefile" ; \ @@ -307,7 +309,8 @@ # Create upgrade branch from current to latest upstream # upgrade-to-latest-upstream: - @if [ '$(ENABLE_UPSTREAM_WATCH)' -ne '1' ] ; then \ + @echo "In upgrade-to-latest-upstream" ; \ + if [ '$(ENABLE_UPSTREAM_WATCH)' -ne '1' ] ; then \ echo "$(NAME) - Upstream Watch is disabled" ; \ else \ if [ ! -n '$(UFILES_REGEX)' ]; then \ 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 Jan 9 00:51:25 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sat, 08 Jan 2011 23:51:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[12271] csw/mgar/pkg/cpan/String-CRC32/trunk Message-ID: Revision: 12271 http://gar.svn.sourceforge.net/gar/?rev=12271&view=rev Author: bonivart Date: 2011-01-08 23:51:25 +0000 (Sat, 08 Jan 2011) Log Message: ----------- pm_stringcrc32: update to gar v2, add license, fix packaging Modified Paths: -------------- csw/mgar/pkg/cpan/String-CRC32/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/cpan/String-CRC32/trunk/files/COPYING Property Changed: ---------------- csw/mgar/pkg/cpan/String-CRC32/trunk/ Property changes on: csw/mgar/pkg/cpan/String-CRC32/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/cpan/String-CRC32/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/String-CRC32/trunk/Makefile 2011-01-08 23:48:47 UTC (rev 12270) +++ csw/mgar/pkg/cpan/String-CRC32/trunk/Makefile 2011-01-08 23:51:25 UTC (rev 12271) @@ -3,7 +3,7 @@ CATEGORIES = cpan AUTHOR = SOENKE -DESCRIPTION = interface for cyclic redundency check generation +DESCRIPTION = Interface for cyclic redundency check generation define BLURB The CRC32 module calculates CRC sums of 32 bit lenghts. It generates the same CRC values as ZMODEM, PKZIP, PICCHECK and many others. Despite its @@ -11,7 +11,16 @@ files. endef +DISTFILES += COPYING + PACKAGES = CSWpmstringcrc32 CATALOGNAME = pm_stringcrc32 include gar/category.mk + +post-install-modulated: + @echo " ==> Post-install for $(NAME) (custom)" + @( cd $(WORKSRC) ; \ + gmake metafile ; \ + cp $(NAME)-$(VERSION)/META.yml . ) + @$(MAKECOOKIE) Added: csw/mgar/pkg/cpan/String-CRC32/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/String-CRC32/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/String-CRC32/trunk/files/COPYING 2011-01-08 23:51:25 UTC (rev 12271) @@ -0,0 +1,8 @@ +CRC algorithm code taken from CRC-32 by Craig Bruce. +The module stuff is inspired by a similar perl module called +String::CRC by David Sharnoff & Matthew Dillon. +Horst Fickenscher told me that it could be useful to supply an init +value to the crc checking function and so I included this possibility. + +The author of this package disclaims all copyrights and +releases it into the public domain. 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 Jan 9 01:12:45 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:12:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[12272] csw/mgar/pkg/cpan/Text-Template/trunk Message-ID: Revision: 12272 http://gar.svn.sourceforge.net/gar/?rev=12272&view=rev Author: bonivart Date: 2011-01-09 00:12:45 +0000 (Sun, 09 Jan 2011) Log Message: ----------- pm_texttemplate: update to 1.45 Modified Paths: -------------- csw/mgar/pkg/cpan/Text-Template/trunk/Makefile csw/mgar/pkg/cpan/Text-Template/trunk/checksums Removed Paths: ------------- csw/mgar/pkg/cpan/Text-Template/trunk/files/CSWpmtexttemplate.gspec Property Changed: ---------------- csw/mgar/pkg/cpan/Text-Template/trunk/ Property changes on: csw/mgar/pkg/cpan/Text-Template/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/cpan/Text-Template/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Text-Template/trunk/Makefile 2011-01-08 23:51:25 UTC (rev 12271) +++ csw/mgar/pkg/cpan/Text-Template/trunk/Makefile 2011-01-09 00:12:45 UTC (rev 12272) @@ -1,9 +1,9 @@ NAME = Text-Template -VERSION = 1.44 +VERSION = 1.45 CATEGORIES = cpan AUTHOR = MJD -DESCRIPTION = expand template text with embedded Perl +DESCRIPTION = Expand template text with embedded Perl define BLURB This is a library for generating form letters, building HTML pages, or filling in templates generally. A `template' is a piece of text that has @@ -12,6 +12,8 @@ values. endef -DISTFILES += CSWpmtexttemplate.gspec +PACKAGES = CSWpmtexttemplate +CATALOGNAME = pm_texttemplate +ARCHALL = 1 include gar/category.mk Modified: csw/mgar/pkg/cpan/Text-Template/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Text-Template/trunk/checksums 2011-01-08 23:51:25 UTC (rev 12271) +++ csw/mgar/pkg/cpan/Text-Template/trunk/checksums 2011-01-09 00:12:45 UTC (rev 12272) @@ -1,2 +1 @@ -b75aadf1615f8dbc393c42a35375d04b download/CSWpmtexttemplate.gspec -81a43d284d9c3cdb2b28e104c1c18609 download/Text-Template-1.44.tar.gz +cd22441c1ab0870c012225c9a585e262 Text-Template-1.45.tar.gz Deleted: csw/mgar/pkg/cpan/Text-Template/trunk/files/CSWpmtexttemplate.gspec =================================================================== --- csw/mgar/pkg/cpan/Text-Template/trunk/files/CSWpmtexttemplate.gspec 2011-01-08 23:51:25 UTC (rev 12271) +++ csw/mgar/pkg/cpan/Text-Template/trunk/files/CSWpmtexttemplate.gspec 2011-01-09 00:12:45 UTC (rev 12272) @@ -1,5 +0,0 @@ -%var bitname pm_texttemplate -%var pkgname CSWpmtexttemplate -%var arch all -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright url file://%{WORKSRC}/COPYING This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:28:17 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:28:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[12273] csw/mgar/pkg/cpan/XML-SemanticDiff/trunk/ Message-ID: Revision: 12273 http://gar.svn.sourceforge.net/gar/?rev=12273&view=rev Author: wbonnet Date: 2011-01-09 00:28:17 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/XML-SemanticDiff/trunk/ Property changes on: csw/mgar/pkg/cpan/XML-SemanticDiff/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sun Jan 9 01:29:05 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:29:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[12274] csw/mgar/pkg/cpan/Text-Autoformat/trunk Message-ID: Revision: 12274 http://gar.svn.sourceforge.net/gar/?rev=12274&view=rev Author: bonivart Date: 2011-01-09 00:29:05 +0000 (Sun, 09 Jan 2011) Log Message: ----------- pm_txtautofmt: update to 1.669002 Modified Paths: -------------- csw/mgar/pkg/cpan/Text-Autoformat/trunk/Makefile csw/mgar/pkg/cpan/Text-Autoformat/trunk/checksums Added Paths: ----------- csw/mgar/pkg/cpan/Text-Autoformat/trunk/files/COPYING Removed Paths: ------------- csw/mgar/pkg/cpan/Text-Autoformat/trunk/files/CSWpmtxtautofmt.depend csw/mgar/pkg/cpan/Text-Autoformat/trunk/files/CSWpmtxtautofmt.gspec Property Changed: ---------------- csw/mgar/pkg/cpan/Text-Autoformat/trunk/ Property changes on: csw/mgar/pkg/cpan/Text-Autoformat/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Modified: csw/mgar/pkg/cpan/Text-Autoformat/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Text-Autoformat/trunk/Makefile 2011-01-09 00:28:17 UTC (rev 12273) +++ csw/mgar/pkg/cpan/Text-Autoformat/trunk/Makefile 2011-01-09 00:29:05 UTC (rev 12274) @@ -1,9 +1,9 @@ NAME = Text-Autoformat -VERSION = 1.13 +VERSION = 1.669002 CATEGORIES = cpan AUTHOR = DCONWAY -DESCRIPTION = automatic text wrapping and reformatting +DESCRIPTION = Automatic text wrapping and reformatting define BLURB The fundamental task of the autoformat subroutine is to identify and rearrange independent paragraphs in a text. Paragraphs typically consist of @@ -14,8 +14,12 @@ numbering, or quoting (see the following sections). endef -DISTFILES += CSWpmtxtautofmt.gspec CSWpmtxtautofmt.depend +DISTFILES += COPYING -DEPENDS += cpan/Text-Reform +PACKAGES = CSWpmtxtautofmt +CATALOGNAME = pm_txtautofmt +ARCHALL = 1 +RUNTIME_DEP_PKGS += CSWpmtxtreform + include gar/category.mk Modified: csw/mgar/pkg/cpan/Text-Autoformat/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Text-Autoformat/trunk/checksums 2011-01-09 00:28:17 UTC (rev 12273) +++ csw/mgar/pkg/cpan/Text-Autoformat/trunk/checksums 2011-01-09 00:29:05 UTC (rev 12274) @@ -1,3 +1 @@ -6a50b9f375d3dd4664839991f4c0c757 download/CSWpmtxtautofmt.gspec -4cab593af41379eb67a143e1bf9c9623 download/CSWpmtxtautofmt.depend -1a944e3e21e176178bb4f87a6068f041 download/Text-Autoformat-1.13.tar.gz +c2c400207f49a769e32b5b1b660b07f7 Text-Autoformat-1.669002.tar.gz Added: csw/mgar/pkg/cpan/Text-Autoformat/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/Text-Autoformat/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/Text-Autoformat/trunk/files/COPYING 2011-01-09 00:29:05 UTC (rev 12274) @@ -0,0 +1,4 @@ +Copyright (C) 1997-2009, Damian Conway + +This library is free software; you can redistribute it and/or modify +it under the same terms as Perl itself. Deleted: csw/mgar/pkg/cpan/Text-Autoformat/trunk/files/CSWpmtxtautofmt.depend =================================================================== --- csw/mgar/pkg/cpan/Text-Autoformat/trunk/files/CSWpmtxtautofmt.depend 2011-01-09 00:28:17 UTC (rev 12273) +++ csw/mgar/pkg/cpan/Text-Autoformat/trunk/files/CSWpmtxtautofmt.depend 2011-01-09 00:29:05 UTC (rev 12274) @@ -1 +0,0 @@ -P CSWpmtxtreform pm_txtreform - manual text wrapping and reformatting Deleted: csw/mgar/pkg/cpan/Text-Autoformat/trunk/files/CSWpmtxtautofmt.gspec =================================================================== --- csw/mgar/pkg/cpan/Text-Autoformat/trunk/files/CSWpmtxtautofmt.gspec 2011-01-09 00:28:17 UTC (rev 12273) +++ csw/mgar/pkg/cpan/Text-Autoformat/trunk/files/CSWpmtxtautofmt.gspec 2011-01-09 00:29:05 UTC (rev 12274) @@ -1,9 +0,0 @@ -%var bitname pm_txtautofmt -%var pkgname CSWpmtxtautofmt -%var arch all -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -Copyright (c) 1997-2000, Damian Conway. All Rights Reserved. This module -is free software. It may be used, redistributed and/or modified under -the terms of the Perl Artistic License (see -http://www.perl.com/perl/misc/Artistic.html) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:38:48 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:38:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[12275] csw/mgar/pkg/cpan/AnyData/trunk/ Message-ID: Revision: 12275 http://gar.svn.sourceforge.net/gar/?rev=12275&view=rev Author: wbonnet Date: 2011-01-09 00:38:47 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/AnyData/trunk/ Property changes on: csw/mgar/pkg/cpan/AnyData/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:38:55 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:38:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[12276] csw/mgar/pkg/cpan/Apache-AuthPAM/trunk/ Message-ID: Revision: 12276 http://gar.svn.sourceforge.net/gar/?rev=12276&view=rev Author: wbonnet Date: 2011-01-09 00:38:55 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Apache-AuthPAM/trunk/ Property changes on: csw/mgar/pkg/cpan/Apache-AuthPAM/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:39:03 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:39:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[12277] csw/mgar/pkg/cpan/Apache-PAR/trunk/ Message-ID: Revision: 12277 http://gar.svn.sourceforge.net/gar/?rev=12277&view=rev Author: wbonnet Date: 2011-01-09 00:39:02 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Apache-PAR/trunk/ Property changes on: csw/mgar/pkg/cpan/Apache-PAR/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:39:10 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:39:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[12278] csw/mgar/pkg/cpan/Apache-Session/trunk/ Message-ID: Revision: 12278 http://gar.svn.sourceforge.net/gar/?rev=12278&view=rev Author: wbonnet Date: 2011-01-09 00:39:10 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Apache-Session/trunk/ Property changes on: csw/mgar/pkg/cpan/Apache-Session/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:39:17 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:39:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[12279] csw/mgar/pkg/cpan/Apache-Template/trunk/ Message-ID: Revision: 12279 http://gar.svn.sourceforge.net/gar/?rev=12279&view=rev Author: wbonnet Date: 2011-01-09 00:39:17 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Apache-Template/trunk/ Property changes on: csw/mgar/pkg/cpan/Apache-Template/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:39:25 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:39:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[12280] csw/mgar/pkg/cpan/Apache-Test/trunk/ Message-ID: Revision: 12280 http://gar.svn.sourceforge.net/gar/?rev=12280&view=rev Author: wbonnet Date: 2011-01-09 00:39:25 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Apache-Test/trunk/ Property changes on: csw/mgar/pkg/cpan/Apache-Test/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:39:38 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:39:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[12281] csw/mgar/pkg/cpan/Archive-SelfExtract/trunk/ Message-ID: Revision: 12281 http://gar.svn.sourceforge.net/gar/?rev=12281&view=rev Author: wbonnet Date: 2011-01-09 00:39:38 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Archive-SelfExtract/trunk/ Property changes on: csw/mgar/pkg/cpan/Archive-SelfExtract/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:39:47 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:39:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[12282] csw/mgar/pkg/cpan/Array-Compare/trunk/ Message-ID: Revision: 12282 http://gar.svn.sourceforge.net/gar/?rev=12282&view=rev Author: wbonnet Date: 2011-01-09 00:39:47 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Array-Compare/trunk/ Property changes on: csw/mgar/pkg/cpan/Array-Compare/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:39:55 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:39:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[12283] csw/mgar/pkg/cpan/Array-Window/trunk/ Message-ID: Revision: 12283 http://gar.svn.sourceforge.net/gar/?rev=12283&view=rev Author: wbonnet Date: 2011-01-09 00:39:55 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Array-Window/trunk/ Property changes on: csw/mgar/pkg/cpan/Array-Window/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:40:05 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:40:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[12284] csw/mgar/pkg/cpan/Attribute-Handlers/trunk/ Message-ID: Revision: 12284 http://gar.svn.sourceforge.net/gar/?rev=12284&view=rev Author: wbonnet Date: 2011-01-09 00:40:04 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Attribute-Handlers/trunk/ Property changes on: csw/mgar/pkg/cpan/Attribute-Handlers/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:40:14 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:40:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[12285] csw/mgar/pkg/cpan/Bit-Vector/trunk/ Message-ID: Revision: 12285 http://gar.svn.sourceforge.net/gar/?rev=12285&view=rev Author: wbonnet Date: 2011-01-09 00:40:14 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Bit-Vector/trunk/ Property changes on: csw/mgar/pkg/cpan/Bit-Vector/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:40:23 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:40:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[12286] csw/mgar/pkg/cpan/BSD-Resource/trunk/ Message-ID: Revision: 12286 http://gar.svn.sourceforge.net/gar/?rev=12286&view=rev Author: wbonnet Date: 2011-01-09 00:40:22 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/BSD-Resource/trunk/ Property changes on: csw/mgar/pkg/cpan/BSD-Resource/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:40:31 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:40:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[12287] csw/mgar/pkg/cpan/C-Scan/trunk/ Message-ID: Revision: 12287 http://gar.svn.sourceforge.net/gar/?rev=12287&view=rev Author: wbonnet Date: 2011-01-09 00:40:30 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/C-Scan/trunk/ Property changes on: csw/mgar/pkg/cpan/C-Scan/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:40:38 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:40:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[12288] csw/mgar/pkg/cpan/Cache/trunk/ Message-ID: Revision: 12288 http://gar.svn.sourceforge.net/gar/?rev=12288&view=rev Author: wbonnet Date: 2011-01-09 00:40:38 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Cache/trunk/ Property changes on: csw/mgar/pkg/cpan/Cache/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:40:46 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:40:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[12289] csw/mgar/pkg/cpan/Cache-Memcached/trunk/ Message-ID: Revision: 12289 http://gar.svn.sourceforge.net/gar/?rev=12289&view=rev Author: wbonnet Date: 2011-01-09 00:40:46 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Cache-Memcached/trunk/ Property changes on: csw/mgar/pkg/cpan/Cache-Memcached/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:40:54 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:40:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[12290] csw/mgar/pkg/cpan/Carp-Clan/trunk/ Message-ID: Revision: 12290 http://gar.svn.sourceforge.net/gar/?rev=12290&view=rev Author: wbonnet Date: 2011-01-09 00:40:54 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Carp-Clan/trunk/ Property changes on: csw/mgar/pkg/cpan/Carp-Clan/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:41:01 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:41:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[12291] csw/mgar/pkg/cpan/Catalyst/trunk/ Message-ID: Revision: 12291 http://gar.svn.sourceforge.net/gar/?rev=12291&view=rev Author: wbonnet Date: 2011-01-09 00:41:01 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Catalyst/trunk/ Property changes on: csw/mgar/pkg/cpan/Catalyst/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:41:09 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:41:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[12292] csw/mgar/pkg/cpan/CGI/trunk/ Message-ID: Revision: 12292 http://gar.svn.sourceforge.net/gar/?rev=12292&view=rev Author: wbonnet Date: 2011-01-09 00:41:09 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/CGI/trunk/ Property changes on: csw/mgar/pkg/cpan/CGI/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:41:16 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:41:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[12293] csw/mgar/pkg/cpan/CGI-Application/trunk/ Message-ID: Revision: 12293 http://gar.svn.sourceforge.net/gar/?rev=12293&view=rev Author: wbonnet Date: 2011-01-09 00:41:16 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/CGI-Application/trunk/ Property changes on: csw/mgar/pkg/cpan/CGI-Application/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:41:25 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:41:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[12294] csw/mgar/pkg/cpan/CGI-Application-Dispatch/trunk/ Message-ID: Revision: 12294 http://gar.svn.sourceforge.net/gar/?rev=12294&view=rev Author: wbonnet Date: 2011-01-09 00:41:25 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/CGI-Application-Dispatch/trunk/ Property changes on: csw/mgar/pkg/cpan/CGI-Application-Dispatch/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:41:32 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:41:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[12295] csw/mgar/pkg/cpan/ CGI-Application-Plugin-LogDispatch/trunk/ Message-ID: Revision: 12295 http://gar.svn.sourceforge.net/gar/?rev=12295&view=rev Author: wbonnet Date: 2011-01-09 00:41:32 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/CGI-Application-Plugin-LogDispatch/trunk/ Property changes on: csw/mgar/pkg/cpan/CGI-Application-Plugin-LogDispatch/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:41:39 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:41:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[12296] csw/mgar/pkg/cpan/CGI-Builder/trunk/ Message-ID: Revision: 12296 http://gar.svn.sourceforge.net/gar/?rev=12296&view=rev Author: wbonnet Date: 2011-01-09 00:41:39 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/CGI-Builder/trunk/ Property changes on: csw/mgar/pkg/cpan/CGI-Builder/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:41:46 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:41:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[12297] csw/mgar/pkg/cpan/CGI-SpeedyCGI/trunk/ Message-ID: Revision: 12297 http://gar.svn.sourceforge.net/gar/?rev=12297&view=rev Author: wbonnet Date: 2011-01-09 00:41:46 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/CGI-SpeedyCGI/trunk/ Property changes on: csw/mgar/pkg/cpan/CGI-SpeedyCGI/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:41:54 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:41:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[12298] csw/mgar/pkg/cpan/CGP-CLI/trunk/ Message-ID: Revision: 12298 http://gar.svn.sourceforge.net/gar/?rev=12298&view=rev Author: wbonnet Date: 2011-01-09 00:41:54 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/CGP-CLI/trunk/ Property changes on: csw/mgar/pkg/cpan/CGP-CLI/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:42:02 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:42:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[12299] csw/mgar/pkg/cpan/Class-BlackHole/trunk/ Message-ID: Revision: 12299 http://gar.svn.sourceforge.net/gar/?rev=12299&view=rev Author: wbonnet Date: 2011-01-09 00:42:01 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Class-BlackHole/trunk/ Property changes on: csw/mgar/pkg/cpan/Class-BlackHole/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:42:09 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:42:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[12300] csw/mgar/pkg/cpan/Class-DBI/trunk/ Message-ID: Revision: 12300 http://gar.svn.sourceforge.net/gar/?rev=12300&view=rev Author: wbonnet Date: 2011-01-09 00:42:08 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Class-DBI/trunk/ Property changes on: csw/mgar/pkg/cpan/Class-DBI/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:42:15 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:42:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[12301] csw/mgar/pkg/cpan/Class-DBI-Loader/trunk/ Message-ID: Revision: 12301 http://gar.svn.sourceforge.net/gar/?rev=12301&view=rev Author: wbonnet Date: 2011-01-09 00:42:15 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Class-DBI-Loader/trunk/ Property changes on: csw/mgar/pkg/cpan/Class-DBI-Loader/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:42:23 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:42:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[12302] csw/mgar/pkg/cpan/Class-DBI-mysql/trunk/ Message-ID: Revision: 12302 http://gar.svn.sourceforge.net/gar/?rev=12302&view=rev Author: wbonnet Date: 2011-01-09 00:42:23 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Class-DBI-mysql/trunk/ Property changes on: csw/mgar/pkg/cpan/Class-DBI-mysql/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:42:30 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:42:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[12303] csw/mgar/pkg/cpan/Class-DBI-Pg/trunk/ Message-ID: Revision: 12303 http://gar.svn.sourceforge.net/gar/?rev=12303&view=rev Author: wbonnet Date: 2011-01-09 00:42:30 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Class-DBI-Pg/trunk/ Property changes on: csw/mgar/pkg/cpan/Class-DBI-Pg/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:42:38 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:42:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[12304] csw/mgar/pkg/cpan/Class-DBI-SQLite/trunk/ Message-ID: Revision: 12304 http://gar.svn.sourceforge.net/gar/?rev=12304&view=rev Author: wbonnet Date: 2011-01-09 00:42:38 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Class-DBI-SQLite/trunk/ Property changes on: csw/mgar/pkg/cpan/Class-DBI-SQLite/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:42:46 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:42:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[12305] csw/mgar/pkg/cpan/Class-ISA/trunk/ Message-ID: Revision: 12305 http://gar.svn.sourceforge.net/gar/?rev=12305&view=rev Author: wbonnet Date: 2011-01-09 00:42:46 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Class-ISA/trunk/ Property changes on: csw/mgar/pkg/cpan/Class-ISA/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:42:54 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:42:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[12306] csw/mgar/pkg/cpan/Class-Loader/trunk/ Message-ID: Revision: 12306 http://gar.svn.sourceforge.net/gar/?rev=12306&view=rev Author: wbonnet Date: 2011-01-09 00:42:54 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Class-Loader/trunk/ Property changes on: csw/mgar/pkg/cpan/Class-Loader/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:43:02 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:43:02 +0000 Subject: [csw-devel] SF.net SVN: gar:[12307] csw/mgar/pkg/cpan/Class-Trigger/trunk/ Message-ID: Revision: 12307 http://gar.svn.sourceforge.net/gar/?rev=12307&view=rev Author: wbonnet Date: 2011-01-09 00:43:01 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Class-Trigger/trunk/ Property changes on: csw/mgar/pkg/cpan/Class-Trigger/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:43:09 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:43:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[12308] csw/mgar/pkg/cpan/Class-WhiteHole/trunk/ Message-ID: Revision: 12308 http://gar.svn.sourceforge.net/gar/?rev=12308&view=rev Author: wbonnet Date: 2011-01-09 00:43:09 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Class-WhiteHole/trunk/ Property changes on: csw/mgar/pkg/cpan/Class-WhiteHole/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:43:17 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:43:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[12309] csw/mgar/pkg/cpan/Config-IniFiles/trunk/ Message-ID: Revision: 12309 http://gar.svn.sourceforge.net/gar/?rev=12309&view=rev Author: wbonnet Date: 2011-01-09 00:43:17 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Config-IniFiles/trunk/ Property changes on: csw/mgar/pkg/cpan/Config-IniFiles/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:43:25 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:43:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[12310] csw/mgar/pkg/cpan/Convert-ASCII-Armour/trunk/ Message-ID: Revision: 12310 http://gar.svn.sourceforge.net/gar/?rev=12310&view=rev Author: wbonnet Date: 2011-01-09 00:43:24 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Convert-ASCII-Armour/trunk/ Property changes on: csw/mgar/pkg/cpan/Convert-ASCII-Armour/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:43:32 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:43:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[12311] csw/mgar/pkg/cpan/Convert-PEM/trunk/ Message-ID: Revision: 12311 http://gar.svn.sourceforge.net/gar/?rev=12311&view=rev Author: wbonnet Date: 2011-01-09 00:43:32 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Convert-PEM/trunk/ Property changes on: csw/mgar/pkg/cpan/Convert-PEM/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:43:40 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:43:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[12312] csw/mgar/pkg/cpan/Crypt-DES/trunk/ Message-ID: Revision: 12312 http://gar.svn.sourceforge.net/gar/?rev=12312&view=rev Author: wbonnet Date: 2011-01-09 00:43:40 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Crypt-DES/trunk/ Property changes on: csw/mgar/pkg/cpan/Crypt-DES/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:43:47 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:43:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[12313] csw/mgar/pkg/cpan/Crypt-DES_EDE3/trunk/ Message-ID: Revision: 12313 http://gar.svn.sourceforge.net/gar/?rev=12313&view=rev Author: wbonnet Date: 2011-01-09 00:43:47 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Crypt-DES_EDE3/trunk/ Property changes on: csw/mgar/pkg/cpan/Crypt-DES_EDE3/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:43:55 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:43:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[12314] csw/mgar/pkg/cpan/Crypt-DH/trunk/ Message-ID: Revision: 12314 http://gar.svn.sourceforge.net/gar/?rev=12314&view=rev Author: wbonnet Date: 2011-01-09 00:43:55 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Crypt-DH/trunk/ Property changes on: csw/mgar/pkg/cpan/Crypt-DH/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:44:03 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:44:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[12315] csw/mgar/pkg/cpan/Crypt-DSA/trunk/ Message-ID: Revision: 12315 http://gar.svn.sourceforge.net/gar/?rev=12315&view=rev Author: wbonnet Date: 2011-01-09 00:44:03 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Crypt-DSA/trunk/ Property changes on: csw/mgar/pkg/cpan/Crypt-DSA/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:44:11 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:44:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[12316] csw/mgar/pkg/cpan/Crypt-OpenPGP/trunk/ Message-ID: Revision: 12316 http://gar.svn.sourceforge.net/gar/?rev=12316&view=rev Author: wbonnet Date: 2011-01-09 00:44:11 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Crypt-OpenPGP/trunk/ Property changes on: csw/mgar/pkg/cpan/Crypt-OpenPGP/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:44:19 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:44:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[12317] csw/mgar/pkg/cpan/Crypt-OpenSSL-DSA/trunk/ Message-ID: Revision: 12317 http://gar.svn.sourceforge.net/gar/?rev=12317&view=rev Author: wbonnet Date: 2011-01-09 00:44:19 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Crypt-OpenSSL-DSA/trunk/ Property changes on: csw/mgar/pkg/cpan/Crypt-OpenSSL-DSA/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:44:26 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:44:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[12318] csw/mgar/pkg/cpan/Crypt-OpenSSL-PKCS12/trunk/ Message-ID: Revision: 12318 http://gar.svn.sourceforge.net/gar/?rev=12318&view=rev Author: wbonnet Date: 2011-01-09 00:44:26 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Crypt-OpenSSL-PKCS12/trunk/ Property changes on: csw/mgar/pkg/cpan/Crypt-OpenSSL-PKCS12/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:44:34 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:44:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[12319] csw/mgar/pkg/cpan/Crypt-OpenSSL-X509/trunk/ Message-ID: Revision: 12319 http://gar.svn.sourceforge.net/gar/?rev=12319&view=rev Author: wbonnet Date: 2011-01-09 00:44:34 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Crypt-OpenSSL-X509/trunk/ Property changes on: csw/mgar/pkg/cpan/Crypt-OpenSSL-X509/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:44:41 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:44:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[12320] csw/mgar/pkg/cpan/Crypt-Primes/trunk/ Message-ID: Revision: 12320 http://gar.svn.sourceforge.net/gar/?rev=12320&view=rev Author: wbonnet Date: 2011-01-09 00:44:41 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Crypt-Primes/trunk/ Property changes on: csw/mgar/pkg/cpan/Crypt-Primes/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:44:48 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:44:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[12321] csw/mgar/pkg/cpan/Crypt-Random/trunk/ Message-ID: Revision: 12321 http://gar.svn.sourceforge.net/gar/?rev=12321&view=rev Author: wbonnet Date: 2011-01-09 00:44:48 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Crypt-Random/trunk/ Property changes on: csw/mgar/pkg/cpan/Crypt-Random/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:44:56 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:44:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[12322] csw/mgar/pkg/cpan/Crypt-Rijndael/trunk/ Message-ID: Revision: 12322 http://gar.svn.sourceforge.net/gar/?rev=12322&view=rev Author: wbonnet Date: 2011-01-09 00:44:56 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Crypt-Rijndael/trunk/ Property changes on: csw/mgar/pkg/cpan/Crypt-Rijndael/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:45:03 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:45:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[12323] csw/mgar/pkg/cpan/Crypt-RIPEMD160/trunk/ Message-ID: Revision: 12323 http://gar.svn.sourceforge.net/gar/?rev=12323&view=rev Author: wbonnet Date: 2011-01-09 00:45:03 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Crypt-RIPEMD160/trunk/ Property changes on: csw/mgar/pkg/cpan/Crypt-RIPEMD160/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:45:11 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:45:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[12324] csw/mgar/pkg/cpan/Crypt-RSA/trunk/ Message-ID: Revision: 12324 http://gar.svn.sourceforge.net/gar/?rev=12324&view=rev Author: wbonnet Date: 2011-01-09 00:45:11 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Crypt-RSA/trunk/ Property changes on: csw/mgar/pkg/cpan/Crypt-RSA/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:45:18 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:45:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[12325] csw/mgar/pkg/cpan/Crypt-SSLeay/trunk/ Message-ID: Revision: 12325 http://gar.svn.sourceforge.net/gar/?rev=12325&view=rev Author: wbonnet Date: 2011-01-09 00:45:18 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Crypt-SSLeay/trunk/ Property changes on: csw/mgar/pkg/cpan/Crypt-SSLeay/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:45:26 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:45:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[12326] csw/mgar/pkg/cpan/Crypt-Twofish/trunk/ Message-ID: Revision: 12326 http://gar.svn.sourceforge.net/gar/?rev=12326&view=rev Author: wbonnet Date: 2011-01-09 00:45:26 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Crypt-Twofish/trunk/ Property changes on: csw/mgar/pkg/cpan/Crypt-Twofish/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:45:33 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:45:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[12327] csw/mgar/pkg/cpan/Curses/trunk/ Message-ID: Revision: 12327 http://gar.svn.sourceforge.net/gar/?rev=12327&view=rev Author: wbonnet Date: 2011-01-09 00:45:33 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Curses/trunk/ Property changes on: csw/mgar/pkg/cpan/Curses/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:45:41 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:45:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[12328] csw/mgar/pkg/cpan/Curses-UI/trunk/ Message-ID: Revision: 12328 http://gar.svn.sourceforge.net/gar/?rev=12328&view=rev Author: wbonnet Date: 2011-01-09 00:45:41 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Curses-UI/trunk/ Property changes on: csw/mgar/pkg/cpan/Curses-UI/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:45:49 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:45:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[12329] csw/mgar/pkg/cpan/Data-Buffer/trunk/ Message-ID: Revision: 12329 http://gar.svn.sourceforge.net/gar/?rev=12329&view=rev Author: wbonnet Date: 2011-01-09 00:45:49 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Data-Buffer/trunk/ Property changes on: csw/mgar/pkg/cpan/Data-Buffer/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:45:56 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:45:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[12330] csw/mgar/pkg/cpan/Data-Dump/trunk/ Message-ID: Revision: 12330 http://gar.svn.sourceforge.net/gar/?rev=12330&view=rev Author: wbonnet Date: 2011-01-09 00:45:56 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Data-Dump/trunk/ Property changes on: csw/mgar/pkg/cpan/Data-Dump/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:46:04 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:46:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[12331] csw/mgar/pkg/cpan/Data-Flow/trunk/ Message-ID: Revision: 12331 http://gar.svn.sourceforge.net/gar/?rev=12331&view=rev Author: wbonnet Date: 2011-01-09 00:46:04 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Data-Flow/trunk/ Property changes on: csw/mgar/pkg/cpan/Data-Flow/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:46:12 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:46:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[12332] csw/mgar/pkg/cpan/Data-ShowTable/trunk/ Message-ID: Revision: 12332 http://gar.svn.sourceforge.net/gar/?rev=12332&view=rev Author: wbonnet Date: 2011-01-09 00:46:11 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Data-ShowTable/trunk/ Property changes on: csw/mgar/pkg/cpan/Data-ShowTable/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:46:19 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:46:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[12333] csw/mgar/pkg/cpan/Data-UUID/trunk/ Message-ID: Revision: 12333 http://gar.svn.sourceforge.net/gar/?rev=12333&view=rev Author: wbonnet Date: 2011-01-09 00:46:19 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Data-UUID/trunk/ Property changes on: csw/mgar/pkg/cpan/Data-UUID/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:46:26 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:46:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[12334] csw/mgar/pkg/cpan/Date-Calc/trunk/ Message-ID: Revision: 12334 http://gar.svn.sourceforge.net/gar/?rev=12334&view=rev Author: wbonnet Date: 2011-01-09 00:46:26 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Date-Calc/trunk/ Property changes on: csw/mgar/pkg/cpan/Date-Calc/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:46:34 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:46:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[12335] csw/mgar/pkg/cpan/Date-Simple/trunk/ Message-ID: Revision: 12335 http://gar.svn.sourceforge.net/gar/?rev=12335&view=rev Author: wbonnet Date: 2011-01-09 00:46:34 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Date-Simple/trunk/ Property changes on: csw/mgar/pkg/cpan/Date-Simple/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:46:42 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:46:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[12336] csw/mgar/pkg/cpan/DBD-AnyData/trunk/ Message-ID: Revision: 12336 http://gar.svn.sourceforge.net/gar/?rev=12336&view=rev Author: wbonnet Date: 2011-01-09 00:46:42 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/DBD-AnyData/trunk/ Property changes on: csw/mgar/pkg/cpan/DBD-AnyData/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:46:49 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:46:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[12337] csw/mgar/pkg/cpan/DBD-CSV/trunk/ Message-ID: Revision: 12337 http://gar.svn.sourceforge.net/gar/?rev=12337&view=rev Author: wbonnet Date: 2011-01-09 00:46:49 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/DBD-CSV/trunk/ Property changes on: csw/mgar/pkg/cpan/DBD-CSV/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:46:57 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:46:57 +0000 Subject: [csw-devel] SF.net SVN: gar:[12338] csw/mgar/pkg/cpan/DBD-File/trunk/ Message-ID: Revision: 12338 http://gar.svn.sourceforge.net/gar/?rev=12338&view=rev Author: wbonnet Date: 2011-01-09 00:46:56 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/DBD-File/trunk/ Property changes on: csw/mgar/pkg/cpan/DBD-File/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:47:04 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:47:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[12339] csw/mgar/pkg/cpan/DBD-mysql5/trunk/ Message-ID: Revision: 12339 http://gar.svn.sourceforge.net/gar/?rev=12339&view=rev Author: wbonnet Date: 2011-01-09 00:47:03 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/DBD-mysql5/trunk/ Property changes on: csw/mgar/pkg/cpan/DBD-mysql5/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:47:11 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:47:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[12340] csw/mgar/pkg/cpan/DBIx-ContextualFetch/trunk/ Message-ID: Revision: 12340 http://gar.svn.sourceforge.net/gar/?rev=12340&view=rev Author: wbonnet Date: 2011-01-09 00:47:11 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/DBIx-ContextualFetch/trunk/ Property changes on: csw/mgar/pkg/cpan/DBIx-ContextualFetch/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:47:18 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:47:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[12341] csw/mgar/pkg/cpan/DBIx-Password/trunk/ Message-ID: Revision: 12341 http://gar.svn.sourceforge.net/gar/?rev=12341&view=rev Author: wbonnet Date: 2011-01-09 00:47:18 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/DBIx-Password/trunk/ Property changes on: csw/mgar/pkg/cpan/DBIx-Password/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:47:25 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:47:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[12342] csw/mgar/pkg/cpan/DBIx-SearchBuilder/trunk/ Message-ID: Revision: 12342 http://gar.svn.sourceforge.net/gar/?rev=12342&view=rev Author: wbonnet Date: 2011-01-09 00:47:24 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/DBIx-SearchBuilder/trunk/ Property changes on: csw/mgar/pkg/cpan/DBIx-SearchBuilder/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:47:32 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:47:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[12343] csw/mgar/pkg/cpan/Devel-Cover/trunk/ Message-ID: Revision: 12343 http://gar.svn.sourceforge.net/gar/?rev=12343&view=rev Author: wbonnet Date: 2011-01-09 00:47:31 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Devel-Cover/trunk/ Property changes on: csw/mgar/pkg/cpan/Devel-Cover/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:47:39 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:47:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[12344] csw/mgar/pkg/cpan/Devel-Cycle/trunk/ Message-ID: Revision: 12344 http://gar.svn.sourceforge.net/gar/?rev=12344&view=rev Author: wbonnet Date: 2011-01-09 00:47:39 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Devel-Cycle/trunk/ Property changes on: csw/mgar/pkg/cpan/Devel-Cycle/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:47:47 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:47:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[12345] csw/mgar/pkg/cpan/Devel-LeakTrace/trunk/ Message-ID: Revision: 12345 http://gar.svn.sourceforge.net/gar/?rev=12345&view=rev Author: wbonnet Date: 2011-01-09 00:47:47 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Devel-LeakTrace/trunk/ Property changes on: csw/mgar/pkg/cpan/Devel-LeakTrace/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:47:56 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:47:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[12346] csw/mgar/pkg/cpan/Devel-Trace/trunk/ Message-ID: Revision: 12346 http://gar.svn.sourceforge.net/gar/?rev=12346&view=rev Author: wbonnet Date: 2011-01-09 00:47:55 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Devel-Trace/trunk/ Property changes on: csw/mgar/pkg/cpan/Devel-Trace/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:48:04 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:48:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[12347] csw/mgar/pkg/cpan/Digest-BubbleBabble/trunk/ Message-ID: Revision: 12347 http://gar.svn.sourceforge.net/gar/?rev=12347&view=rev Author: wbonnet Date: 2011-01-09 00:48:04 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Digest-BubbleBabble/trunk/ Property changes on: csw/mgar/pkg/cpan/Digest-BubbleBabble/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:48:12 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:48:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[12348] csw/mgar/pkg/cpan/Digest-MD2/trunk/ Message-ID: Revision: 12348 http://gar.svn.sourceforge.net/gar/?rev=12348&view=rev Author: wbonnet Date: 2011-01-09 00:48:11 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Digest-MD2/trunk/ Property changes on: csw/mgar/pkg/cpan/Digest-MD2/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:48:19 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:48:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[12349] csw/mgar/pkg/cpan/Digest-Nilsimsa/trunk/ Message-ID: Revision: 12349 http://gar.svn.sourceforge.net/gar/?rev=12349&view=rev Author: wbonnet Date: 2011-01-09 00:48:19 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Digest-Nilsimsa/trunk/ Property changes on: csw/mgar/pkg/cpan/Digest-Nilsimsa/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:48:27 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:48:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[12350] csw/mgar/pkg/cpan/Email-Valid/trunk/ Message-ID: Revision: 12350 http://gar.svn.sourceforge.net/gar/?rev=12350&view=rev Author: wbonnet Date: 2011-01-09 00:48:26 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Email-Valid/trunk/ Property changes on: csw/mgar/pkg/cpan/Email-Valid/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:48:34 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:48:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[12351] csw/mgar/pkg/cpan/Env-Path/trunk/ Message-ID: Revision: 12351 http://gar.svn.sourceforge.net/gar/?rev=12351&view=rev Author: wbonnet Date: 2011-01-09 00:48:33 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Env-Path/trunk/ Property changes on: csw/mgar/pkg/cpan/Env-Path/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:48:41 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:48:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[12352] csw/mgar/pkg/cpan/Event/trunk/ Message-ID: Revision: 12352 http://gar.svn.sourceforge.net/gar/?rev=12352&view=rev Author: wbonnet Date: 2011-01-09 00:48:41 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Event/trunk/ Property changes on: csw/mgar/pkg/cpan/Event/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:48:53 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:48:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[12353] csw/mgar/pkg/cpan/Exception-Class-DBI/trunk/ Message-ID: Revision: 12353 http://gar.svn.sourceforge.net/gar/?rev=12353&view=rev Author: wbonnet Date: 2011-01-09 00:48:53 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Exception-Class-DBI/trunk/ Property changes on: csw/mgar/pkg/cpan/Exception-Class-DBI/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:49:01 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:49:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[12354] csw/mgar/pkg/cpan/ExtUtils-AutoInstall/trunk/ Message-ID: Revision: 12354 http://gar.svn.sourceforge.net/gar/?rev=12354&view=rev Author: wbonnet Date: 2011-01-09 00:49:01 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/ExtUtils-AutoInstall/trunk/ Property changes on: csw/mgar/pkg/cpan/ExtUtils-AutoInstall/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:49:08 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:49:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[12355] csw/mgar/pkg/cpan/ExtUtils-XSBuilder/trunk/ Message-ID: Revision: 12355 http://gar.svn.sourceforge.net/gar/?rev=12355&view=rev Author: wbonnet Date: 2011-01-09 00:49:08 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/ExtUtils-XSBuilder/trunk/ Property changes on: csw/mgar/pkg/cpan/ExtUtils-XSBuilder/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:49:16 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:49:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[12356] csw/mgar/pkg/cpan/File-chdir/trunk/ Message-ID: Revision: 12356 http://gar.svn.sourceforge.net/gar/?rev=12356&view=rev Author: wbonnet Date: 2011-01-09 00:49:15 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/File-chdir/trunk/ Property changes on: csw/mgar/pkg/cpan/File-chdir/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:49:23 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:49:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[12357] csw/mgar/pkg/cpan/File-MMagic/trunk/ Message-ID: Revision: 12357 http://gar.svn.sourceforge.net/gar/?rev=12357&view=rev Author: wbonnet Date: 2011-01-09 00:49:23 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/File-MMagic/trunk/ Property changes on: csw/mgar/pkg/cpan/File-MMagic/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:49:30 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:49:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[12358] csw/mgar/pkg/cpan/File-Modified/trunk/ Message-ID: Revision: 12358 http://gar.svn.sourceforge.net/gar/?rev=12358&view=rev Author: wbonnet Date: 2011-01-09 00:49:30 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/File-Modified/trunk/ Property changes on: csw/mgar/pkg/cpan/File-Modified/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:49:37 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:49:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[12359] csw/mgar/pkg/cpan/File-NFSLock/trunk/ Message-ID: Revision: 12359 http://gar.svn.sourceforge.net/gar/?rev=12359&view=rev Author: wbonnet Date: 2011-01-09 00:49:37 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/File-NFSLock/trunk/ Property changes on: csw/mgar/pkg/cpan/File-NFSLock/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:49:45 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:49:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[12360] csw/mgar/pkg/cpan/File-Type/trunk/ Message-ID: Revision: 12360 http://gar.svn.sourceforge.net/gar/?rev=12360&view=rev Author: wbonnet Date: 2011-01-09 00:49:44 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/File-Type/trunk/ Property changes on: csw/mgar/pkg/cpan/File-Type/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:49:59 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:49:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[12361] csw/mgar/pkg/cpan/Frontier-RPC/trunk/ Message-ID: Revision: 12361 http://gar.svn.sourceforge.net/gar/?rev=12361&view=rev Author: wbonnet Date: 2011-01-09 00:49:59 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Frontier-RPC/trunk/ Property changes on: csw/mgar/pkg/cpan/Frontier-RPC/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:50:09 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:50:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[12362] csw/mgar/pkg/cpan/Gnome2/trunk/ Message-ID: Revision: 12362 http://gar.svn.sourceforge.net/gar/?rev=12362&view=rev Author: wbonnet Date: 2011-01-09 00:50:09 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Gnome2/trunk/ Property changes on: csw/mgar/pkg/cpan/Gnome2/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:50:17 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:50:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[12363] csw/mgar/pkg/cpan/Gnome2-Canvas/trunk/ Message-ID: Revision: 12363 http://gar.svn.sourceforge.net/gar/?rev=12363&view=rev Author: wbonnet Date: 2011-01-09 00:50:16 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Gnome2-Canvas/trunk/ Property changes on: csw/mgar/pkg/cpan/Gnome2-Canvas/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:50:24 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:50:24 +0000 Subject: [csw-devel] SF.net SVN: gar:[12364] csw/mgar/pkg/cpan/Gnome2-GConf/trunk/ Message-ID: Revision: 12364 http://gar.svn.sourceforge.net/gar/?rev=12364&view=rev Author: wbonnet Date: 2011-01-09 00:50:24 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Gnome2-GConf/trunk/ Property changes on: csw/mgar/pkg/cpan/Gnome2-GConf/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:50:31 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:50:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[12365] csw/mgar/pkg/cpan/Gnome2-Print/trunk/ Message-ID: Revision: 12365 http://gar.svn.sourceforge.net/gar/?rev=12365&view=rev Author: wbonnet Date: 2011-01-09 00:50:31 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Gnome2-Print/trunk/ Property changes on: csw/mgar/pkg/cpan/Gnome2-Print/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:50:39 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:50:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[12366] csw/mgar/pkg/cpan/Gnome2-VFS/trunk/ Message-ID: Revision: 12366 http://gar.svn.sourceforge.net/gar/?rev=12366&view=rev Author: wbonnet Date: 2011-01-09 00:50:39 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Gnome2-VFS/trunk/ Property changes on: csw/mgar/pkg/cpan/Gnome2-VFS/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:50:46 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:50:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[12367] csw/mgar/pkg/cpan/Gnome2-Wnck/trunk/ Message-ID: Revision: 12367 http://gar.svn.sourceforge.net/gar/?rev=12367&view=rev Author: wbonnet Date: 2011-01-09 00:50:46 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Gnome2-Wnck/trunk/ Property changes on: csw/mgar/pkg/cpan/Gnome2-Wnck/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:50:54 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:50:54 +0000 Subject: [csw-devel] SF.net SVN: gar:[12368] csw/mgar/pkg/cpan/Graph/trunk/ Message-ID: Revision: 12368 http://gar.svn.sourceforge.net/gar/?rev=12368&view=rev Author: wbonnet Date: 2011-01-09 00:50:53 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Graph/trunk/ Property changes on: csw/mgar/pkg/cpan/Graph/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:51:01 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:51:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[12369] csw/mgar/pkg/cpan/GraphViz/trunk/ Message-ID: Revision: 12369 http://gar.svn.sourceforge.net/gar/?rev=12369&view=rev Author: wbonnet Date: 2011-01-09 00:51:01 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/GraphViz/trunk/ Property changes on: csw/mgar/pkg/cpan/GraphViz/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:51:08 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:51:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[12370] csw/mgar/pkg/cpan/Gtk2-GladeXML/trunk/ Message-ID: Revision: 12370 http://gar.svn.sourceforge.net/gar/?rev=12370&view=rev Author: wbonnet Date: 2011-01-09 00:51:08 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Gtk2-GladeXML/trunk/ Property changes on: csw/mgar/pkg/cpan/Gtk2-GladeXML/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:51:15 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:51:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[12371] csw/mgar/pkg/cpan/Gtk2-PodViewer/trunk/ Message-ID: Revision: 12371 http://gar.svn.sourceforge.net/gar/?rev=12371&view=rev Author: wbonnet Date: 2011-01-09 00:51:15 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Gtk2-PodViewer/trunk/ Property changes on: csw/mgar/pkg/cpan/Gtk2-PodViewer/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:51:23 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:51:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[12372] csw/mgar/pkg/cpan/Gtk2-TrayIcon/trunk/ Message-ID: Revision: 12372 http://gar.svn.sourceforge.net/gar/?rev=12372&view=rev Author: wbonnet Date: 2011-01-09 00:51:22 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Gtk2-TrayIcon/trunk/ Property changes on: csw/mgar/pkg/cpan/Gtk2-TrayIcon/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:51:30 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:51:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[12373] csw/mgar/pkg/cpan/HTML-CalendarMonth/trunk/ Message-ID: Revision: 12373 http://gar.svn.sourceforge.net/gar/?rev=12373&view=rev Author: wbonnet Date: 2011-01-09 00:51:29 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/HTML-CalendarMonth/trunk/ Property changes on: csw/mgar/pkg/cpan/HTML-CalendarMonth/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:51:37 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:51:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[12374] csw/mgar/pkg/cpan/HTML-Element-Extended/trunk/ Message-ID: Revision: 12374 http://gar.svn.sourceforge.net/gar/?rev=12374&view=rev Author: wbonnet Date: 2011-01-09 00:51:36 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/HTML-Element-Extended/trunk/ Property changes on: csw/mgar/pkg/cpan/HTML-Element-Extended/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:51:44 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:51:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[12375] csw/mgar/pkg/cpan/HTML-TokeParser/trunk/ Message-ID: Revision: 12375 http://gar.svn.sourceforge.net/gar/?rev=12375&view=rev Author: wbonnet Date: 2011-01-09 00:51:44 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/HTML-TokeParser/trunk/ Property changes on: csw/mgar/pkg/cpan/HTML-TokeParser/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:51:52 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:51:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[12376] csw/mgar/pkg/cpan/HTTP-Body/trunk/ Message-ID: Revision: 12376 http://gar.svn.sourceforge.net/gar/?rev=12376&view=rev Author: wbonnet Date: 2011-01-09 00:51:51 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/HTTP-Body/trunk/ Property changes on: csw/mgar/pkg/cpan/HTTP-Body/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:52:00 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:52:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[12377] csw/mgar/pkg/cpan/HTTP-DAV/trunk/ Message-ID: Revision: 12377 http://gar.svn.sourceforge.net/gar/?rev=12377&view=rev Author: wbonnet Date: 2011-01-09 00:51:59 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/HTTP-DAV/trunk/ Property changes on: csw/mgar/pkg/cpan/HTTP-DAV/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:52:08 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:52:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[12378] csw/mgar/pkg/cpan/I18N-LangTags/trunk/ Message-ID: Revision: 12378 http://gar.svn.sourceforge.net/gar/?rev=12378&view=rev Author: wbonnet Date: 2011-01-09 00:52:07 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/I18N-LangTags/trunk/ Property changes on: csw/mgar/pkg/cpan/I18N-LangTags/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:52:15 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:52:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[12379] csw/mgar/pkg/cpan/Ima-DBI/trunk/ Message-ID: Revision: 12379 http://gar.svn.sourceforge.net/gar/?rev=12379&view=rev Author: wbonnet Date: 2011-01-09 00:52:15 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Ima-DBI/trunk/ Property changes on: csw/mgar/pkg/cpan/Ima-DBI/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:52:23 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:52:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[12380] csw/mgar/pkg/cpan/Image-Info/trunk/ Message-ID: Revision: 12380 http://gar.svn.sourceforge.net/gar/?rev=12380&view=rev Author: wbonnet Date: 2011-01-09 00:52:22 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Image-Info/trunk/ Property changes on: csw/mgar/pkg/cpan/Image-Info/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:52:30 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:52:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[12381] csw/mgar/pkg/cpan/Image-Size/trunk/ Message-ID: Revision: 12381 http://gar.svn.sourceforge.net/gar/?rev=12381&view=rev Author: wbonnet Date: 2011-01-09 00:52:30 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Image-Size/trunk/ Property changes on: csw/mgar/pkg/cpan/Image-Size/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:52:38 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:52:38 +0000 Subject: [csw-devel] SF.net SVN: gar:[12382] csw/mgar/pkg/cpan/IO-Pager/trunk/ Message-ID: Revision: 12382 http://gar.svn.sourceforge.net/gar/?rev=12382&view=rev Author: wbonnet Date: 2011-01-09 00:52:38 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/IO-Pager/trunk/ Property changes on: csw/mgar/pkg/cpan/IO-Pager/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:52:45 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:52:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[12383] csw/mgar/pkg/cpan/IO-String/trunk/ Message-ID: Revision: 12383 http://gar.svn.sourceforge.net/gar/?rev=12383&view=rev Author: wbonnet Date: 2011-01-09 00:52:45 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/IO-String/trunk/ Property changes on: csw/mgar/pkg/cpan/IO-String/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:52:53 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:52:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[12384] csw/mgar/pkg/cpan/IO-Util/trunk/ Message-ID: Revision: 12384 http://gar.svn.sourceforge.net/gar/?rev=12384&view=rev Author: wbonnet Date: 2011-01-09 00:52:53 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/IO-Util/trunk/ Property changes on: csw/mgar/pkg/cpan/IO-Util/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:53:01 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:53:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[12385] csw/mgar/pkg/cpan/Jcode/trunk/ Message-ID: Revision: 12385 http://gar.svn.sourceforge.net/gar/?rev=12385&view=rev Author: wbonnet Date: 2011-01-09 00:53:01 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Jcode/trunk/ Property changes on: csw/mgar/pkg/cpan/Jcode/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:53:08 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:53:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[12386] csw/mgar/pkg/cpan/libxml-perl/trunk/ Message-ID: Revision: 12386 http://gar.svn.sourceforge.net/gar/?rev=12386&view=rev Author: wbonnet Date: 2011-01-09 00:53:08 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/libxml-perl/trunk/ Property changes on: csw/mgar/pkg/cpan/libxml-perl/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:53:17 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:53:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[12387] csw/mgar/pkg/cpan/Locale-Maketext-Fuzzy/trunk/ Message-ID: Revision: 12387 http://gar.svn.sourceforge.net/gar/?rev=12387&view=rev Author: wbonnet Date: 2011-01-09 00:53:17 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Locale-Maketext-Fuzzy/trunk/ Property changes on: csw/mgar/pkg/cpan/Locale-Maketext-Fuzzy/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:53:25 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:53:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[12388] csw/mgar/pkg/cpan/Mail-Box-Parser-C/trunk/ Message-ID: Revision: 12388 http://gar.svn.sourceforge.net/gar/?rev=12388&view=rev Author: wbonnet Date: 2011-01-09 00:53:25 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Mail-Box-Parser-C/trunk/ Property changes on: csw/mgar/pkg/cpan/Mail-Box-Parser-C/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:53:33 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:53:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[12389] csw/mgar/pkg/cpan/Math-Bezier/trunk/ Message-ID: Revision: 12389 http://gar.svn.sourceforge.net/gar/?rev=12389&view=rev Author: wbonnet Date: 2011-01-09 00:53:33 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Math-Bezier/trunk/ Property changes on: csw/mgar/pkg/cpan/Math-Bezier/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:53:40 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:53:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[12390] csw/mgar/pkg/cpan/Math-GMP/trunk/ Message-ID: Revision: 12390 http://gar.svn.sourceforge.net/gar/?rev=12390&view=rev Author: wbonnet Date: 2011-01-09 00:53:40 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Math-GMP/trunk/ Property changes on: csw/mgar/pkg/cpan/Math-GMP/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:53:48 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:53:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[12391] csw/mgar/pkg/cpan/Math-Interpolate/trunk/ Message-ID: Revision: 12391 http://gar.svn.sourceforge.net/gar/?rev=12391&view=rev Author: wbonnet Date: 2011-01-09 00:53:48 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Math-Interpolate/trunk/ Property changes on: csw/mgar/pkg/cpan/Math-Interpolate/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:53:56 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:53:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[12392] csw/mgar/pkg/cpan/Math-Pari/trunk/ Message-ID: Revision: 12392 http://gar.svn.sourceforge.net/gar/?rev=12392&view=rev Author: wbonnet Date: 2011-01-09 00:53:56 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Math-Pari/trunk/ Property changes on: csw/mgar/pkg/cpan/Math-Pari/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:54:05 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:54:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[12393] csw/mgar/pkg/cpan/MLDBM-Sync/trunk/ Message-ID: Revision: 12393 http://gar.svn.sourceforge.net/gar/?rev=12393&view=rev Author: wbonnet Date: 2011-01-09 00:54:05 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/MLDBM-Sync/trunk/ Property changes on: csw/mgar/pkg/cpan/MLDBM-Sync/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:54:12 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:54:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[12394] csw/mgar/pkg/cpan/mod_perl/trunk/ Message-ID: Revision: 12394 http://gar.svn.sourceforge.net/gar/?rev=12394&view=rev Author: wbonnet Date: 2011-01-09 00:54:12 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/mod_perl/trunk/ Property changes on: csw/mgar/pkg/cpan/mod_perl/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:54:20 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:54:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[12395] csw/mgar/pkg/cpan/mod_perl2/trunk/ Message-ID: Revision: 12395 http://gar.svn.sourceforge.net/gar/?rev=12395&view=rev Author: wbonnet Date: 2011-01-09 00:54:19 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/mod_perl2/trunk/ Property changes on: csw/mgar/pkg/cpan/mod_perl2/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:54:28 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:54:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[12396] csw/mgar/pkg/cpan/Module-ScanDeps/trunk/ Message-ID: Revision: 12396 http://gar.svn.sourceforge.net/gar/?rev=12396&view=rev Author: wbonnet Date: 2011-01-09 00:54:28 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Module-ScanDeps/trunk/ Property changes on: csw/mgar/pkg/cpan/Module-ScanDeps/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:54:43 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:54:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[12397] csw/mgar/pkg/cpan/Net-SSH-Perl/trunk/ Message-ID: Revision: 12397 http://gar.svn.sourceforge.net/gar/?rev=12397&view=rev Author: wbonnet Date: 2011-01-09 00:54:43 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Net-SSH-Perl/trunk/ Property changes on: csw/mgar/pkg/cpan/Net-SSH-Perl/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:54:52 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:54:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[12398] csw/mgar/pkg/cpan/Object-MultiType/trunk/ Message-ID: Revision: 12398 http://gar.svn.sourceforge.net/gar/?rev=12398&view=rev Author: wbonnet Date: 2011-01-09 00:54:51 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Object-MultiType/trunk/ Property changes on: csw/mgar/pkg/cpan/Object-MultiType/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:54:59 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:54:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[12399] csw/mgar/pkg/cpan/OOTools/trunk/ Message-ID: Revision: 12399 http://gar.svn.sourceforge.net/gar/?rev=12399&view=rev Author: wbonnet Date: 2011-01-09 00:54:59 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/OOTools/trunk/ Property changes on: csw/mgar/pkg/cpan/OOTools/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:55:08 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:55:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[12400] csw/mgar/pkg/cpan/PAR/trunk/ Message-ID: Revision: 12400 http://gar.svn.sourceforge.net/gar/?rev=12400&view=rev Author: wbonnet Date: 2011-01-09 00:55:07 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/PAR/trunk/ Property changes on: csw/mgar/pkg/cpan/PAR/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:55:15 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:55:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[12401] csw/mgar/pkg/cpan/PAR-Dist/trunk/ Message-ID: Revision: 12401 http://gar.svn.sourceforge.net/gar/?rev=12401&view=rev Author: wbonnet Date: 2011-01-09 00:55:14 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/PAR-Dist/trunk/ Property changes on: csw/mgar/pkg/cpan/PAR-Dist/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:55:23 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:55:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[12402] csw/mgar/pkg/cpan/Path-Class/trunk/ Message-ID: Revision: 12402 http://gar.svn.sourceforge.net/gar/?rev=12402&view=rev Author: wbonnet Date: 2011-01-09 00:55:22 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Path-Class/trunk/ Property changes on: csw/mgar/pkg/cpan/Path-Class/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:55:32 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:55:32 +0000 Subject: [csw-devel] SF.net SVN: gar:[12403] csw/mgar/pkg/cpan/Pod-POM/trunk/ Message-ID: Revision: 12403 http://gar.svn.sourceforge.net/gar/?rev=12403&view=rev Author: wbonnet Date: 2011-01-09 00:55:32 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Pod-POM/trunk/ Property changes on: csw/mgar/pkg/cpan/Pod-POM/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:55:40 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:55:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[12404] csw/mgar/pkg/cpan/PodToHTML/trunk/ Message-ID: Revision: 12404 http://gar.svn.sourceforge.net/gar/?rev=12404&view=rev Author: wbonnet Date: 2011-01-09 00:55:39 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/PodToHTML/trunk/ Property changes on: csw/mgar/pkg/cpan/PodToHTML/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:55:48 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:55:48 +0000 Subject: [csw-devel] SF.net SVN: gar:[12405] csw/mgar/pkg/cpan/Proc-ProcessTable/trunk/ Message-ID: Revision: 12405 http://gar.svn.sourceforge.net/gar/?rev=12405&view=rev Author: wbonnet Date: 2011-01-09 00:55:47 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Proc-ProcessTable/trunk/ Property changes on: csw/mgar/pkg/cpan/Proc-ProcessTable/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:55:56 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:55:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[12406] csw/mgar/pkg/cpan/psh/trunk/ Message-ID: Revision: 12406 http://gar.svn.sourceforge.net/gar/?rev=12406&view=rev Author: wbonnet Date: 2011-01-09 00:55:55 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/psh/trunk/ Property changes on: csw/mgar/pkg/cpan/psh/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:56:04 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:56:04 +0000 Subject: [csw-devel] SF.net SVN: gar:[12407] csw/mgar/pkg/cpan/Regexp-Shellish/trunk/ Message-ID: Revision: 12407 http://gar.svn.sourceforge.net/gar/?rev=12407&view=rev Author: wbonnet Date: 2011-01-09 00:56:03 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Regexp-Shellish/trunk/ Property changes on: csw/mgar/pkg/cpan/Regexp-Shellish/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:56:12 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:56:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[12408] csw/mgar/pkg/cpan/RPC-XML/trunk/ Message-ID: Revision: 12408 http://gar.svn.sourceforge.net/gar/?rev=12408&view=rev Author: wbonnet Date: 2011-01-09 00:56:11 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/RPC-XML/trunk/ Property changes on: csw/mgar/pkg/cpan/RPC-XML/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:56:19 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:56:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[12409] csw/mgar/pkg/cpan/Scalar-List-Utils/trunk/ Message-ID: Revision: 12409 http://gar.svn.sourceforge.net/gar/?rev=12409&view=rev Author: wbonnet Date: 2011-01-09 00:56:19 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Scalar-List-Utils/trunk/ Property changes on: csw/mgar/pkg/cpan/Scalar-List-Utils/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:56:26 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:56:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[12410] csw/mgar/pkg/cpan/Schedule-Cron/trunk/ Message-ID: Revision: 12410 http://gar.svn.sourceforge.net/gar/?rev=12410&view=rev Author: wbonnet Date: 2011-01-09 00:56:26 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Schedule-Cron/trunk/ Property changes on: csw/mgar/pkg/cpan/Schedule-Cron/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:56:33 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:56:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[12411] csw/mgar/pkg/cpan/SDF/trunk/ Message-ID: Revision: 12411 http://gar.svn.sourceforge.net/gar/?rev=12411&view=rev Author: wbonnet Date: 2011-01-09 00:56:33 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/SDF/trunk/ Property changes on: csw/mgar/pkg/cpan/SDF/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:56:42 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:56:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[12412] csw/mgar/pkg/cpan/SOAP-WSDL/trunk/ Message-ID: Revision: 12412 http://gar.svn.sourceforge.net/gar/?rev=12412&view=rev Author: wbonnet Date: 2011-01-09 00:56:41 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/SOAP-WSDL/trunk/ Property changes on: csw/mgar/pkg/cpan/SOAP-WSDL/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:56:49 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:56:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[12413] csw/mgar/pkg/cpan/sol-inst/trunk/ Message-ID: Revision: 12413 http://gar.svn.sourceforge.net/gar/?rev=12413&view=rev Author: wbonnet Date: 2011-01-09 00:56:48 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/sol-inst/trunk/ Property changes on: csw/mgar/pkg/cpan/sol-inst/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:56:56 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:56:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[12414] csw/mgar/pkg/cpan/Solaris-DeviceTree/trunk/ Message-ID: Revision: 12414 http://gar.svn.sourceforge.net/gar/?rev=12414&view=rev Author: wbonnet Date: 2011-01-09 00:56:56 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Solaris-DeviceTree/trunk/ Property changes on: csw/mgar/pkg/cpan/Solaris-DeviceTree/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:57:03 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:57:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[12415] csw/mgar/pkg/cpan/Solaris-Sysconf/trunk/ Message-ID: Revision: 12415 http://gar.svn.sourceforge.net/gar/?rev=12415&view=rev Author: wbonnet Date: 2011-01-09 00:57:03 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Solaris-Sysconf/trunk/ Property changes on: csw/mgar/pkg/cpan/Solaris-Sysconf/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:57:10 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:57:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[12416] csw/mgar/pkg/cpan/SQL-Statement/trunk/ Message-ID: Revision: 12416 http://gar.svn.sourceforge.net/gar/?rev=12416&view=rev Author: wbonnet Date: 2011-01-09 00:57:10 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/SQL-Statement/trunk/ Property changes on: csw/mgar/pkg/cpan/SQL-Statement/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:57:17 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:57:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[12417] csw/mgar/pkg/cpan/Statistics-Descriptive/trunk/ Message-ID: Revision: 12417 http://gar.svn.sourceforge.net/gar/?rev=12417&view=rev Author: wbonnet Date: 2011-01-09 00:57:17 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Statistics-Descriptive/trunk/ Property changes on: csw/mgar/pkg/cpan/Statistics-Descriptive/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:57:30 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:57:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[12418] csw/mgar/pkg/cpan/String-ShellQuote/trunk/ Message-ID: Revision: 12418 http://gar.svn.sourceforge.net/gar/?rev=12418&view=rev Author: wbonnet Date: 2011-01-09 00:57:29 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/String-ShellQuote/trunk/ Property changes on: csw/mgar/pkg/cpan/String-ShellQuote/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:57:37 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:57:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[12419] csw/mgar/pkg/cpan/Sub-Override/trunk/ Message-ID: Revision: 12419 http://gar.svn.sourceforge.net/gar/?rev=12419&view=rev Author: wbonnet Date: 2011-01-09 00:57:37 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Sub-Override/trunk/ Property changes on: csw/mgar/pkg/cpan/Sub-Override/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:57:45 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:57:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[12420] csw/mgar/pkg/cpan/SVN-Notify/trunk/ Message-ID: Revision: 12420 http://gar.svn.sourceforge.net/gar/?rev=12420&view=rev Author: wbonnet Date: 2011-01-09 00:57:45 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/SVN-Notify/trunk/ Property changes on: csw/mgar/pkg/cpan/SVN-Notify/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:57:52 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:57:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[12421] csw/mgar/pkg/cpan/SVN-Simple/trunk/ Message-ID: Revision: 12421 http://gar.svn.sourceforge.net/gar/?rev=12421&view=rev Author: wbonnet Date: 2011-01-09 00:57:52 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/SVN-Simple/trunk/ Property changes on: csw/mgar/pkg/cpan/SVN-Simple/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:57:59 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:57:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[12422] csw/mgar/pkg/cpan/Syslog/trunk/ Message-ID: Revision: 12422 http://gar.svn.sourceforge.net/gar/?rev=12422&view=rev Author: wbonnet Date: 2011-01-09 00:57:59 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Syslog/trunk/ Property changes on: csw/mgar/pkg/cpan/Syslog/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:58:06 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:58:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[12423] csw/mgar/pkg/cpan/Template-Extract/trunk/ Message-ID: Revision: 12423 http://gar.svn.sourceforge.net/gar/?rev=12423&view=rev Author: wbonnet Date: 2011-01-09 00:58:06 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Template-Extract/trunk/ Property changes on: csw/mgar/pkg/cpan/Template-Extract/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:58:13 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:58:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[12424] csw/mgar/pkg/cpan/Template-TAL/trunk/ Message-ID: Revision: 12424 http://gar.svn.sourceforge.net/gar/?rev=12424&view=rev Author: wbonnet Date: 2011-01-09 00:58:13 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Template-TAL/trunk/ Property changes on: csw/mgar/pkg/cpan/Template-TAL/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:58:21 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:58:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[12425] csw/mgar/pkg/cpan/Template-Toolkit/trunk/ Message-ID: Revision: 12425 http://gar.svn.sourceforge.net/gar/?rev=12425&view=rev Author: wbonnet Date: 2011-01-09 00:58:21 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Template-Toolkit/trunk/ Property changes on: csw/mgar/pkg/cpan/Template-Toolkit/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:58:30 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:58:30 +0000 Subject: [csw-devel] SF.net SVN: gar:[12426] csw/mgar/pkg/cpan/Term-Cap/trunk/ Message-ID: Revision: 12426 http://gar.svn.sourceforge.net/gar/?rev=12426&view=rev Author: wbonnet Date: 2011-01-09 00:58:29 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Term-Cap/trunk/ Property changes on: csw/mgar/pkg/cpan/Term-Cap/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:58:37 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:58:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[12427] csw/mgar/pkg/cpan/TermReadKey/trunk/ Message-ID: Revision: 12427 http://gar.svn.sourceforge.net/gar/?rev=12427&view=rev Author: wbonnet Date: 2011-01-09 00:58:37 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/TermReadKey/trunk/ Property changes on: csw/mgar/pkg/cpan/TermReadKey/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:58:45 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:58:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[12428] csw/mgar/pkg/cpan/Test-Class/trunk/ Message-ID: Revision: 12428 http://gar.svn.sourceforge.net/gar/?rev=12428&view=rev Author: wbonnet Date: 2011-01-09 00:58:45 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Test-Class/trunk/ Property changes on: csw/mgar/pkg/cpan/Test-Class/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:58:53 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:58:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[12429] csw/mgar/pkg/cpan/Test-Differences/trunk/ Message-ID: Revision: 12429 http://gar.svn.sourceforge.net/gar/?rev=12429&view=rev Author: wbonnet Date: 2011-01-09 00:58:52 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Test-Differences/trunk/ Property changes on: csw/mgar/pkg/cpan/Test-Differences/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:59:00 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:59:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[12430] csw/mgar/pkg/cpan/Test-Distribution/trunk/ Message-ID: Revision: 12430 http://gar.svn.sourceforge.net/gar/?rev=12430&view=rev Author: wbonnet Date: 2011-01-09 00:59:00 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Test-Distribution/trunk/ Property changes on: csw/mgar/pkg/cpan/Test-Distribution/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:59:08 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:59:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[12431] csw/mgar/pkg/cpan/Test-Inline/trunk/ Message-ID: Revision: 12431 http://gar.svn.sourceforge.net/gar/?rev=12431&view=rev Author: wbonnet Date: 2011-01-09 00:59:08 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Test-Inline/trunk/ Property changes on: csw/mgar/pkg/cpan/Test-Inline/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:59:15 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:59:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[12432] csw/mgar/pkg/cpan/Test-Manifest/trunk/ Message-ID: Revision: 12432 http://gar.svn.sourceforge.net/gar/?rev=12432&view=rev Author: wbonnet Date: 2011-01-09 00:59:15 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Test-Manifest/trunk/ Property changes on: csw/mgar/pkg/cpan/Test-Manifest/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:59:22 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:59:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[12433] csw/mgar/pkg/cpan/Test-Memory-Cycle/trunk/ Message-ID: Revision: 12433 http://gar.svn.sourceforge.net/gar/?rev=12433&view=rev Author: wbonnet Date: 2011-01-09 00:59:22 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Test-Memory-Cycle/trunk/ Property changes on: csw/mgar/pkg/cpan/Test-Memory-Cycle/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:59:29 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:59:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[12434] csw/mgar/pkg/cpan/Test-MockObject/trunk/ Message-ID: Revision: 12434 http://gar.svn.sourceforge.net/gar/?rev=12434&view=rev Author: wbonnet Date: 2011-01-09 00:59:29 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Test-MockObject/trunk/ Property changes on: csw/mgar/pkg/cpan/Test-MockObject/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:59:37 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:59:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[12435] csw/mgar/pkg/cpan/Test-XML/trunk/ Message-ID: Revision: 12435 http://gar.svn.sourceforge.net/gar/?rev=12435&view=rev Author: wbonnet Date: 2011-01-09 00:59:37 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Test-XML/trunk/ Property changes on: csw/mgar/pkg/cpan/Test-XML/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:59:50 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:59:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[12436] csw/mgar/pkg/cpan/Text-Diff/trunk/ Message-ID: Revision: 12436 http://gar.svn.sourceforge.net/gar/?rev=12436&view=rev Author: wbonnet Date: 2011-01-09 00:59:50 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Text-Diff/trunk/ Property changes on: csw/mgar/pkg/cpan/Text-Diff/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 01:59:58 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 00:59:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[12437] csw/mgar/pkg/cpan/Text-Quoted/trunk/ Message-ID: Revision: 12437 http://gar.svn.sourceforge.net/gar/?rev=12437&view=rev Author: wbonnet Date: 2011-01-09 00:59:57 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Text-Quoted/trunk/ Property changes on: csw/mgar/pkg/cpan/Text-Quoted/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 02:00:05 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 01:00:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[12438] csw/mgar/pkg/cpan/Text-Scraper/trunk/ Message-ID: Revision: 12438 http://gar.svn.sourceforge.net/gar/?rev=12438&view=rev Author: wbonnet Date: 2011-01-09 01:00:05 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Text-Scraper/trunk/ Property changes on: csw/mgar/pkg/cpan/Text-Scraper/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 02:00:13 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 01:00:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[12440] csw/mgar/pkg/cpan/Text-Tabs+Wrap/trunk/ Message-ID: Revision: 12440 http://gar.svn.sourceforge.net/gar/?rev=12440&view=rev Author: wbonnet Date: 2011-01-09 01:00:12 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Text-Tabs+Wrap/trunk/ Property changes on: csw/mgar/pkg/cpan/Text-Tabs+Wrap/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sun Jan 9 02:00:13 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sun, 09 Jan 2011 01:00:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[12439] csw/mgar/pkg/cpan Message-ID: Revision: 12439 http://gar.svn.sourceforge.net/gar/?rev=12439&view=rev Author: bonivart Date: 2011-01-09 01:00:12 +0000 (Sun, 09 Jan 2011) Log Message: ----------- pm_carpassert: initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Carp-Assert/ csw/mgar/pkg/cpan/Carp-Assert/branches/ csw/mgar/pkg/cpan/Carp-Assert/tags/ csw/mgar/pkg/cpan/Carp-Assert/trunk/ csw/mgar/pkg/cpan/Carp-Assert/trunk/Makefile csw/mgar/pkg/cpan/Carp-Assert/trunk/checksums csw/mgar/pkg/cpan/Carp-Assert/trunk/files/ csw/mgar/pkg/cpan/Carp-Assert/trunk/files/COPYING Property changes on: csw/mgar/pkg/cpan/Carp-Assert/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/cpan/Carp-Assert/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Carp-Assert/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Carp-Assert/trunk/Makefile 2011-01-09 01:00:12 UTC (rev 12439) @@ -0,0 +1,17 @@ +NAME = Carp-Assert +VERSION = 0.20 +CATEGORIES = cpan +AUTHOR = MSCHWERN + +DESCRIPTION = Executable comments +define BLURB + Executable comments +endef + +DISTFILES += COPYING + +PACKAGES = CSWpmcarpassert +CATALOGNAME = pm_carpassert +ARCHALL = 1 + +include gar/category.mk Added: csw/mgar/pkg/cpan/Carp-Assert/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Carp-Assert/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Carp-Assert/trunk/checksums 2011-01-09 01:00:12 UTC (rev 12439) @@ -0,0 +1 @@ +9dafe361b9e5e93e8e3e70e015f6b191 Carp-Assert-0.20.tar.gz Added: csw/mgar/pkg/cpan/Carp-Assert/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/Carp-Assert/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/Carp-Assert/trunk/files/COPYING 2011-01-09 01:00:12 UTC (rev 12439) @@ -0,0 +1,6 @@ +Copyright 2001-2007 by Michael G Schwern . + +This program is free software; you can redistribute it and/or +modify it under the same terms as Perl itself. + +See http://dev.perl.org/licenses/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 02:00:25 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 01:00:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[12441] csw/mgar/pkg/cpan/Tie-DBI/trunk/ Message-ID: Revision: 12441 http://gar.svn.sourceforge.net/gar/?rev=12441&view=rev Author: wbonnet Date: 2011-01-09 01:00:25 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Tie-DBI/trunk/ Property changes on: csw/mgar/pkg/cpan/Tie-DBI/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 02:00:33 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 01:00:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[12442] csw/mgar/pkg/cpan/Tie-EncryptedHash/trunk/ Message-ID: Revision: 12442 http://gar.svn.sourceforge.net/gar/?rev=12442&view=rev Author: wbonnet Date: 2011-01-09 01:00:32 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Tie-EncryptedHash/trunk/ Property changes on: csw/mgar/pkg/cpan/Tie-EncryptedHash/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 02:00:41 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 01:00:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[12443] csw/mgar/pkg/cpan/Tie-MLDBM/trunk/ Message-ID: Revision: 12443 http://gar.svn.sourceforge.net/gar/?rev=12443&view=rev Author: wbonnet Date: 2011-01-09 01:00:41 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Tie-MLDBM/trunk/ Property changes on: csw/mgar/pkg/cpan/Tie-MLDBM/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 02:00:49 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 01:00:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[12444] csw/mgar/pkg/cpan/Time-HiRes/trunk/ Message-ID: Revision: 12444 http://gar.svn.sourceforge.net/gar/?rev=12444&view=rev Author: wbonnet Date: 2011-01-09 01:00:49 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Time-HiRes/trunk/ Property changes on: csw/mgar/pkg/cpan/Time-HiRes/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 02:00:58 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 01:00:58 +0000 Subject: [csw-devel] SF.net SVN: gar:[12445] csw/mgar/pkg/cpan/Tree-Simple/trunk/ Message-ID: Revision: 12445 http://gar.svn.sourceforge.net/gar/?rev=12445&view=rev Author: wbonnet Date: 2011-01-09 01:00:58 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Tree-Simple/trunk/ Property changes on: csw/mgar/pkg/cpan/Tree-Simple/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 02:01:07 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 01:01:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[12446] csw/mgar/pkg/cpan/Unicode-Map8/trunk/ Message-ID: Revision: 12446 http://gar.svn.sourceforge.net/gar/?rev=12446&view=rev Author: wbonnet Date: 2011-01-09 01:01:06 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Unicode-Map8/trunk/ Property changes on: csw/mgar/pkg/cpan/Unicode-Map8/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 02:01:14 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 01:01:14 +0000 Subject: [csw-devel] SF.net SVN: gar:[12447] csw/mgar/pkg/cpan/Unicode-MapUTF8/trunk/ Message-ID: Revision: 12447 http://gar.svn.sourceforge.net/gar/?rev=12447&view=rev Author: wbonnet Date: 2011-01-09 01:01:14 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Unicode-MapUTF8/trunk/ Property changes on: csw/mgar/pkg/cpan/Unicode-MapUTF8/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 02:01:22 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 01:01:22 +0000 Subject: [csw-devel] SF.net SVN: gar:[12448] csw/mgar/pkg/cpan/UNIVERSAL-moniker/trunk/ Message-ID: Revision: 12448 http://gar.svn.sourceforge.net/gar/?rev=12448&view=rev Author: wbonnet Date: 2011-01-09 01:01:22 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/UNIVERSAL-moniker/trunk/ Property changes on: csw/mgar/pkg/cpan/UNIVERSAL-moniker/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 02:01:29 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 01:01:29 +0000 Subject: [csw-devel] SF.net SVN: gar:[12449] csw/mgar/pkg/cpan/UNIVERSAL-require/trunk/ Message-ID: Revision: 12449 http://gar.svn.sourceforge.net/gar/?rev=12449&view=rev Author: wbonnet Date: 2011-01-09 01:01:29 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/UNIVERSAL-require/trunk/ Property changes on: csw/mgar/pkg/cpan/UNIVERSAL-require/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 02:01:37 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 01:01:37 +0000 Subject: [csw-devel] SF.net SVN: gar:[12450] csw/mgar/pkg/cpan/VCP/trunk/ Message-ID: Revision: 12450 http://gar.svn.sourceforge.net/gar/?rev=12450&view=rev Author: wbonnet Date: 2011-01-09 01:01:36 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/VCP/trunk/ Property changes on: csw/mgar/pkg/cpan/VCP/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 02:01:44 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 01:01:44 +0000 Subject: [csw-devel] SF.net SVN: gar:[12451] csw/mgar/pkg/cpan/VCP-Dest-svk/trunk/ Message-ID: Revision: 12451 http://gar.svn.sourceforge.net/gar/?rev=12451&view=rev Author: wbonnet Date: 2011-01-09 01:01:43 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/VCP-Dest-svk/trunk/ Property changes on: csw/mgar/pkg/cpan/VCP-Dest-svk/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 02:01:51 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 01:01:51 +0000 Subject: [csw-devel] SF.net SVN: gar:[12452] csw/mgar/pkg/cpan/Want/trunk/ Message-ID: Revision: 12452 http://gar.svn.sourceforge.net/gar/?rev=12452&view=rev Author: wbonnet Date: 2011-01-09 01:01:51 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/Want/trunk/ Property changes on: csw/mgar/pkg/cpan/Want/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 02:02:06 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 01:02:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[12453] csw/mgar/pkg/cpan/X11-Protocol/trunk/ Message-ID: Revision: 12453 http://gar.svn.sourceforge.net/gar/?rev=12453&view=rev Author: wbonnet Date: 2011-01-09 01:02:06 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/X11-Protocol/trunk/ Property changes on: csw/mgar/pkg/cpan/X11-Protocol/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 02:02:13 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 01:02:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[12454] csw/mgar/pkg/cpan/XML-Atom/trunk/ Message-ID: Revision: 12454 http://gar.svn.sourceforge.net/gar/?rev=12454&view=rev Author: wbonnet Date: 2011-01-09 01:02:13 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/XML-Atom/trunk/ Property changes on: csw/mgar/pkg/cpan/XML-Atom/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 02:02:20 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 01:02:20 +0000 Subject: [csw-devel] SF.net SVN: gar:[12455] csw/mgar/pkg/cpan/XML-AutoWriter/trunk/ Message-ID: Revision: 12455 http://gar.svn.sourceforge.net/gar/?rev=12455&view=rev Author: wbonnet Date: 2011-01-09 01:02:20 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/XML-AutoWriter/trunk/ Property changes on: csw/mgar/pkg/cpan/XML-AutoWriter/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 02:02:28 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 01:02:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[12456] csw/mgar/pkg/cpan/XML-DOM/trunk/ Message-ID: Revision: 12456 http://gar.svn.sourceforge.net/gar/?rev=12456&view=rev Author: wbonnet Date: 2011-01-09 01:02:27 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/XML-DOM/trunk/ Property changes on: csw/mgar/pkg/cpan/XML-DOM/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 02:02:35 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 01:02:35 +0000 Subject: [csw-devel] SF.net SVN: gar:[12457] csw/mgar/pkg/cpan/XML-Encoding/trunk/ Message-ID: Revision: 12457 http://gar.svn.sourceforge.net/gar/?rev=12457&view=rev Author: wbonnet Date: 2011-01-09 01:02:35 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/XML-Encoding/trunk/ Property changes on: csw/mgar/pkg/cpan/XML-Encoding/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 02:02:42 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 01:02:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[12458] csw/mgar/pkg/cpan/XML-GDOME/trunk/ Message-ID: Revision: 12458 http://gar.svn.sourceforge.net/gar/?rev=12458&view=rev Author: wbonnet Date: 2011-01-09 01:02:42 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/XML-GDOME/trunk/ Property changes on: csw/mgar/pkg/cpan/XML-GDOME/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 02:02:50 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 01:02:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[12459] csw/mgar/pkg/cpan/XML-GDOME-XSLT/trunk/ Message-ID: Revision: 12459 http://gar.svn.sourceforge.net/gar/?rev=12459&view=rev Author: wbonnet Date: 2011-01-09 01:02:49 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/XML-GDOME-XSLT/trunk/ Property changes on: csw/mgar/pkg/cpan/XML-GDOME-XSLT/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 02:02:56 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 01:02:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[12460] csw/mgar/pkg/cpan/XML-LibXML/trunk/ Message-ID: Revision: 12460 http://gar.svn.sourceforge.net/gar/?rev=12460&view=rev Author: wbonnet Date: 2011-01-09 01:02:56 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/XML-LibXML/trunk/ Property changes on: csw/mgar/pkg/cpan/XML-LibXML/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 02:03:03 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 01:03:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[12461] csw/mgar/pkg/cpan/XML-LibXML-Common/trunk/ Message-ID: Revision: 12461 http://gar.svn.sourceforge.net/gar/?rev=12461&view=rev Author: wbonnet Date: 2011-01-09 01:03:03 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/XML-LibXML-Common/trunk/ Property changes on: csw/mgar/pkg/cpan/XML-LibXML-Common/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 02:03:11 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 01:03:11 +0000 Subject: [csw-devel] SF.net SVN: gar:[12462] csw/mgar/pkg/cpan/XML-RegExp/trunk/ Message-ID: Revision: 12462 http://gar.svn.sourceforge.net/gar/?rev=12462&view=rev Author: wbonnet Date: 2011-01-09 01:03:11 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/XML-RegExp/trunk/ Property changes on: csw/mgar/pkg/cpan/XML-RegExp/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 02:03:19 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 01:03:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[12463] csw/mgar/pkg/cpan/XML-Smart/trunk/ Message-ID: Revision: 12463 http://gar.svn.sourceforge.net/gar/?rev=12463&view=rev Author: wbonnet Date: 2011-01-09 01:03:18 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Switch to GAR v2 Property Changed: ---------------- csw/mgar/pkg/cpan/XML-Smart/trunk/ Property changes on: csw/mgar/pkg/cpan/XML-Smart/trunk ___________________________________________________________________ Modified: svn:externals - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1 + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sun Jan 9 02:08:03 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sun, 09 Jan 2011 01:08:03 +0000 Subject: [csw-devel] SF.net SVN: gar:[12464] csw/mgar/pkg/cpan Message-ID: Revision: 12464 http://gar.svn.sourceforge.net/gar/?rev=12464&view=rev Author: bonivart Date: 2011-01-09 01:08:03 +0000 (Sun, 09 Jan 2011) Log Message: ----------- pm_carpassertmore: initial commit Added Paths: ----------- csw/mgar/pkg/cpan/Carp-Assert-More/ csw/mgar/pkg/cpan/Carp-Assert-More/branches/ csw/mgar/pkg/cpan/Carp-Assert-More/tags/ csw/mgar/pkg/cpan/Carp-Assert-More/trunk/ csw/mgar/pkg/cpan/Carp-Assert-More/trunk/Makefile csw/mgar/pkg/cpan/Carp-Assert-More/trunk/checksums csw/mgar/pkg/cpan/Carp-Assert-More/trunk/files/ csw/mgar/pkg/cpan/Carp-Assert-More/trunk/files/COPYING Property changes on: csw/mgar/pkg/cpan/Carp-Assert-More/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/cpan/Carp-Assert-More/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Carp-Assert-More/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Carp-Assert-More/trunk/Makefile 2011-01-09 01:08:03 UTC (rev 12464) @@ -0,0 +1,17 @@ +NAME = Carp-Assert-More +VERSION = 1.12 +CATEGORIES = cpan +AUTHOR = PETDANCE + +DESCRIPTION = Convenience wrappers around Carp::Assert +define BLURB + Convenience wrappers around Carp::Assert +endef + +DISTFILES += COPYING + +PACKAGES = CSWpmcarpassertmore +CATALOGNAME = pm_carpassertmore +ARCHALL = 1 + +include gar/category.mk Added: csw/mgar/pkg/cpan/Carp-Assert-More/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Carp-Assert-More/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Carp-Assert-More/trunk/checksums 2011-01-09 01:08:03 UTC (rev 12464) @@ -0,0 +1 @@ +dbd6a0fcbff5f00d2e39b77322036d3f Carp-Assert-More-1.12.tar.gz Added: csw/mgar/pkg/cpan/Carp-Assert-More/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/Carp-Assert-More/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/Carp-Assert-More/trunk/files/COPYING 2011-01-09 01:08:03 UTC (rev 12464) @@ -0,0 +1,3 @@ +Copyright (c) 2005 Andy Lester. All rights reserved. This program is +free software; you can redistribute it and/or modify it under the same +terms as Perl itself. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Sun Jan 9 02:59:15 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sun, 09 Jan 2011 01:59:15 +0000 Subject: [csw-devel] SF.net SVN: gar:[12465] csw/mgar/pkg/cpan Message-ID: Revision: 12465 http://gar.svn.sourceforge.net/gar/?rev=12465&view=rev Author: bonivart Date: 2011-01-09 01:59:15 +0000 (Sun, 09 Jan 2011) Log Message: ----------- pm_testwwwmech: update to 1.30 Added Paths: ----------- csw/mgar/pkg/cpan/Test-WWW-Mechanize/ csw/mgar/pkg/cpan/Test-WWW-Mechanize/branches/ csw/mgar/pkg/cpan/Test-WWW-Mechanize/tags/ csw/mgar/pkg/cpan/Test-WWW-Mechanize/trunk/ csw/mgar/pkg/cpan/Test-WWW-Mechanize/trunk/Makefile csw/mgar/pkg/cpan/Test-WWW-Mechanize/trunk/checksums csw/mgar/pkg/cpan/Test-WWW-Mechanize/trunk/files/ csw/mgar/pkg/cpan/Test-WWW-Mechanize/trunk/files/COPYING Property changes on: csw/mgar/pkg/cpan/Test-WWW-Mechanize/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/cpan/Test-WWW-Mechanize/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Test-WWW-Mechanize/trunk/Makefile (rev 0) +++ csw/mgar/pkg/cpan/Test-WWW-Mechanize/trunk/Makefile 2011-01-09 01:59:15 UTC (rev 12465) @@ -0,0 +1,26 @@ +NAME = Test-WWW-Mechanize +VERSION = 1.30 +CATEGORIES = cpan +AUTHOR = PETDANCE + +DESCRIPTION = Testing-specific WWW::Mechanize subclass +define BLURB + Testing-specific WWW::Mechanize subclass +endef + +DISTFILES += COPYING + +PACKAGES = CSWpmtestwwwmech +CATALOGNAME = pm_testwwwmech +ARCHALL = 1 + +SKIPTEST = 1 + +RUNTIME_DEP_PKGS += CSWpmtestlongstring +RUNTIME_DEP_PKGS += CSWpmwwwmechanize +RUNTIME_DEP_PKGS += CSWpmhtmltree +RUNTIME_DEP_PKGS += CSWpmcarpassertmore + +CHECKPKG_OVERRIDES_CSWpmtestwwwmech += unidentified-dependency + +include gar/category.mk Added: csw/mgar/pkg/cpan/Test-WWW-Mechanize/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/Test-WWW-Mechanize/trunk/checksums (rev 0) +++ csw/mgar/pkg/cpan/Test-WWW-Mechanize/trunk/checksums 2011-01-09 01:59:15 UTC (rev 12465) @@ -0,0 +1 @@ +a0d70d501e26e398f47bf0b3a5be0483 Test-WWW-Mechanize-1.30.tar.gz Added: csw/mgar/pkg/cpan/Test-WWW-Mechanize/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/cpan/Test-WWW-Mechanize/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/cpan/Test-WWW-Mechanize/trunk/files/COPYING 2011-01-09 01:59:15 UTC (rev 12465) @@ -0,0 +1,4 @@ +Copyright (C) 2004 Andy Lester + +This library is free software; you can redistribute it and/or modify +it under the same terms as Perl itself. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Sun Jan 9 07:57:18 2011 From: maciej at opencsw.org (maciej at opencsw.org) Date: Sun, 9 Jan 2011 07:57:18 +0100 Subject: [csw-devel] [PATCH] mGAR v2: A bugfix for EXPANDVARS Message-ID: <1294556238-8779-1-git-send-email-maciej@opencsw.org> From: Maciej Blizinski The 'g' parameter was missing, and only one instance of a variable was expanded per line. This patch adds 'g' to the perl invocation which expands variables. --- gar/v2/gar.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/gar/v2/gar.mk b/gar/v2/gar.mk index 4a3eee4..02b14f1 100644 --- a/gar/v2/gar.mk +++ b/gar/v2/gar.mk @@ -444,7 +444,7 @@ extract-p: _var_definitions = $(foreach VAR,$(shell perl -ne 'print "$$1 " if( /@([^@]+)@/ )' <$1),$(VAR)=$($(VAR))) expandvars-%: - $(call _var_definitions,$(WORKDIR)/$*) perl -i-unexpanded -npe 's/@([^@]+)@/$$ENV{$$1}/e' $(WORKDIR)/$* + $(call _var_definitions,$(WORKDIR)/$*) perl -i-unexpanded -npe 's/@([^@]+)@/$$ENV{$$1}/eg' $(WORKDIR)/$* @$(MAKECOOKIE) -- 1.7.1 From bonivart at users.sourceforge.net Sun Jan 9 09:53:10 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Sun, 09 Jan 2011 08:53:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[12466] csw/mgar/pkg/cpan/Font-AFM/trunk Message-ID: Revision: 12466 http://gar.svn.sourceforge.net/gar/?rev=12466&view=rev Author: bonivart Date: 2011-01-09 08:53:10 +0000 (Sun, 09 Jan 2011) Log Message: ----------- pm_fontafm: add patch for font paths Modified Paths: -------------- csw/mgar/pkg/cpan/Font-AFM/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/cpan/Font-AFM/trunk/files/0001-add-csw-font-paths.patch Modified: csw/mgar/pkg/cpan/Font-AFM/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Font-AFM/trunk/Makefile 2011-01-09 01:59:15 UTC (rev 12465) +++ csw/mgar/pkg/cpan/Font-AFM/trunk/Makefile 2011-01-09 08:53:10 UTC (rev 12466) @@ -16,4 +16,6 @@ CATALOGNAME = pm_fontafm ARCHALL = 1 +PATCHFILES += 0001-add-csw-font-paths.patch + include gar/category.mk Added: csw/mgar/pkg/cpan/Font-AFM/trunk/files/0001-add-csw-font-paths.patch =================================================================== --- csw/mgar/pkg/cpan/Font-AFM/trunk/files/0001-add-csw-font-paths.patch (rev 0) +++ csw/mgar/pkg/cpan/Font-AFM/trunk/files/0001-add-csw-font-paths.patch 2011-01-09 08:53:10 UTC (rev 12466) @@ -0,0 +1,34 @@ +From e266ae3c231f3387b850c95113fe3c431fe75eec Mon Sep 17 00:00:00 2001 +From: Peter Bonivart +Date: Sun, 9 Jan 2011 09:48:51 +0100 +Subject: [PATCH] add-csw-font-paths + +--- + AFM.pm | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/AFM.pm b/AFM.pm +index 9cb223d..7a8d496 100644 +--- a/AFM.pm ++++ b/AFM.pm +@@ -160,7 +160,7 @@ The AFM specification can be found at: + Contains the path to search for AFM-files. Format is as for the PATH + environment variable. The default path built into this library is: + +- /usr/lib/afm:/usr/local/lib/afm:/usr/openwin/lib/fonts/afm/:. ++ /opt/csw/share/ghostscript/fonts:/opt/csw/share/libwmf/fonts:/usr/local/lib/afm:/usr/openwin/lib/fonts/afm/:. + + =back + +@@ -192,7 +192,7 @@ $VERSION = "1.20"; + # The metrics_path is used to locate metrics files + # + my $metrics_path = $ENV{METRICS} || +- "/usr/lib/afm:/usr/local/lib/afm:/usr/openwin/lib/fonts/afm/:."; ++ "/opt/csw/share/ghostscript/fonts:/opt/csw/share/libwmf/fonts:/usr/local/lib/afm:/usr/openwin/lib/fonts/afm/:."; + my @metrics_path = split(/:/, $metrics_path); + foreach (@metrics_path) { s,/$,, } # reove trailing slashes + +-- +1.7.3.2 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Jan 9 11:38:00 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 09 Jan 2011 10:38:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[12467] csw/mgar/pkg/cswutils/trunk Message-ID: Revision: 12467 http://gar.svn.sourceforge.net/gar/?rev=12467&view=rev Author: wahwah Date: 2011-01-09 10:37:59 +0000 (Sun, 09 Jan 2011) Log Message: ----------- cswutils: Newer submitpkg, bump up to 1.16 Many Python libraries have been split out, so we're including all of them. Modified Paths: -------------- csw/mgar/pkg/cswutils/trunk/Makefile csw/mgar/pkg/cswutils/trunk/checksums Modified: csw/mgar/pkg/cswutils/trunk/Makefile =================================================================== --- csw/mgar/pkg/cswutils/trunk/Makefile 2011-01-09 08:53:10 UTC (rev 12466) +++ csw/mgar/pkg/cswutils/trunk/Makefile 2011-01-09 10:37:59 UTC (rev 12467) @@ -1,7 +1,7 @@ # $Id$ NAME = cswutils -VERSION = 1.15 +VERSION = 1.16 CATEGORIES = utils DESCRIPTION = Utilities for CSW maintainers @@ -15,11 +15,35 @@ SVN_REV_gar = HEAD MASTER_SITES = -SVN_FILES = compare_pkgs.py # these are pulled from gar/lib/python -PYFILES = opencsw.py checkpkg.py submit_to_newpkgs.py package_checks.py -PYFILES += dependency_checks.py overrides.py configuration.py tag.py +PYFILES += catalog.py +PYFILES += checkpkg.py +PYFILES += checkpkg2.py +PYFILES += checkpkg_lib.py +PYFILES += common_constants.py +PYFILES += compare_pkgs.py +PYFILES += configuration.py +PYFILES += database.py +PYFILES += dependency_checks.py +PYFILES += inspective_package.py +PYFILES += ldd_emul.py +PYFILES += models.py +PYFILES += mute_progressbar.py +PYFILES += opencsw.py +PYFILES += overrides.py +PYFILES += package.py +PYFILES += package_checks.py +PYFILES += package_stats.py +PYFILES += pkgdb.py +PYFILES += pkgmap.py +PYFILES += pylintrc +PYFILES += sharedlib_utils.py +PYFILES += shell.py +PYFILES += struct_util.py +PYFILES += submit_to_newpkgs.py +PYFILES += system_pkgmap.py +PYFILES += tag.py DISTFILES = COPYING DISTFILES += checkpkg checkpkg.8 @@ -27,7 +51,6 @@ DISTFILES += createpkg createpkg.8 DISTFILES += stagepkg stagepkg.8 DISTFILES += stagepkg stagepkg.8 -DISTFILES += $(foreach F,$(SVN_FILES),$(F)-r$(SVN_REV)) DISTFILES += $(PYFILES) RUNTIME_DEP_PKGS += CSWcoreutils @@ -36,8 +59,9 @@ RUNTIME_DEP_PKGS += CSWpmhtmltree RUNTIME_DEP_PKGS += CSWpmlibwww RUNTIME_DEP_PKGS += CSWpmyaml +RUNTIME_DEP_PKGS += CSWpy-hachoir-parser RUNTIME_DEP_PKGS += CSWpy-libmagic -RUNTIME_DEP_PKGS += CSWpy-hachoir-parser +RUNTIME_DEP_PKGS += CSWpy-progressbar RUNTIME_DEP_PKGS += CSWpython WORKSRC = $(WORKDIR) @@ -57,12 +81,6 @@ include gar/category.mk -# This target doesn't work when defined as $(DOWNLOADDIR)/%-r$(SVN_REV) -$(foreach F,$(SVN_FILES),$(DOWNLOADDIR)/$(F)-r$(SVN_REV)): - svn export -r $(SVN_REV) $(SVNROOT)$(subst -r$(SVN_REV),,$(notdir $@)) - mv $(subst -r$(SVN_REV),,$(notdir $@)) $@ - @$(MAKECOOKIE) - $(foreach PY,$(PYFILES),$(DOWNLOADDIR)/$(PY)): @echo "Grabbing $@" @svn export -r $(SVN_REV_gar) $(SVNROOT_gar)$(subst -r$(SVN_REV_gar),,$(notdir $@)) @@ -85,10 +103,6 @@ ginstall -m 755 $(WORKSRC)/$${f} \ $(DESTDIR)/$(libdir)/python/csw/; \ done - @for f in $(SVN_FILES); do \ - ginstall -m 755 $(WORKSRC)/$${f}-r$(SVN_REV) \ - $(DESTDIR)$(libdir)/python/csw/$${f}; \ - done @ln -s ../lib/python/csw/compare_pkgs.py $(DESTDIR)$(bindir)/comparepkg @ln -s ../lib/python/csw/submit_to_newpkgs.py $(DESTDIR)$(bindir)/submitpkg @$(MAKECOOKIE) Modified: csw/mgar/pkg/cswutils/trunk/checksums =================================================================== --- csw/mgar/pkg/cswutils/trunk/checksums 2011-01-09 08:53:10 UTC (rev 12466) +++ csw/mgar/pkg/cswutils/trunk/checksums 2011-01-09 10:37:59 UTC (rev 12467) @@ -1,17 +1,27 @@ -091b12575ebc0e45cf8c3d8b43d8b638 COPYING -ab8a00cad3c3650318a3e552505e2715 checkpkg -6ec3b6597e04714430987ccc199db3c4 checkpkg.8 -519e70aa36b68d6756636ab2b250455f checkpkg.py -2b5e6e6219b9ad9e48bcd119bd8a5f39 compare_pkgs.py-r133 -3b39b38198465ada00a5e609ddb93fca configuration.py -9a637f6546cc50974159a987302d91c0 cpan2pkg -68c82dcd6955c4031e89bb9c9a1a9988 createpkg -a605598f30195f9ab1b29fc3944d3b31 createpkg.8 -e53cce5b895258fd59001305c3b5c366 dependency_checks.py -d3742659a5968bf235ac4255188d1071 opencsw.py -1d7f8e43d72679f690307e083b9096d9 overrides.py -2666005c078d31371eaca2c12d0d9c60 package_checks.py -cd4496ee27bf86d5c8bc656c9c5974be stagepkg -8908a0a898aa07a7a928b2b8bd8384f0 stagepkg.8 -a9da7bd75daa9e8bce5dfa6c1d4e534d submit_to_newpkgs.py -46d9b1dcc02cad223ec3323014f2fa54 tag.py +4b5ef28c5a8fb45f60d57d5a12bc31b5 catalog.py +03eab3c2fda6212d2468ae2f6bc34bf8 checkpkg.py +03c7384869e75284b0df6803df62b68f checkpkg2.py +7f38545df383993488d959bf05842e87 checkpkg_lib.py +b7ed7604e92d375b421f69a17fbf27cd common_constants.py +70200cc5eb2c87a1b1aaf6efa6ffd2bc compare_pkgs.py +f4789eb3717cd52ea84eb5ce53040643 configuration.py +10b999d9f9b2c5e380edba9ab2302188 database.py +d6fe04aa4349dfd980d053ce7b2210eb dependency_checks.py +7bfe4469e93caa02064ae63d65435cf9 inspective_package.py +ae8f0f606838bbc14670e145bcc7442d ldd_emul.py +1f7e98eb1b2166f89992f67d0a92f183 models.py +5ab798ae3fe3a2e10c1d2aa9e4a31594 mute_progressbar.py +283779d73a88aca3d3fa203b38d4c0d8 opencsw.py +614dca976de7a563a587e6fd5b585629 overrides.py +fa476d0cec5adbac1091192a6aefe8b3 package.py +4744c45a736d2d19eb4c4da6b945fce3 package_checks.py +f9bde429846be3d98f9e4af11a36672e package_stats.py +ad38d99678db4d758e3e7a9265adcfdf pkgdb.py +fa5c633db8dbd1da61d12e4a858720c4 pkgmap.py +0dc3c750ee9f5c0286c2e292b2e27086 pylintrc +519169afa0be666d05cbfa94fce1a205 sharedlib_utils.py +000b4eacb602a91e02dcdcfc0858c42c shell.py +de09f38d0c145c572a4e44ab17bb02ef struct_util.py +2fb7af0c40fa5da3ee034014ae5b9855 submit_to_newpkgs.py +64d86b86a7d5a65d6685aa60aa0d5aec system_pkgmap.py +60a9a1281f9ab455c5fa90c084f05d64 tag.py This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Sun Jan 9 12:13:13 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 09 Jan 2011 11:13:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[12468] csw/mgar/pkg/subversion/trunk/Makefile Message-ID: Revision: 12468 http://gar.svn.sourceforge.net/gar/?rev=12468&view=rev Author: rthurner Date: 2011-01-09 11:13:13 +0000 (Sun, 09 Jan 2011) Log Message: ----------- subversion: patching contributions Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2011-01-09 10:37:59 UTC (rev 12467) +++ csw/mgar/pkg/subversion/trunk/Makefile 2011-01-09 11:13:13 UTC (rev 12468) @@ -267,6 +267,11 @@ else \ perl -i -pe 's,-xarch=386,-march=i386,' $(WORKSRC)/*.gcc; \ fi ) + @echo "~~~ patching contributions with csw paths ~~~" + gsed -i -e 's,/usr/bin/perl,/opt/csw/bin/perl,' $(WORKSRC)/contrib/*/*.pl + gsed -i -e 's,/usr/bin/svnlook,/opt/csw/bin/svnlook,' $(WORKSRC)/contrib/*/* + gsed -i -e 's,/usr/bin/perl,/opt/csw/bin/perl,' $(WORKSRC)/contrib/*/*.cgi + gsed -i -e 's,/usr/bin/,/opt/csw/bin/,' $(WORKSRC)/contrib/*/svnmirror.sh @$(MAKECOOKIE) copy-apache-templates: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Jan 9 12:28:07 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 09 Jan 2011 11:28:07 +0000 Subject: [csw-devel] SF.net SVN: gar:[12469] csw/mgar/pkg/flex_new/trunk/Makefile Message-ID: Revision: 12469 http://gar.svn.sourceforge.net/gar/?rev=12469&view=rev Author: wahwah Date: 2011-01-09 11:28:07 +0000 (Sun, 09 Jan 2011) Log Message: ----------- flex-new: Removed an unnecessary dependency, removed .a files Modified Paths: -------------- csw/mgar/pkg/flex_new/trunk/Makefile Property Changed: ---------------- csw/mgar/pkg/flex_new/trunk/Makefile Modified: csw/mgar/pkg/flex_new/trunk/Makefile =================================================================== --- csw/mgar/pkg/flex_new/trunk/Makefile 2011-01-09 11:13:13 UTC (rev 12468) +++ csw/mgar/pkg/flex_new/trunk/Makefile 2011-01-09 11:28:07 UTC (rev 12469) @@ -1,3 +1,5 @@ +# $Id$ + NAME = flex VERSION = 2.5.35 CATEGORIES = devel @@ -21,13 +23,15 @@ PACKAGES = CSWflex-new CATALOGNAME = flex_new -RUNTIME_DEP_PKGS = CSWggettextrt CSWiconv +RUNTIME_DEP_PKGS = CSWggettextrt NOISALIST = 1 CONFIGURE_ARGS = --prefix=$(libexecdir)/$(NAME)-$(VERSION) TEST_TARGET = check +EXTRA_MERGE_EXCLUDE_FILES = $(prefix)/.*\.a + include gar/category.mk # Must use GNU diff for option '-q' or two tests fail due to bailing out Sun diff Property changes on: csw/mgar/pkg/flex_new/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Sun Jan 9 13:06:52 2011 From: maciej at opencsw.org (Maciej (Matchek) Blizinski) Date: Sun, 9 Jan 2011 12:06:52 +0000 Subject: [csw-devel] SF.net SVN: gar:[12261] csw/mgar/gar/v2/gar.pkg.mk In-Reply-To: <1294506543-sup-1757@pinkfloyd.chass.utoronto.ca> References: <1294506543-sup-1757@pinkfloyd.chass.utoronto.ca> Message-ID: [+phil] I remember Phil mentioning he doesn't read the devel mailing list. Adding him to Cc. No dia 8 de Janeiro de 2011 17:10, Ben Walton escreveu: > Excerpts from theferret's message of Sat Jan 08 11:01:56 -0500 2011: > > Hi Phil, > >> gar.pkg.mk: attempt to blindly add CPTEMPLATES support >> (cswcptemplates CAS) > > Don't do things to GAR 'blindly.' ?If it doesn't work, you affect all > GAR users. ?While I'm not willing to do all the work for you on this > issue, I'm certainly willing to provide guidance on doing it > correctly. ?I'm sure Dago and others that have worked with GAR would > also lend support. > > Thanks > -Ben > -- > Ben Walton > Systems Programmer - CHASS > University of Toronto > C:416.407.5610 | W:416.978.4302 > > _______________________________________________ > devel mailing list > devel at lists.opencsw.org > https://lists.opencsw.org/mailman/listinfo/devel > From rthurner at users.sourceforge.net Sun Jan 9 14:31:26 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Sun, 09 Jan 2011 13:31:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[12470] csw/mgar/pkg/subversion/trunk/Makefile Message-ID: Revision: 12470 http://gar.svn.sourceforge.net/gar/?rev=12470&view=rev Author: rthurner Date: 2011-01-09 13:31:26 +0000 (Sun, 09 Jan 2011) Log Message: ----------- subversion: patching bin files is not build related but install Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2011-01-09 11:28:07 UTC (rev 12469) +++ csw/mgar/pkg/subversion/trunk/Makefile 2011-01-09 13:31:26 UTC (rev 12470) @@ -267,11 +267,6 @@ else \ perl -i -pe 's,-xarch=386,-march=i386,' $(WORKSRC)/*.gcc; \ fi ) - @echo "~~~ patching contributions with csw paths ~~~" - gsed -i -e 's,/usr/bin/perl,/opt/csw/bin/perl,' $(WORKSRC)/contrib/*/*.pl - gsed -i -e 's,/usr/bin/svnlook,/opt/csw/bin/svnlook,' $(WORKSRC)/contrib/*/* - gsed -i -e 's,/usr/bin/perl,/opt/csw/bin/perl,' $(WORKSRC)/contrib/*/*.cgi - gsed -i -e 's,/usr/bin/,/opt/csw/bin/,' $(WORKSRC)/contrib/*/svnmirror.sh @$(MAKECOOKIE) copy-apache-templates: @@ -293,6 +288,12 @@ @$(MAKECOOKIE) install-extras: + @echo "~~~ patching contributions with csw paths ~~~" + gsed -i -e 's,/usr/bin/perl,/opt/csw/bin/perl,' $(WORKSRC)/contrib/*/*.pl + gsed -i -e 's,/usr/bin/svnlook,/opt/csw/bin/svnlook,' $(WORKSRC)/contrib/*/* + gsed -i -e 's,/usr/bin/perl,/opt/csw/bin/perl,' $(WORKSRC)/contrib/*/*.cgi + gsed -i -e 's,/usr/bin/,/opt/csw/bin/,' $(WORKSRC)/contrib/*/svnmirror.sh + @echo "~~~ install tools and contrib ~~~" ginstall -d $(DESTDIR)$(docdir)/subversion/tools ginstall -d $(DESTDIR)$(docdir)/subversion/contrib gcp -R $(WORKSRC)/tools/* $(DESTDIR)$(docdir)/subversion/tools/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From theferret at users.sourceforge.net Sun Jan 9 17:08:50 2011 From: theferret at users.sourceforge.net (theferret at users.sourceforge.net) Date: Sun, 09 Jan 2011 16:08:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[12471] csw/mgar/pkg/cswutils/trunk/files/checkpkg Message-ID: Revision: 12471 http://gar.svn.sourceforge.net/gar/?rev=12471&view=rev Author: theferret Date: 2011-01-09 16:08:50 +0000 (Sun, 09 Jan 2011) Log Message: ----------- cswutils:checkpkg - misc updates Modified Paths: -------------- csw/mgar/pkg/cswutils/trunk/files/checkpkg Modified: csw/mgar/pkg/cswutils/trunk/files/checkpkg =================================================================== --- csw/mgar/pkg/cswutils/trunk/files/checkpkg 2011-01-09 13:31:26 UTC (rev 12470) +++ csw/mgar/pkg/cswutils/trunk/files/checkpkg 2011-01-09 16:08:50 UTC (rev 12471) @@ -14,10 +14,15 @@ # you know you are tracking the most current version. # +# Make this prog flexible to be usable by other organizations with non"CSW" +# prefixes +PKGPREF=CSW -PATH=/opt/csw/bin:$PATH:/usr/sbin -# this is actually a base for tmpfiles, not the full name +PATH=$PATH:/usr/sbin + +# This is actually a base for tmpfiles, not the full name +# Most things go into EXTRACTDIR, lower down TMPDIR=${TMPDIR:-/tmp} LOCAL_ARCH=`uname -p` @@ -36,21 +41,119 @@ fi } -warnmsg(){ - print WARNING: $* >/dev/fd/2 - if [[ "$quit_on_warn" != "" ]] ; then - cleanup - exit 1 - fi -} # Print error message, and quit program. -errmsg(){ +quitmsg(){ print ERROR: $* >/dev/fd/2 cleanup exit 1 } + +errmsg(){ + print "ERROR: $@" >>$ERRORFILE + +} +warnmsg(){ + if [[ $quit_on_warn == 1 ]] ; then + print "PROBLEM: $@" >/dev/fd/2 + exit 1 + fi + #else + print "WARNING: $@" >>$WARNINGFILE + +} + +isLower(){ + typeset -l LOWER=$1 + [ "$LOWER" = "$1" ] +} + + +# This function exists, because pkgtrans is BROKEN!! +# It leaves a directory in /var/tmp/aaXXXXXXX, even after clean quit +# SO, emulate pkgtrans behaviour, for "pkgtrans src destdir pkgname" +# Except that we ignore pkgname arg, and just do first one we find. +# and we are a bit hacky about how we do things. +pkgtrans(){ + if [[ ! -d $2 ]] ; then + print INTERNAL ERROR: $2 is not a directory >/dev/fd/2 + return 1 + fi + hdrblks=`(dd if=$1 skip=1 2>/dev/null| cpio -i -t >/dev/null) 2>&1 | + nawk '{print $1; exit;}'` + + ## print initial hdrblks=$hdrblks + + hdrblks=$(($hdrblks + 1)) + mkdir $2/$3 || return 1 + + dd if=$1 skip=$hdrblks 2>/dev/null | (cd $2/$3 ; cpio -ivdm) + # on fail, SOMETIMES cpio returns 1, but sometimes it returns 0!! + if [[ ! -d $2/$3/install ]] ; then + print retrying extract with different archive offset... + # no, I cant tell in advance why/when the prev fails + hdrblks=$(($hdrblks + 1)) + dd if=$1 skip=$hdrblks 2>/dev/null| (cd $2/$3 ; cpio -ivdm) + fi +} + +######################################### +# find all executables and dynamic libs,and list their filenames. +listbinaries() { + if [ ! -d $1 ] ; then + print INTERNAL ERROR: $1 not a directory + rm -rf $EXTRACTDIR + exit 1 + fi + + find $1 -print | xargs file |grep ELF |nawk -F: '{print $1}' +} + +# This is kind of specific to CSW, even though it uses $PKGPREF +checkforclasses () { + typeset local=no + classlist=`sed -n 's/CLASSES=//p' $EXTRACTDIR/$pkgname/pkginfo` + for c in $classlist ; do + case $c in + csw*) + local=yes + ;; + esac + done + if [[ "$local" != "yes" ]] ; then + return 0; + fi + if grep ${PKGPREF}cas- $EXTRACTDIR/$pkgname/install/depend >/dev/null + then + return 0; + fi + errmsg $pkgname uses a csw CLASS ACTION SCRIPT but missing dependancy on any ${PKGPREF}cas- pkg + return 1 +} + + +# pass in name of dynamic object, and specific catalog file. +# Will attempt "best match" heuristics appropriate for ${PKGPREF} dependancy file +# and print out result. +# We will always print out either ONE package, or NOTHING +findlibincat() { + # important to use same grep as we did looking through pkgmap + grep "[/=]$1[ =]" $2 | + nawk ' + $2 == "f" || $2 == "l" {pkg=$NF;next} + # Give 'real' files priority over symlinks + {if(pkg==""){pkg=$NF}; + next } + END {print pkg} + ' + + #old simple (inadequate) way: + # grep /$1 $2 | + # nawk '{print $NF}' |sort -u +} + + if [[ "$1" == "-e" ]] ; then quit_on_warn=1; shift @@ -61,7 +164,10 @@ shift fi -for f in "$@" + + + +for f in "$@" # --------------MAIN-LOOP-START------------------------ do @@ -89,14 +195,13 @@ # check for badly set RUNPATHs. sigh. # Note that need to escape one /, so that it does not #trigger check if checking its own package - badpaths="[/]export/medusa [/]opt/build [/]export/home [/]usr/share [/]usr/local" + badpaths="[/]export/medusa [/]opt/build [/]export/home [/]usr/share [/]usr/local" + unset badstrings for badpath in $badpaths ; do GREP=/bin/grep gzgrep "$badpath" $f if [[ $? -eq 0 ]] ; then - print "" - print ERROR: build-machine paths found in file $f - print "($badpath found)" - exit 1 + errmsg "bad path strings found in file $f ($badpath)" + badstrings=yes fi done esac @@ -117,14 +222,17 @@ pkgname=`nawk 'NR == 2 {print $1; exit;}' $f` EXTRACTDIR=$TMPDIR/checkpkg.$$ +ERRORFILE=$EXTRACTDIR.checkpkg.errs +WARNINGFILE=$EXTRACTDIR.checkpkg.warn if [ -d $EXTRACTDIR ] ; then print ERROR: $EXTRACTDIR already exists exit 1 fi -mkdir $EXTRACTDIR +mkdir $EXTRACTDIR || exit 1 + TMPFILE=$EXTRACTDIR/pkginfo @@ -142,19 +250,14 @@ version=`sed -n 's/^VERSION=//p' $TMPFILE` desc=`sed -n 's/^DESC=//p' $TMPFILE` email=`sed -n 's/^EMAIL=//p' $TMPFILE` -maintname=`sed -n 's/^VENDOR=.*for CSW by //p' $TMPFILE` +maintname=`sed -n 's/^VENDOR=.*for '${PKGPREF}' by //p' $TMPFILE` hotline=`sed -n 's/^HOTLINE=//p' $TMPFILE` basedir=`sed -n 's/^BASEDIR=//p' $TMPFILE` pkgarch=`sed -n 's/^ARCH=//p' $TMPFILE|head -1` -isLower(){ - typeset -l LOWER=$1 - [ "$LOWER" = "$1" ] -} if ! isLower $software ; then - echo ERROR: $software must be all lowercase - exit 1 + errmsg $software must be all lowercase fi case `basename $f` in @@ -162,21 +265,17 @@ # file name looks okay ;; ${software}-*) - print ERROR: filename missing full version field $version - rm -rf $EXTRACTDIR $TMPARCHIVE - exit 1 + errmsg filename missing full version field $version ;; *) - print ERROR: filename should start with $software-$version- - rm -rf $EXTRACTDIR $TMPARCHIVE - exit 1 + errmsg filename should start with $software-$version- esac if [ "$maintname" = "" ] ; then # the old format, in the DESC field - maintname=`sed -n 's/^DESC=.*for CSW by //p' $TMPFILE` + maintname=`sed -n 's/^DESC=.*for '${PKGPREF}' by //p' $TMPFILE` # Since the DESC field has been coopted, take # description from second half of NAME field now. @@ -222,15 +321,14 @@ case $version in *-*) - print ERROR: VERSION field not allowed to have '"-"' in it - exit 1 + errmsg VERSION field not allowed to have '"-"' in it + exitsatus=1 ;; *,REV=20[01][0-9].[0-9][0-9].[0-9][0-9]*) : ;; *) - print ERROR: no REV=YYYY.MM.DD field in VERSION - exit 1 + errmsg no REV=YYYY.MM.DD field in VERSION ;; esac @@ -241,9 +339,7 @@ ;; *) - print ERROR: non-standard ARCH def in package: $pkgarch - rm -rf $EXTRACTDIR $TMPARCHIVE - exit 1 + errmsg non-standard ARCH def in package: $pkgarch esac goodarch=yes @@ -265,35 +361,6 @@ # exit 0 #fi - -# This function exists, because pkgtrans is BROKEN!! -# It leaves a directory in /var/tmp/aaXXXXXXX, even after clean quit -# SO, emulate pkgtrans behaviour, for "pkgtrans src destdir pkgname" -# Except that we ignore pkgname arg, and just do first one we find. -# and we are a bit hacky about how we do things. -pkgtrans(){ - if [[ ! -d $2 ]] ; then - print ERROR: $2 is not a directory >/dev/fd/2 - return 1 - fi - hdrblks=`(dd if=$1 skip=1 2>/dev/null| cpio -i -t >/dev/null) 2>&1 | - nawk '{print $1; exit;}'` - - ## print initial hdrblks=$hdrblks - - hdrblks=$(($hdrblks + 1)) - mkdir $2/$3 || return 1 - - dd if=$1 skip=$hdrblks 2>/dev/null | (cd $2/$3 ; cpio -ivdm) - # on fail, SOMETIMES cpio returns 1, but sometimes it returns 0!! - if [[ ! -d $2/$3/install ]] ; then - print retrying extract with different archive offset... - # no, I cant tell in advance why/when the prev fails - hdrblks=$(($hdrblks + 1)) - dd if=$1 skip=$hdrblks 2>/dev/null| (cd $2/$3 ; cpio -ivdm) - fi -} - print "" print Extracing pkg for examination of files... pkgtrans $f $EXTRACTDIR $pkgname @@ -312,14 +379,12 @@ ######################################## # Check for some common errors -if [[ $pkgname != "CSWcommon" ]] ; then +if [[ $pkgname != "${PKGPREF}common" ]] ; then if [[ $LOGNAME != "root" ]] ; then nawk '$6 == "'$LOGNAME'" {print; exit 1}' $EXTRACTDIR/$pkgname/pkgmap if [[ $? -eq 1 ]] ; then - print ERROR: files owned by $LOGNAME in prototype file - rm -rf $EXTRACTDIR $TMPARCHIVE - exit 1 + errmsg files owned by $LOGNAME in prototype file fi fi @@ -345,11 +410,11 @@ fi egrep 'lib/charset.alias' $EXTRACTDIR/$pkgname/pkgmap if [[ $? -eq 0 ]] ; then - warnmsg Only CSWiconv should have lib/charset.alias in it + warnmsg Only ${PKGPREF}iconv should have lib/charset.alias in it fi egrep 'share/locale/locale.alias' $EXTRACTDIR/$pkgname/pkgmap if [[ $? -eq 0 ]] ; then - warnmsg Only CSWcommon should have share/locale/locale.alias in it + warnmsg Only ${PKGPREF}common should have share/locale/locale.alias in it fi fgrep '? ? ?' $EXTRACTDIR/$pkgname/pkgmap | egrep '[/]opt[/]csw' @@ -363,80 +428,39 @@ if [[ $? -eq 0 ]] ; then errmsg perllocal.pod should be removed from prototype file fi + egrep ' f .* /var/' $EXTRACTDIR/$pkgname/pkgmap + if [[ $? -eq 0 ]] ; then + errmsg Files detected in /var + fi fi + # special case. sigh. -if [[ $pkgname != "CSWtexinfo" ]] ; then +if [[ $pkgname != "${PKGPREF}texinfo" ]] ; then egrep '/opt/csw/share/info/dir[ ]|none share/info/dir[ ]' $EXTRACTDIR/$pkgname/pkgmap if [[ $? -eq 0 ]] ; then - errmsg /opt/csw/share/info/dir should only be in CSWtexinfo - rm -rf $EXTRACTDIR $TMPARCHIVE - exit 1 + errmsg /opt/csw/share/info/dir should only be in ${PKGPREF}texinfo fi fi -######################################### -# find all executables and dynamic libs,and list their filenames. -listbinaries() { - if [ ! -d $1 ] ; then - print errmsg $1 not a directory - rm -rf $EXTRACTDIR - exit 1 - fi - find $1 -print | xargs file |grep ELF |nawk -F: '{print $1}' -} - -# Kinda a hardcode for one special package that cant be -# detected by normal lib dependancies. -checkforclasses () { - typeset local=no - classlist=`sed -n 's/CLASSES=//p' $EXTRACTDIR/$pkgname/pkginfo` - for c in $classlist ; do - case $c in - csw*) - local=yes - ;; - esac +if [[ "$badstrings" != "" ]] ; then + print hunting for which speficic file have bad strings in them + p=$PWD + cd $EXTRACTDIR/$pkgname + for badpath in $badpaths ; do + find . -type f | xargs grep $badpath done - if [[ "$local" != "yes" ]] ; then - return 0; - fi - if grep CSWcswclassutils $EXTRACTDIR/$pkgname/install/depend >/dev/null - then - return 0; - fi - echo ERROR: package uses a csw CLASS but missing dependancy on CSWcswclassutils - return 1 -} + cd $p +fi - -# pass in name of dynamic object, and specific catalog file. -# Will attempt "best match" heuristics appropriate for CSW dependancy file -# and print out result. -# We will always print out either ONE package, or NOTHING -findlibincat() { - # important to use same grep as we did looking through pkgmap - grep "[/=]$1[ =]" $2 | - nawk ' - $2 == "f" || $2 == "l" {pkg=$NF;next} - # Give 'real' files priority over symlinks - {if(pkg==""){pkg=$NF}; - next } - END {print pkg} - ' - - #old simple (inadequate) way: - # grep /$1 $2 | - # nawk '{print $NF}' |sort -u -} - #################################################################### # Auto-dependancy checking section.... -# strategy currently: identify all ELF object files to elflist. -# Then identify all dependancies to "liblist" -# THEEEN go searching through SVR4 pkg "contents" file for PKG matches -# to those libraries. +# strategy currently: first identify all ELF object files, to "elflist". +# Then identify all 'NEEDED' dependancies for them, to "libsneeded" +# Create list of libraries provided by things already in our depend file. +# THEEEN go searching through SVR4 pkg "contents" databasefile for PKG matches +# to libraries not provided by stuff in the depend file. # (but give priority to lib dependancies satisfied by current PKG itself) -# Final output is saved to file "libpkgs" +# Final output is saved to file "autopkgdeps" ###################################################################### sparccheck=""; sparcwarning="" if [[ "$pkgarch" = "sparc" ]] ; then @@ -448,7 +472,7 @@ if [[ "$sparccheck" != "" ]] ; then (cd $sparccheck && file *) | grep 'ELF.*V8+' if [[ $? = 0 ]] ; then - sparcwarning="WARNING: found binaries in normal bin dir that are V8+" + warnmsg="WARNING: found binaries in normal bin dir that are V8+" fi fi fi @@ -462,20 +486,20 @@ chmod 0755 `cat $EXTRACTDIR/elflist` #cat $EXTRACTDIR/elflist| xargs ldd 2>/dev/null |fgrep '.so' | - # sed 's:^.*=>[^/]*::' | nawk '{print $1}' |sort -u >$EXTRACTDIR/liblist + #sed 's:^.*=>[^/]*::'|nawk '{print $1}'|sort -u >$EXTRACTDIR/libsneeded cat $EXTRACTDIR/elflist| xargs dump -Lv |nawk '$2=="NEEDED"{print $3}' | - sort -u | egrep -v $EXTRACTDIR >$EXTRACTDIR/liblist + sort -u | egrep -v $EXTRACTDIR >$EXTRACTDIR/libsneeded print libraries used are: - cat $EXTRACTDIR/liblist + cat $EXTRACTDIR/libsneeded else print No dynamic libraries in the package fi fi #If these dont exist, it is Bad. -touch $EXTRACTDIR/liblist $EXTRACTDIR/libpkgs +touch $EXTRACTDIR/libsneeded $EXTRACTDIR/autopkgdeps if [[ -f $EXTRACTDIR/$pkgname/install/depend ]] ; then print @@ -492,83 +516,126 @@ # sanity check against "depends on self" nawk '$2=="'$pkgname'" {exit 1}' $EXTRACTDIR/$pkgname/install/depend if [[ $? -ne 0 ]] ; then - print ERROR: $pkgname references self in depend file - exit 1 + errmsg $pkgname references self in depend file fi nawk '$1=="P" {print $2}' $EXTRACTDIR/$pkgname/install/depend | sort >$EXTRACTDIR/deppkgs for dep in `cat $EXTRACTDIR/deppkgs` do - pkginfo $dep || errmsg Invalid package $dep specified. Check of $f fails + pkginfo $dep 2>/dev/null || errmsg Invalid depend $dep specified. done - #strategy update: poorly grep for all possible matches against our liblist, - # and save in "shortcswcatalog". and now "shortsuncatalog" too. - # in theory, slower for small pkgs, but should be faster for pkgs - # with lots of shared libs. - # + #strategy update: poorly grep for all possible matches against our + # libsneeded, + # and save in "shortcswcatalog". and now "shortsuncatalog" too. + # in theory, slower for small pkgs, but should be faster for pkgs + # with lots of shared libs. + # -if test -s $EXTRACTDIR/liblist ; then +if test -s $EXTRACTDIR/libsneeded ; then print Building index from SVR4 installed packages database... print '(May take a while)' #It's noticably faster (30%) this way, than the second way, at least on a # multiproc box. - grep CSW /var/sadm/install/contents |nawk '$2 ~ /^[fsl]$/ {print}' | - fgrep -f $EXTRACTDIR/liblist >$EXTRACTDIR/shortcswcatalog + grep ${PKGPREF} /var/sadm/install/contents |nawk '$2 ~ /^[fsl]$/ {print}' | + fgrep -f $EXTRACTDIR/libsneeded >$EXTRACTDIR/shortcswcatalog grep SUNW /var/sadm/install/contents |nawk '$2 ~ /^[fsl]$/ {print}' | egrep -v 'SUNWbcp|SUNWowbcp|SUNWucb' | - fgrep -f $EXTRACTDIR/liblist >$EXTRACTDIR/shortsuncatalog + fgrep -f $EXTRACTDIR/libsneeded >$EXTRACTDIR/shortsuncatalog - #nawk '$2 ~ /^[fsl]$/ && $NF ~ /^CSW/ {print}' /var/sadm/install/contents | - # fgrep -f $EXTRACTDIR/liblist >$EXTRACTDIR/shortcswcatalog + #nawk '$2 ~ /^[fsl]$/ && $NF ~ /^'${PKGPREF}'/ {print}' /var/sadm/install/contents | + # fgrep -f $EXTRACTDIR/libsneeded >$EXTRACTDIR/shortcswcatalog #nawk '$2 ~ /^[fsl]$/ && $NF ~ /^SUNW/ {print}' /var/sadm/install/contents | # egrep -v 'SUNWbcp|SUNWowbcp|SUNWucb' | - # fgrep -f $EXTRACTDIR/liblist >$EXTRACTDIR/shortsuncatalog + # fgrep -f $EXTRACTDIR/libsneeded >$EXTRACTDIR/shortsuncatalog print Cross-referencing indexes... + + # At this point: + # shortsuncatalog == SUNW packages with intersections with libsneeded + # shortcswcatalog == CSW packages with intersections with libsneeded + # libsneeded == list of things found with dump -Lv in "NEEDED" field + # deppkgs == Clean list of dependant packages (may have non-SUNW) + # + # Note that "intersection" may be sloppy, with substring matches perhaps + + # Going to try to weed out things that are already covered by declared + # dependancies. + # + mkdir $EXTRACTDIR/depliblists 2>/dev/null + rm -rf $EXTRACTDIR/depliblists/* # clear out prior loops + for pkg in `cat $EXTRACTDIR/deppkgs` ; do + grep " $pkg( |$)" $EXTRACTDIR/shortcswcatalog >$EXTRACTDIR/depliblists/$pkg + done fi - - -# DEBUG: should we weed out libs already covered by pkg dependancy list? -# that would be to handle things like libgcc_s.so.1 that are in both -# CSWgcc3rt and CSWgcc4rt but in different dirs - -for lib in `cat $EXTRACTDIR/liblist` ; do +for lib in `cat $EXTRACTDIR/libsneeded` ; do grep "[/=]$lib[ =]" $EXTRACTDIR/$pkgname/pkgmap if [[ $? -eq 0 ]] ; then echo $lib provided by package itself continue fi - # We want to give priority to CSW packages. + # First check in declared dependancies + libpkg=`cd $EXTRACTDIR/depliblists && grep -l "[/=]$lib[ =]" *` + + if [[ -z "$libpkg" ]] ; then + # Next, check against CSW packages installed but not declared as deps # This is one way; force ONLY parsing CSW pkgs first. - # Then search SUNW pkgs only if nothing else - libpkg=`findlibincat $lib $EXTRACTDIR/shortcswcatalog` + libpkg=`findlibincat $lib $EXTRACTDIR/shortcswcatalog` + fi if [[ -z "$libpkg" ]] ; then - libpkg=`findlibincat $lib $EXTRACTDIR/shortsuncatalog` + # Then search SUNW pkgs only if nothing else + libpkg=`findlibincat $lib $EXTRACTDIR/shortsuncatalog` fi + if [[ -z "$libpkg" ]] ; then - errmsg cannot find package for $lib + errmsg cannot find package for $lib, in $pkgname else - print $libpkg >>$EXTRACTDIR/libpkgs + print $libpkg >>$EXTRACTDIR/autopkgdeps print " found $libpkg for $lib" fi done -sort -u $EXTRACTDIR/libpkgs >$EXTRACTDIR/libpkgs.x -mv $EXTRACTDIR/libpkgs.x $EXTRACTDIR/libpkgs +if [[ -s $EXTRACTDIR/autopkgdeps ]] ; then + sort -u $EXTRACTDIR/autopkgdeps >$EXTRACTDIR/autopkgdeps.x + mv $EXTRACTDIR/autopkgdeps.x $EXTRACTDIR/autopkgdeps -diff $EXTRACTDIR/deppkgs $EXTRACTDIR/libpkgs >/dev/null -if [[ $? -ne 0 ]] ; then + + for pkg in `cat $EXTRACTDIR/autopkgdeps` ; do + grep "^${pkg}$" $EXTRACTDIR/deppkgs>/dev/null || + echo $pkg >>$EXTRACTDIR/missingpkgdeps + done +fi +if [[ -s $EXTRACTDIR/missingpkgdeps ]] ; then print SUGGESTION: you may want to add some or all of the following as depends: - print ' (Feel free to ignore SUNW or SPRO packages)' - diff $EXTRACTDIR/deppkgs $EXTRACTDIR/libpkgs | fgrep '>' -fi + print '(But feel free to ignore SUNWxxx packages)' + cat $EXTRACTDIR/missingpkgdeps +fi >> $WARNINGFILE +for pkg in `cat $EXTRACTDIR/deppkgs` ; do + case $pkg in + # known "non-sharedlib requirements" + CSWcommon|CSWcas-*|CSWpython|CSWperl) + : + ;; + *) + grep "^${pkg}$" $EXTRACTDIR/autopkgdeps>/dev/null || + echo $pkg >>$EXTRACTDIR/notfoundpkgs + ;; + esac +done +if [[ -s $EXTRACTDIR/notfoundpkgs ]] ; then + print SUGGESTION: the following packages were NOT found as needed. + print You might want to consider removing them from depend + cat $EXTRACTDIR/notfoundpkgs +fi >> $WARNINGFILE + + + checkforclasses if [[ "$basedir" != "" ]] ; then @@ -589,6 +656,18 @@ cleanup -print "$sparcwarning" +print " --- " +if [[ -f $ERRORFILE ]] ; then + print === ERRORS detected for $f === >/dev/fd/2 + cat $ERRORFILE >/dev/fd/2 + rm $ERRORFILE +fi +if [[ -f $WARNINGFILE ]] ; then + print ... Warnings detected for $f ... >/dev/fd/2 + cat $WARNINGFILE >/dev/fd/2 + rm $WARNINGFILE +fi +print " --- " +sleep 2 done This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From pfelecan at opencsw.org Sun Jan 9 18:29:19 2011 From: pfelecan at opencsw.org (Peter FELECAN) Date: Sun, 09 Jan 2011 18:29:19 +0100 Subject: [csw-devel] SF.net SVN: gar:[12471] csw/mgar/pkg/cswutils/trunk/files/checkpkg In-Reply-To: (theferret@users.sourceforge.net's message of "Sun, 09 Jan 2011 16:08:50 +0000") References: Message-ID: theferret at users.sourceforge.net writes: > @@ -89,14 +195,13 @@ > # check for badly set RUNPATHs. sigh. > # Note that need to escape one /, so that it does not > #trigger check if checking its own package > - badpaths="[/]export/medusa [/]opt/build [/]export/home [/]usr/share [/]usr/local" > + badpaths="[/]export/medusa [/]opt/build [/]export/home [/]usr/share [/]usr/local" > + unset badstrings > for badpath in $badpaths ; do > GREP=/bin/grep gzgrep "$badpath" $f > if [[ $? -eq 0 ]] ; then > - print "" > - print ERROR: build-machine paths found in file $f > - print "($badpath found)" > - exit 1 > + errmsg "bad path strings found in file $f ($badpath)" > + badstrings=yes > fi > done > esac Nice. Thanks. -- Peter From wbonnet at users.sourceforge.net Sun Jan 9 20:12:25 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 19:12:25 +0000 Subject: [csw-devel] SF.net SVN: gar:[12472] csw/mgar/pkg/cpan/PDF-API2/trunk Message-ID: Revision: 12472 http://gar.svn.sourceforge.net/gar/?rev=12472&view=rev Author: wbonnet Date: 2011-01-09 19:12:25 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Add /opt/csw/share/perl/csw/PDF/API2/fonts to font path Modified Paths: -------------- csw/mgar/pkg/cpan/PDF-API2/trunk/Makefile csw/mgar/pkg/cpan/PDF-API2/trunk/checksums Modified: csw/mgar/pkg/cpan/PDF-API2/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/PDF-API2/trunk/Makefile 2011-01-09 16:08:50 UTC (rev 12471) +++ csw/mgar/pkg/cpan/PDF-API2/trunk/Makefile 2011-01-09 19:12:25 UTC (rev 12472) @@ -16,4 +16,6 @@ ARCHALL = 1 +PATCHFILES = 0001-Add-opt-csw-share-perl-csw-PDF-API2-fonts-to-font-pa.patch + include gar/category.mk Modified: csw/mgar/pkg/cpan/PDF-API2/trunk/checksums =================================================================== --- csw/mgar/pkg/cpan/PDF-API2/trunk/checksums 2011-01-09 16:08:50 UTC (rev 12471) +++ csw/mgar/pkg/cpan/PDF-API2/trunk/checksums 2011-01-09 19:12:25 UTC (rev 12472) @@ -1 +1 @@ -848fb727323390128cac85cc11f52de1 download/PDF-API2-0.73.tar.gz +848fb727323390128cac85cc11f52de1 PDF-API2-0.73.tar.gz This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wbonnet at users.sourceforge.net Sun Jan 9 20:14:56 2011 From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net) Date: Sun, 09 Jan 2011 19:14:56 +0000 Subject: [csw-devel] SF.net SVN: gar:[12473] csw/mgar/pkg/cpan/PDF-API2/trunk/files/ 0001-Add-opt-csw-share-perl-csw-PDF-API2-fonts-to-font-pa.patch Message-ID: Revision: 12473 http://gar.svn.sourceforge.net/gar/?rev=12473&view=rev Author: wbonnet Date: 2011-01-09 19:14:56 +0000 (Sun, 09 Jan 2011) Log Message: ----------- Add /opt/csw/share/perl/csw/PDF/API2/fonts to font path Added Paths: ----------- csw/mgar/pkg/cpan/PDF-API2/trunk/files/0001-Add-opt-csw-share-perl-csw-PDF-API2-fonts-to-font-pa.patch Added: csw/mgar/pkg/cpan/PDF-API2/trunk/files/0001-Add-opt-csw-share-perl-csw-PDF-API2-fonts-to-font-pa.patch =================================================================== --- csw/mgar/pkg/cpan/PDF-API2/trunk/files/0001-Add-opt-csw-share-perl-csw-PDF-API2-fonts-to-font-pa.patch (rev 0) +++ csw/mgar/pkg/cpan/PDF-API2/trunk/files/0001-Add-opt-csw-share-perl-csw-PDF-API2-fonts-to-font-pa.patch 2011-01-09 19:14:56 UTC (rev 12473) @@ -0,0 +1,25 @@ +From f7362bd9fa0ee68fbee2d364edec85be7ec0f6ba Mon Sep 17 00:00:00 2001 +From: William Bonnet +Date: Sun, 9 Jan 2011 20:03:59 +0100 +Subject: [PATCH] Add /opt/csw/share/perl/csw/PDF/API2/fonts to font path + +--- + lib/PDF/API2.pm | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/lib/PDF/API2.pm b/lib/PDF/API2.pm +index 2ff6f90..b937039 100644 +--- a/lib/PDF/API2.pm ++++ b/lib/PDF/API2.pm +@@ -40,7 +40,7 @@ BEGIN { + ($VERSION) = sprintf '%i.%03i', split(/\./,('$Revision: 2.15 $' =~ /Revision: (\S+)\s/)[0]); # $Date: 2008/01/18 00:11:38 $ + + @FontDirs = ( (map { "$_/PDF/API2/fonts" } @INC), +- qw[ /usr/share/fonts /usr/local/share/fonts c:/windows/fonts c:/winnt/fonts ] ); ++ qw[ /opt/csw/share/perl/csw/PDF/API2/fonts /usr/share/fonts /usr/local/share/fonts c:/windows/fonts c:/winnt/fonts ] ); + + $seq="AA"; + +-- +1.7.3.2 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Jan 9 22:28:05 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 09 Jan 2011 21:28:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[12474] csw/mgar/gar/v2/gar.mk Message-ID: Revision: 12474 http://gar.svn.sourceforge.net/gar/?rev=12474&view=rev Author: wahwah Date: 2011-01-09 21:28:05 +0000 (Sun, 09 Jan 2011) Log Message: ----------- mGAR v2: A bugfix for EXPANDVARS The 'g' parameter was missing, and only one instance of a variable was expanded per line. This patch adds 'g' to the perl invocation which expands variables. Modified Paths: -------------- csw/mgar/gar/v2/gar.mk Modified: csw/mgar/gar/v2/gar.mk =================================================================== --- csw/mgar/gar/v2/gar.mk 2011-01-09 19:14:56 UTC (rev 12473) +++ csw/mgar/gar/v2/gar.mk 2011-01-09 21:28:05 UTC (rev 12474) @@ -444,7 +444,7 @@ _var_definitions = $(foreach VAR,$(shell perl -ne 'print "$$1 " if( /@([^@]+)@/ )' <$1),$(VAR)=$($(VAR))) expandvars-%: - $(call _var_definitions,$(WORKDIR)/$*) perl -i-unexpanded -npe 's/@([^@]+)@/$$ENV{$$1}/e' $(WORKDIR)/$* + $(call _var_definitions,$(WORKDIR)/$*) perl -i-unexpanded -npe 's/@([^@]+)@/$$ENV{$$1}/eg' $(WORKDIR)/$* @$(MAKECOOKIE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Jan 9 22:34:59 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 09 Jan 2011 21:34:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[12475] csw/mgar/gar/v2/lib/python/checkpkg.py Message-ID: Revision: 12475 http://gar.svn.sourceforge.net/gar/?rev=12475&view=rev Author: wahwah Date: 2011-01-09 21:34:59 +0000 (Sun, 09 Jan 2011) Log Message: ----------- checkpkg: Additional disallowed paths Notably, /usr/local which has lately cropped up on pkgsubmissions a lot. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/checkpkg.py Modified: csw/mgar/gar/v2/lib/python/checkpkg.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg.py 2011-01-09 21:28:05 UTC (rev 12474) +++ csw/mgar/gar/v2/lib/python/checkpkg.py 2011-01-09 21:34:59 UTC (rev 12475) @@ -23,8 +23,11 @@ DESCRIPTION_RE = r"^([\S]+) - (.*)$" BAD_CONTENT_REGEXES = ( # Slightly obfuscating these by using concatenation of strings. + r'/export' r'/home', r'/export' r'/medusa', r'/opt' r'/build', + r'/usr' r'/local', + r'/usr' r'/share', ) INSTALL_CONTENTS_AVG_LINE_LENGTH = 102.09710677919261 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Jan 9 22:35:33 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 09 Jan 2011 21:35:33 +0000 Subject: [csw-devel] SF.net SVN: gar:[12476] csw/mgar/gar/v2/lib/python Message-ID: Revision: 12476 http://gar.svn.sourceforge.net/gar/?rev=12476&view=rev Author: wahwah Date: 2011-01-09 21:35:32 +0000 (Sun, 09 Jan 2011) Log Message: ----------- checkpkg: Reset state of checkpkg manager Not very important for current scenarios, but in case checkpkg manager is run twice, it should reset its state. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/checkpkg_lib.py csw/mgar/gar/v2/lib/python/checkpkg_lib_test.py csw/mgar/gar/v2/lib/python/models_test.py Property Changed: ---------------- csw/mgar/gar/v2/lib/python/models_test.py Modified: csw/mgar/gar/v2/lib/python/checkpkg_lib.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg_lib.py 2011-01-09 21:34:59 UTC (rev 12475) +++ csw/mgar/gar/v2/lib/python/checkpkg_lib.py 2011-01-09 21:35:32 UTC (rev 12476) @@ -136,15 +136,18 @@ self.debug = debug self.name = name self.sqo_pkgs_list = sqo_pkgs_list - self.errors = [] - self.individual_checks = [] - self.set_checks = [] - self.packages = [] self.osrel = osrel self.arch = arch self.catrel = catrel self.show_progress = show_progress + self._ResetState() + def _ResetState(self): + self.errors = [] + self.individual_checks = [] + self.set_checks = [] + self.packages = [] + def GetProgressBar(self): if self.show_progress and not self.debug: return progressbar.ProgressBar() @@ -215,7 +218,7 @@ Returns a tuple of an exit code and a report. """ - # packages_data = self.GetPackageStatsList() + self._ResetState() assert self.sqo_pkgs_list, "The list of packages must not be empty." db_stat_objs_by_pkgname = {} for pkg in self.sqo_pkgs_list: Modified: csw/mgar/gar/v2/lib/python/checkpkg_lib_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg_lib_test.py 2011-01-09 21:34:59 UTC (rev 12475) +++ csw/mgar/gar/v2/lib/python/checkpkg_lib_test.py 2011-01-09 21:35:32 UTC (rev 12476) @@ -350,7 +350,22 @@ # Verifying that there are some reported error tags. self.assertTrue(list(models.CheckpkgErrorTag.select())) + def testReRunCheckpkg(self): + """Error tags should not accumulate.""" + self.dbc.InitialDataImport() + sqo_pkg = package_stats.PackageStats.SaveStats(neon_stats[0], True) + cm = checkpkg_lib.CheckpkgManager2( + "testname", [sqo_pkg], "SunOS5.9", "sparc", "unstable", + show_progress=False) + before_count = models.CheckpkgErrorTag.selectBy(srv4_file=sqo_pkg).count() + cm.Run() + first_run_count = models.CheckpkgErrorTag.selectBy(srv4_file=sqo_pkg).count() + cm.Run() + second_run_count = models.CheckpkgErrorTag.selectBy(srv4_file=sqo_pkg).count() + self.assertEquals(0, before_count) + self.assertEquals(first_run_count, second_run_count) + class IndividualCheckInterfaceUnitTest(mox.MoxTestBase): def testNeededFile(self): Modified: csw/mgar/gar/v2/lib/python/models_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/models_test.py 2011-01-09 21:34:59 UTC (rev 12475) +++ csw/mgar/gar/v2/lib/python/models_test.py 2011-01-09 21:35:32 UTC (rev 12476) @@ -1,5 +1,11 @@ +#!/usr/bin/env python2.6 + import unittest +import mox +import test_base import models +import sqlobject +import datetime class CheckpkgErrorTagUnitTest(unittest.TestCase): @@ -28,6 +34,52 @@ self.assertEquals(t1, t2) +class Srv4FileStatsUnitTest(test_base.SqlObjectTestMixin, mox.MoxTestBase): + + def setUp(self): + super(Srv4FileStatsUnitTest, self).setUp() + self.dbc.InitialDataImport() + self.sqo_arch = models.Architecture.selectBy(id=1).getOne() + self.sqo_osrel = models.OsRelease.selectBy(id=1).getOne() + self.sqo_catrel = models.CatalogRelease.selectBy(id=1).getOne() + self.pkginst = models.Pkginst(pkgname="CSWfoo") + self.maintainer = models.Maintainer( + email='joe at example.com', + full_name='Joe Bloggs') + self.p = models.Srv4FileStats( + arch=self.sqo_arch, + basename="foo.pkg", + catalogname="foo", + data_obj=None, + filename_arch=self.sqo_arch, + latest=True, + maintainer=self.maintainer, + md5_sum="not a real one", + size=1L, + mtime=datetime.datetime.now(), + os_rel=self.sqo_osrel, + pkginst=self.pkginst, + registered=True, + use_to_generate_catalogs=True, + rev="2011.01.01", + stats_version=0, + version_string="1.0,REV=2011.01.01", + ) + + def testRemoveCheckpkgResults(self): + error_tag = models.CheckpkgErrorTag( + tag_name="foo", + tag_info="foo_info", + srv4_file=self.p, + os_rel=self.sqo_osrel, + arch=self.sqo_arch, + catrel=self.sqo_catrel, + ) + self.assertEqual(1, models.CheckpkgErrorTag.select().count()) + self.p.RemoveCheckpkgResults(self.sqo_osrel, self.sqo_arch, self.sqo_catrel) + self.assertEqual(0, models.CheckpkgErrorTag.select().count()) + + if __name__ == '__main__': unittest.main() Property changes on: csw/mgar/gar/v2/lib/python/models_test.py ___________________________________________________________________ Added: svn:executable + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Jan 9 22:36:05 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 09 Jan 2011 21:36:05 +0000 Subject: [csw-devel] SF.net SVN: gar:[12477] csw/mgar/gar/v2/lib/python Message-ID: Revision: 12477 http://gar.svn.sourceforge.net/gar/?rev=12477&view=rev Author: wahwah Date: 2011-01-09 21:36:05 +0000 (Sun, 09 Jan 2011) Log Message: ----------- checkpkg: Small optimization and cleanup Taking a db query outside a loop. Removing an unnecessary variable. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/checkpkg_lib.py csw/mgar/gar/v2/lib/python/checkpkg_lib_test.py Modified: csw/mgar/gar/v2/lib/python/checkpkg_lib.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg_lib.py 2011-01-09 21:35:32 UTC (rev 12476) +++ csw/mgar/gar/v2/lib/python/checkpkg_lib.py 2011-01-09 21:36:05 UTC (rev 12477) @@ -224,14 +224,12 @@ for pkg in self.sqo_pkgs_list: db_stat_objs_by_pkgname[pkg.pkginst.pkgname] = pkg logging.debug("Deleting old errors from the database.") + sqo_os_rel, sqo_arch, sqo_catrel = self.GetSqlobjectTriad() for pkgname, db_obj in db_stat_objs_by_pkgname.iteritems(): - sqo_os_rel, sqo_arch, sqo_catrel = self.GetSqlobjectTriad() - db_obj.RemoveCheckpkgResults( - sqo_os_rel, sqo_arch, sqo_catrel) + db_obj.RemoveCheckpkgResults(sqo_os_rel, sqo_arch, sqo_catrel) errors, messages, gar_lines = self.GetAllTags(self.sqo_pkgs_list) - no_errors = len(errors) + 1 pbar = self.GetProgressBar() - pbar.maxval = no_errors + pbar.maxval = len(errors) + 1 count = itertools.count(1) logging.info("Stuffing the candies under the pillow...") pbar.start() Modified: csw/mgar/gar/v2/lib/python/checkpkg_lib_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg_lib_test.py 2011-01-09 21:35:32 UTC (rev 12476) +++ csw/mgar/gar/v2/lib/python/checkpkg_lib_test.py 2011-01-09 21:36:05 UTC (rev 12477) @@ -1,18 +1,19 @@ #!/usr/bin/env python2.6 +import checkpkg_lib import copy -import unittest -import checkpkg_lib -import tag -import package_stats +import cPickle import database -import sqlobject +import inspective_package import models +import mox import package_stats -import inspective_package -import mox +import package_stats +import pprint +import sqlobject +import tag import test_base -import cPickle +import unittest from testdata import stubs from testdata.neon_stats import pkgstats as neon_stats This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Jan 9 22:36:43 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 09 Jan 2011 21:36:43 +0000 Subject: [csw-devel] SF.net SVN: gar:[12478] csw/mgar/gar/v2/lib/python Message-ID: Revision: 12478 http://gar.svn.sourceforge.net/gar/?rev=12478&view=rev Author: wahwah Date: 2011-01-09 21:36:43 +0000 (Sun, 09 Jan 2011) Log Message: ----------- checkpkg: Better tag info for libraries checks Don't output square brackets and apostrophes in tag_info, since they cause problems in gar. Using no quoting, and commas as a separator. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/package_checks.py csw/mgar/gar/v2/lib/python/package_checks_test.py Modified: csw/mgar/gar/v2/lib/python/package_checks.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks.py 2011-01-09 21:36:05 UTC (rev 12477) +++ csw/mgar/gar/v2/lib/python/package_checks.py 2011-01-09 21:36:43 UTC (rev 12478) @@ -984,7 +984,7 @@ error_mgr.ReportError( "non-uniform-lib-versions-in-package", "sonames=%s" - % (sonames)) + % (",".join(sonames))) messenger.Message( "Package %s contains shared libraries, and their soname " "versions are not in sync: %s. This means that " Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py =================================================================== --- csw/mgar/gar/v2/lib/python/package_checks_test.py 2011-01-09 21:36:05 UTC (rev 12477) +++ csw/mgar/gar/v2/lib/python/package_checks_test.py 2011-01-09 21:36:43 UTC (rev 12478) @@ -1406,7 +1406,7 @@ self.pkg_data = neon_stats[0] self.error_mgr_mock.ReportError( 'non-uniform-lib-versions-in-package', - "sonames=['libneon.so.26', 'libneon.so.27']") + "sonames=libneon.so.26,libneon.so.27") class TestCheckSharedLibraryNamingPolicyBerkeley(CheckpkgUnitTestHelper, unittest.TestCase): This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Sun Jan 9 22:37:13 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Sun, 09 Jan 2011 21:37:13 +0000 Subject: [csw-devel] SF.net SVN: gar:[12479] csw/mgar/gar/v2/lib/sh/run_full_cat.sh Message-ID: Revision: 12479 http://gar.svn.sourceforge.net/gar/?rev=12479&view=rev Author: wahwah Date: 2011-01-09 21:37:13 +0000 (Sun, 09 Jan 2011) Log Message: ----------- checkpkg: Removed an obsolete shell script Removed Paths: ------------- csw/mgar/gar/v2/lib/sh/run_full_cat.sh Deleted: csw/mgar/gar/v2/lib/sh/run_full_cat.sh =================================================================== --- csw/mgar/gar/v2/lib/sh/run_full_cat.sh 2011-01-09 21:36:43 UTC (rev 12478) +++ csw/mgar/gar/v2/lib/sh/run_full_cat.sh 2011-01-09 21:37:13 UTC (rev 12479) @@ -1,26 +0,0 @@ -#!/opt/csw/bin/bash -# -# A small script to run checkpkg against the whole catalog. The results are -# stored in a sqlite database in ~/.checkpkg. -# -# Architecture -# sparc, i386 -arch=sparc - -# Solaris version -# 5.9, 5.10 -ver=5.9 - -# OpenCSW release -# current, stable, testing, unstable -release=current - -c="/home/mirror/opencsw/${release}/${arch}/${ver}" -readonly c - -time \ -bin/checkpkg \ - -q \ - -M "${c}/catalog" \ - "${c}/"*.pkg \ - "${c}/"*.pkg.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 Jan 10 01:59:09 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Mon, 10 Jan 2011 00:59:09 +0000 Subject: [csw-devel] SF.net SVN: gar:[12480] csw/mgar/pkg/cswutils/trunk/checksums Message-ID: Revision: 12480 http://gar.svn.sourceforge.net/gar/?rev=12480&view=rev Author: bdwalton Date: 2011-01-10 00:59:09 +0000 (Mon, 10 Jan 2011) Log Message: ----------- cswutils/trunk: update checksums Modified Paths: -------------- csw/mgar/pkg/cswutils/trunk/checksums Modified: csw/mgar/pkg/cswutils/trunk/checksums =================================================================== --- csw/mgar/pkg/cswutils/trunk/checksums 2011-01-09 21:37:13 UTC (rev 12479) +++ csw/mgar/pkg/cswutils/trunk/checksums 2011-01-10 00:59:09 UTC (rev 12480) @@ -1,7 +1,7 @@ 4b5ef28c5a8fb45f60d57d5a12bc31b5 catalog.py -03eab3c2fda6212d2468ae2f6bc34bf8 checkpkg.py +e2150c4ad6bbb5545a3ddc23eccea8d9 checkpkg.py 03c7384869e75284b0df6803df62b68f checkpkg2.py -7f38545df383993488d959bf05842e87 checkpkg_lib.py +7181db66ceb6929dd540ada837f1b4cf checkpkg_lib.py b7ed7604e92d375b421f69a17fbf27cd common_constants.py 70200cc5eb2c87a1b1aaf6efa6ffd2bc compare_pkgs.py f4789eb3717cd52ea84eb5ce53040643 configuration.py @@ -14,7 +14,7 @@ 283779d73a88aca3d3fa203b38d4c0d8 opencsw.py 614dca976de7a563a587e6fd5b585629 overrides.py fa476d0cec5adbac1091192a6aefe8b3 package.py -4744c45a736d2d19eb4c4da6b945fce3 package_checks.py +e3737793a23b1955b1f369c9a030c117 package_checks.py f9bde429846be3d98f9e4af11a36672e package_stats.py ad38d99678db4d758e3e7a9265adcfdf pkgdb.py fa5c633db8dbd1da61d12e4a858720c4 pkgmap.py This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From gmarler at users.sourceforge.net Mon Jan 10 03:27:47 2011 From: gmarler at users.sourceforge.net (gmarler at users.sourceforge.net) Date: Mon, 10 Jan 2011 02:27:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[12481] csw/mgar/pkg/cpan/IO-Digest/trunk/Makefile Message-ID: Revision: 12481 http://gar.svn.sourceforge.net/gar/?rev=12481&view=rev Author: gmarler Date: 2011-01-10 02:27:47 +0000 (Mon, 10 Jan 2011) Log Message: ----------- put non-conflicting man pages back Modified Paths: -------------- csw/mgar/pkg/cpan/IO-Digest/trunk/Makefile Modified: csw/mgar/pkg/cpan/IO-Digest/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/IO-Digest/trunk/Makefile 2011-01-10 00:59:09 UTC (rev 12480) +++ csw/mgar/pkg/cpan/IO-Digest/trunk/Makefile 2011-01-10 02:27:47 UTC (rev 12481) @@ -17,6 +17,4 @@ ARCHALL = 1 -EXTRA_MERGE_EXCLUDE_FILES = \/opt\/csw\/share\/man.* - include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Mon Jan 10 07:28:41 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Mon, 10 Jan 2011 06:28:41 +0000 Subject: [csw-devel] SF.net SVN: gar:[12482] csw/mgar/pkg/subversion/trunk/Makefile Message-ID: Revision: 12482 http://gar.svn.sourceforge.net/gar/?rev=12482&view=rev Author: rthurner Date: 2011-01-10 06:28:41 +0000 (Mon, 10 Jan 2011) Log Message: ----------- subversion,use find to not gsed directories Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2011-01-10 02:27:47 UTC (rev 12481) +++ csw/mgar/pkg/subversion/trunk/Makefile 2011-01-10 06:28:41 UTC (rev 12482) @@ -289,8 +289,8 @@ install-extras: @echo "~~~ patching contributions with csw paths ~~~" + gfind $(WORKSRC)/contrib -type f -print0 | gxargs -0 gsed -i -e 's,/usr/bin/svn,/opt/csw/bin/svn,' {} gsed -i -e 's,/usr/bin/perl,/opt/csw/bin/perl,' $(WORKSRC)/contrib/*/*.pl - gsed -i -e 's,/usr/bin/svnlook,/opt/csw/bin/svnlook,' $(WORKSRC)/contrib/*/* gsed -i -e 's,/usr/bin/perl,/opt/csw/bin/perl,' $(WORKSRC)/contrib/*/*.cgi gsed -i -e 's,/usr/bin/,/opt/csw/bin/,' $(WORKSRC)/contrib/*/svnmirror.sh @echo "~~~ install tools and contrib ~~~" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Mon Jan 10 07:30:46 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Mon, 10 Jan 2011 06:30:46 +0000 Subject: [csw-devel] SF.net SVN: gar:[12483] csw/mgar/pkg/subversion/trunk/Makefile Message-ID: Revision: 12483 http://gar.svn.sourceforge.net/gar/?rev=12483&view=rev Author: rthurner Date: 2011-01-10 06:30:46 +0000 (Mon, 10 Jan 2011) Log Message: ----------- subversion, parameter at the end is default Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2011-01-10 06:28:41 UTC (rev 12482) +++ csw/mgar/pkg/subversion/trunk/Makefile 2011-01-10 06:30:46 UTC (rev 12483) @@ -289,7 +289,7 @@ install-extras: @echo "~~~ patching contributions with csw paths ~~~" - gfind $(WORKSRC)/contrib -type f -print0 | gxargs -0 gsed -i -e 's,/usr/bin/svn,/opt/csw/bin/svn,' {} + gfind $(WORKSRC)/contrib -type f -print0 | gxargs -0 gsed -i -e 's,/usr/bin/svn,/opt/csw/bin/svn,' gsed -i -e 's,/usr/bin/perl,/opt/csw/bin/perl,' $(WORKSRC)/contrib/*/*.pl gsed -i -e 's,/usr/bin/perl,/opt/csw/bin/perl,' $(WORKSRC)/contrib/*/*.cgi gsed -i -e 's,/usr/bin/,/opt/csw/bin/,' $(WORKSRC)/contrib/*/svnmirror.sh This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Mon Jan 10 08:23:10 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Mon, 10 Jan 2011 07:23:10 +0000 Subject: [csw-devel] SF.net SVN: gar:[12484] csw/mgar/pkg/subversion/trunk/Makefile Message-ID: Revision: 12484 http://gar.svn.sourceforge.net/gar/?rev=12484&view=rev Author: rthurner Date: 2011-01-10 07:23:10 +0000 (Mon, 10 Jan 2011) Log Message: ----------- subversion: checkpkg moarns ... so remove Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2011-01-10 06:30:46 UTC (rev 12483) +++ csw/mgar/pkg/subversion/trunk/Makefile 2011-01-10 07:23:10 UTC (rev 12484) @@ -88,7 +88,6 @@ RUNTIME_DEP_PKGS_CSWap2svn += CSWiconv PKGFILES_CSWap2svn = $(prefix)/apache2.* PKGFILES_CSWap2svn += $(docdir)/$(CATALOGNAME_CSWap2svn)/changelog.CSW -CHECKPKG_OVERRIDES_CSWap2svn += surplus-dependency|CSWapache2 SPKG_DESC_CSWjavasvn = Subversion Java Language Binding CATALOGNAME_CSWjavasvn = javasvn @@ -287,7 +286,7 @@ ln -s libsvn_ra_neon-1.so.0.0.0 libsvn_ra_dav-1.so; ) @$(MAKECOOKIE) -install-extras: +instal-extras: @echo "~~~ patching contributions with csw paths ~~~" gfind $(WORKSRC)/contrib -type f -print0 | gxargs -0 gsed -i -e 's,/usr/bin/svn,/opt/csw/bin/svn,' gsed -i -e 's,/usr/bin/perl,/opt/csw/bin/perl,' $(WORKSRC)/contrib/*/*.pl This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Mon Jan 10 08:50:19 2011 From: maciej at opencsw.org (Maciej (Matchek) Blizinski) Date: Mon, 10 Jan 2011 07:50:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[12484] csw/mgar/pkg/subversion/trunk/Makefile In-Reply-To: References: Message-ID: Hi Rupert, No dia 10 de Janeiro de 2011 07:23, escreveu: > Revision: 12484 > ? ? ? ? ?http://gar.svn.sourceforge.net/gar/?rev=12484&view=rev > Author: ? rthurner > Date: ? ? 2011-01-10 07:23:10 +0000 (Mon, 10 Jan 2011) > > Log Message: > ----------- > subversion: checkpkg moarns ... so remove > > Modified Paths: > -------------- > ? ?csw/mgar/pkg/subversion/trunk/Makefile > > Modified: csw/mgar/pkg/subversion/trunk/Makefile > =================================================================== > --- csw/mgar/pkg/subversion/trunk/Makefile ? ? ?2011-01-10 06:30:46 UTC (rev 12483) > +++ csw/mgar/pkg/subversion/trunk/Makefile ? ? ?2011-01-10 07:23:10 UTC (rev 12484) > @@ -88,7 +88,6 @@ > ?RUNTIME_DEP_PKGS_CSWap2svn ? += CSWiconv > ?PKGFILES_CSWap2svn ? ? ? ? ? ?= $(prefix)/apache2.* > ?PKGFILES_CSWap2svn ? ? ? ? ? += $(docdir)/$(CATALOGNAME_CSWap2svn)/changelog.CSW > -CHECKPKG_OVERRIDES_CSWap2svn += surplus-dependency|CSWapache2 > > ?SPKG_DESC_CSWjavasvn ? ? ? ? ? = Subversion Java Language Binding > ?CATALOGNAME_CSWjavasvn ? ? ? ? = javasvn > @@ -287,7 +286,7 @@ > ? ? ? ? ? ? ? ?ln -s libsvn_ra_neon-1.so.0.0.0 libsvn_ra_dav-1.so; ) > ? ? ? ?@$(MAKECOOKIE) > > -install-extras: > +instal-extras: > ? ? ? ?@echo "~~~ patching contributions with csw paths ~~~" > ? ? ? ?gfind $(WORKSRC)/contrib -type f -print0 | gxargs -0 gsed -i -e 's,/usr/bin/svn,/opt/csw/bin/svn,' > ? ? ? ?gsed -i -e 's,/usr/bin/perl,/opt/csw/bin/perl,' $(WORKSRC)/contrib/*/*.pl Looks like you've introduced a typo in this revision. From dmichelsen at users.sourceforge.net Mon Jan 10 09:42:00 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 10 Jan 2011 08:42:00 +0000 Subject: [csw-devel] SF.net SVN: gar:[12485] csw/mgar/pkg/libicu/trunk/Makefile Message-ID: Revision: 12485 http://gar.svn.sourceforge.net/gar/?rev=12485&view=rev Author: dmichelsen Date: 2011-01-10 08:42:00 +0000 (Mon, 10 Jan 2011) Log Message: ----------- libicu: Make *-devel not depend on legacy CSWlibicu Modified Paths: -------------- csw/mgar/pkg/libicu/trunk/Makefile Modified: csw/mgar/pkg/libicu/trunk/Makefile =================================================================== --- csw/mgar/pkg/libicu/trunk/Makefile 2011-01-10 07:23:10 UTC (rev 12484) +++ csw/mgar/pkg/libicu/trunk/Makefile 2011-01-10 08:42:00 UTC (rev 12485) @@ -34,7 +34,7 @@ CATALOGNAME_CSWlibicu-devel = libicu_devel SPKG_DESC_CSWlibicu-devel = Development Files for libicu # This package is PKGFILES catchall -RUNTIME_DEP_PKGS_CSWlibicu-devel = CSWlibicu CSWlibicu46 +RUNTIME_DEP_PKGS_CSWlibicu-devel = CSWlibicu46 PACKAGES += CSWlibicu CATALOGNAME_CSWlibicu = libicu This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Mon Jan 10 09:59:50 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 10 Jan 2011 08:59:50 +0000 Subject: [csw-devel] SF.net SVN: gar:[12486] csw/mgar/gar/v2/lib/python/checkpkg_lib.py Message-ID: Revision: 12486 http://gar.svn.sourceforge.net/gar/?rev=12486&view=rev Author: wahwah Date: 2011-01-10 08:59:50 +0000 (Mon, 10 Jan 2011) Log Message: ----------- checkpkg: bugfix: Don't reset registered checks If registered checks are cleared inside Run(), no checks are done in result. Modified Paths: -------------- csw/mgar/gar/v2/lib/python/checkpkg_lib.py Modified: csw/mgar/gar/v2/lib/python/checkpkg_lib.py =================================================================== --- csw/mgar/gar/v2/lib/python/checkpkg_lib.py 2011-01-10 08:42:00 UTC (rev 12485) +++ csw/mgar/gar/v2/lib/python/checkpkg_lib.py 2011-01-10 08:59:50 UTC (rev 12486) @@ -141,11 +141,11 @@ self.catrel = catrel self.show_progress = show_progress self._ResetState() + self.individual_checks = [] + self.set_checks = [] def _ResetState(self): self.errors = [] - self.individual_checks = [] - self.set_checks = [] self.packages = [] def GetProgressBar(self): 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 Jan 10 14:17:27 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 10 Jan 2011 13:17:27 +0000 Subject: [csw-devel] SF.net SVN: gar:[12487] csw/mgar/pkg/asciidoc/trunk/Makefile Message-ID: Revision: 12487 http://gar.svn.sourceforge.net/gar/?rev=12487&view=rev Author: dmichelsen Date: 2011-01-10 13:17:27 +0000 (Mon, 10 Jan 2011) Log Message: ----------- asciidoc: Fix typo Modified Paths: -------------- csw/mgar/pkg/asciidoc/trunk/Makefile Modified: csw/mgar/pkg/asciidoc/trunk/Makefile =================================================================== --- csw/mgar/pkg/asciidoc/trunk/Makefile 2011-01-10 08:59:50 UTC (rev 12486) +++ csw/mgar/pkg/asciidoc/trunk/Makefile 2011-01-10 13:17:27 UTC (rev 12487) @@ -2,7 +2,7 @@ VERSION = 8.6.1 CATEGORIES = utils -DESCRIPTION = An Documentation Generator +DESCRIPTION = A Documentation Generator define BLURB AsciiDoc is a text document format for writing short documents, articles, books and UNIX man pages. AsciiDoc files can be translated to This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dam at opencsw.org Mon Jan 10 14:25:12 2011 From: dam at opencsw.org (Dagobert Michelsen) Date: Mon, 10 Jan 2011 14:25:12 +0100 Subject: [csw-devel] [PATCH] mGAR v2: A bugfix for EXPANDVARS In-Reply-To: <1294556238-8779-1-git-send-email-maciej@opencsw.org> References: <1294556238-8779-1-git-send-email-maciej@opencsw.org> Message-ID: Hi Maciej, Am 09.01.2011 um 07:57 schrieb maciej at opencsw.org: > From: Maciej Blizinski > > The 'g' parameter was missing, and only one instance of a variable was > expanded per line. This patch adds 'g' to the perl invocation which expands > variables. Right. Thanks! -- Dago > --- > gar/v2/gar.mk | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/gar/v2/gar.mk b/gar/v2/gar.mk > index 4a3eee4..02b14f1 100644 > --- a/gar/v2/gar.mk > +++ b/gar/v2/gar.mk > @@ -444,7 +444,7 @@ extract-p: > _var_definitions = $(foreach VAR,$(shell perl -ne 'print "$$1 " if( /@([^@]+)@/ )' <$1),$(VAR)=$($(VAR))) > > expandvars-%: > - $(call _var_definitions,$(WORKDIR)/$*) perl -i-unexpanded -npe 's/@([^@]+)@/$$ENV{$$1}/e' $(WORKDIR)/$* > + $(call _var_definitions,$(WORKDIR)/$*) perl -i-unexpanded -npe 's/@([^@]+)@/$$ENV{$$1}/eg' $(WORKDIR)/$* > @$(MAKECOOKIE) > > > -- > 1.7.1 > From wahwah at users.sourceforge.net Mon Jan 10 15:35:01 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Mon, 10 Jan 2011 14:35:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[12488] csw/mgar/pkg/postgresql/branches/postgresql-9.0 Message-ID: Revision: 12488 http://gar.svn.sourceforge.net/gar/?rev=12488&view=rev Author: wahwah Date: 2011-01-10 14:35:01 +0000 (Mon, 10 Jan 2011) Log Message: ----------- postgresql-9.0: checking script Adding a script to check whether PKGROOT contains what we want it to contain. Also, committing work in progress in the Makefile. Modified Paths: -------------- csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile Added Paths: ----------- csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/check_pkgroot.sh Modified: csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile 2011-01-10 13:17:27 UTC (rev 12487) +++ csw/mgar/pkg/postgresql/branches/postgresql-9.0/Makefile 2011-01-10 14:35:01 UTC (rev 12488) @@ -24,8 +24,6 @@ VERSION = $(BASE_VERSION).$(PATCHLEVEL) CATEGORIES = apps -SHELL = /opt/csw/bin/bash - # Useful when making a series of builds on the same day # GARFLAVOR ?= DBG @@ -68,22 +66,21 @@ DISTFILES += CSWpostgresql-$(BASE_VERSION_G).postinstall PACKAGES += CSWpostgresql -PACKAGES += CSWpostgresql-$(BASE_VERSION_G)-doc +CATALOGNAME_CSWpostgresql = postgresql +SPKG_DESC_CSWpostgresql = An advanced open source database +PACKAGES += CSWpostgresql-$(BASE_VERSION_G)-doc CATALOGNAME_CSWpostgresql-$(BASE_VERSION_G)-doc = postgresql_$(BASE_VERSION_G)_doc -CATALOGNAME_CSWpostgresql = postgresql - -SPKG_DESC_CSWpostgresql = An advanced open source database SPKG_DESC_CSWpostgresql-$(BASE_VERSION_G)-doc = PostgreSQL $(BASE_VERSION).x Documentation -RUNTIME_DEP_PKGS_CSWpostgresql-90 += CSWlibxslt -RUNTIME_DEP_PKGS_CSWpostgresql-90 += CSWlibgnugetopt -RUNTIME_DEP_PKGS_CSWpostgresql-90 += CSWzlib -RUNTIME_DEP_PKGS_CSWpostgresql-90 += CSWlibxml2 -RUNTIME_DEP_PKGS_CSWpostgresql-90 += CSWreadline -RUNTIME_DEP_PKGS_CSWpostgresql-90 += CSWkrb5lib -RUNTIME_DEP_PKGS_CSWpostgresql-90 += CSWosslrt -RUNTIME_DEP_PKGS_CSWpostgresql-90 += CSWlibpq5 +RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G) += CSWlibxslt +RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G) += CSWlibgnugetopt +RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G) += CSWzlib +RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G) += CSWlibxml2 +RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G) += CSWreadline +RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G) += CSWkrb5lib +RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G) += CSWosslrt +RUNTIME_DEP_PKGS_CSWpostgresql-$(BASE_VERSION_G) += CSWlibpq5 ARCHALL_CSWpostgresql = 1 ARCHALL_CSWpostgresql-$(BASE_VERSION_G)-doc = 1 @@ -186,9 +183,10 @@ # This is one of the rare cases where a protoype filter is needed. # Do not copy this for other Makefiles unless you understand exactly what it does!! # (explanation: It adds -isaexec to the isaexec-name of the binaries to be isaexec'ed) -PROTOTYPE_FILTER = perl -npe 's,=/opt/csw/bin/isaexec,-isaexec=/opt/csw/bin/isaexec,' +PROTOTYPE_FILTER = perl -npe 's,=$(bindir)/isaexec,-isaexec=/opt/csw/bin/isaexec,' -# ISAEXEC_FILES = $(addsuffix -isaexec,$(foreach B,$(BIN_NAMES),$(bindir_install)/$B)) +ISAEXEC_FILES = $(addsuffix -isaexec,$(foreach B,$(BIN_NAMES),$(bindir_install)/$B)) + ALTERNATIVES_CSWpostgresql-$(BASE_VERSION_G) = $(NAME)$(BASE_VERSION_G)-32 $(NAME)$(BASE_VERSION_G)-64 $(NAME)$(BASE_VERSION_G)-auto ALTERNATIVE_$(NAME)$(BASE_VERSION_G)-32 = $(bindir_install)/$(firstword $(BIN_NAMES)) $(firstword $(BIN_NAMES)) $(bindir_install)/$(ISA_DEFAULT)/$(firstword $(BIN_NAMES)) 100 ALTERNATIVE_$(NAME)$(BASE_VERSION_G)-32 += $(foreach B,$(wordlist 2,$(words $(BIN_NAMES)),$(BIN_NAMES)),$(bindir_install)/$B $B $(bindir_install)/$(ISA_DEFAULT)/$B) @@ -202,7 +200,6 @@ PACKAGES += CSWlibpq5 CATALOGNAME_CSWlibpq5 = libpq5 -PKGFILES_CSWlibpq5 += $(call baseisadirs,$(prefix)/lib,libpq\.so\.5\.3) PKGFILES_CSWlibpq5 += $(call baseisadirs,$(prefix)/lib,libpq\.so\.5(\.\d+)*) SPKG_DESC_CSWlibpq5 += PostgreSQL C client library (built from $(BASE_VERSION).x sources), libpq.so.5 RUNTIME_DEP_PKGS_CSWlibpq5 += CSWosslrt @@ -210,7 +207,6 @@ PACKAGES += CSWlibecpg6 CATALOGNAME_CSWlibecpg6 = libecpg6 -PKGFILES_CSWlibecpg6 += $(call baseisadirs,$(prefix)/lib,libecpg\.so\.6\.0) PKGFILES_CSWlibecpg6 += $(call baseisadirs,$(prefix)/lib,libecpg\.so\.6(\.\d+)*) SPKG_DESC_CSWlibecpg6 += Embedded PostgreSQL for C library (built from $(BASE_VERSION).x sources), libecpg.so.6 RUNTIME_DEP_PKGS_CSWlibecpg6 += CSWlibpgtypes3 @@ -218,7 +214,6 @@ PACKAGES += CSWlibecpg-compat3 CATALOGNAME_CSWlibecpg-compat3 = libecpg_compat3 -PKGFILES_CSWlibecpg-compat3 += $(call baseisadirs,$(prefix)/lib,libecpg_compat\.so\.3\.2) PKGFILES_CSWlibecpg-compat3 += $(call baseisadirs,$(prefix)/lib,libecpg_compat\.so\.3(\.\d+)*) SPKG_DESC_CSWlibecpg-compat3 += Older version of run-time library for ECPG programs (built from $(BASE_VERSION).x sources), libecpg_compat.so.3 RUNTIME_DEP_PKGS_CSWlibecpg-compat3 += CSWlibecpg6 @@ -261,33 +256,28 @@ # Legacy libraries PACKAGES += CSWlibpq3 CATALOGNAME_CSWlibpq3 = libpq3 -PKGFILES_CSWlibpq3 += $(call baseisadirs,$(prefix)/lib,libpq\.so\.3\.2) PKGFILES_CSWlibpq3 += $(call baseisadirs,$(prefix)/lib,libpq\.so\.3(\.\d+)*) SPKG_DESC_CSWlibpq3 += PostgreSQL C client library, libpq.so.3 RUNTIME_DEP_PKGS_CSWlibpq3 += CSWosslrt PACKAGES += CSWlibpq4 CATALOGNAME_CSWlibpq4 = libpq4 -PKGFILES_CSWlibpq4 += $(call baseisadirs,$(prefix)/lib,libpq\.so\.4\.1) PKGFILES_CSWlibpq4 += $(call baseisadirs,$(prefix)/lib,libpq\.so\.4(\.\d+)*) SPKG_DESC_CSWlibpq4 += PostgreSQL C client library, libpq.so.4 RUNTIME_DEP_PKGS_CSWlibpq4 += CSWosslrt PACKAGES += CSWlibpgtypes1 CATALOGNAME_CSWlibpgtypes1 = libpgtypes1 -PKGFILES_CSWlibpgtypes1 += $(call baseisadirs,$(prefix)/lib,libpgtypes\.so\.1\.2) PKGFILES_CSWlibpgtypes1 += $(call baseisadirs,$(prefix)/lib,libpgtypes\.so\.1(\.\d+)*) SPKG_DESC_CSWlibpgtypes1 += Used by programs built with ecpg (Embedded PostgreSQL for C), libpgtypes.so.1 PACKAGES += CSWlibpgtypes2 CATALOGNAME_CSWlibpgtypes2 = libpgtypes2 -PKGFILES_CSWlibpgtypes2 += $(call baseisadirs,$(prefix)/lib,libpgtypes\.so\.2\.2) PKGFILES_CSWlibpgtypes2 += $(call baseisadirs,$(prefix)/lib,libpgtypes\.so\.2(\.\d+)*) SPKG_DESC_CSWlibpgtypes2 += Used by programs built with ecpg (Embedded PostgreSQL for C), libpgtypes.so.2 PACKAGES += CSWlibecpg4 CATALOGNAME_CSWlibecpg4 = libecpg4 -PKGFILES_CSWlibecpg4 += $(call baseisadirs,$(prefix)/lib,libecpg\.so\.4\.2) PKGFILES_CSWlibecpg4 += $(call baseisadirs,$(prefix)/lib,libecpg\.so\.4(\.\d+)*) SPKG_DESC_CSWlibecpg4 += Embedded PostgreSQL for C library, libecpg.so.4 RUNTIME_DEP_PKGS_CSWlibecpg4 += CSWlibpgtypes1 @@ -296,7 +286,6 @@ PACKAGES += CSWlibecpg5 CATALOGNAME_CSWlibecpg5 = libecpg5 -PKGFILES_CSWlibecpg5 += $(call baseisadirs,$(prefix)/lib,libecpg\.so\.5\.2) PKGFILES_CSWlibecpg5 += $(call baseisadirs,$(prefix)/lib,libecpg\.so\.5(\.\d+)*) SPKG_DESC_CSWlibecpg5 += Embedded PostgreSQL for C library, libecpg.so.5 RUNTIME_DEP_PKGS_CSWlibecpg5 += CSWlibpgtypes2 @@ -304,7 +293,6 @@ PACKAGES += CSWlibecpg-compat2 CATALOGNAME_CSWlibecpg-compat2 = libecpg_compat2 -PKGFILES_CSWlibecpg-compat2 += $(call baseisadirs,$(prefix)/lib,libecpg_compat\.so\.2\.2) PKGFILES_CSWlibecpg-compat2 += $(call baseisadirs,$(prefix)/lib,libecpg_compat\.so\.2(\.\d+)*) SPKG_DESC_CSWlibecpg-compat2 += Older version of run-time library for ECPG programs, libecpg_compat.so.2 RUNTIME_DEP_PKGS_CSWlibecpg-compat2 += CSWlibpgtypes2 @@ -340,27 +328,27 @@ ginstall -d -m 755 $(DESTDIR)$(prefix)/bin [ -r $(DESTDIR)$(bindir)/pg_config ] && \ gmv -v $(DESTDIR)$(bindir)/pg_config $(DESTDIR)$(prefix)/bin || true - @$(MAKECOOKIE) - -post-merge: - ginstall -d $(PKGROOT)/etc$(prefix)/init.d + ginstall -d $(DESTDIR)/etc$(prefix)/init.d ginstall \ $(WORKDIR)/cswpostgres.tmpl \ - $(PKGROOT)/etc$(prefix)/init.d/$(initscript_base_name) - ginstall -d $(PKGROOT)/etc$(prefix)/pkg/$(NAME) + $(DESTDIR)/etc$(prefix)/init.d/$(initscript_base_name) + ginstall -d $(DESTDIR)/etc$(prefix)/pkg/$(NAME) gsed -e 's+ at PGDATA@+$(PGDATA)+g' \ < $(FILEDIR)/cswusergroup.tmpl \ > $(WORKDIR)/cswusergroup ginstall $(WORKDIR)/cswusergroup \ - $(PKGROOT)/etc$(prefix)/pkg/$(NAME)/cswusergroup_$(VERSION_NODOT) - ginstall -d $(PKGROOT)$(sysconfdir) + $(DESTDIR)/etc$(prefix)/pkg/$(NAME)/cswusergroup_$(VERSION_NODOT) + ginstall -d $(DESTDIR)$(sysconfdir) gsed -e 's+ at PGDATA@+$(PGDATA)+g' \ < $(FILEDIR)/postgresql.conf.tmpl \ > $(WORKDIR)/postgresql.conf ginstall $(WORKDIR)/postgresql.conf \ - $(PKGROOT)$(sysconfdir) - ginstall -d $(PKGROOT)$(docdir) - # ginstall $(WORKDIR)/README-CSW.txt $(PKGROOT)$(docdir) + $(DESTDIR)$(sysconfdir) + ginstall -d $(DESTDIR)$(docdir) + # ginstall $(WORKDIR)/README-CSW.txt $(DESTDIR)$(docdir) + @$(MAKECOOKIE) + +post-merge: ginstall -m 755 -d $(PKGROOT)$(prefix)/bin # for b in $(BIN_NAMES); do \ # gln -s ..$(version_dependent)/bin/$${b} $(PKGROOT)$(prefix)/bin/$${b}; \ @@ -393,4 +381,7 @@ ../../lib/$(ISA_DEFAULT64)/`basename $${f}` \ $(PKGROOT)$(prefix)/postgresql/lib/$(ISA_DEFAULT64); \ done + + # Checks whether the pkgroot contents is OK. + $(FILEDIR)/check_pkgroot.sh "$(PKGROOT)" @$(MAKECOOKIE) Added: csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/check_pkgroot.sh =================================================================== --- csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/check_pkgroot.sh (rev 0) +++ csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/check_pkgroot.sh 2011-01-10 14:35:01 UTC (rev 12488) @@ -0,0 +1,20 @@ +#!/opt/csw/bin/bash +# $Id$ + +declare -r PKGROOT="$1" + +if [[ -z "${PKGROOT}" ]] +then + echo "Please give an argument." + exit 1 +fi + +set -u +set -e +set -x + +# Look for unexpanded variables +! grep @sysconfdir@ ${PKGROOT}/etc/opt/csw/init.d/cswpostgres_9_0 + + +! test -h ${PKGROOT}/opt/csw/lib/postgresql/9.0/lib/libecpg.so Property changes on: csw/mgar/pkg/postgresql/branches/postgresql-9.0/files/check_pkgroot.sh ___________________________________________________________________ Added: svn:executable + * Added: svn:keywords + Id 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 Jan 10 16:12:55 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Mon, 10 Jan 2011 15:12:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[12489] csw/mgar/pkg/cpan/Archive-Tar/trunk/files Message-ID: Revision: 12489 http://gar.svn.sourceforge.net/gar/?rev=12489&view=rev Author: dmichelsen Date: 2011-01-10 15:12:55 +0000 (Mon, 10 Jan 2011) Log Message: ----------- cpan/Archive-Tar: Remove old unused gspec Removed Paths: ------------- csw/mgar/pkg/cpan/Archive-Tar/trunk/files/CSWpmarchivetar.depend csw/mgar/pkg/cpan/Archive-Tar/trunk/files/CSWpmarchivetar.gspec csw/mgar/pkg/cpan/Archive-Tar/trunk/files/CSWpmarchivetar.prototype Deleted: csw/mgar/pkg/cpan/Archive-Tar/trunk/files/CSWpmarchivetar.depend =================================================================== --- csw/mgar/pkg/cpan/Archive-Tar/trunk/files/CSWpmarchivetar.depend 2011-01-10 14:35:01 UTC (rev 12488) +++ csw/mgar/pkg/cpan/Archive-Tar/trunk/files/CSWpmarchivetar.depend 2011-01-10 15:12:55 UTC (rev 12489) @@ -1 +0,0 @@ -P CSWpmiozlib pm_iozlib - IO:: style interface to Compress::Zlib Deleted: csw/mgar/pkg/cpan/Archive-Tar/trunk/files/CSWpmarchivetar.gspec =================================================================== --- csw/mgar/pkg/cpan/Archive-Tar/trunk/files/CSWpmarchivetar.gspec 2011-01-10 14:35:01 UTC (rev 12488) +++ csw/mgar/pkg/cpan/Archive-Tar/trunk/files/CSWpmarchivetar.gspec 2011-01-10 15:12:55 UTC (rev 12489) @@ -1,10 +0,0 @@ -%var bitname pm_archivetar -%var pkgname CSWpmarchivetar -%var arch all -%include url file://%{PKGLIB}/csw_cpan.gspec -%copyright -This module is copyright (c) 2002 Jos Boumans -Ekane at cpan.orgE. All rights reserved. - -This library is free software; you may redistribute and/or -modify it under the same terms as Perl itself. Deleted: csw/mgar/pkg/cpan/Archive-Tar/trunk/files/CSWpmarchivetar.prototype =================================================================== --- csw/mgar/pkg/cpan/Archive-Tar/trunk/files/CSWpmarchivetar.prototype 2011-01-10 14:35:01 UTC (rev 12488) +++ csw/mgar/pkg/cpan/Archive-Tar/trunk/files/CSWpmarchivetar.prototype 2011-01-10 15:12:55 UTC (rev 12489) @@ -1,23 +0,0 @@ -d none /opt/csw/bin 0755 root bin -f none /opt/csw/bin/ptar 0555 root bin -f none /opt/csw/bin/ptardiff 0555 root bin -d none /opt/csw/lib 0755 root bin -d none /opt/csw/lib/perl 0755 root bin -d none /opt/csw/lib/perl/csw 0755 root bin -d none /opt/csw/lib/perl/csw/auto 0755 root bin -d none /opt/csw/lib/perl/csw/auto/Archive 0755 root bin -d none /opt/csw/lib/perl/csw/auto/Archive/Tar 0755 root bin -f none /opt/csw/lib/perl/csw/auto/Archive/Tar/.packlist 0644 root bin -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man1 0755 root bin -d none /opt/csw/share/man/man3 0755 root bin -f none /opt/csw/share/man/man3/Archive::Tar.3perl 0444 root bin -f none /opt/csw/share/man/man3/Archive::Tar::File.3perl 0444 root bin -d none /opt/csw/share/perl 0755 root bin -d none /opt/csw/share/perl/csw 0755 root bin -d none /opt/csw/share/perl/csw/Archive 0755 root bin -d none /opt/csw/share/perl/csw/Archive/Tar 0755 root bin -f none /opt/csw/share/perl/csw/Archive/Tar.pm 0444 root bin -f none /opt/csw/share/perl/csw/Archive/Tar/Constant.pm 0444 root bin -f none /opt/csw/share/perl/csw/Archive/Tar/File.pm 0444 root bin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bonivart at users.sourceforge.net Mon Jan 10 16:15:06 2011 From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net) Date: Mon, 10 Jan 2011 15:15:06 +0000 Subject: [csw-devel] SF.net SVN: gar:[12490] csw/mgar/pkg/cpan/Test-WWW-Mechanize/trunk/Makefile Message-ID: Revision: 12490 http://gar.svn.sourceforge.net/gar/?rev=12490&view=rev Author: bonivart Date: 2011-01-10 15:15:06 +0000 (Mon, 10 Jan 2011) Log Message: ----------- pm_testwwwmech: change dep to old name CSWpmtestlongstr Modified Paths: -------------- csw/mgar/pkg/cpan/Test-WWW-Mechanize/trunk/Makefile Modified: csw/mgar/pkg/cpan/Test-WWW-Mechanize/trunk/Makefile =================================================================== --- csw/mgar/pkg/cpan/Test-WWW-Mechanize/trunk/Makefile 2011-01-10 15:12:55 UTC (rev 12489) +++ csw/mgar/pkg/cpan/Test-WWW-Mechanize/trunk/Makefile 2011-01-10 15:15:06 UTC (rev 12490) @@ -16,11 +16,9 @@ SKIPTEST = 1 -RUNTIME_DEP_PKGS += CSWpmtestlongstring +RUNTIME_DEP_PKGS += CSWpmtestlongstr RUNTIME_DEP_PKGS += CSWpmwwwmechanize RUNTIME_DEP_PKGS += CSWpmhtmltree RUNTIME_DEP_PKGS += CSWpmcarpassertmore -CHECKPKG_OVERRIDES_CSWpmtestwwwmech += unidentified-dependency - include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From theferret at users.sourceforge.net Mon Jan 10 17:38:01 2011 From: theferret at users.sourceforge.net (theferret at users.sourceforge.net) Date: Mon, 10 Jan 2011 16:38:01 +0000 Subject: [csw-devel] SF.net SVN: gar:[12491] csw/mgar/pkg/cswutils/trunk/files/checkpkg Message-ID: Revision: 12491 http://gar.svn.sourceforge.net/gar/?rev=12491&view=rev Author: theferret Date: 2011-01-10 16:38:01 +0000 (Mon, 10 Jan 2011) Log Message: ----------- checkpkg: remove old path Modified Paths: -------------- csw/mgar/pkg/cswutils/trunk/files/checkpkg Modified: csw/mgar/pkg/cswutils/trunk/files/checkpkg =================================================================== --- csw/mgar/pkg/cswutils/trunk/files/checkpkg 2011-01-10 15:15:06 UTC (rev 12490) +++ csw/mgar/pkg/cswutils/trunk/files/checkpkg 2011-01-10 16:38:01 UTC (rev 12491) @@ -195,7 +195,7 @@ # check for badly set RUNPATHs. sigh. # Note that need to escape one /, so that it does not #trigger check if checking its own package - badpaths="[/]export/medusa [/]opt/build [/]export/home [/]usr/share [/]usr/local" + badpaths="[/]export/home [/]usr/share [/]usr/local" unset badstrings for badpath in $badpaths ; do GREP=/bin/grep gzgrep "$badpath" $f This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From rthurner at users.sourceforge.net Mon Jan 10 20:49:19 2011 From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net) Date: Mon, 10 Jan 2011 19:49:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[12492] csw/mgar/pkg/subversion/trunk/Makefile Message-ID: Revision: 12492 http://gar.svn.sourceforge.net/gar/?rev=12492&view=rev Author: rthurner Date: 2011-01-10 19:49:18 +0000 (Mon, 10 Jan 2011) Log Message: ----------- subversion, typo in Makefile target Modified Paths: -------------- csw/mgar/pkg/subversion/trunk/Makefile Modified: csw/mgar/pkg/subversion/trunk/Makefile =================================================================== --- csw/mgar/pkg/subversion/trunk/Makefile 2011-01-10 16:38:01 UTC (rev 12491) +++ csw/mgar/pkg/subversion/trunk/Makefile 2011-01-10 19:49:18 UTC (rev 12492) @@ -286,7 +286,7 @@ ln -s libsvn_ra_neon-1.so.0.0.0 libsvn_ra_dav-1.so; ) @$(MAKECOOKIE) -instal-extras: +install-extras: @echo "~~~ patching contributions with csw paths ~~~" gfind $(WORKSRC)/contrib -type f -print0 | gxargs -0 gsed -i -e 's,/usr/bin/svn,/opt/csw/bin/svn,' gsed -i -e 's,/usr/bin/perl,/opt/csw/bin/perl,' $(WORKSRC)/contrib/*/*.pl 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 Jan 11 04:39:59 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 11 Jan 2011 03:39:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[12493] csw/mgar/pkg/gettext/trunk/Makefile Message-ID: Revision: 12493 http://gar.svn.sourceforge.net/gar/?rev=12493&view=rev Author: bdwalton Date: 2011-01-11 03:39:58 +0000 (Tue, 11 Jan 2011) Log Message: ----------- gettext/trunk: add lines to split out the library packages Modified Paths: -------------- csw/mgar/pkg/gettext/trunk/Makefile Modified: csw/mgar/pkg/gettext/trunk/Makefile =================================================================== --- csw/mgar/pkg/gettext/trunk/Makefile 2011-01-10 19:49:18 UTC (rev 12492) +++ csw/mgar/pkg/gettext/trunk/Makefile 2011-01-11 03:39:58 UTC (rev 12493) @@ -8,15 +8,39 @@ endef PACKAGES = CSWggettextrt CSWggettextdoc CSWggettext +PACKAGES += CSWlibasprintf0 CSWlibgettextlib0-14-1 CSWlibgettextlib0-17 +PACKAGES += CSWlibgettextlib0-18-1 CSWlibgettextpo0 CSWlibgettextsrc0-17 +PACKAGES += CSWlibgettextsrc0-18-1 CSWlibintl2 CSWlibintl3 CSWlibintl8 ARCHALL_CSWggettextel = 1 CATALOGNAME_CSWggettext = ggettext CATALOGNAME_CSWggettextdoc = ggettextdoc CATALOGNAME_CSWggettextrt = ggettextrt +CATALOGNAME_CSWlibasprintf0 = libasprintf0 +CATALOGNAME_CSWlibgettextlib0-14-1 = libgettextlib0_14_1 +CATALOGNAME_CSWlibgettextlib0-17 = libgettextlib0_17 +CATALOGNAME_CSWlibgettextlib0-18-1 = libgettextlib0_18_1 +CATALOGNAME_CSWlibgettextpo0 = libgettextpo0 +CATALOGNAME_CSWlibgettextsrc0-17 = libgettextsrc0_17 +CATALOGNAME_CSWlibgettextsrc0-18-1 = libgettextsrc0_18_1 +CATALOGNAME_CSWlibintl2 = libintl2 +CATALOGNAME_CSWlibintl3 = libintl3 +CATALOGNAME_CSWlibintl8 = libintl8 SPKG_DESC_CSWggettext = GNU locale utilities and development headers SPKG_DESC_CSWggettextdoc = GNU locale documentation SPKG_DESC_CSWggettextrt = GNU locale runtime +SPKG_DESC_CSWlibasprintf0 = GNU locale runtime, libasprintf.so.0 +SPKG_DESC_CSWlibgettextlib0-14-1 += GNU locale runtime, libgettextlib-0.14.1.so +SPKG_DESC_CSWlibgettextlib0-17 += GNU locale runtime, libgettextlib-0.17.so +SPKG_DESC_CSWlibgettextlib0-17 += GNU locale runtime, libgettextlib-0.18.1.so +SPKG_DESC_CSWlibgettextpo0 += GNU locale runtime, libgettextpo.so.0 +SPKG_DESC_CSWlibgettextsrc0-17 += GNU locale runtime, libgettextsrc-0.17.so +SPKG_DESC_CSWlibgettextsrc0-18-1 += GNU locale runtime, libgettextsrc-0.18.1.so +SPKG_DESC_CSWlibintl2 += GNU locale runtime, libintl.so.2 +SPKG_DESC_CSWlibintl3 += GNU locale runtime, libintl.so.3 +SPKG_DESC_CSWlibintl8 += GNU locale runtime, libintl.so.8 + ARCHALL_CSWggettextdoc = 1 COMPILE_ELISP = 1 @@ -62,6 +86,26 @@ #PKGFILES_CSWggettextrt = $(call baseisadirs,$(libdir),libintl\..*) #PKGFILES_CSWggettextrt += $(call baseisadirs,$(libdir),libasprintf\..*) #PKGFILES_CSWggettextrt += $(call baseisadirs,$(libdir),libgettextpo\..*) +PKGFILES_CSWlibasprintf0 += $(call baseisadirs,$(libdir),libasprintf\.so\.0(\.\d+)*) +PKGFILES_CSWlibgettextlib0-14-1 += $(call baseisadirs,$(libdir),libgettextlib-0.14\.1\.so) +PKGFILES_CSWlibgettextlib0-14-1 += $(call baseisadirs,$(libdir),libgettextlib-0\.14\.1\.so(\.\d+)*) +PKGFILES_CSWlibgettextlib0-18-1 += $(call baseisadirs,$(libdir),libgettextlib-0\.18\.1\.so) +PKGFILES_CSWlibgettextlib0-18-1 += $(call baseisadirs,$(libdir),libgettextlib-0\.18\.1\.so(\.\d+)*) +PKGFILES_CSWlibgettextpo0 += $(call baseisadirs,$(libdir),libgettextpo\.so\.0\.4\.0) +PKGFILES_CSWlibgettextpo0 += $(call baseisadirs,$(libdir),libgettextpo\.so\.0(\.\d+)*) +PKGFILES_CSWlibgettextsrc0-17 += $(call baseisadirs,$(libdir),libgettextsrc-0\.17\.so) +PKGFILES_CSWlibgettextsrc0-17 += $(call baseisadirs,$(libdir),libgettextsrc-0\.17\.so(\.\d+)*) +PKGFILES_CSWlibgettextsrc0-18-1 += $(call baseisadirs,$(libdir),libgettextsrc-0\.18\.1\.so) +PKGFILES_CSWlibgettextsrc0-18-1 += $(call baseisadirs,$(libdir),libgettextsrc-0\.18\.1\.so(\.\d+)*) +PKGFILES_CSWlibintl2 += $(call baseisadirs,$(libdir),libintl\.so\.2) +PKGFILES_CSWlibintl2 += $(call baseisadirs,$(libdir),libintl\.so\.2(\.\d+)*) +PKGFILES_CSWlibintl3 += $(call baseisadirs,$(libdir),libintl\.so\.3) +PKGFILES_CSWlibintl3 += $(call baseisadirs,$(libdir),libintl\.so\.3(\.\d+)*) +PKGFILES_CSWlibintl8 += $(call baseisadirs,$(libdir),libintl\.so\.8\.0\.2) +PKGFILES_CSWlibintl8 += $(call baseisadirs,$(libdir),libintl\.so\.8(\.\d+)*) +PKGFILES_CSWlibintl8 += $(call baseisadirs,$(libdir),libintl\.so\.8\.1\.1) +PKGFILES_CSWlibintl8 += $(call baseisadirs,$(libdir),libintl\.so\.8(\.\d+)*) + #so use this for now PKGFILES_CSWggettextrt = .*/libintl\.so.* .*/libasprintf\.so.* .*/libgettextpo\.so.* PKGFILES_CSWggettextrt += .*/libgettext.*\.so.* 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 Jan 11 04:48:45 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 11 Jan 2011 03:48:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[12494] csw/mgar/pkg/gettext/trunk/Makefile Message-ID: Revision: 12494 http://gar.svn.sourceforge.net/gar/?rev=12494&view=rev Author: bdwalton Date: 2011-01-11 03:48:45 +0000 (Tue, 11 Jan 2011) Log Message: ----------- gettext/trunk: correct variable name in libgettextlib package splitting Modified Paths: -------------- csw/mgar/pkg/gettext/trunk/Makefile Modified: csw/mgar/pkg/gettext/trunk/Makefile =================================================================== --- csw/mgar/pkg/gettext/trunk/Makefile 2011-01-11 03:39:58 UTC (rev 12493) +++ csw/mgar/pkg/gettext/trunk/Makefile 2011-01-11 03:48:45 UTC (rev 12494) @@ -33,7 +33,7 @@ SPKG_DESC_CSWlibasprintf0 = GNU locale runtime, libasprintf.so.0 SPKG_DESC_CSWlibgettextlib0-14-1 += GNU locale runtime, libgettextlib-0.14.1.so SPKG_DESC_CSWlibgettextlib0-17 += GNU locale runtime, libgettextlib-0.17.so -SPKG_DESC_CSWlibgettextlib0-17 += GNU locale runtime, libgettextlib-0.18.1.so +SPKG_DESC_CSWlibgettextlib0-18 += GNU locale runtime, libgettextlib-0.1.1.so SPKG_DESC_CSWlibgettextpo0 += GNU locale runtime, libgettextpo.so.0 SPKG_DESC_CSWlibgettextsrc0-17 += GNU locale runtime, libgettextsrc-0.17.so SPKG_DESC_CSWlibgettextsrc0-18-1 += GNU locale runtime, libgettextsrc-0.18.1.so 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 Jan 11 04:50:40 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Tue, 11 Jan 2011 03:50:40 +0000 Subject: [csw-devel] SF.net SVN: gar:[12495] csw/mgar/pkg/gettext/trunk/Makefile Message-ID: Revision: 12495 http://gar.svn.sourceforge.net/gar/?rev=12495&view=rev Author: bdwalton Date: 2011-01-11 03:50:39 +0000 (Tue, 11 Jan 2011) Log Message: ----------- gettext/trunk: second correction on libgettextlib package splitting Modified Paths: -------------- csw/mgar/pkg/gettext/trunk/Makefile Modified: csw/mgar/pkg/gettext/trunk/Makefile =================================================================== --- csw/mgar/pkg/gettext/trunk/Makefile 2011-01-11 03:48:45 UTC (rev 12494) +++ csw/mgar/pkg/gettext/trunk/Makefile 2011-01-11 03:50:39 UTC (rev 12495) @@ -33,7 +33,7 @@ SPKG_DESC_CSWlibasprintf0 = GNU locale runtime, libasprintf.so.0 SPKG_DESC_CSWlibgettextlib0-14-1 += GNU locale runtime, libgettextlib-0.14.1.so SPKG_DESC_CSWlibgettextlib0-17 += GNU locale runtime, libgettextlib-0.17.so -SPKG_DESC_CSWlibgettextlib0-18 += GNU locale runtime, libgettextlib-0.1.1.so +SPKG_DESC_CSWlibgettextlib0-18-1 += GNU locale runtime, libgettextlib-0.18.1.so SPKG_DESC_CSWlibgettextpo0 += GNU locale runtime, libgettextpo.so.0 SPKG_DESC_CSWlibgettextsrc0-17 += GNU locale runtime, libgettextsrc-0.17.so SPKG_DESC_CSWlibgettextsrc0-18-1 += GNU locale runtime, libgettextsrc-0.18.1.so This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Jan 11 11:49:08 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 11 Jan 2011 10:49:08 +0000 Subject: [csw-devel] SF.net SVN: gar:[12497] csw/mgar/pkg/lang-python/python/branches/python-3.1 /Makefile Message-ID: Revision: 12497 http://gar.svn.sourceforge.net/gar/?rev=12497&view=rev Author: wahwah Date: 2011-01-11 10:49:08 +0000 (Tue, 11 Jan 2011) Log Message: ----------- python-3.1: Fixed file collisions with CSWpython Modified Paths: -------------- csw/mgar/pkg/lang-python/python/branches/python-3.1/Makefile Modified: csw/mgar/pkg/lang-python/python/branches/python-3.1/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-3.1/Makefile 2011-01-11 10:28:19 UTC (rev 12496) +++ csw/mgar/pkg/lang-python/python/branches/python-3.1/Makefile 2011-01-11 10:49:08 UTC (rev 12497) @@ -50,10 +50,6 @@ # Test for sunaudiodev fails. SKIPTEST = 1 -# EXTRA_INC += $(prefix)/X11/include -# EXTRA_LIB += $(prefix)/X11/lib -# EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib -# EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR)) BASECFLAGS = $(CFLAGS) EXTRA_COMMON_EXPORTS = BASECFLAGS @@ -70,7 +66,7 @@ # This doesn't work here, as _PYCOMPILE_FILES is not the directory Python uses. # PYCOMPILE = 1 -EXTRA_MERGE_EXCLUDE_FILES = .*\.pyo .*\.pyc +EXTRA_MERGE_EXCLUDE_FILES += .*\.pyo .*\.pyc # use prototype filters to set the class PROTOTYPE_FILTER = awk '$$$$3 ~/.*\.py$$$$/ { $$$$2 = "cswpycompile" } { print }' @@ -149,6 +145,8 @@ CHECKPKG_OVERRIDES_CSWidle$(CVER) += missing-dependency|CSWpython CHECKPKG_OVERRIDES_CSWidle$(CVER) += surplus-dependency|CSWpython$(CVER) CHECKPKG_OVERRIDES_CSWpython$(CVER)-devel += surplus-dependency|CSWpython$(CVER) +CHECKPKG_OVERRIDES_CSWpython$(CVER)-devel += missing-dependency|CSWpython +CHECKPKG_OVERRIDES_CSWpython$(CVER)-tk += missing-dependency|CSWpython LICENSE = LICENSE @@ -165,4 +163,18 @@ CHECKPKG_OVERRIDES_CSWpython$(CVER) += catalogname-does-not-start-with-py_ CHECKPKG_OVERRIDES_CSWpython$(CVER)-tk += surplus-dependency|CSWpython$(CVER) +# Checkpkg does not understand relocatable packages. +CHECKPKG_OVERRIDES_CSWpython$(CVER) += soname-not-found|libgdbm.so.3|is|needed|by|opt/csw/lib/$(PVER)/lib-dynload/gdbm.so +CHECKPKG_OVERRIDES_CSWpython$(CVER) += soname-not-found|libgdbm.so.3|is|needed|by|opt/csw/lib/$(PVER)/lib-dynload/_gdbm.so +CHECKPKG_OVERRIDES_CSWpython$(CVER) += surplus-dependency|CSWgdbm + + +# To avoid file collisions with CSWpython: +EXTRA_PAX_ARGS += -s ',^\.$(bindir)/idle,$(bindir)/idle-$(VER),' +EXTRA_PAX_ARGS += -s ',^\.$(bindir)/smtpd.py,$(bindir)/smtpd.py-$(VER),' +EXTRA_PAX_ARGS += -s ',^\.$(bindir)/pydoc,$(bindir)/pydoc-$(VER),' +EXTRA_PAX_ARGS += -s ',^\.$(bindir)/2to3,$(bindir)/2to3-$(VER),' +EXTRA_PAX_ARGS += -s ',^\.$(bindir)/python-config,$(bindir)/python-config-$(VER),' +EXTRA_MERGE_EXCLUDE_FILES += $(bindir)/python + include gar/category.mk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Jan 11 11:28:19 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 11 Jan 2011 10:28:19 +0000 Subject: [csw-devel] SF.net SVN: gar:[12496] csw/mgar/pkg/lang-python/python/branches/python-2.7 Message-ID: Revision: 12496 http://gar.svn.sourceforge.net/gar/?rev=12496&view=rev Author: wahwah Date: 2011-01-11 10:28:19 +0000 (Tue, 11 Jan 2011) Log Message: ----------- python-2.7: Fix file collisions Modified Paths: -------------- csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile csw/mgar/pkg/lang-python/python/branches/python-2.7/checksums Modified: csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile 2011-01-11 03:50:39 UTC (rev 12495) +++ csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile 2011-01-11 10:28:19 UTC (rev 12496) @@ -1,7 +1,7 @@ # $Id$ NAME = Python -VERSION = 2.7 +VERSION = 2.7.1 CATEGORIES = lang VER = 2.7 DVER = 2-7 @@ -52,8 +52,6 @@ # Test for sunaudiodev fails. SKIPTEST = 1 -# EXTRA_INC += $(prefix)/bdb47/include -# EXTRA_LIB += $(prefix)/bdb47/lib BASECFLAGS = $(CFLAGS) EXTRA_COMMON_EXPORTS = BASECFLAGS @@ -70,7 +68,7 @@ # This doesn't work here, as _PYCOMPILE_FILES is not the directory Python uses. # PYCOMPILE = 1 -EXTRA_MERGE_EXCLUDE_FILES = .*\.pyo .*\.pyc +EXTRA_MERGE_EXCLUDE_FILES += .*\.pyo .*\.pyc # use prototype filters to set the class PROTOTYPE_FILTER = awk '$$$$3 ~/.*\.py$$$$/ { $$$$2 = "cswpycompile" } { print }' @@ -167,4 +165,16 @@ CHECKPKG_OVERRIDES_CSWpython$(CVER) += catalogname-does-not-start-with-py_ CHECKPKG_OVERRIDES_CSWpython$(CVER)-tk += surplus-dependency|CSWpython$(CVER) +# Checkpkg does not understand relocatable packages. +CHECKPKG_OVERRIDES_CSWpython$(CVER) += soname-not-found|libgdbm.so.3|is|needed|by|opt/csw/lib/python2.7/lib-dynload/gdbm.so +CHECKPKG_OVERRIDES_CSWpython$(CVER) += surplus-dependency|CSWgdbm + +# To avoid file collisions with CSWpython: +EXTRA_PAX_ARGS += -s ',^\.$(bindir)/idle,$(bindir)/idle-$(VER),' +EXTRA_PAX_ARGS += -s ',^\.$(bindir)/smtpd.py,$(bindir)/smtpd.py-$(VER),' +EXTRA_PAX_ARGS += -s ',^\.$(bindir)/pydoc,$(bindir)/pydoc-$(VER),' +EXTRA_PAX_ARGS += -s ',^\.$(bindir)/2to3,$(bindir)/2to3-$(VER),' +EXTRA_PAX_ARGS += -s ',^\.$(bindir)/python-config,$(bindir)/python-config-$(VER),' +EXTRA_MERGE_EXCLUDE_FILES += $(bindir)/python + include gar/category.mk Modified: csw/mgar/pkg/lang-python/python/branches/python-2.7/checksums =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-2.7/checksums 2011-01-11 03:50:39 UTC (rev 12495) +++ csw/mgar/pkg/lang-python/python/branches/python-2.7/checksums 2011-01-11 10:28:19 UTC (rev 12496) @@ -1 +1 @@ -0e8c9ec32abf5b732bea7d91b38c3339 Python-2.7.tar.bz2 +aa27bc25725137ba155910bd8e5ddc4f Python-2.7.1.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 Jan 11 13:32:42 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 11 Jan 2011 12:32:42 +0000 Subject: [csw-devel] SF.net SVN: gar:[12498] csw/mgar/pkg Message-ID: Revision: 12498 http://gar.svn.sourceforge.net/gar/?rev=12498&view=rev Author: dmichelsen Date: 2011-01-11 12:32:41 +0000 (Tue, 11 Jan 2011) Log Message: ----------- getopt: Initial commit, some minor issues TBD Added Paths: ----------- csw/mgar/pkg/getopt/ csw/mgar/pkg/getopt/branches/ csw/mgar/pkg/getopt/tags/ csw/mgar/pkg/getopt/trunk/ csw/mgar/pkg/getopt/trunk/Makefile csw/mgar/pkg/getopt/trunk/checksums csw/mgar/pkg/getopt/trunk/files/ csw/mgar/pkg/getopt/trunk/files/0001-Include-locale.h-when-using-gettext.patch Property changes on: csw/mgar/pkg/getopt/trunk ___________________________________________________________________ Added: svn:ignore + cookies download work Added: svn:externals + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 Added: csw/mgar/pkg/getopt/trunk/Makefile =================================================================== --- csw/mgar/pkg/getopt/trunk/Makefile (rev 0) +++ csw/mgar/pkg/getopt/trunk/Makefile 2011-01-11 12:32:41 UTC (rev 12498) @@ -0,0 +1,48 @@ +# $Id$ +NAME = getopt +VERSION = 1.1.4 +CATEGORIES = lib + +DESCRIPTION = Help shell scripts parse command-line parameters +define BLURB +endef + +# TBD: +# - The existing package uses ggetopt instead of getopt everywhere +# - The existing package is linked against CSWggettext and CSWlibiconv + +MASTER_SITES = http://software.frodo.looijaard.name/getopt/files/ +DISTFILES = $(DISTNAME).tar.gz + +PATCHFILES = 0001-Include-locale.h-when-using-gettext.patch + +# File name regex to get notifications about upstream software releases +UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz + +PACKAGES = CSWggetopt +CATALOGNAME = ggetopt + +VENDOR_URL = http://software.frodo.looijaard.name/getopt/ + +# No scipt there... +CONFIGURE_SCRIPTS = + +BUILD_OVERRIDE_VARS = prefix CC CFLAGS LIBCGETOPT +BUILD_OVERRIDE_VAR_prefix = $(prefix) +BUILD_OVERRIDE_VAR_CC = $(CC) +BUILD_OVERRIDE_VAR_CFLAGS = $(CFLAGS) +BUILD_OVERRIDE_VAR_LIBCGETOPT = 0 + +TEST_TARGET = + +INSTALL_OVERRIDE_VARS = prefix mandir WITH_GETTEXT +INSTALL_OVERRIDE_VAR_prefix = $(prefix) +INSTALL_OVERRIDE_VAR_mandir = $(mandir) +INSTALL_OVERRIDE_VAR_WITH_GETTEXT = 1 + +INSTALL_ARGS = install install_doc + +include gar/category.mk + +# Use correct version of 'install' +PATH := /opt/csw/gnu:$(PATH) Property changes on: csw/mgar/pkg/getopt/trunk/Makefile ___________________________________________________________________ Added: svn:keywords + Id Added: csw/mgar/pkg/getopt/trunk/checksums =================================================================== --- csw/mgar/pkg/getopt/trunk/checksums (rev 0) +++ csw/mgar/pkg/getopt/trunk/checksums 2011-01-11 12:32:41 UTC (rev 12498) @@ -0,0 +1 @@ +02188ca68da27c4175d6e9f3da732101 getopt-1.1.4.tar.gz Added: csw/mgar/pkg/getopt/trunk/files/0001-Include-locale.h-when-using-gettext.patch =================================================================== --- csw/mgar/pkg/getopt/trunk/files/0001-Include-locale.h-when-using-gettext.patch (rev 0) +++ csw/mgar/pkg/getopt/trunk/files/0001-Include-locale.h-when-using-gettext.patch 2011-01-11 12:32:41 UTC (rev 12498) @@ -0,0 +1,27 @@ +From 93ded6e9eb0d0e84ea9ae9cda8c70af71a48d688 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Tue, 11 Jan 2011 13:18:09 +0100 +Subject: [PATCH] Include locale.h when using gettext + +--- + getopt.c | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +diff --git a/getopt.c b/getopt.c +index 10396a0..43e49dd 100644 +--- a/getopt.c ++++ b/getopt.c +@@ -44,6 +44,10 @@ + #include + #include + #include ++#if WITHOUT_GETTEXT ++#else ++#include ++#endif + + #if LIBCGETOPT + #include +-- +1.7.3.2 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Tue Jan 11 14:23:23 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 11 Jan 2011 13:23:23 +0000 Subject: [csw-devel] SF.net SVN: gar:[12499] csw/mgar/pkg/lang-python/python/branches/python-2.7 /Makefile Message-ID: Revision: 12499 http://gar.svn.sourceforge.net/gar/?rev=12499&view=rev Author: wahwah Date: 2011-01-11 13:23:23 +0000 (Tue, 11 Jan 2011) Log Message: ----------- python-2.7: Moving /opt/csw/lib/python2.7/config to CSWpython27 Otherwise: maciej at netra ~/src/opencsw-git $ python2.7 Traceback (most recent call last): File "/opt/csw/lib/python2.7/site.py", line 553, in main() File "/opt/csw/lib/python2.7/site.py", line 535, in main known_paths = addusersitepackages(known_paths) File "/opt/csw/lib/python2.7/site.py", line 268, in addusersitepackages user_site = getusersitepackages() File "/opt/csw/lib/python2.7/site.py", line 243, in getusersitepackages user_base = getuserbase() # this will also set USER_BASE File "/opt/csw/lib/python2.7/site.py", line 233, in getuserbase USER_BASE = get_config_var('userbase') File "/opt/csw/lib/python2.7/sysconfig.py", line 535, in get_config_var return get_config_vars().get(name) File "/opt/csw/lib/python2.7/sysconfig.py", line 434, in get_config_vars _init_posix(_CONFIG_VARS) File "/opt/csw/lib/python2.7/sysconfig.py", line 287, in _init_posix raise IOError(msg) IOError: invalid Python installation: unable to open /opt/csw/lib/python2.7/config/Makefile (No such file or directory) Modified Paths: -------------- csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile Modified: csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile 2011-01-11 12:32:41 UTC (rev 12498) +++ csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile 2011-01-11 13:23:23 UTC (rev 12499) @@ -84,7 +84,6 @@ PKGFILES_CSWidle$(CVER) = $(libdir)/.*/idlelib/.* PKGFILES_CSWidle$(CVER) += $(bindir)/idle PKGFILES_CSWpython$(CVER)-devel = $(includedir)/.* -PKGFILES_CSWpython$(CVER)-devel += $(libdir)/.*/config/.* PKGFILES_CSWpython$(CVER)-devel += $(bindir)/.*config.* PKGFILES_CSWpython-devel += $(libdir)/libpython$(VER).so # No idea why would this be in CSWpython, and no good idea for a better package 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 Jan 11 14:27:31 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 11 Jan 2011 13:27:31 +0000 Subject: [csw-devel] SF.net SVN: gar:[12500] csw/mgar/pkg/gnulinks/trunk/Makefile Message-ID: Revision: 12500 http://gar.svn.sourceforge.net/gar/?rev=12500&view=rev Author: dmichelsen Date: 2011-01-11 13:27:31 +0000 (Tue, 11 Jan 2011) Log Message: ----------- gnulinks: Remove findutils rebuilt by Gordon to make it self-sufficient and overwrite dependencies Modified Paths: -------------- csw/mgar/pkg/gnulinks/trunk/Makefile Modified: csw/mgar/pkg/gnulinks/trunk/Makefile =================================================================== --- csw/mgar/pkg/gnulinks/trunk/Makefile 2011-01-11 13:23:23 UTC (rev 12499) +++ csw/mgar/pkg/gnulinks/trunk/Makefile 2011-01-11 13:27:31 UTC (rev 12500) @@ -5,7 +5,7 @@ VENDOR_URL = http://opencsw.org GLINKPKGS = CSWggettext CSWggettextrt CSWbinutils -GLINKPKGS += CSWggetopt CSWfindutils CSWgwhois +GLINKPKGS += CSWggetopt CSWgwhois BUILD_DEP_PKGS = $(GLINKPKGS) CSWpkgutil CSWbash DESCRIPTION = Creates native symlinks for GNU tools in /opt/csw/gnu @@ -26,6 +26,9 @@ SHELL = /opt/csw/bin/bash +# We point to these packages, but do not depend on them on purpose. +CHECKPKG_OVERRIDES_CSWgnulinks += $(foreach P,$(GLINKPKGS),missing-dependency|$P) + include gar/category.mk pre-build-modulated: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Tue Jan 11 14:36:47 2011 From: maciej at opencsw.org (Maciej (Matchek) Blizinski) Date: Tue, 11 Jan 2011 13:36:47 +0000 Subject: [csw-devel] SF.net SVN: gar:[12498] csw/mgar/pkg In-Reply-To: References: Message-ID: No dia 11 de Janeiro de 2011 12:32, escreveu: > Revision: 12498 > ? ? ? ? ?http://gar.svn.sourceforge.net/gar/?rev=12498&view=rev > Author: ? dmichelsen > Date: ? ? 2011-01-11 12:32:41 +0000 (Tue, 11 Jan 2011) > > Log Message: > ----------- > getopt: Initial commit, some minor issues TBD Do you know of shflags? http://www.opencsw.org/packages/shflags/ From dmichelsen at users.sourceforge.net Tue Jan 11 15:26:49 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 11 Jan 2011 14:26:49 +0000 Subject: [csw-devel] SF.net SVN: gar:[12501] csw/mgar/pkg/rdesktop Message-ID: Revision: 12501 http://gar.svn.sourceforge.net/gar/?rev=12501&view=rev Author: dmichelsen Date: 2011-01-11 14:26:48 +0000 (Tue, 11 Jan 2011) Log Message: ----------- rdesktop: Move legacy/ to tags/ Added Paths: ----------- csw/mgar/pkg/rdesktop/tags/legacy/ Removed Paths: ------------- csw/mgar/pkg/rdesktop/trunk/legacy/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Tue Jan 11 15:56:55 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 11 Jan 2011 14:56:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[12502] csw/mgar/pkg/rdesktop/trunk Message-ID: Revision: 12502 http://gar.svn.sourceforge.net/gar/?rev=12502&view=rev Author: dmichelsen Date: 2011-01-11 14:56:55 +0000 (Tue, 11 Jan 2011) Log Message: ----------- rdeskstop: Apply patch from #4664 and some cleanup Modified Paths: -------------- csw/mgar/pkg/rdesktop/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/rdesktop/trunk/files/ csw/mgar/pkg/rdesktop/trunk/files/fix-2022945.patch Modified: csw/mgar/pkg/rdesktop/trunk/Makefile =================================================================== --- csw/mgar/pkg/rdesktop/trunk/Makefile 2011-01-11 14:26:48 UTC (rev 12501) +++ csw/mgar/pkg/rdesktop/trunk/Makefile 2011-01-11 14:56:55 UTC (rev 12502) @@ -4,25 +4,36 @@ DESCRIPTION = RDP client for Windows NT/2000/2003/XP Terminal Server define BLURB - rdesktop is an open source client for Windows Terminal Services, capable of natively speaking Remote Desktop Protocol (RDP) in order to present the user's Windows desktop. Supported servers include Windows 2000 Server, Windows Server 2003, Windows Server 2008, Windows XP, Windows Vista and Windows NT Server 4.0. + rdesktop is an open source client for Windows Terminal Services, capable of natively + speaking Remote Desktop Protocol (RDP) in order to present the user's Windows desktop. + Supported servers include Windows 2000 Server, Windows Server 2003, Windows Server 2008, + Windows XP, Windows Vista and Windows NT Server 4.0. endef +MASTER_SITES = $(SF_MIRROR) +DISTFILES = $(NAME)-$(VERSION).tar.gz + +# Apply patch from +# https://sourceforge.net/tracker/?func=detail&aid=2812158&group_id=24366&atid=381349 +# as referenced from +# http://csiuo.com/drupal/content/rdesktop-160-and-windows-server-2008-sp2 +PATCHFILES += fix-2022945.patch + PACKAGES = CSWrdesktop CATALOGNAME_CSWrdesktop = rdesktop -MASTER_SITES = $(SF_MIRROR) -SPKG_SOURCEURL = http://www.rdesktop.org/ +VENDOR_URL = http://www.rdesktop.org/ -DISTFILES = $(NAME)-$(VERSION).tar.gz - CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --with-openssl=/opt/csw UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz -RUNTIME_DEP_PKGS_CSWrdesktop = CSWiconv CSWosslrt +RUNTIME_DEP_PKGS_CSWrdesktop += CSWiconv +RUNTIME_DEP_PKGS_CSWrdesktop += CSWosslrt +RUNTIME_DEP_PKGS_CSWrdesktop += CSWlibao -#No test/check target provided by rdesktop -SKIPTEST=1 +# No test/check target provided by rdesktop +TEST_SCRIPTS = include gar/category.mk Added: csw/mgar/pkg/rdesktop/trunk/files/fix-2022945.patch =================================================================== --- csw/mgar/pkg/rdesktop/trunk/files/fix-2022945.patch (rev 0) +++ csw/mgar/pkg/rdesktop/trunk/files/fix-2022945.patch 2011-01-11 14:56:55 UTC (rev 12502) @@ -0,0 +1,28 @@ +--- rdesktop-1.6.0.orig/disk.c 2009-06-19 09:06:27.000000000 -0400 ++++ rdesktop-1.6.0/disk.c 2009-06-25 09:40:44.000000000 -0400 +@@ -1096,10 +1101,24 @@ + rdp_out_unistr(out, fsinfo->type, 2 * strlen(fsinfo->type) - 2); + break; + ++ /* JMD 20090623: Needed for Windows 2008 support ++ http://msdn.microsoft.com/en-us/library/cc232104(PROT.13).aspx ++ IRP Query Volume Information class: 0x07 */ ++ case FileFsFullSizeInformation: ++ printf("Called FileFsFullSizeInformation\n"); ++ out_uint32_le(out, stat_fs.f_blocks); /* TotalAllocationUnits */ ++ out_uint32_le(out, 0); ++ out_uint32_le(out, stat_fs.f_bavail); /* CallerAvailableAllocationUnits */ ++ out_uint32_le(out, 0); ++ out_uint32_le(out, stat_fs.f_bfree); /* ActualAvailableAllocationUnits */ ++ out_uint32_le(out, 0); ++ out_uint32_le(out, stat_fs.f_bsize / 0x200); /* SectorsPerAllocationUnit */ ++ out_uint32_le(out, 0x200); /* Bytes per sector */ ++ break; ++ + case FileFsLabelInformation: + case FileFsDeviceInformation: + case FileFsControlInformation: +- case FileFsFullSizeInformation: + case FileFsObjectIdInformation: + case FileFsMaximumInformation: + 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 Jan 11 16:22:18 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Tue, 11 Jan 2011 15:22:18 +0000 Subject: [csw-devel] SF.net SVN: gar:[12503] csw/mgar/pkg/libsamplerate/trunk Message-ID: Revision: 12503 http://gar.svn.sourceforge.net/gar/?rev=12503&view=rev Author: dmichelsen Date: 2011-01-11 15:22:17 +0000 (Tue, 11 Jan 2011) Log Message: ----------- libsamplerate: Update to new standards, add 64 bit, reported bugs upstream to Erik Modified Paths: -------------- csw/mgar/pkg/libsamplerate/trunk/Makefile csw/mgar/pkg/libsamplerate/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libsamplerate/trunk/files/0001-Fix-testcase.patch Removed Paths: ------------- csw/mgar/pkg/libsamplerate/trunk/files/CSWlibsamplerate.depend csw/mgar/pkg/libsamplerate/trunk/files/CSWlibsamplerate.gspec csw/mgar/pkg/libsamplerate/trunk/files/CSWlibsamplerate.patch csw/mgar/pkg/libsamplerate/trunk/files/CSWlibsamplerate.prototype Modified: csw/mgar/pkg/libsamplerate/trunk/Makefile =================================================================== --- csw/mgar/pkg/libsamplerate/trunk/Makefile 2011-01-11 14:56:55 UTC (rev 12502) +++ csw/mgar/pkg/libsamplerate/trunk/Makefile 2011-01-11 15:22:17 UTC (rev 12503) @@ -8,23 +8,45 @@ DESCRIPTION = Secret Rabbit Code (aka libsamplerate) is a Sample Rate Converter for audio define BLURB -SRC is capable of arbitrary and time varying conversions ; from -downsampling by a factor of 256 to upsampling by the same factor. -Arbitrary in this case means that the ratio of input and output sample -rates can be an irrational number. The conversion ratio can also vary -with time for speeding up and slowing down effects. + SRC is capable of arbitrary and time varying conversions ; from + downsampling by a factor of 256 to upsampling by the same factor. + Arbitrary in this case means that the ratio of input and output sample + rates can be an irrational number. The conversion ratio can also vary + with time for speeding up and slowing down effects. endef MASTER_SITES = http://www.mega-nerd.com/SRC/ DISTFILES = $(NAME)-$(VERSION).tar.gz +PATCHFILES += 0001-Fix-testcase.patch + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz -RUNTIME_DEP_PKGS = CSWlibsndfile +PACKAGES += CSWlibsamplerate0 +CATALOGNAME_CSWlibsamplerate0 = libsamplerate0 +SPKG_DESC_CSWlibsamplerate0 = Sample rate converter for audio, libsamplerate.so.0 + +PACKAGES += CSWlibsamplerate-dev +CATALOGNAME_CSWlibsamplerate-dev = libsamplerate_dev +SPKG_DESC_CSWlibsamplerate-dev = Development files for libsamplerate +PKGFILES_CSWlibsamplerate-dev = $(PKGFILES_DEVEL) +RUNTIME_DEP_PKGS_CSWlibsamplerate-dev = CSWlibsamplerate0 + +PACKAGES += CSWlibsamplerate-utils +CATALOGNAME_CSWlibsamplerate-utils = libsamplerate_utils +SPKG_DESC_CSWlibsamplerate-utils = Sample rate conversion programs using libsamplerate +PKGFILES_CSWlibsamplerate-utils = $(bindir)/.* +RUNTIME_DEP_PKGS_CSWlibsamplerate-utils += CSWlibsamplerate0 +RUNTIME_DEP_PKGS_CSWlibsamplerate-utils += CSWlibsndfile + BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) +BUILD64 = 1 CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --disable-static +# Some broken tests, skip for now +SKIPTEST ?= 1 + include gar/category.mk Modified: csw/mgar/pkg/libsamplerate/trunk/checksums =================================================================== --- csw/mgar/pkg/libsamplerate/trunk/checksums 2011-01-11 14:56:55 UTC (rev 12502) +++ csw/mgar/pkg/libsamplerate/trunk/checksums 2011-01-11 15:22:17 UTC (rev 12503) @@ -1,2 +1 @@ -5f136a391374030efc9027f336a9dcfc download/CSWlibsamplerate.patch -ad093e60ec44f0a60de8e29983ddbc0f download/libsamplerate-0.1.7.tar.gz +6731a81cb0c622c483b28c0d7f90867d libsamplerate-0.1.7.tar.gz Added: csw/mgar/pkg/libsamplerate/trunk/files/0001-Fix-testcase.patch =================================================================== --- csw/mgar/pkg/libsamplerate/trunk/files/0001-Fix-testcase.patch (rev 0) +++ csw/mgar/pkg/libsamplerate/trunk/files/0001-Fix-testcase.patch 2011-01-11 15:22:17 UTC (rev 12503) @@ -0,0 +1,25 @@ +From 67b3cdff50020f2f9b49af0252cf660b4550bea7 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Tue, 11 Jan 2011 15:54:23 +0100 +Subject: [PATCH] Fix testcase + +--- + tests/callback_test.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/tests/callback_test.c b/tests/callback_test.c +index 124a0d5..fa9c673 100644 +--- a/tests/callback_test.c ++++ b/tests/callback_test.c +@@ -137,7 +137,7 @@ callback_test (int converter, double src_ratio) + + src_state = src_delete (src_state) ; + +- if (fabs (read_total - src_ratio * ARRAY_LEN (test_callback_data.data)) > src_ratio) ++ if (fabs (read_total - floor(0.5 + src_ratio * ARRAY_LEN (test_callback_data.data))) > ceil(src_ratio)) + { printf ("\n\nLine %d : input / output length mismatch.\n\n", __LINE__) ; + printf (" input len : %d\n", ARRAY_LEN (test_callback_data.data)) ; + printf (" output len : %ld (should be %g +/- %g)\n\n", read_total, +-- +1.7.3.2 + Deleted: csw/mgar/pkg/libsamplerate/trunk/files/CSWlibsamplerate.depend =================================================================== Deleted: csw/mgar/pkg/libsamplerate/trunk/files/CSWlibsamplerate.gspec =================================================================== --- csw/mgar/pkg/libsamplerate/trunk/files/CSWlibsamplerate.gspec 2011-01-11 14:56:55 UTC (rev 12502) +++ csw/mgar/pkg/libsamplerate/trunk/files/CSWlibsamplerate.gspec 2011-01-11 15:22:17 UTC (rev 12503) @@ -1,4 +0,0 @@ -%var bitname libsamplerate -%var pkgname CSWlibsamplerate -%include url file://%{PKGLIB}/csw_dyndepend.gspec -%copyright url file://%{WORKSRC}/COPYING Deleted: csw/mgar/pkg/libsamplerate/trunk/files/CSWlibsamplerate.patch =================================================================== --- csw/mgar/pkg/libsamplerate/trunk/files/CSWlibsamplerate.patch 2011-01-11 14:56:55 UTC (rev 12502) +++ csw/mgar/pkg/libsamplerate/trunk/files/CSWlibsamplerate.patch 2011-01-11 15:22:17 UTC (rev 12503) @@ -1,21 +0,0 @@ -diff --speed-large-files --minimal -Nru libsamplerate-0.1.2.orig/doc/Makefile.in libsamplerate-0.1.2/doc/Makefile.in ---- libsamplerate-0.1.2.orig/doc/Makefile.in 2004-09-12 23:12:02.000000000 +0200 -+++ libsamplerate-0.1.2/doc/Makefile.in 2007-12-05 23:51:44.424498000 +0100 -@@ -153,7 +153,8 @@ - target_os = @target_os@ - target_vendor = @target_vendor@ - EXTRA_DIST = SRC.png SRC.css index.html license.html history.html download.html \ -- lists.html quality.html win32.html faq.html api.html -+ lists.html quality.html win32.html faq.html api.html \ -+ api_simple.html api_callback.html api_full.html api_misc.html - - subdir = doc - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -@@ -301,7 +302,6 @@ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-info-am - -- api_simple.html api_callback.html api_full.html api_misc.html - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: Deleted: csw/mgar/pkg/libsamplerate/trunk/files/CSWlibsamplerate.prototype =================================================================== --- csw/mgar/pkg/libsamplerate/trunk/files/CSWlibsamplerate.prototype 2011-01-11 14:56:55 UTC (rev 12502) +++ csw/mgar/pkg/libsamplerate/trunk/files/CSWlibsamplerate.prototype 2011-01-11 15:22:17 UTC (rev 12503) @@ -1,33 +0,0 @@ -d none /opt/csw/bin 0755 root bin -f none /opt/csw/bin/sndfile-resample 0755 root bin -d none /opt/csw/include 0755 root bin -f none /opt/csw/include/samplerate.h 0644 root bin -d none /opt/csw/lib 0755 root bin -f none /opt/csw/lib/libsamplerate.so.0.1.1 0755 root bin -s none /opt/csw/lib/libsamplerate.so.0=libsamplerate.so.0.1.1 -s none /opt/csw/lib/libsamplerate.so=libsamplerate.so.0.1.1 -d none /opt/csw/lib/pkgconfig 0755 root bin -f none /opt/csw/lib/pkgconfig/samplerate.pc 0644 root bin -d none /opt/csw/sbin 0755 root bin -d none /opt/csw/share 0755 root bin -d none /opt/csw/share/doc 0755 root bin -d none /opt/csw/share/info 0755 root bin -d none /opt/csw/share/locale 0755 root bin -d none /opt/csw/share/locale/de 0755 root bin -d none /opt/csw/share/locale/de/LC_MESSAGES 0755 root bin -d none /opt/csw/share/locale/es 0755 root bin -d none /opt/csw/share/locale/es/LC_MESSAGES 0755 root bin -d none /opt/csw/share/locale/fr 0755 root bin -d none /opt/csw/share/locale/fr/LC_MESSAGES 0755 root bin -d none /opt/csw/share/locale/ru 0755 root bin -d none /opt/csw/share/locale/ru/LC_MESSAGES 0755 root bin -d none /opt/csw/share/locale/sv 0755 root bin -d none /opt/csw/share/locale/sv/LC_MESSAGES 0755 root bin -d none /opt/csw/share/man 0755 root bin -d none /opt/csw/share/man/man1 0755 root bin -d none /opt/csw/share/man/man3 0755 root bin -d none /opt/csw/share/man/man5 0755 root bin -d none /opt/csw/share/man/man7 0755 root bin -i copyright=CSWlibsamplerate.copyright -i depend=CSWlibsamplerate.depend -i pkginfo=CSWlibsamplerate.pkginfo This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dam at opencsw.org Tue Jan 11 21:30:51 2011 From: dam at opencsw.org (Dagobert Michelsen) Date: Tue, 11 Jan 2011 21:30:51 +0100 Subject: [csw-devel] SF.net SVN: gar:[12498] csw/mgar/pkg In-Reply-To: References: Message-ID: <866D843C-AD4A-440A-BBC4-125099E90AE6@opencsw.org> Hi Maciej, Am 11.01.2011 um 14:36 schrieb Maciej (Matchek) Blizinski: > No dia 11 de Janeiro de 2011 12:32, > escreveu: >> Revision: 12498 >> http://gar.svn.sourceforge.net/gar/?rev=12498&view=rev >> Author: dmichelsen >> Date: 2011-01-11 12:32:41 +0000 (Tue, 11 Jan 2011) >> >> Log Message: >> ----------- >> getopt: Initial commit, some minor issues TBD > > Do you know of shflags? > > http://www.opencsw.org/packages/shflags/ Yes, but this is already in use: http://www.opencsw.org/packages/ggetopt/ I rebuilt it using GAR to get rid of gnulinks for the package. Best regards -- Dago From wahwah at users.sourceforge.net Tue Jan 11 21:36:55 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Tue, 11 Jan 2011 20:36:55 +0000 Subject: [csw-devel] SF.net SVN: gar:[12504] csw/mgar/pkg/lang-python Message-ID: Revision: 12504 http://gar.svn.sourceforge.net/gar/?rev=12504&view=rev Author: wahwah Date: 2011-01-11 20:36:55 +0000 (Tue, 11 Jan 2011) Log Message: ----------- webpy: Initial commit Modified Paths: -------------- csw/mgar/pkg/lang-python/webpy/trunk/Makefile csw/mgar/pkg/lang-python/webpy/trunk/checksums Added Paths: ----------- csw/mgar/pkg/lang-python/webpy/ Modified: csw/mgar/pkg/lang-python/webpy/trunk/Makefile =================================================================== --- csw/mgar/pkg/template/trunk/Makefile 2010-12-15 04:27:05 UTC (rev 11951) +++ csw/mgar/pkg/lang-python/webpy/trunk/Makefile 2011-01-11 20:36:55 UTC (rev 12504) @@ -2,184 +2,20 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -## This file contains comments to guide you through various GAR settings. -## Please remove unnecessary comments before committing your code to the code -## repository. The comments to remove are marked with double hashes. -## If you want to remove them all in-place, use: -## gsed -i -e '/^##/d' Makefile -## -## For more information about GAR variables, please see: -## https://sourceforge.net/apps/trac/gar/wiki/GAR%20Variable%20Reference -## -NAME = mypkg -VERSION = 1.0 -## -## The category that your software fits in. This is not a descriptive field, but -## influences the build process. Depending on the CATEGORIES setting, different -## Makefiles are included from gar/categories/ in your trunk directory, which -## adjust the build settings for the respective category. -## -## Possible settings are: -## apps, cpan, devel, gnome, java, kde, lang, lib, meta, net, python, server, -## utils, x11, xfce, xorg, xtra -CATEGORIES = lib -## -## A one-line description of the package, which will appear in the pkginfo. -DESCRIPTION = -## -## A longer description of the package. This is only for descriptive purposes -## inside the Makefile and is not used elsewhere. +NAME = web +VERSION = 0.34 +CATEGORIES = python +DESCRIPTION = Simple web framework for Python define BLURB - endef -## -## Upstream URL that should show up in the VENDOR field as well as on -## http://opencsw.org/packages/. -SPKG_SOURCEURL = -## -## Whitespace-separated list of URLs to download the source package from. -## There are presets: $(SF_MIRRORS), $(GNU_MIRRORS) and $(GOOGLE_MIRROR). -MASTER_SITES = -## -## SF_PROJ is required if you set $(MASTER_SITES) to $(SF_MIRRORS) and the -## Sourceforge project name differs from $(NAME). Specifies the Sourceforge -## project name of the software you wish to download. -## SF_PROJ = -## -## A list of space separated patch filenames from files/ that are to be applied -## to the extracted software before the ./configure stage. Patches need to be -## included in the DISTFILES variable as well. -## PATCHFILES = -## -## Whitespace-separated list of files which comprise this build. mGAR will look -## for the files in the $(FILEDIR) (trunk/files) directory and on the -## $(MASTER_SITES). -DISTFILES = $(NAME)-$(VERSION).tar.gz -## -## We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz -## -## Catalog name is the name to be used with pkg{-get,util} -i . -## It is different from the system package name, which by convention is CSWpkgname. -## CATALOGNAME = -## -## Set to 1 to mark the package as architecture-independent. -## ARCHALL = 0 -## -## A list of files / patterns that should be excluded from the package. Amends -## the default list of excluded filenames $(MERGE_EXCLUDE_DEFAULT), which -## contains things like libtool .la files and files with a leading ~. -## EXTRA_MERGE_EXCLUDE_FILES = -## -## A list of space separated package names that should be marked as -## incompatible with the current package. This will go into the depend file. -## When a user has one of the incompatible packages installed and installs -## your package, he will be prompted that the incompatible package must be -## removed. He will however not be prevented to install your package without -## removing the conflicting package first. -## INCOMPATIBLE_PKGS = -## -## The name of the license file that should be included in your package. Defaults -## to COPYING. See http://sourceforge.net/apps/trac/gar/wiki/CopyRightfor details -## on including and displaying licenses. -## LICENSE = -## -## A list of space separated package names that should be produced from your -## Makefile. This is used when a software has different components that can be -## packaged and used individually (think runtime libraries, client tools, server -## files, development headers). You don't need to set this when you just want to -## produce one package. -## -## When you set this variable to include more than one package, you also need to -## set PKGFILES_CSWpkgname for each package (except for the first one in your -## $(PACKAGES) list) to define which files go into each package. The first -## package from $(PACKAGES) one will hold all files that are not matched by -## PKGFILES_ for other packages. -## PACKAGES = -## -## If specified, GAR feeds the almost-final package prototype file to -## $(PROTOTYPE_FILTER) and reads the final package prototype file from it. -## $(PROTOTYPE_FILTER) is usually a sed/awk/perl one-liner, which was mostly used -## to prepare the prototype file for use with cswclassutils (see -## $(SPKG_CLASSES)). Now that there are convenience variables for cswclassutils, -## you will rarely have to use this. A still valid use case would be to change -## the file permissions of a file to be set-UID. -## See http://wiki.opencsw.org/cswclassutils-package for common usage information -## PROTOTYPE_FILTER = -## -## cswclassutils settings -## -## A list of action classes. Possible values are: -## none cswpreserveconf cswcpsampleconf cswpycompile cswusergroup cswinitsmf -## cswinetd cswetcservices -## The class 'cswinitsmf' must be the last class listed. When you use cswclassutils, -## you need to add CSWcswclassutils to RUNTIME_DEP_PKGS. -## SPKG_CLASSES = none -## Simplified settings for classes: -## PRESERVECONF = -## SAMPLECONF = -## INITSMF = -## USERGROUP = -## ETCSERVICES = -## INETDCONF = -## A list of runtime package dependencies in the form of CSWfoo. -## RUNTIME_DEP_PKGS = -## -## A list of packages necessary to build this package -## BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) -## -## When using non-empty $(PACKAGES): -## RUNTIME_DEP_PKGS_CSWpkgname = -## SPKG_DESC_CSWpkgname = -## PKGFILES_CSWpkgname = -## CATALOGNAME_CSWpkgname = -## -## A list of space separated directories where objects should be stripped in -## addition to the bin/ and sbin/ directories. -## STRIP_DIRS = -## -## Define a custom target for the configure phase. When you set this, the target -## that will be used instead of configure: target, is named -## configure-$(CONFIGURE_SCRIPTS) and you will need to define it in your Makefile -## after including gar/gar.include.mk. If you want to skip the configure phase -## completely (for example when your software doesn't need to be compiled) assign -## this variable an empty value. The procedure works for configure, build, -## install and test steps. -## CONFIGURE_SCRIPTS = -## BUILD_SCRIPTS = -## INSTALL_SCRIPTS = -## TEST_SCRIPTS = -## -## Compilation settings -## -## The build directory. -## WORKSRC = $(WORKDIR)/$(NAME)-$(VERSION) -## -## BUILD_ARGS is passed as an argument to gmake during the build phase. Use this -## for example, if you need to override Makefile variables. -## BUILD_ARGS = -## -## Arguments passed to the ./configure script. -CONFIGURE_ARGS = $(DIRPATHS) -## -## BUILD64 = -## CONFIGURE_ENV = -## EXTRA_CFLAGS = -## EXTRA_LDFLAGS = -## EXTRA_INC = -## EXTRA_LIB = -## GARFLAVOR = -## INSTALL_ARGS = -## OPT_FLAGS_SOS = -xO3 -## OPT_FLAGS_GCC = -O2 -pipe -## -## The compiler to use. Defaults to SOS11, can be also: SOS12, GCC3, GCC4. -## GARCOMPILER = SOS11 -## -# Remove the following rules and uncomment the -# include before building. -all: .DEFAULT -.DEFAULT: - @true - -#include gar/category.mk +SPKG_SOURCEURL = http://webpy.org/ +MASTER_SITES = http://webpy.org/static/ +DISTNAME = web.py-$(VERSION) +DISTFILES = $(DISTNAME).tar.gz +UFILES_REGEX = web.py-(\d+(?:\.\d+)*).tar.gz +PACKAGES = CSWpy-webpy +CATALOGNAME_CSWpy-webpy = py_webpy +ARCHALL = 1 +LICENSE = PKG-INFO +TEST_SCRIPTS = +include gar/category.mk Modified: csw/mgar/pkg/lang-python/webpy/trunk/checksums =================================================================== --- csw/mgar/pkg/template/trunk/checksums 2010-12-15 04:27:05 UTC (rev 11951) +++ csw/mgar/pkg/lang-python/webpy/trunk/checksums 2011-01-11 20:36:55 UTC (rev 12504) @@ -0,0 +1 @@ +bc4f8b23c25358f75e2712c8cecca516 web.py-0.34.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 Jan 12 03:04:59 2011 From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net) Date: Wed, 12 Jan 2011 02:04:59 +0000 Subject: [csw-devel] SF.net SVN: gar:[12505] csw/mgar/pkg/gettext/trunk/Makefile Message-ID: Revision: 12505 http://gar.svn.sourceforge.net/gar/?rev=12505&view=rev Author: bdwalton Date: 2011-01-12 02:04:58 +0000 (Wed, 12 Jan 2011) Log Message: ----------- gettext/trunk: update several checkpkg overrides and rearrange a few dependencies Modified Paths: -------------- csw/mgar/pkg/gettext/trunk/Makefile Modified: csw/mgar/pkg/gettext/trunk/Makefile =================================================================== --- csw/mgar/pkg/gettext/trunk/Makefile 2011-01-11 20:36:55 UTC (rev 12504) +++ csw/mgar/pkg/gettext/trunk/Makefile 2011-01-12 02:04:58 UTC (rev 12505) @@ -66,10 +66,15 @@ NOISAEXEC = 1 STRIP_LIBTOOL = 1 -RUNTIME_DEP_PKGS_CSWggettextrt = CSWiconv CSWlibxml2 CSWncurses -RUNTIME_DEP_PKGS_CSWggettext = CSWggettextrt CSWiconv CSWexpat CSWncurses -RUNTIME_DEP_PKGS_CSWggettext += CSWlibxml2 +RUNTIME_DEP_PKGS_CSWggettextrt = CSWlibgettextlib0-14-1 +RUNTIME_DEP_PKGS_CSWggettextrt += CSWlibintl2 CSWlibintl3 CSWlibintl8 +RUNTIME_DEP_PKGS_CSWggettext = CSWiconv CSWexpat CSWncurses CSWlibxml2 +RUNTIME_DEP_PKGS_CSWggettext += CSWlibgettextpo0 CSWlibgettextsrc0-18-1 +RUNTIME_DEP_PKGS_CSWggettext += CSWlibgettextlib0-18-1 CSWlibintl8 RUNTIME_DEP_PKGS_CSWggettextdoc = CSWggettext +RUNTIME_DEP_PKGS_CSWlibgettextlib0-18-1 += CSWlibxml2 CSWncurses CSWiconv +RUNTIME_DEP_PKGS_CSWlibgettextpo0 += CSWiconv +RUNTIME_DEP_PKGS_CSWlibintl8 += CSWiconv #NOTE: gettext tests are sensitive to bash environment variables, make sure # custom paths are prefixed by $PATH, may be better to set aside @@ -107,11 +112,6 @@ PKGFILES_CSWlibintl8 += $(call baseisadirs,$(libdir),libintl\.so\.8(\.\d+)*) #so use this for now -PKGFILES_CSWggettextrt = .*/libintl\.so.* .*/libasprintf\.so.* .*/libgettextpo\.so.* -PKGFILES_CSWggettextrt += .*/libgettext.*\.so.* -PKGFILES_CSWggettextrt += /opt/csw/bin/ggettext /opt/csw/bin/gngettext /opt/csw/bin/genvsubst -PKGFILES_CSWggettextrt += /opt/csw/bin/ggettext.sh /opt/csw/share/java/libintl.jar -PKGFILES_CSWggettextrt += /opt/csw/share/locale/.* PKGFILES_CSWggettextdoc = $(PKGFILES_DOC) CHECKPKG_OVERRIDES_CSWggettextdoc += missing-dependency|CSWperl @@ -120,9 +120,8 @@ # This lib is legacy from the old versions and can't be updated (easily) CHECKPKG_OVERRIDES_CSWggettext += bad-rpath-entry|/export/home/phil/build/gettext-0.14.1/gettext-tools/intl/.libs|opt/csw/lib/sparcv9/libgettextlib-0.14.1.so # A few more legacy libs that we can't update. -CHECKPKG_OVERRIDES_CSWggettextrt += bad-rpath-entry|/opt/csw/lib/|opt/csw/lib/libgettextlib-0.17.so -CHECKPKG_OVERRIDES_CSWggettextrt += bad-rpath-entry|/opt/csw/lib/|opt/csw/lib/libgettextsrc-0.17.so -CHECKPKG_OVERRIDES_CSWggettextrt += bad-rpath-entry|/opt/csw/lib/|opt/csw/lib/libgettextpo.so.0.4.0 +CHECKPKG_OVERRIDES_CSWlibgettextsrc0-17 += bad-rpath-entry|/opt/csw/lib/|opt/csw/lib/libgettextsrc-0.17.so +CHECKPKG_OVERRIDES_CSWlibgettextpo0 += bad-rpath-entry|/opt/csw/lib/|opt/csw/lib/libgettextpo.so.0.4.0 # just until checkpkg doesn't squawk about this. CHECKPKG_OVERRIDES_CSWggettext += missing-dependency|CSWemacscommon 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 Jan 12 09:26:26 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 12 Jan 2011 08:26:26 +0000 Subject: [csw-devel] SF.net SVN: gar:[12506] csw/mgar/pkg/lang-python/python/branches/python-2.7 /Makefile Message-ID: Revision: 12506 http://gar.svn.sourceforge.net/gar/?rev=12506&view=rev Author: wahwah Date: 2011-01-12 08:26:26 +0000 (Wed, 12 Jan 2011) Log Message: ----------- python-2.7: Including pyconfig.h in CSWpython27 Otherwise: maciej at netra ~/src/webpy $ python2.7 Traceback (most recent call last): File "/opt/csw/lib/python2.7/site.py", line 553, in main() File "/opt/csw/lib/python2.7/site.py", line 535, in main known_paths = addusersitepackages(known_paths) File "/opt/csw/lib/python2.7/site.py", line 268, in addusersitepackages user_site = getusersitepackages() File "/opt/csw/lib/python2.7/site.py", line 243, in getusersitepackages user_base = getuserbase() # this will also set USER_BASE File "/opt/csw/lib/python2.7/site.py", line 233, in getuserbase USER_BASE = get_config_var('userbase') File "/opt/csw/lib/python2.7/sysconfig.py", line 535, in get_config_var return get_config_vars().get(name) File "/opt/csw/lib/python2.7/sysconfig.py", line 434, in get_config_vars _init_posix(_CONFIG_VARS) File "/opt/csw/lib/python2.7/sysconfig.py", line 298, in _init_posix raise IOError(msg) IOError: invalid Python installation: unable to open /opt/csw/include/python2.7/pyconfig.h (No such file or directory) Also: - shuffling files around to get the same layout as with CSWpython with test files, etc. - Renaming -devel to -dev - Moving the .so symlink do -dev Modified Paths: -------------- csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile Modified: csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile 2011-01-12 02:04:58 UTC (rev 12505) +++ csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile 2011-01-12 08:26:26 UTC (rev 12506) @@ -74,32 +74,53 @@ PACKAGES = CSWidle$(CVER) PACKAGES += CSWpython$(CVER) -PACKAGES += CSWpython$(CVER)-devel PACKAGES += CSWpython$(CVER)-test PACKAGES += CSWpython$(CVER)-tk + + PACKAGES += CSWlibpython$(DVER)-1-0 +CATALOGNAME_CSWlibpython$(DVER)-1-0 = libpython$(UVER)_1_0 +PKGFILES_CSWlibpython2-7-1-0 += $(call baseisadirs,$(libdir),libpython2\.7\.so\.1\.0(\.\d+)*) +PKGFILES_CSWlibpython$(DVER)-1-0 += $(libdir)/$(PVER)\.so\.([0-9\.]+) +SPKG_DESC_CSWlibpython$(DVER)-1-0 = Python shared library ($(VER)) INCOMPATIBLE_PKGS_CSWpython$(CVER) = CSWpydistutils -PKGFILES_CSWidle$(CVER) = $(libdir)/.*/idlelib/.* -PKGFILES_CSWidle$(CVER) += $(bindir)/idle -PKGFILES_CSWpython$(CVER)-devel = $(includedir)/.* -PKGFILES_CSWpython$(CVER)-devel += $(bindir)/.*config.* -PKGFILES_CSWpython-devel += $(libdir)/libpython$(VER).so +# Devel package +PACKAGES += CSWpython$(CVER)-dev +CATALOGNAME_CSWpython$(CVER)-dev = python_$(CVER)_devel +SPKG_DESC_CSWpython$(CVER)-dev = Development Files for Python +PKGFILES_CSWpython$(CVER)-dev += $(includedir)/$(PVER)/(?!pyconfig\.h).* +# /opt/csw/include/python2.7/pyconfig.h +PKGFILES_CSWpython$(CVER)-dev += $(bindir)/.*config.* +PKGFILES_CSWpython$(CVER)-dev += $(libdir)/pkgconfig.* +PKGFILES_CSWpython$(CVER)-dev += $(libdir)/libpython$(VER).so # No idea why would this be in CSWpython, and no good idea for a better package # to put it. -PKGFILES_CSWpython$(CVER)-devel += $(bindir)/smtpd.py +PKGFILES_CSWpython$(CVER)-dev += $(bindir)/smtpd.py-$(VER) +RUNTIME_DEP_PKGS_CSWpython$(CVER)-dev += CSWpython$(CVER) +RUNTIME_DEP_PKGS_CSWpython$(CVER)-dev += CSWlibpython$(DVER)-1-0 +CHECKPKG_OVERRIDES_CSWpython$(CVER)-dev += surplus-dependency|CSWpython$(CVER) +CHECKPKG_OVERRIDES_CSWpython$(CVER)-dev += missing-dependency|CSWpython +CHECKPKG_OVERRIDES_CSWpython$(CVER)-dev += pkgname-does-not-start-with-CSWpy- +CHECKPKG_OVERRIDES_CSWpython$(CVER)-dev += catalogname-does-not-start-with-py_ + +# CHECKPKG_OVERRIDES_CSWpython27 += +# dependency-listed-more-than-once|CSWlibpython2-7-1-0 +# CHECKPKG_OVERRIDES_CSWpython27 += surplus-dependency|CSWlibffi + +PKGFILES_CSWidle$(CVER) += $(libdir)/.*/idlelib/.* +PKGFILES_CSWidle$(CVER) += $(bindir)/idle 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_CSWlibpython$(DVER)-1-0 += $(libdir)/libpython$(VER)\.so\.([0-9\.]+) +PKGFILES_CSWpython$(CVER)-test = $(libdir)/$(PVER)/test/.* +PKGFILES_CSWpython$(CVER)-test += $(libdir)/$(PVER)/bsddb/test.* +PKGFILES_CSWpython$(CVER)-test += $(libdir)/$(PVER)/ctypes/test.* +PKGFILES_CSWpython$(CVER)-test += $(libdir)/$(PVER)/email/test.* +PKGFILES_CSWpython$(CVER)-test += $(libdir)/$(PVER)/distutils/tests.* +PKGFILES_CSWpython$(CVER)-test += $(libdir)/$(PVER)/json/tests.* +PKGFILES_CSWpython$(CVER)-test += $(libdir)/$(PVER)/lib2to3/tests.* +PKGFILES_CSWpython$(CVER)-test += $(libdir)/$(PVER)/sqlite3/test.* ARCHALL_CSWpython$(CVER)-test = 1 ARCHALL_CSWidle$(CVER) = 1 @@ -109,7 +130,8 @@ RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWbzip2 RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWgdbm RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWggettextrt -RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibffi +# Was once needed, may need revisiting. +# RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibffi RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWlibpython$(DVER)-1-0 RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWncurses RUNTIME_DEP_PKGS_CSWpython$(CVER) += CSWosslrt @@ -120,7 +142,7 @@ 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$(CVER)-devel += CSWpython$(CVER) + RUNTIME_DEP_PKGS_CSWpython$(CVER)-test += CSWpython$(CVER) # This could be handled by automatic dependency detection @@ -128,25 +150,19 @@ CATALOGNAME_CSWidle$(CVER) = idle_$(CVER) CATALOGNAME_CSWpython$(CVER) = python_$(CVER) -CATALOGNAME_CSWpython$(CVER)-devel = python_$(CVER)_devel CATALOGNAME_CSWpython$(CVER)-tk = python_$(CVER)_tk CATALOGNAME_CSWpython$(CVER)-test = python_$(CVER)_test -CATALOGNAME_CSWlibpython$(DVER)-1-0 = libpython$(UVER)_1_0 SPKG_DESC_CSWidle$(CVER) = Python IDE SPKG_DESC_CSWpython$(CVER) = A high-level scripting language, $(VER) series -SPKG_DESC_CSWpython$(CVER)-devel = Development Files for Python SPKG_DESC_CSWpython$(CVER)-tk = Python Tk Interface (TkInter) SPKG_DESC_CSWpython$(CVER)-test = Python Test modules -SPKG_DESC_CSWlibpython$(DVER)-1-0 = Python shared library ($(VER)) CHECKPKG_OVERRIDES_CSWpython$(CVER) += missing-dependency|CSWpython CHECKPKG_OVERRIDES_CSWpython$(CVER)-test += missing-dependency|CSWpython CHECKPKG_OVERRIDES_CSWpython$(CVER)-test += surplus-dependency|CSWpython$(CVER) CHECKPKG_OVERRIDES_CSWidle$(CVER) += missing-dependency|CSWpython CHECKPKG_OVERRIDES_CSWidle$(CVER) += surplus-dependency|CSWpython$(CVER) -CHECKPKG_OVERRIDES_CSWpython$(CVER)-devel += surplus-dependency|CSWpython$(CVER) -CHECKPKG_OVERRIDES_CSWpython$(CVER)-devel += missing-dependency|CSWpython CHECKPKG_OVERRIDES_CSWpython$(CVER)-tk += missing-dependency|CSWpython LICENSE = LICENSE @@ -156,8 +172,6 @@ CHECKPKG_OVERRIDES_CSWidle$(CVER) += catalogname-does-not-start-with-py_ CHECKPKG_OVERRIDES_CSWpython$(CVER)-test += pkgname-does-not-start-with-CSWpy- CHECKPKG_OVERRIDES_CSWpython$(CVER)-test += catalogname-does-not-start-with-py_ -CHECKPKG_OVERRIDES_CSWpython$(CVER)-devel += pkgname-does-not-start-with-CSWpy- -CHECKPKG_OVERRIDES_CSWpython$(CVER)-devel += catalogname-does-not-start-with-py_ CHECKPKG_OVERRIDES_CSWpython$(CVER)-tk += pkgname-does-not-start-with-CSWpy- CHECKPKG_OVERRIDES_CSWpython$(CVER)-tk += catalogname-does-not-start-with-py_ CHECKPKG_OVERRIDES_CSWpython$(CVER) += pkgname-does-not-start-with-CSWpy- This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From wahwah at users.sourceforge.net Wed Jan 12 09:44:28 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 12 Jan 2011 08:44:28 +0000 Subject: [csw-devel] SF.net SVN: gar:[12507] csw/mgar/pkg/lang-python/python/branches/python-2.7 /Makefile Message-ID: Revision: 12507 http://gar.svn.sourceforge.net/gar/?rev=12507&view=rev Author: wahwah Date: 2011-01-12 08:44:28 +0000 (Wed, 12 Jan 2011) Log Message: ----------- python-2.7: Update python_27_devel to python_27_dev Modified Paths: -------------- csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile Modified: csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile 2011-01-12 08:26:26 UTC (rev 12506) +++ csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile 2011-01-12 08:44:28 UTC (rev 12507) @@ -88,7 +88,7 @@ # Devel package PACKAGES += CSWpython$(CVER)-dev -CATALOGNAME_CSWpython$(CVER)-dev = python_$(CVER)_devel +CATALOGNAME_CSWpython$(CVER)-dev = python_$(CVER)_dev SPKG_DESC_CSWpython$(CVER)-dev = Development Files for Python PKGFILES_CSWpython$(CVER)-dev += $(includedir)/$(PVER)/(?!pyconfig\.h).* # /opt/csw/include/python2.7/pyconfig.h 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 Jan 12 10:19:21 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 12 Jan 2011 09:19:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[12509] csw/mgar/pkg/lang-python/python/branches Message-ID: Revision: 12509 http://gar.svn.sourceforge.net/gar/?rev=12509&view=rev Author: wahwah Date: 2011-01-12 09:19:20 +0000 (Wed, 12 Jan 2011) Log Message: ----------- python: Unified python 2.7 and 3.1 builds As much as possible. Modified Paths: -------------- csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile csw/mgar/pkg/lang-python/python/branches/python-3.1/Makefile Modified: csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile 2011-01-12 09:14:34 UTC (rev 12508) +++ csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile 2011-01-12 09:19:20 UTC (rev 12509) @@ -80,7 +80,7 @@ PACKAGES += CSWlibpython$(DVER)-1-0 CATALOGNAME_CSWlibpython$(DVER)-1-0 = libpython$(UVER)_1_0 -PKGFILES_CSWlibpython2-7-1-0 += $(call baseisadirs,$(libdir),libpython2\.7\.so\.1\.0(\.\d+)*) +PKGFILES_CSWlibpython$(DVER)-1-0 += $(call baseisadirs,$(libdir),libpython$(DVER)\.so\.1\.0(\.\d+)*) PKGFILES_CSWlibpython$(DVER)-1-0 += $(libdir)/$(PVER)\.so\.([0-9\.]+) SPKG_DESC_CSWlibpython$(DVER)-1-0 = Python shared library ($(VER)) @@ -90,8 +90,8 @@ PACKAGES += CSWpython$(CVER)-dev CATALOGNAME_CSWpython$(CVER)-dev = python_$(CVER)_dev SPKG_DESC_CSWpython$(CVER)-dev = Development Files for Python +# /opt/csw/include/python$(VER)/pyconfig.h is necessary for Python to start up PKGFILES_CSWpython$(CVER)-dev += $(includedir)/$(PVER)/(?!pyconfig\.h).* -# /opt/csw/include/python2.7/pyconfig.h PKGFILES_CSWpython$(CVER)-dev += $(bindir)/.*config.* PKGFILES_CSWpython$(CVER)-dev += $(libdir)/pkgconfig.* PKGFILES_CSWpython$(CVER)-dev += $(libdir)/libpython$(VER).so @@ -105,10 +105,6 @@ CHECKPKG_OVERRIDES_CSWpython$(CVER)-dev += pkgname-does-not-start-with-CSWpy- CHECKPKG_OVERRIDES_CSWpython$(CVER)-dev += catalogname-does-not-start-with-py_ -# CHECKPKG_OVERRIDES_CSWpython27 += -# dependency-listed-more-than-once|CSWlibpython2-7-1-0 -# CHECKPKG_OVERRIDES_CSWpython27 += surplus-dependency|CSWlibffi - PKGFILES_CSWidle$(CVER) += $(libdir)/.*/idlelib/.* PKGFILES_CSWidle$(CVER) += $(bindir)/idle PKGFILES_CSWpython$(CVER)-tk = $(libdir)/.*/lib-tk/.* @@ -143,7 +139,6 @@ 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$(CVER)-test += CSWpython$(CVER) # This could be handled by automatic dependency detection @@ -180,7 +175,8 @@ CHECKPKG_OVERRIDES_CSWpython$(CVER)-tk += surplus-dependency|CSWpython$(CVER) # Checkpkg does not understand relocatable packages. -CHECKPKG_OVERRIDES_CSWpython$(CVER) += soname-not-found|libgdbm.so.3|is|needed|by|opt/csw/lib/python2.7/lib-dynload/gdbm.so +CHECKPKG_OVERRIDES_CSWpython$(CVER) += soname-not-found|libgdbm.so.3|is|needed|by|opt/csw/lib/$(PVER)/lib-dynload/gdbm.so +CHECKPKG_OVERRIDES_CSWpython$(CVER) += soname-not-found|libgdbm.so.3|is|needed|by|opt/csw/lib/$(PVER)/lib-dynload/_gdbm.so CHECKPKG_OVERRIDES_CSWpython$(CVER) += surplus-dependency|CSWgdbm # To avoid file collisions with CSWpython: Modified: csw/mgar/pkg/lang-python/python/branches/python-3.1/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-3.1/Makefile 2011-01-12 09:14:34 UTC (rev 12508) +++ csw/mgar/pkg/lang-python/python/branches/python-3.1/Makefile 2011-01-12 09:19:20 UTC (rev 12509) @@ -72,33 +72,50 @@ PACKAGES = CSWidle$(CVER) PACKAGES += CSWpython$(CVER) -PACKAGES += CSWpython$(CVER)-devel PACKAGES += CSWpython$(CVER)-test PACKAGES += CSWpython$(CVER)-tk + + PACKAGES += CSWlibpython$(DVER)-1-0 +CATALOGNAME_CSWlibpython$(DVER)-1-0 = libpython$(UVER)_1_0 +PKGFILES_CSWlibpython$(DVER)-1-0 += $(call baseisadirs,$(libdir),libpython$(DVER)\.so\.1\.0(\.\d+)*) +PKGFILES_CSWlibpython$(DVER)-1-0 += $(libdir)/$(PVER)\.so\.([0-9\.]+) +SPKG_DESC_CSWlibpython$(DVER)-1-0 = Python shared library ($(VER)) INCOMPATIBLE_PKGS_CSWpython$(CVER) = CSWpydistutils -PKGFILES_CSWidle$(CVER) = $(libdir)/.*/idlelib/.* -PKGFILES_CSWidle$(CVER) += $(bindir)/idle -PKGFILES_CSWpython$(CVER)-devel = $(includedir)/.* -PKGFILES_CSWpython$(CVER)-devel += $(libdir)/.*/config/.* -PKGFILES_CSWpython$(CVER)-devel += $(bindir)/.*config.* -PKGFILES_CSWpython-devel += $(libdir)/libpython$(VER).so +# Devel package +PACKAGES += CSWpython$(CVER)-dev +CATALOGNAME_CSWpython$(CVER)-dev = python_$(CVER)_dev +SPKG_DESC_CSWpython$(CVER)-dev = Development Files for Python +# /opt/csw/include/python$(VER)/pyconfig.h is necessary for Python to start up +PKGFILES_CSWpython$(CVER)-dev += $(includedir)/$(PVER)/(?!pyconfig\.h).* +PKGFILES_CSWpython$(CVER)-dev += $(bindir)/.*config.* +PKGFILES_CSWpython$(CVER)-dev += $(libdir)/pkgconfig.* +PKGFILES_CSWpython$(CVER)-dev += $(libdir)/libpython$(VER).so # No idea why would this be in CSWpython, and no good idea for a better package # to put it. -PKGFILES_CSWpython$(CVER)-devel += $(bindir)/smtpd.py +PKGFILES_CSWpython$(CVER)-dev += $(bindir)/smtpd.py-$(VER) +RUNTIME_DEP_PKGS_CSWpython$(CVER)-dev += CSWpython$(CVER) +RUNTIME_DEP_PKGS_CSWpython$(CVER)-dev += CSWlibpython$(DVER)-1-0 +CHECKPKG_OVERRIDES_CSWpython$(CVER)-dev += surplus-dependency|CSWpython$(CVER) +CHECKPKG_OVERRIDES_CSWpython$(CVER)-dev += missing-dependency|CSWpython +CHECKPKG_OVERRIDES_CSWpython$(CVER)-dev += pkgname-does-not-start-with-CSWpy- +CHECKPKG_OVERRIDES_CSWpython$(CVER)-dev += catalogname-does-not-start-with-py_ + +PKGFILES_CSWidle$(CVER) += $(libdir)/.*/idlelib/.* +PKGFILES_CSWidle$(CVER) += $(bindir)/idle 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_CSWlibpython$(DVER)-1-0 += $(libdir)/libpython$(VER)\.so\.([0-9\.]+) +PKGFILES_CSWpython$(CVER)-test = $(libdir)/$(PVER)/test/.* +PKGFILES_CSWpython$(CVER)-test += $(libdir)/$(PVER)/bsddb/test.* +PKGFILES_CSWpython$(CVER)-test += $(libdir)/$(PVER)/ctypes/test.* +PKGFILES_CSWpython$(CVER)-test += $(libdir)/$(PVER)/email/test.* +PKGFILES_CSWpython$(CVER)-test += $(libdir)/$(PVER)/distutils/tests.* +PKGFILES_CSWpython$(CVER)-test += $(libdir)/$(PVER)/json/tests.* +PKGFILES_CSWpython$(CVER)-test += $(libdir)/$(PVER)/lib2to3/tests.* +PKGFILES_CSWpython$(CVER)-test += $(libdir)/$(PVER)/sqlite3/test.* +PKGFILES_CSWpython$(CVER)-test += $(libdir)/$(PVER)/unittest/test.* ARCHALL_CSWpython$(CVER)-test = 1 ARCHALL_CSWidle$(CVER) = 1 @@ -118,34 +135,26 @@ 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$(CVER)-devel += CSWpython$(CVER) RUNTIME_DEP_PKGS_CSWpython$(CVER)-test += CSWpython$(CVER) -RUNTIME_DEP_PKGS_CSWlibpython$(DVER)-1-0 += CSWggettextrt # This could be handled by automatic dependency detection CHECKPKG_OVERRIDES_CSWidle$(CVER) += surplus-dependency|CSWpython$(CVER)-tk CATALOGNAME_CSWidle$(CVER) = idle_$(CVER) CATALOGNAME_CSWpython$(CVER) = python_$(CVER) -CATALOGNAME_CSWpython$(CVER)-devel = python_$(CVER)_devel CATALOGNAME_CSWpython$(CVER)-tk = python_$(CVER)_tk CATALOGNAME_CSWpython$(CVER)-test = python_$(CVER)_test -CATALOGNAME_CSWlibpython$(DVER)-1-0 = libpython$(UVER)_1_0 SPKG_DESC_CSWidle$(CVER) = Python IDE SPKG_DESC_CSWpython$(CVER) = A high-level scripting language, $(VER) series -SPKG_DESC_CSWpython$(CVER)-devel = Development Files for Python SPKG_DESC_CSWpython$(CVER)-tk = Python Tk Interface (TkInter) SPKG_DESC_CSWpython$(CVER)-test = Python Test modules -SPKG_DESC_CSWlibpython$(DVER)-1-0 = Python shared library ($(VER)) CHECKPKG_OVERRIDES_CSWpython$(CVER) += missing-dependency|CSWpython CHECKPKG_OVERRIDES_CSWpython$(CVER)-test += missing-dependency|CSWpython CHECKPKG_OVERRIDES_CSWpython$(CVER)-test += surplus-dependency|CSWpython$(CVER) CHECKPKG_OVERRIDES_CSWidle$(CVER) += missing-dependency|CSWpython CHECKPKG_OVERRIDES_CSWidle$(CVER) += surplus-dependency|CSWpython$(CVER) -CHECKPKG_OVERRIDES_CSWpython$(CVER)-devel += surplus-dependency|CSWpython$(CVER) -CHECKPKG_OVERRIDES_CSWpython$(CVER)-devel += missing-dependency|CSWpython CHECKPKG_OVERRIDES_CSWpython$(CVER)-tk += missing-dependency|CSWpython LICENSE = LICENSE @@ -155,8 +164,6 @@ CHECKPKG_OVERRIDES_CSWidle$(CVER) += catalogname-does-not-start-with-py_ CHECKPKG_OVERRIDES_CSWpython$(CVER)-test += pkgname-does-not-start-with-CSWpy- CHECKPKG_OVERRIDES_CSWpython$(CVER)-test += catalogname-does-not-start-with-py_ -CHECKPKG_OVERRIDES_CSWpython$(CVER)-devel += pkgname-does-not-start-with-CSWpy- -CHECKPKG_OVERRIDES_CSWpython$(CVER)-devel += catalogname-does-not-start-with-py_ CHECKPKG_OVERRIDES_CSWpython$(CVER)-tk += pkgname-does-not-start-with-CSWpy- CHECKPKG_OVERRIDES_CSWpython$(CVER)-tk += catalogname-does-not-start-with-py_ CHECKPKG_OVERRIDES_CSWpython$(CVER) += pkgname-does-not-start-with-CSWpy- @@ -168,7 +175,6 @@ CHECKPKG_OVERRIDES_CSWpython$(CVER) += soname-not-found|libgdbm.so.3|is|needed|by|opt/csw/lib/$(PVER)/lib-dynload/_gdbm.so CHECKPKG_OVERRIDES_CSWpython$(CVER) += surplus-dependency|CSWgdbm - # To avoid file collisions with CSWpython: EXTRA_PAX_ARGS += -s ',^\.$(bindir)/idle,$(bindir)/idle-$(VER),' EXTRA_PAX_ARGS += -s ',^\.$(bindir)/smtpd.py,$(bindir)/smtpd.py-$(VER),' 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 Jan 12 10:14:34 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 12 Jan 2011 09:14:34 +0000 Subject: [csw-devel] SF.net SVN: gar:[12508] csw/mgar/pkg/lang-python/python/branches/python-2.7 /Makefile Message-ID: Revision: 12508 http://gar.svn.sourceforge.net/gar/?rev=12508&view=rev Author: wahwah Date: 2011-01-12 09:14:34 +0000 (Wed, 12 Jan 2011) Log Message: ----------- python-2.7: Don't include unittest tests in the main package Modified Paths: -------------- csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile Modified: csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile =================================================================== --- csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile 2011-01-12 08:44:28 UTC (rev 12507) +++ csw/mgar/pkg/lang-python/python/branches/python-2.7/Makefile 2011-01-12 09:14:34 UTC (rev 12508) @@ -121,6 +121,7 @@ PKGFILES_CSWpython$(CVER)-test += $(libdir)/$(PVER)/json/tests.* PKGFILES_CSWpython$(CVER)-test += $(libdir)/$(PVER)/lib2to3/tests.* PKGFILES_CSWpython$(CVER)-test += $(libdir)/$(PVER)/sqlite3/test.* +PKGFILES_CSWpython$(CVER)-test += $(libdir)/$(PVER)/unittest/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 dmichelsen at users.sourceforge.net Wed Jan 12 14:21:21 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 12 Jan 2011 13:21:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[12510] csw/mgar/pkg/libsamplerate/trunk Message-ID: Revision: 12510 http://gar.svn.sourceforge.net/gar/?rev=12510&view=rev Author: dmichelsen Date: 2011-01-12 13:21:20 +0000 (Wed, 12 Jan 2011) Log Message: ----------- libsamplerate: Adjust testsuite Modified Paths: -------------- csw/mgar/pkg/libsamplerate/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/libsamplerate/trunk/files/0002-Raise-failure-levels-slightly-for-Solaris-Sparc-and-.patch Modified: csw/mgar/pkg/libsamplerate/trunk/Makefile =================================================================== --- csw/mgar/pkg/libsamplerate/trunk/Makefile 2011-01-12 09:19:20 UTC (rev 12509) +++ csw/mgar/pkg/libsamplerate/trunk/Makefile 2011-01-12 13:21:20 UTC (rev 12510) @@ -18,7 +18,10 @@ MASTER_SITES = http://www.mega-nerd.com/SRC/ DISTFILES = $(NAME)-$(VERSION).tar.gz +# Both changes have been reported upstream to Erik de Castro Lopo and +# he gave his placet that they are correct. They affect the testsuite only. PATCHFILES += 0001-Fix-testcase.patch +PATCHFILES += 0002-Raise-failure-levels-slightly-for-Solaris-Sparc-and-.patch # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz @@ -46,7 +49,4 @@ CONFIGURE_ARGS = $(DIRPATHS) CONFIGURE_ARGS += --disable-static -# Some broken tests, skip for now -SKIPTEST ?= 1 - include gar/category.mk Added: csw/mgar/pkg/libsamplerate/trunk/files/0002-Raise-failure-levels-slightly-for-Solaris-Sparc-and-.patch =================================================================== --- csw/mgar/pkg/libsamplerate/trunk/files/0002-Raise-failure-levels-slightly-for-Solaris-Sparc-and-.patch (rev 0) +++ csw/mgar/pkg/libsamplerate/trunk/files/0002-Raise-failure-levels-slightly-for-Solaris-Sparc-and-.patch 2011-01-12 13:21:20 UTC (rev 12510) @@ -0,0 +1,48 @@ +From 7e1954751788fb89a987f7e79149a03ab807a8ae Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Wed, 12 Jan 2011 13:48:19 +0100 +Subject: [PATCH] Raise failure levels slightly for Solaris Sparc and Solaris amd64 + +--- + tests/snr_bw_test.c | 12 ++++++------ + 1 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/tests/snr_bw_test.c b/tests/snr_bw_test.c +index 62131c2..5fa5a50 100644 +--- a/tests/snr_bw_test.c ++++ b/tests/snr_bw_test.c +@@ -117,10 +117,10 @@ main (int argc, char *argv []) + 9, + BOOLEAN_TRUE, + { { 1, { 0.01111111111 }, 3.0, 1, 145.0, 1.0 }, +- { 1, { 0.01111111111 }, 0.6, 1, 132.0, 1.0 }, ++ { 1, { 0.01111111111 }, 0.6, 1, 131.0, 1.0 }, + { 1, { 0.01111111111 }, 0.3, 1, 138.0, 1.0 }, + { 1, { 0.01111111111 }, 1.0, 1, 157.0, 1.0 }, +- { 1, { 0.01111111111 }, 1.001, 1, 148.0, 1.0 }, ++ { 1, { 0.01111111111 }, 1.001, 1, 147.0, 1.0 }, + { 2, { 0.011111, 0.324 }, 1.9999, 2, 127.0, 1.0 }, + { 2, { 0.012345, 0.457 }, 0.456789, 1, 124.0, 0.5 }, + { 2, { 0.011111, 0.45 }, 0.6, 1, 126.0, 0.5 }, +@@ -131,14 +131,14 @@ main (int argc, char *argv []) + { SRC_SINC_BEST_QUALITY, + 9, + BOOLEAN_TRUE, +- { { 1, { 0.01111111111 }, 3.0, 1, 149.0, 1.0 }, ++ { { 1, { 0.01111111111 }, 3.0, 1, 146.0, 1.0 }, + { 1, { 0.01111111111 }, 0.6, 1, 147.0, 1.0 }, +- { 1, { 0.01111111111 }, 0.3, 1, 148.0, 1.0 }, ++ { 1, { 0.01111111111 }, 0.3, 1, 147.0, 1.0 }, + { 1, { 0.01111111111 }, 1.0, 1, 155.0, 1.0 }, + { 1, { 0.01111111111 }, 1.001, 1, 148.0, 1.0 }, + { 2, { 0.011111, 0.324 }, 1.9999, 2, 147.0, 1.0 }, +- { 2, { 0.012345, 0.457 }, 0.456789, 1, 148.0, 0.5 }, +- { 2, { 0.011111, 0.45 }, 0.6, 1, 149.0, 0.5 }, ++ { 2, { 0.012345, 0.457 }, 0.456789, 1, 146.0, 0.5 }, ++ { 2, { 0.011111, 0.45 }, 0.6, 1, 148.0, 0.5 }, + { 1, { 0.43111111111 }, 1.33, 1, 145.0, 1.0 } + } + }, +-- +1.7.3.2 + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From dmichelsen at users.sourceforge.net Wed Jan 12 14:46:16 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 12 Jan 2011 13:46:16 +0000 Subject: [csw-devel] SF.net SVN: gar:[12511] csw/mgar/pkg/lame/trunk/Makefile Message-ID: Revision: 12511 http://gar.svn.sourceforge.net/gar/?rev=12511&view=rev Author: dmichelsen Date: 2011-01-12 13:46:15 +0000 (Wed, 12 Jan 2011) Log Message: ----------- lame: Add comment about bug Modified Paths: -------------- csw/mgar/pkg/lame/trunk/Makefile Modified: csw/mgar/pkg/lame/trunk/Makefile =================================================================== --- csw/mgar/pkg/lame/trunk/Makefile 2011-01-12 13:21:20 UTC (rev 12510) +++ csw/mgar/pkg/lame/trunk/Makefile 2011-01-12 13:46:15 UTC (rev 12511) @@ -41,6 +41,9 @@ BUILD64 = 1 EXTRA_BUILD_ISAS = sparcv8plus+vis pentium_pro +# Disable intrinsics until this has been resolved: +# https://sourceforge.net/tracker/?func=detail&aid=3150289&group_id=290&atid=100290 +# CONFIGURE_ARGS_isa-i386 = --without-nasm CONFIGURE_ARGS_isa-i386 = ac_cv_header_xmmintrin_h=no CONFIGURE_ARGS_isa-pentium_pro = ac_cv_header_xmmintrin_h=no 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 Jan 12 16:00:21 2011 From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net) Date: Wed, 12 Jan 2011 15:00:21 +0000 Subject: [csw-devel] SF.net SVN: gar:[12512] csw/mgar/pkg/xerces-c/trunk Message-ID: Revision: 12512 http://gar.svn.sourceforge.net/gar/?rev=12512&view=rev Author: dmichelsen Date: 2011-01-12 15:00:21 +0000 (Wed, 12 Jan 2011) Log Message: ----------- xerces-c: Update to 3.1.1 and split library Modified Paths: -------------- csw/mgar/pkg/xerces-c/trunk/Makefile csw/mgar/pkg/xerces-c/trunk/checksums Added Paths: ----------- csw/mgar/pkg/xerces-c/trunk/files/0001-Do-not-strip-norunpath.patch Modified: csw/mgar/pkg/xerces-c/trunk/Makefile =================================================================== --- csw/mgar/pkg/xerces-c/trunk/Makefile 2011-01-12 13:46:15 UTC (rev 12511) +++ csw/mgar/pkg/xerces-c/trunk/Makefile 2011-01-12 15:00:21 UTC (rev 12512) @@ -1,5 +1,5 @@ NAME = xerces-c -VERSION = 3.0.1 +VERSION = 3.1.1 CATEGORIES = lib DESCRIPTION = Xerces XML parser for C++ @@ -13,18 +13,58 @@ endef MASTER_SITES = http://apache.abdaal.com/xerces/c/3/sources/ -DISTFILES = $(NAME)-$(VERSION).tar.gz +DISTFILES += $(NAME)-$(VERSION).tar.gz +PATCHFILES += 0001-Do-not-strip-norunpath.patch + # We define upstream file regex so we can be notifed of new upstream software release UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz -PACKAGES = CSWxerces-c -CATALOGNAME = xerces_c +PACKAGES += CSWlibxerces-c3-1 +CATALOGNAME_CSWlibxerces-c3-1 = libxerces_c3_1 +SPKG_DESC_CSWlibxerces-c3-1 = Xerces XML parser for C++ providing libxerces-c-3.1.so +PKGFILES_CSWlibxerces-c3-1 = $(call baseisadirs,$(libdir),libxerces-c-3\.1\.so) +RUNTIME_DEP_PKGS_CSWlibxerces-c3-1 += CSWcurlrt +RUNTIME_DEP_PKGS_CSWlibxerces-c3-1 += CSWlibidn +RUNTIME_DEP_PKGS_CSWlibxerces-c3-1 += CSWzlib +RUNTIME_DEP_PKGS_CSWlibxerces-c3-1 += CSWlibcares +RUNTIME_DEP_PKGS_CSWlibxerces-c3-1 += CSWosslrt +RUNTIME_DEP_PKGS_CSWlibxerces-c3-1 += CSWoldaprt -SPKG_SOURCEURL = http://xerces.apache.org/xerces-c/ +PACKAGES += CSWlibxerces-c-devel +CATALOGNAME_CSWlibxerces-c-devel = libxerces_c_devel +SPKG_DESC_CSWlibxerces-c-devel = Development files for Xerces +RUNTIME_DEP_PKGS_CSWlibxerces-c-devel += CSWlibxerces-c3-1 +RUNTIME_DEP_PKGS_CSWlibxerces-c-devel += CSWcurlrt +RUNTIME_DEP_PKGS_CSWlibxerces-c-devel += CSWlibidn +RUNTIME_DEP_PKGS_CSWlibxerces-c-devel += CSWzlib +RUNTIME_DEP_PKGS_CSWlibxerces-c-devel += CSWlibcares +RUNTIME_DEP_PKGS_CSWlibxerces-c-devel += CSWosslrt +RUNTIME_DEP_PKGS_CSWlibxerces-c-devel += CSWoldaprt +PACKAGES += CSWxerces-c +CATALOGNAME_CSWxerces-c = xerces_c +SPKG_DESC_CSWxerces-c = Utility programs from the Xerces XML parser +PKGFILES_CSWxerces-c = $(bindir)/.* +RUNTIME_DEP_PKGS_CSWxerces-c += CSWlibxerces-c3-1 +RUNTIME_DEP_PKGS_CSWxerces-c += CSWcurlrt +RUNTIME_DEP_PKGS_CSWxerces-c += CSWlibidn +RUNTIME_DEP_PKGS_CSWxerces-c += CSWzlib +RUNTIME_DEP_PKGS_CSWxerces-c += CSWlibcares +RUNTIME_DEP_PKGS_CSWxerces-c += CSWosslrt +RUNTIME_DEP_PKGS_CSWxerces-c += CSWoldaprt + +VENDOR_URL = http://xerces.apache.org/xerces-c/ +LICENSE = LICENSE + BUILD64 = 1 + +icu_config = $(bindir)/icu-config +EXTRA_CONFIGURE_EXPORTS = icu_config + CONFIGURE_ARGS = $(DIRPATHS) +# CONFIGURE_ARGS += --with-icu=$(prefix) +# CONFIGURE_ARGS += --with-curl=$(prefix) TEST_TARGET = check Modified: csw/mgar/pkg/xerces-c/trunk/checksums =================================================================== --- csw/mgar/pkg/xerces-c/trunk/checksums 2011-01-12 13:46:15 UTC (rev 12511) +++ csw/mgar/pkg/xerces-c/trunk/checksums 2011-01-12 15:00:21 UTC (rev 12512) @@ -1 +1 @@ -293c03f59bf8e956020d73f5b122094c xerces-c-3.0.1.tar.gz +6a8ec45d83c8cfb1584c5a5345cb51ae xerces-c-3.1.1.tar.gz Added: csw/mgar/pkg/xerces-c/trunk/files/0001-Do-not-strip-norunpath.patch =================================================================== --- csw/mgar/pkg/xerces-c/trunk/files/0001-Do-not-strip-norunpath.patch (rev 0) +++ csw/mgar/pkg/xerces-c/trunk/files/0001-Do-not-strip-norunpath.patch 2011-01-12 15:00:21 UTC (rev 12512) @@ -0,0 +1,25 @@ +From 0cb78ef329cacbf4f4954a9d792b01b53ac63798 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen +Date: Wed, 12 Jan 2011 14:24:04 +0100 +Subject: [PATCH] Do not strip -norunpath + +--- + config/ltmain.sh | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/config/ltmain.sh b/config/ltmain.sh +index 3506ead..7e0670f 100755 +--- a/config/ltmain.sh ++++ b/config/ltmain.sh +@@ -4765,7 +4765,7 @@ func_mode_link () + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ +- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) ++ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-norunpath) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" +-- +1.7.3.2 + 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 Jan 12 16:22:17 2011 From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net) Date: Wed, 12 Jan 2011 15:22:17 +0000 Subject: [csw-devel] SF.net SVN: gar:[12513] csw/mgar/pkg/examples/minimalsmf/trunk Message-ID: Revision: 12513 http://gar.svn.sourceforge.net/gar/?rev=12513&view=rev Author: wahwah Date: 2011-01-12 15:22:16 +0000 (Wed, 12 Jan 2011) Log Message: ----------- minimalsmf: Updated the minimal SMF build Modified Paths: -------------- csw/mgar/pkg/examples/minimalsmf/trunk/Makefile Added Paths: ----------- csw/mgar/pkg/examples/minimalsmf/trunk/files/COPYING Modified: csw/mgar/pkg/examples/minimalsmf/trunk/Makefile =================================================================== --- csw/mgar/pkg/examples/minimalsmf/trunk/Makefile 2011-01-12 15:00:21 UTC (rev 12512) +++ csw/mgar/pkg/examples/minimalsmf/trunk/Makefile 2011-01-12 15:22:16 UTC (rev 12513) @@ -20,6 +20,8 @@ MASTER_SITES = DISTFILES = sleeping-beauty DISTFILES += csw$(NAME) +DISTFILES += COPYING +SPKG_SOURCEURL = http://www.opencsw.org INITSMF = /etc/opt/csw/init.d/cswminimalsmf Added: csw/mgar/pkg/examples/minimalsmf/trunk/files/COPYING =================================================================== --- csw/mgar/pkg/examples/minimalsmf/trunk/files/COPYING (rev 0) +++ csw/mgar/pkg/examples/minimalsmf/trunk/files/COPYING 2011-01-12 15:22:16 UTC (rev 12513) @@ -0,0 +1 @@ +Public domain This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From gadavis at users.sourceforge.net Wed Jan 12 20:01:53 2011 From: gadavis at users.sourceforge.net (gadavis at users.sourceforge.net) Date: Wed, 12 Jan 2011 19:01:53 +0000 Subject: [csw-devel] SF.net SVN: gar:[12514] csw/mgar/gar/v2-fortran/gar.conf.mk Message-ID: Revision: 12514 http://gar.svn.sourceforge.net/gar/?rev=12514&view=rev Author: gadavis Date: 2011-01-12 19:01:53 +0000 (Wed, 12 Jan 2011) Log Message: ----------- removed erroneous GCC4_FC_VERSION check Modified Paths: -------------- csw/mgar/gar/v2-fortran/gar.conf.mk Modified: csw/mgar/gar/v2-fortran/gar.conf.mk =================================================================== --- csw/mgar/gar/v2-fortran/gar.conf.mk 2011-01-12 15:22:16 UTC (rev 12513) +++ csw/mgar/gar/v2-fortran/gar.conf.mk 2011-01-12 19:01:53 UTC (rev 12514) @@ -526,11 +526,10 @@ GCC3_CC_VERSION = $(shell $(GCC3_CC) -v 2>&1| ggrep version) GCC3_CXX_VERSION = $(shell $(GCC3_CXX) -v 2>&1| ggrep version) GCC3_F77_VERSION = $(shell $(GCC3_F77) -v 2>&1| ggrep version) - GCC4_FC_VERSION = $(shell $(GCC4_FC) -v 2>&1| ggrep version) GCC4_CC_VERSION = $(shell $(GCC4_CC) -v 2>&1| ggrep version) GCC4_CXX_VERSION = $(shell $(GCC4_CXX) -v 2>&1| ggrep version) GCC4_F77_VERSION = $(shell $(GCC4_F77) -v 2>&1| ggrep version) - GCC4_FC_VERSION = $(shell $(GCC4_F77) -v 2>&1| ggrep version) + GCC4_FC_VERSION = $(shell $(GCC4_FC) -v 2>&1| ggrep version) SOS11_CC_VERSION = $(shell $(SOS11_CC) -V 2>&1| ggrep cc: | gsed -e 's/cc: //') SOS11_CXX_VERSION = $(shell $(SOS11_CXX) -V 2>&1| ggrep CC: | gsed -e 's/CC: //') This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From gadavis at users.sourceforge.net Wed Jan 12 20:26:12 2011 From: gadavis at users.sourceforge.net (gadavis at users.sourceforge.net) Date: Wed, 12 Jan 2011 19:26:12 +0000 Subject: [csw-devel] SF.net SVN: gar:[12515] csw/mgar/gar/v2-fortran Message-ID: Revision: 12515 http://gar.svn.sourceforge.net/gar/?rev=12515&view=rev Author: gadavis Date: 2011-01-12 19:26:11 +0000 (Wed, 12 Jan 2011) Log Message: ----------- Merge in changes from v2 trunk r11821:HEAD to v2-fortran Modified Paths: -------------- csw/mgar/gar/v2-fortran/bin/checkpkg csw/mgar/gar/v2-fortran/bin/checkpkg_inspect_stats.py csw/mgar/gar/v2-fortran/bin/cpan_apply_updates csw/mgar/gar/v2-fortran/bin/custom-pkgtrans csw/mgar/gar/v2-fortran/bin/depgraph csw/mgar/gar/v2-fortran/bin/gem2pkg csw/mgar/gar/v2-fortran/bin/mkpackage csw/mgar/gar/v2-fortran/bin/update-commondirs csw/mgar/gar/v2-fortran/categories/cpan/category.mk csw/mgar/gar/v2-fortran/categories/java/category.mk csw/mgar/gar/v2-fortran/categories/kde/category.mk csw/mgar/gar/v2-fortran/categories/kde4/category.mk csw/mgar/gar/v2-fortran/categories/rbgems/category.mk csw/mgar/gar/v2-fortran/categories/xfce/category.mk csw/mgar/gar/v2-fortran/etc/commondirs-i386 csw/mgar/gar/v2-fortran/etc/commondirs-sparc csw/mgar/gar/v2-fortran/gar.conf.mk csw/mgar/gar/v2-fortran/gar.lib.mk csw/mgar/gar/v2-fortran/gar.mk csw/mgar/gar/v2-fortran/gar.pkg.mk csw/mgar/gar/v2-fortran/gar.svn.mk csw/mgar/gar/v2-fortran/lib/python/README csw/mgar/gar/v2-fortran/lib/python/catalog.py csw/mgar/gar/v2-fortran/lib/python/checkpkg.py csw/mgar/gar/v2-fortran/lib/python/checkpkg_test.py csw/mgar/gar/v2-fortran/lib/python/compare_pkgs.py csw/mgar/gar/v2-fortran/lib/python/configuration.py csw/mgar/gar/v2-fortran/lib/python/database.py csw/mgar/gar/v2-fortran/lib/python/dependency_checks.py csw/mgar/gar/v2-fortran/lib/python/dependency_checks_test.py csw/mgar/gar/v2-fortran/lib/python/gartest.py csw/mgar/gar/v2-fortran/lib/python/inspective_package.py csw/mgar/gar/v2-fortran/lib/python/models.py csw/mgar/gar/v2-fortran/lib/python/opencsw.py csw/mgar/gar/v2-fortran/lib/python/opencsw_test.py csw/mgar/gar/v2-fortran/lib/python/overrides.py csw/mgar/gar/v2-fortran/lib/python/package.py csw/mgar/gar/v2-fortran/lib/python/package_checks.py csw/mgar/gar/v2-fortran/lib/python/package_checks_test.py csw/mgar/gar/v2-fortran/lib/python/package_stats.py csw/mgar/gar/v2-fortran/lib/python/package_stats_test.py csw/mgar/gar/v2-fortran/lib/python/package_test.py csw/mgar/gar/v2-fortran/lib/python/pkgdb.py csw/mgar/gar/v2-fortran/lib/python/sharedlib_utils.py csw/mgar/gar/v2-fortran/lib/python/sharedlib_utils_test.py csw/mgar/gar/v2-fortran/lib/python/tag.py csw/mgar/gar/v2-fortran/lib/python/tag_test.py csw/mgar/gar/v2-fortran/lib/python/testdata/neon_stats.py csw/mgar/gar/v2-fortran/lib/python/testdata/tree_stats.py csw/mgar/gar/v2-fortran/lib/sh/libcheckpkg.sh csw/mgar/gar/v2-fortran/pkglib/Makefile csw/mgar/gar/v2-fortran/tests/example_test.py csw/mgar/gar/v2-fortran/tests/overrides_test.py csw/mgar/gar/v2-fortran/tests/run_tests.py csw/mgar/gar/v2-fortran/tests/static/example/Makefile Added Paths: ----------- csw/mgar/gar/v2-fortran/bin/comparepkg csw/mgar/gar/v2-fortran/lib/python/checkpkg2.py csw/mgar/gar/v2-fortran/lib/python/checkpkg_defaults.ini csw/mgar/gar/v2-fortran/lib/python/checkpkg_lib.py csw/mgar/gar/v2-fortran/lib/python/checkpkg_lib_test.py csw/mgar/gar/v2-fortran/lib/python/common_constants.py csw/mgar/gar/v2-fortran/lib/python/database_test.py csw/mgar/gar/v2-fortran/lib/python/inspective_package_test.py csw/mgar/gar/v2-fortran/lib/python/ldd_emul.py csw/mgar/gar/v2-fortran/lib/python/ldd_emul_test.py csw/mgar/gar/v2-fortran/lib/python/models_test.py csw/mgar/gar/v2-fortran/lib/python/mute_progressbar.py csw/mgar/gar/v2-fortran/lib/python/pkgdb_test.py csw/mgar/gar/v2-fortran/lib/python/pkgmap.py csw/mgar/gar/v2-fortran/lib/python/pkgmap_test.py csw/mgar/gar/v2-fortran/lib/python/pylintrc csw/mgar/gar/v2-fortran/lib/python/shell.py csw/mgar/gar/v2-fortran/lib/python/struct_util.py csw/mgar/gar/v2-fortran/lib/python/struct_util_test.py csw/mgar/gar/v2-fortran/lib/python/system_pkgmap.py csw/mgar/gar/v2-fortran/lib/python/system_pkgmap_test.py csw/mgar/gar/v2-fortran/lib/python/test_base.py csw/mgar/gar/v2-fortran/lib/sh/db_privileges.sh Removed Paths: ------------- csw/mgar/gar/v2-fortran/bin/analyze_module_results.py csw/mgar/gar/v2-fortran/bin/checkpkg_collect_stats.py csw/mgar/gar/v2-fortran/bin/checkpkg_run_modules.py csw/mgar/gar/v2-fortran/lib/sh/run_full_cat.sh Property Changed: ---------------- csw/mgar/gar/v2-fortran/ csw/mgar/gar/v2-fortran/bin/checkpkg csw/mgar/gar/v2-fortran/lib/python/package_stats_test.py csw/mgar/gar/v2-fortran/lib/python/package_test.py csw/mgar/gar/v2-fortran/pkglib/csw/depend Property changes on: csw/mgar/gar/v2-fortran ___________________________________________________________________ Modified: svn:mergeinfo - /csw/mgar/gar/v2:4936-6678,10883-11818 /csw/mgar/gar/v2-bwalton:9784-10011 /csw/mgar/gar/v2-checkpkg:7722-7855 /csw/mgar/gar/v2-checkpkg-override-relocation:10585-10737 /csw/mgar/gar/v2-checkpkg-stats:8454-8649 /csw/mgar/gar/v2-collapsed-modulations:6895 /csw/mgar/gar/v2-dirpackage:8125-8180 /csw/mgar/gar/v2-git/v2-relocate:7617 /csw/mgar/gar/v2-migrateconf:7082-7211 /csw/mgar/gar/v2-noexternals:11592-11745 /csw/mgar/gar/v2-relocate:5028-11738 /csw/mgar/gar/v2-skayser:6087-6132 /csw/mgar/gar/v2-sqlite:10434-10449 + /csw/mgar/gar/v2:4936-6678,10883-11818,11822-12514 /csw/mgar/gar/v2-bwalton:9784-10011 /csw/mgar/gar/v2-checkpkg:7722-7855 /csw/mgar/gar/v2-checkpkg-override-relocation:10585-10737 /csw/mgar/gar/v2-checkpkg-stats:8454-8649 /csw/mgar/gar/v2-collapsed-modulations:6895 /csw/mgar/gar/v2-dirpackage:8125-8180 /csw/mgar/gar/v2-git/v2-relocate:7617 /csw/mgar/gar/v2-migrateconf:7082-7211 /csw/mgar/gar/v2-noexternals:11592-11745 /csw/mgar/gar/v2-relocate:5028-11738 /csw/mgar/gar/v2-skayser:6087-6132 /csw/mgar/gar/v2-sqlite:10434-10449 Deleted: csw/mgar/gar/v2-fortran/bin/analyze_module_results.py =================================================================== --- csw/mgar/gar/v2-fortran/bin/analyze_module_results.py 2011-01-12 19:01:53 UTC (rev 12514) +++ csw/mgar/gar/v2-fortran/bin/analyze_module_results.py 2011-01-12 19:26:11 UTC (rev 12515) @@ -1,73 +0,0 @@ -#!/opt/csw/bin/python2.6 -# $Id$ - -import itertools -import operator -import optparse -import os -import pprint -import progressbar -import sys -import textwrap - -# The following bit of code sets the correct path to Python libraries -# distributed with GAR. -path_list = [os.path.dirname(__file__), - "..", "lib", "python"] -sys.path.append(os.path.join(*path_list)) -import checkpkg -import overrides -import package_stats - -BEFORE_OVERRIDES = """If any of the reported errors were false positives, you -can override them pasting the lines below to the GAR recipe.""" - -AFTER_OVERRIDES = """Please note that checkpkg isn't suggesting you should -simply add these overrides do the Makefile. It only informs what the overrides -could look like. You need to understand what are the reported issues about and -use your best judgement to decide whether to fix the underlying problems or -override them. For more information, scroll up and read the detailed -messages.""" - -UNAPPLIED_OVERRIDES = """WARNING: Some overrides did not match any errors. -They can be removed, as they don't take any effect anyway. If you're getting -errors at the same time, maybe you didn't specify the overrides correctly.""" - -def main(): - parser = optparse.OptionParser() - parser.add_option("-c", "--catalog_file", dest="catalog", - help="Optional catalog file") - parser.add_option("-q", "--quiet", dest="quiet", - default=False, action="store_true", - help=("Display less messages")) - options, args = parser.parse_args() - filenames = args - - # This might be bottleneck. Perhaps a list of md5 sums can be given to this - # script instead. - - # It might be a good idea to store the error tags in the database and - # eliminate the need to access the directory with the error tag files. - - pkgstats = package_stats.StatsListFromCatalog(filenames, options.catalog) - overrides_list = [pkg.GetSavedOverrides() for pkg in pkgstats] - override_list = reduce(operator.add, overrides_list) - error_tags = reduce(operator.add, [stat.GetSavedErrorTags() for stat in pkgstats]) - (tags_after_overrides, - unapplied_overrides) = overrides.ApplyOverrides(error_tags, override_list) - if not options.quiet: - if tags_after_overrides: - print textwrap.fill(BEFORE_OVERRIDES, 80) - for checkpkg_tag in tags_after_overrides: - print checkpkg_tag.ToGarSyntax() - print textwrap.fill(AFTER_OVERRIDES, 80) - if unapplied_overrides: - print textwrap.fill(UNAPPLIED_OVERRIDES, 80) - for override in unapplied_overrides: - print "* Unused %s" % override - exit_code = bool(tags_after_overrides) - sys.exit(exit_code) - - -if __name__ == '__main__': - main() Modified: csw/mgar/gar/v2-fortran/bin/checkpkg =================================================================== --- csw/mgar/gar/v2-fortran/bin/checkpkg 2011-01-12 19:01:53 UTC (rev 12514) +++ csw/mgar/gar/v2-fortran/bin/checkpkg 2011-01-12 19:26:11 UTC (rev 12515) @@ -1,322 +1 @@ -#!/bin/ksh -p -# -# $Id$ -# -# checkpkg 1.51 -# -# diff to 1.46a -# - check multiple package files -# - checkpkg.d plugin support -# - getopts support for command line options -# - colors -# - modular architecture + unit tests -# - reliable shared library checking -# -# This script examines a package that has been put together -# for submittal to the CSW archive at opencsw.org -# -# It examines it for compliance with the packaging standards at -# http://www.opencsw.org/standards/ -# It DOES NOT CATCH EVERYTHING. However, the package will be -# tested with this script before acceptance, so you may as well -# save yourself some time, and run the script yourself! -# -# Be sure to occasionally do a "pkg-get update cswutils" so that -# you know you are tracking the most current version. -# -# TODO: -# - add message handlig to the CheckInterface class. -# - -PATH=$PATH:/usr/sbin -readonly NAME_MAX_LENGTH=${NAME_MAX_LENGTH:-20} - -command_basename=`basename $0` -command_basedir="${0%/${command_basename}}" -libshdir="${command_basedir}/../lib/sh" -readonly command_basename command_basedir libshdir -. "${libshdir}/libcheckpkg.sh" - -LOCAL_ARCH=`uname -p` -CHECKPKG_TMPDIR=${CHECKPKG_TMPDIR:-/var/tmp} -readonly CHECKPKG_TMPDIR - -# Colors only when running interactively -if [[ -t 1 ]]; then - GREEN="\\033[0;32;40m" - RED="\\033[1;31;40m" - BOLD="\\033[1m" - COLOR_RESET="\\033[00m" -else - GREEN="" - RED="" - BOLD="" - COLOR_RESET="" -fi -readonly GREEN RED BOLD COLOR_RESET - -readonly selfpath="$0" -readonly selfargs="$@" - -cleanup(){ - if [[ -d "$EXTRACTDIR" ]] ; then - rm -rf $EXTRACTDIR - fi - cleantmparchives -} - -cleantmparchives() { - for TMPARCHIVE in $tmparchives; do - if [[ "$TMPARCHIVE" != "" ]]; then - [ -f "$TMPARCHIVE" ] && rm $TMPARCHIVE - fi - done -} - -cleanupset(){ - if [ "`echo $SETINF*`" != "$SETINF*" ]; then - rm $SETINF* - fi -} - -# Print error message, and quit program. -errmsg(){ - print ERROR: $* >/dev/fd/2 - cleanup - cleanupset - print "To run checkpkg in the debug mode, add the '-d' flag, for example:" - # selfargs can be very, very long. Find a way to truncate it. - # print "${selfpath} -d ${selfargs}" - print "After you modify any overrides, you need to do gmake remerge repackage" - print "or gmake platforms-remerge platforms-repackage." - exit 1 -} - -debugmsg() { - if [[ "${DEBUG}" != "" ]]; then - print "DEBUG: $*" > /dev/fd/2 - fi -} - -# TODO: Options to add: -# - Use an pre-cached (from a catalog file?) list of md5 sums -# - Don't use the data from /var/sadm/install/contents -display_help=0 -SKIP_STATS_COLLECTION=0 -MD5_SUMS_CATALOG_FILE="" -INSTALL_CONTENTS_FILES="/var/sadm/install/contents" -ANALYZE=1 -PROFILE=0 -QUIET=0 - -while getopts hsdNM:o:c:Apq opt; do - case "${opt}" in - c) - INSTALL_CONTENTS_FILES="${INSTALL_CONTENTS_FILES} ${OPTARG}" - ;; - d) - DEBUG=1 - ;; - h) - display_help=1 - ;; - N) - SKIP_STATS_COLLECTION=1 - ;; - M) - MD5_SUMS_CATALOG_FILE="${OPTARG}" - ;; - A) - ANALYZE=0 - ;; - p) - PROFILE=1 - ;; - q) QUIET=1 - ;; - *) - echo "Unknown option '${opt}'" - ;; - esac -done -shift $(( $OPTIND -1 )) - -readonly INSTALL_CONTENTS_FILES -readonly MD5_SUMS_CATALOG_FILE -readonly SKIP_STATS_COLLECTION -readonly ANALYZE -readonly PROFILE -readonly QUIET - -if [[ "${display_help}" -eq 1 ]] ; then - print 'Usage: checkpkg [options] pkg1 [pkg2 ....]' - print 'Options:' - print ' -c use an additional install/contents file' - print ' -d display debug messages' - print ' -N skip statistics collection' - print ' -M use package md5sums from a catalog file' - print ' -A Do not analyze the results.' - print ' -p Enable profiling' - print ' -q Display less messages' - print '' - print 'Error tags are saved to the sqlite database.' - exit 0 -fi - -# a unique filename for the list of package deps and libs we see in a 'set' -SETINF=$CHECKPKG_TMPDIR/checkpkg.$$.`date +%Y%m%d%H%M%S` -SETLIBS=$SETINF.libs -SETDEPS=$SETINF.deps -pkgnames="" -tmparchives="" - -EXTRACTDIR=$CHECKPKG_TMPDIR/dissect.$$ - -if [ -d $EXTRACTDIR ] ; then - errmsg ERROR: $EXTRACTDIR already exists -fi - -for f in "$@" -do - - if [[ ! -f $f ]] ; then - errmsg ERROR: $f does not exist - fi - - -[ -d ${EXTRACTDIR} ] || mkdir ${EXTRACTDIR} - -######################################## -# Check for some common errors -######################################### - -# TODO: To be ported. -# -# # find all executables and dynamic libs,and list their filenames. -# if [[ "$basedir" != "" ]] ; then -# print -# if [[ -f $EXTRACTDIR/elflist ]] ; then -# print "Checking relocation ability..." -# xargs strings < $EXTRACTDIR/elflist| grep /opt/csw -# if [[ $? -eq 0 ]] ; then -# errmsg package build as relocatable, but binaries have hardcoded /opt/csw paths in them -# else -# print trivial check passed -# fi -# else -# echo No relocation check done for non-binary relocatable package. -# fi -# fi - -tmparchives="$tmparchives $TMPARCHIVE" -done - -# Plugin section. This is here for support for other programming languages -# than Python. As of 2010-03-16 there are no checks in there. If this keeps -# empty, if no checks in other languages get written, it could be removed. -# -# Plugins should live in checkpkg.d subdirectory in the same directory in which -# checkpkg is. Each plugin file name should be an executable and begin with -# "checkpkg-". - -test_suite_ok=1 -checkpkg_module_dir="${command_basedir}/../lib/checkpkg.d" -checkpkg_module_tag="checkpkg-" -checkpkg_stats_basedir="${HOME}/.checkpkg/stats" - -# Cleaning up old *.pyc files which can cause grief. This is because of the -# move of Python libraries. -for pyc_file in ${checkpkg_module_dir}/opencsw.pyc \ - ${checkpkg_module_dir}/checkpkg.pyc; do - if [ -f "${pyc_file}" ]; then - echo "Removing old pyc file: '${pyc_file}'" - rm "${pyc_file}" - fi -done - -if [[ "${DEBUG}" != "" ]]; then - extra_options="--debug" -fi -if [[ "${PROFILE}" -eq 1 ]]; then - extra_options="${extra_options} --profile" -fi -if [[ "${QUIET}" -eq 1 ]]; then - quiet_options="--quiet" -else - quiet_options="" -fi - -if [[ -n "${MD5_SUMS_CATALOG_FILE}" ]]; then - catalog_options="--catalog=${MD5_SUMS_CATALOG_FILE}" -else - catalog_options="" -fi - -# /var/sadm/install/contents cache update -# TODO: Either remove this section or stop the stats collection phase from -# updating the cache. -${command_basedir}/update_contents_cache.py ${extra_options} -if [[ $? -ne 0 ]]; then - errmsg "Updating the contents cache has failed." -fi -if [[ "${SKIP_STATS_COLLECTION}" -eq 0 ]]; then - # Collects package stats to be analyzed later - ${command_basedir}/checkpkg_collect_stats.py \ - ${catalog_options} \ - ${extra_options} \ - "$@" - if [[ "$?" -ne 0 ]]; then - errmsg "Stats collection phase has failed." - fi -fi - -# TODO: A performance problem. The following line means that the md5sums are -# calculated once more. -if [ "${MD5_SUMS_CATALOG_FILE}" ]; then - debugmsg "Reading md5sums from ${MD5_SUMS_CATALOG_FILE}" - md5sums=`cat "${MD5_SUMS_CATALOG_FILE}" \ - | awk '{print $5}' \ - | ggrep -E '[0-9abcdef]{32}'` -else - debugmsg "Calculating md5 sums of all the package files." - md5sums=`gmd5sum "$@" | awk '{print $1}'` -fi -debugmsg "All md5 sums: ${md5sums}" - -# Running the checks. -${command_basedir}/checkpkg_run_modules.py \ - ${extra_options} \ - -b "${checkpkg_stats_basedir}" \ - ${quiet_options} \ - ${md5sums} -if [[ "$?" -ne 0 ]]; then - print "There was a problem analyzing package stats." - test_suite_ok=0 -fi - -if [[ ${test_suite_ok} -ne 1 ]]; then - errmsg "One or more tests have finished with an error." -fi - -if [[ "${ANALYZE}" -eq 1 ]]; then -# Collecting errors and applying the overrides. -# This has to use the original files. - ${command_basedir}/analyze_module_results.py \ - ${catalog_options} \ - ${quiet_options} \ - "$@" - if [[ "$?" -ne 0 ]]; then - errmsg "${RED}Checkpkg has reported errors.${COLOR_RESET}" - else - print "${GREEN}Checkpkg reports no errors.${COLOR_RESET}" - fi -else - echo "Skipping result analysis." -fi - -print "" - -# Cleaning up after all packages -cleanup - -cleanupset +link ../lib/python/checkpkg2.py \ No newline at end of file Property changes on: csw/mgar/gar/v2-fortran/bin/checkpkg ___________________________________________________________________ Deleted: svn:executable - * Added: svn:special + * Deleted: csw/mgar/gar/v2-fortran/bin/checkpkg_collect_stats.py =================================================================== --- csw/mgar/gar/v2-fortran/bin/checkpkg_collect_stats.py 2011-01-12 19:01:53 UTC (rev 12514) +++ csw/mgar/gar/v2-fortran/bin/checkpkg_collect_stats.py 2011-01-12 19:26:11 UTC (rev 12515) @@ -1,69 +0,0 @@ -#!/opt/csw/bin/python2.6 -# -# $Id$ -# -# Collects statistics about a package and saves to a directory, for later use -# by checkpkg modules. - -import itertools -import logging -import optparse -import os -import os.path -import subprocess -import sys -import progressbar - -# The following bit of code sets the correct path to Python libraries -# distributed with GAR. -path_list = [os.path.dirname(__file__), - "..", "lib", "python"] -sys.path.append(os.path.join(*path_list)) -import checkpkg -import opencsw -import package_stats - -def main(): - parser = optparse.OptionParser() - parser.add_option("-d", "--debug", dest="debug", - default=False, action="store_true", - help="Turn on debugging messages") - parser.add_option("-c", "--catalog", dest="catalog", - help="Catalog file") - parser.add_option("-p", "--profile", dest="profile", - default=False, action="store_true", - help="A disabled option") - options, args = parser.parse_args() - if options.debug: - logging.basicConfig(level=logging.DEBUG) - else: - logging.basicConfig(level=logging.INFO) - logging.debug("Collecting statistics about given package files.") - args_display = args - if len(args_display) > 5: - args_display = args_display[:5] + ["...more..."] - file_list = args - logging.debug("Processing: %s, please be patient", args_display) - stats_list = package_stats.StatsListFromCatalog( - file_list, options.catalog, options.debug) - # Reversing the item order in the list, so that the pop() method can be used - # to get packages, and the order of processing still matches the one in the - # catalog file. - stats_list.reverse() - total_packages = len(stats_list) - counter = itertools.count(1) - logging.info("Juicing the srv4 package stream files...") - bar = progressbar.ProgressBar() - bar.maxval = total_packages - bar.start() - while stats_list: - # This way objects will get garbage collected as soon as they are removed - # from the list by pop(). The destructor (__del__()) of the srv4 class - # removes the temporary directory from the disk. This allows to process - # the whole catalog. - stats_list.pop().CollectStats() - bar.update(counter.next()) - bar.finish() - -if __name__ == '__main__': - main() Modified: csw/mgar/gar/v2-fortran/bin/checkpkg_inspect_stats.py =================================================================== --- csw/mgar/gar/v2-fortran/bin/checkpkg_inspect_stats.py 2011-01-12 19:01:53 UTC (rev 12514) +++ csw/mgar/gar/v2-fortran/bin/checkpkg_inspect_stats.py 2011-01-12 19:26:11 UTC (rev 12515) @@ -18,8 +18,10 @@ sys.path.append(os.path.join(*path_list)) import checkpkg import opencsw +import configuration def main(): + configuration.SetUpSqlobjectConnection() usage = "Usage: %prog [ options ] file | md5 [ file | md5 [ ... ] ]" parser = optparse.OptionParser(usage) parser.add_option("-d", "--debug", dest="debug", Deleted: csw/mgar/gar/v2-fortran/bin/checkpkg_run_modules.py =================================================================== --- csw/mgar/gar/v2-fortran/bin/checkpkg_run_modules.py 2011-01-12 19:01:53 UTC (rev 12514) +++ csw/mgar/gar/v2-fortran/bin/checkpkg_run_modules.py 2011-01-12 19:26:11 UTC (rev 12515) @@ -1,56 +0,0 @@ -#!/opt/csw/bin/python2.6 -# $Id$ - -"""This script runs all the checks written in Python.""" - -import datetime -import logging -import os -import os.path -import sys -import re -import cProfile - -CHECKPKG_MODULE_NAME = "Second checkpkg API version" - -# The following bit of code sets the correct path to Python libraries -# distributed with GAR. -path_list = [os.path.dirname(__file__), - "..", "lib", "python"] -sys.path.append(os.path.join(*path_list)) -import checkpkg -import opencsw - - -def main(): - options, args = checkpkg.GetOptions() - if options.debug: - logging.basicConfig(level=logging.DEBUG) - else: - logging.basicConfig(level=logging.INFO) - md5sums = args - # CheckpkgManager2 class abstracts away things such as the collection of - # results. - check_manager = checkpkg.CheckpkgManager2(CHECKPKG_MODULE_NAME, - options.stats_basedir, - md5sums, - options.debug) - # Running the checks, reporting and exiting. - exit_code, screen_report, tags_report = check_manager.Run() - screen_report = unicode(screen_report) - if not options.quiet and screen_report: - sys.stdout.write(screen_report) - else: - logging.debug("No screen report.") - sys.exit(exit_code) - - -if __name__ == '__main__': - if "--profile" in sys.argv: - t_str = datetime.datetime.now().strftime("%Y-%m-%d-%H-%M") - home = os.environ["HOME"] - cprof_file_name = os.path.join( - home, ".checkpkg", "run-modules-%s.cprof" % t_str) - cProfile.run("main()", sort=1, filename=cprof_file_name) - else: - main() Copied: csw/mgar/gar/v2-fortran/bin/comparepkg (from rev 12514, csw/mgar/gar/v2/bin/comparepkg) =================================================================== --- csw/mgar/gar/v2-fortran/bin/comparepkg (rev 0) +++ csw/mgar/gar/v2-fortran/bin/comparepkg 2011-01-12 19:26:11 UTC (rev 12515) @@ -0,0 +1 @@ +link ../lib/python/compare_pkgs.py \ No newline at end of file Modified: csw/mgar/gar/v2-fortran/bin/cpan_apply_updates =================================================================== --- csw/mgar/gar/v2-fortran/bin/cpan_apply_updates 2011-01-12 19:01:53 UTC (rev 12514) +++ csw/mgar/gar/v2-fortran/bin/cpan_apply_updates 2011-01-12 19:26:11 UTC (rev 12515) @@ -28,7 +28,7 @@ next; } print "Updating $module to $newvers\n"; - my $rpat = "s/^(GARVERSION).*\$/\$1 = $newvers/"; + my $rpat = "s/^(VERSION).*\$/\$1 = $newvers/"; system("perl -i.bak -plne '$rpat' $module/Makefile") and die "Failed to upgrade $module\n"; system("gmake -C $module update") Modified: csw/mgar/gar/v2-fortran/bin/custom-pkgtrans =================================================================== --- csw/mgar/gar/v2-fortran/bin/custom-pkgtrans 2011-01-12 19:01:53 UTC (rev 12514) +++ csw/mgar/gar/v2-fortran/bin/custom-pkgtrans 2011-01-12 19:26:11 UTC (rev 12515) @@ -1,10 +1,15 @@ -#!/bin/ksh -p +#!/bin/bash # # $Id$ # # This file exists in order to avoid implementing pipelines in Python. It # could be integrated into the package stats collection program. +# +# It has to use the same interpreter as lib/sh/libcheckpkg.sh, currently bash. +set -u +set -e + command_basename=`basename $0` command_basedir="${0%/${command_basename}}" libshdir="${command_basedir}/../lib/sh" @@ -12,11 +17,11 @@ . "${libshdir}/libcheckpkg.sh" if [[ -z "$1" || -z "$2" || -z "$3" ]]; then - print >&2 "usage: $0 " + echo >&2 "usage: $0 " exit 1 fi if [[ "$3" == "all" ]]; then - print >&2 "This script can't handle 'all' as the third argument" + echo >&2 "This script can't handle 'all' as the third argument" exit 1 fi custom_pkgtrans "$1" "$2" "$3" Modified: csw/mgar/gar/v2-fortran/bin/depgraph =================================================================== --- csw/mgar/gar/v2-fortran/bin/depgraph 2011-01-12 19:01:53 UTC (rev 12514) +++ csw/mgar/gar/v2-fortran/bin/depgraph 2011-01-12 19:26:11 UTC (rev 12515) @@ -49,7 +49,7 @@ my ($garname, @deps); foreach (@lines) { - if (/^GARNAME\s*=\s*(\S*)\s*$/) { + if (/^NAME\s*=\s*(\S*)\s*$/) { $garname = $1; next; } Modified: csw/mgar/gar/v2-fortran/bin/gem2pkg =================================================================== --- csw/mgar/gar/v2-fortran/bin/gem2pkg 2011-01-12 19:01:53 UTC (rev 12514) +++ csw/mgar/gar/v2-fortran/bin/gem2pkg 2011-01-12 19:26:11 UTC (rev 12515) @@ -14,8 +14,8 @@ blurb = spec.description.gsub("\n", ' ').squeeze.lstrip puts <<"EOF" -GARNAME = #{spec.name} -GARVERSION = #{spec.version} +NAME = #{spec.name} +VERSION = #{spec.version} CATEGORIES = rbgems DESCRIPTION = #{spec.summary} Modified: csw/mgar/gar/v2-fortran/bin/mkpackage =================================================================== --- csw/mgar/gar/v2-fortran/bin/mkpackage 2011-01-12 19:01:53 UTC (rev 12514) +++ csw/mgar/gar/v2-fortran/bin/mkpackage 2011-01-12 19:26:11 UTC (rev 12515) @@ -25,6 +25,9 @@ # Tool Version/Revision Information $TOOLVERSION = "1.4"; ($REVISION) = q/$Revision$/ =~ /(\d+)/; +# This shows a warning: +# "Use of uninitialized value $REVISION in sprintf at +# /home/maciej/src/opencsw/pkg/nspr/trunk/gar/bin/mkpackage line 31." $VERSION = sprintf '%s (r%d)', $TOOLVERSION, $REVISION; # Discover network support Modified: csw/mgar/gar/v2-fortran/bin/update-commondirs =================================================================== --- csw/mgar/gar/v2-fortran/bin/update-commondirs 2011-01-12 19:01:53 UTC (rev 12514) +++ csw/mgar/gar/v2-fortran/bin/update-commondirs 2011-01-12 19:26:11 UTC (rev 12515) @@ -19,7 +19,7 @@ mkdir $TMPDIR ( cd $TMPDIR - wget http://mirror.opencsw.org/opencsw/current/$1/5.8/common-1.4.7,REV=2009.09.20-SunOS5.8-$1-CSW.pkg + wget http://mirror.opencsw.org/opencsw/current/$1/5.9/common-1.5,REV=2010.12.11-SunOS5.8-$1-CSW.pkg cat common-* | pkgtrans /dev/fd/0 $TMPDIR all ) Modified: csw/mgar/gar/v2-fortran/categories/cpan/category.mk =================================================================== --- csw/mgar/gar/v2-fortran/categories/cpan/category.mk 2011-01-12 19:01:53 UTC (rev 12514) +++ csw/mgar/gar/v2-fortran/categories/cpan/category.mk 2011-01-12 19:26:11 UTC (rev 12515) @@ -3,7 +3,7 @@ MASTER_SITES ?= $(CPAN_MIRRORS) # This is common to most modules - override in module makefile if different -MODDIST ?= $(GARNAME)-$(GARVERSION).tar.gz +MODDIST ?= $(NAME)-$(VERSION).tar.gz DISTFILES += $(MODDIST) CHECKPATH ?= $(firstword $(CPAN_MIRRORS)) @@ -28,13 +28,13 @@ SPKG_SOURCEURL := $(SPKG_SOURCEURL)/~$(call TOLOWER,$(AUTHOR)) # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX ?= $(GARNAME)-(\d+(?:\.\d+)*).tar.gz +UFILES_REGEX ?= $(NAME)-(\d+(?:\.\d+)*).tar.gz USTREAM_MASTER_SITE ?= $(SPKG_SOURCEURL) -$(foreach P,$(PACKAGES),$(eval _CATEGORY_SPKG_DESC_$P = $$(GARNAME): $$(or $$(SPKG_DESC_$P),$$(SPKG_DESC)))) -_CATEGORY_PKGINFO = echo "PERL_MODULE_NAME=$(GARNAME)"; +$(foreach P,$(PACKAGES),$(eval _CATEGORY_SPKG_DESC_$P = $$(NAME): $$(or $$(SPKG_DESC_$P),$$(SPKG_DESC)))) +_CATEGORY_PKGINFO = echo "PERL_MODULE_NAME=$(NAME)"; -SPKG_SOURCEURL := $(SPKG_SOURCEURL)/$(GARNAME) +SPKG_SOURCEURL := $(SPKG_SOURCEURL)/$(NAME) _MERGE_EXCLUDE_CATEGORY = .*/perllocal\.pod .*/\.packlist _CATEGORY_GSPEC_INCLUDE ?= csw_cpan_dyngspec.gspec @@ -48,6 +48,9 @@ # upstream chose uppercase or not as case must match. _CATEGORY_CHECKPKG_OVERRIDES += pkginfo-description-not-starting-with-uppercase +# Copy in META.yml if it exists so checkpkg can check Perl dependencies +_CATEGORY_FILTER = | ( cat; if test -f "$(WORKDIR_GLOBAL)/META.yml";then echo "i cswpm-meta.yml=META.yml"; fi) + include gar/gar.mk CONFIGURE_ENV += PERL5LIB=$(PERL5LIB) @@ -89,25 +92,28 @@ ( cd $* ; $(INSTALL_ENV) ./Build install $(PERLBUILD_INSTALL_ARGS) ) @$(MAKECOOKIE) +pre-package: + test -f $(WORKSRC_FIRSTMOD)/META.yml && cp $(WORKSRC_FIRSTMOD)/META.yml $(WORKDIR_GLOBAL) + # Check for a CPAN module version update update-check: - @echo " ==> Update Check: $(GARNAME) $(GARVERSION)" + @echo " ==> Update Check: $(NAME) $(VERSION)" @if test "x$(MANUAL_UPDATE)" != "x0" ; then \ cpan_check $(CHECKPATH)$(MODDIST) \ $(CURDIR)/../update_results.txt ; \ else \ - echo " ==> AUTO UPDATE CHECK FOR $(GARNAME) IS DISABLED" ; \ + echo " ==> AUTO UPDATE CHECK FOR $(NAME) IS DISABLED" ; \ fi # Print HTML info for modules module-info: - @echo " ==> Generating module info for $(GARNAME) $(GARVERSION)" + @echo " ==> Generating module info for $(NAME) $(VERSION)" @printf "> ../module_info.html @printf "~$(shell echo $(AUTHOR) | tr '[A-Z]' '[a-z]')/" \ >> ../module_info.html - @printf "$(GARNAME)-$(GARVERSION)" \ + @printf "$(NAME)-$(VERSION)" \ >> ../module_info.html - @printf "\">$(GARNAME)-$(GARVERSION)
\n" \ + @printf "\">$(NAME)-$(VERSION)
\n" \ >> ../module_info.html Modified: csw/mgar/gar/v2-fortran/categories/java/category.mk =================================================================== --- csw/mgar/gar/v2-fortran/categories/java/category.mk 2011-01-12 19:01:53 UTC (rev 12514) +++ csw/mgar/gar/v2-fortran/categories/java/category.mk 2011-01-12 19:26:11 UTC (rev 12515) @@ -1,7 +1,7 @@ # http://jakarta.apache.org/commons # We define upstream file regex so we can be notifed of new upstream software release -UFILES_REGEX ?= commons-$(GARNAME)-(\d+(?:\.\d+)*)-bin.tar.gz +UFILES_REGEX ?= commons-$(NAME)-(\d+(?:\.\d+)*)-bin.tar.gz USTREAM_MASTER_SITE ?= $(SPKG_SOURCEURL) # Includes the rest of gar Modified: csw/mgar/gar/v2-fortran/categories/kde/category.mk =================================================================== --- csw/mgar/gar/v2-fortran/categories/kde/category.mk 2011-01-12 19:01:53 UTC (rev 12514) +++ csw/mgar/gar/v2-fortran/categories/kde/category.mk 2011-01-12 19:26:11 UTC (rev 12515) @@ -6,8 +6,8 @@ KDE_MIRROR = $(KDE_ROOT)/$(KDE_DIST)/$(KDE_VERSION)/src/ MASTER_SITES ?= $(KDE_MIRROR) -GARVERSION ?= $(KDE_VERSION) -PKGDIST ?= $(GARNAME)-$(GARVERSION).tar.bz2 +VERSION ?= $(KDE_VERSION) +PKGDIST ?= $(NAME)-$(VERSION).tar.bz2 DISTFILES += $(PKGDIST) # Compiler Modified: csw/mgar/gar/v2-fortran/categories/kde4/category.mk =================================================================== --- csw/mgar/gar/v2-fortran/categories/kde4/category.mk 2011-01-12 19:01:53 UTC (rev 12514) +++ csw/mgar/gar/v2-fortran/categories/kde4/category.mk 2011-01-12 19:26:11 UTC (rev 12515) @@ -6,8 +6,8 @@ KDE_MIRROR = $(KDE_ROOT)/$(KDE_DIST)/$(KDE_VERSION)/src/ MASTER_SITES ?= $(KDE_MIRROR) -GARVERSION ?= $(KDE_VERSION) -PKGDIST ?= $(DISTNAME)-$(GARVERSION).tar.bz2 +VERSION ?= $(KDE_VERSION) +PKGDIST ?= $(DISTNAME)-$(VERSION).tar.bz2 DISTFILES += $(PKGDIST) # Compiler Modified: csw/mgar/gar/v2-fortran/categories/rbgems/category.mk =================================================================== --- csw/mgar/gar/v2-fortran/categories/rbgems/category.mk 2011-01-12 19:01:53 UTC (rev 12514) +++ csw/mgar/gar/v2-fortran/categories/rbgems/category.mk 2011-01-12 19:26:11 UTC (rev 12515) @@ -4,13 +4,13 @@ MASTER_SITES ?= http://rubygems.org/downloads/ # This is common to most modules - override in module makefile if different -GEMNAME ?= $(GARNAME) -GEMVERSION ?= $(GARVERSION) +GEMNAME ?= $(NAME) +GEMVERSION ?= $(VERSION) GEMFILE ?= $(GEMNAME)-$(GEMVERSION).gem DISTFILES += $(GEMFILE) GEMPKGNAME ?= $(GEMNAME) -GEMCATALOGNAME ?= $(GEMPKGNAME) +GEMCATALOGNAME ?= $(subst -,_,$(GEMPKGNAME)) # PACKAGES ?= CSWgem-$(GEMPKGNAME) CSWgem-$(GEMPKGNAME)-doc PACKAGES ?= CSWgem-$(GEMPKGNAME) @@ -86,5 +86,5 @@ # Check for a CPAN module version update update-check: @# TBD! - @echo " ==> Update Check: $(GARNAME) $(GARVERSION)" - @echo " ==> AUTO UPDATE CHECK FOR $(GARNAME) IS DISABLED" + @echo " ==> Update Check: $(NAME) $(VERSION)" + @echo " ==> AUTO UPDATE CHECK FOR $(NAME) IS DISABLED" Modified: csw/mgar/gar/v2-fortran/categories/xfce/category.mk =================================================================== --- csw/mgar/gar/v2-fortran/categories/xfce/category.mk 2011-01-12 19:01:53 UTC (rev 12514) +++ csw/mgar/gar/v2-fortran/categories/xfce/category.mk 2011-01-12 19:26:11 UTC (rev 12515) @@ -4,8 +4,8 @@ XFCE_MIRROR = $(XFCE_ROOT)/archive/xfce-$(XFCE_VERSION)/src/ MASTER_SITES ?= $(XFCE_MIRROR) -GARVERSION ?= $(XFCE_VERSION) -PKGDIST ?= $(GARNAME)-$(GARVERSION).tar.bz2 +VERSION ?= $(XFCE_VERSION) +PKGDIST ?= $(NAME)-$(VERSION).tar.bz2 DISTFILES += $(PKGDIST) # Compiler options Modified: csw/mgar/gar/v2-fortran/etc/commondirs-i386 =================================================================== --- csw/mgar/gar/v2-fortran/etc/commondirs-i386 2011-01-12 19:01:53 UTC (rev 12514) +++ csw/mgar/gar/v2-fortran/etc/commondirs-i386 2011-01-12 19:26:11 UTC (rev 12515) @@ -42,28 +42,22 @@ /opt/csw/share/locale/be/LC_MESSAGES /opt/csw/share/locale/bg /opt/csw/share/locale/bg/LC_MESSAGES -/opt/csw/share/locale/bg/LC_TIME /opt/csw/share/locale/ca /opt/csw/share/locale/ca/LC_MESSAGES /opt/csw/share/locale/cs /opt/csw/share/locale/cs/LC_MESSAGES -/opt/csw/share/locale/cs/LC_TIME /opt/csw/share/locale/da /opt/csw/share/locale/da/LC_MESSAGES -/opt/csw/share/locale/da/LC_TIME /opt/csw/share/locale/de /opt/csw/share/locale/de/LC_MESSAGES -/opt/csw/share/locale/de/LC_TIME /opt/csw/share/locale/el /opt/csw/share/locale/el/LC_MESSAGES -/opt/csw/share/locale/el/LC_TIME /opt/csw/share/locale/en at boldquot /opt/csw/share/locale/en at boldquot/LC_MESSAGES /opt/csw/share/locale/en at quot /opt/csw/share/locale/en at quot/LC_MESSAGES /opt/csw/share/locale/es /opt/csw/share/locale/es/LC_MESSAGES -/opt/csw/share/locale/es/LC_TIME /opt/csw/share/locale/et /opt/csw/share/locale/et/LC_MESSAGES /opt/csw/share/locale/eu @@ -72,12 +66,10 @@ /opt/csw/share/locale/fi/LC_MESSAGES /opt/csw/share/locale/fr /opt/csw/share/locale/fr/LC_MESSAGES -/opt/csw/share/locale/fr/LC_TIME /opt/csw/share/locale/ga /opt/csw/share/locale/ga/LC_MESSAGES /opt/csw/share/locale/gl /opt/csw/share/locale/gl/LC_MESSAGES -/opt/csw/share/locale/gl/LC_TIME /opt/csw/share/locale/he /opt/csw/share/locale/he/LC_MESSAGES /opt/csw/share/locale/hr @@ -88,50 +80,38 @@ /opt/csw/share/locale/id/LC_MESSAGES /opt/csw/share/locale/it /opt/csw/share/locale/it/LC_MESSAGES -/opt/csw/share/locale/it/LC_TIME /opt/csw/share/locale/ja /opt/csw/share/locale/ja/LC_MESSAGES -/opt/csw/share/locale/ja/LC_TIME /opt/csw/share/locale/ko /opt/csw/share/locale/ko/LC_MESSAGES -/opt/csw/share/locale/ko/LC_TIME /opt/csw/share/locale/lt /opt/csw/share/locale/lt/LC_MESSAGES /opt/csw/share/locale/nl /opt/csw/share/locale/nl/LC_MESSAGES -/opt/csw/share/locale/nl/LC_TIME /opt/csw/share/locale/nn /opt/csw/share/locale/nn/LC_MESSAGES /opt/csw/share/locale/no /opt/csw/share/locale/no/LC_MESSAGES -/opt/csw/share/locale/no/LC_TIME /opt/csw/share/locale/pl /opt/csw/share/locale/pl/LC_MESSAGES -/opt/csw/share/locale/pl/LC_TIME /opt/csw/share/locale/pt /opt/csw/share/locale/pt/LC_MESSAGES -/opt/csw/share/locale/pt/LC_TIME /opt/csw/share/locale/pt_BR /opt/csw/share/locale/pt_BR/LC_MESSAGES -/opt/csw/share/locale/pt_BR/LC_TIME /opt/csw/share/locale/ro /opt/csw/share/locale/ro/LC_MESSAGES /opt/csw/share/locale/ru /opt/csw/share/locale/ru/LC_MESSAGES -/opt/csw/share/locale/ru/LC_TIME /opt/csw/share/locale/sk /opt/csw/share/locale/sk/LC_MESSAGES -/opt/csw/share/locale/sk/LC_TIME /opt/csw/share/locale/sl /opt/csw/share/locale/sl/LC_MESSAGES -/opt/csw/share/locale/sl/LC_TIME /opt/csw/share/locale/sp /opt/csw/share/locale/sp/LC_MESSAGES /opt/csw/share/locale/sr /opt/csw/share/locale/sr/LC_MESSAGES /opt/csw/share/locale/sv /opt/csw/share/locale/sv/LC_MESSAGES -/opt/csw/share/locale/sv/LC_TIME /opt/csw/share/locale/tr /opt/csw/share/locale/tr/LC_MESSAGES /opt/csw/share/locale/uk @@ -142,7 +122,6 @@ /opt/csw/share/locale/wa/LC_MESSAGES /opt/csw/share/locale/zh /opt/csw/share/locale/zh/LC_MESSAGES -/opt/csw/share/locale/zh/LC_TIME /opt/csw/share/locale/zh_CN /opt/csw/share/locale/zh_CN.GB2312 /opt/csw/share/locale/zh_CN.GB2312/LC_MESSAGES Modified: csw/mgar/gar/v2-fortran/etc/commondirs-sparc =================================================================== --- csw/mgar/gar/v2-fortran/etc/commondirs-sparc 2011-01-12 19:01:53 UTC (rev 12514) +++ csw/mgar/gar/v2-fortran/etc/commondirs-sparc 2011-01-12 19:26:11 UTC (rev 12515) @@ -46,28 +46,22 @@ /opt/csw/share/locale/be/LC_MESSAGES /opt/csw/share/locale/bg /opt/csw/share/locale/bg/LC_MESSAGES -/opt/csw/share/locale/bg/LC_TIME /opt/csw/share/locale/ca /opt/csw/share/locale/ca/LC_MESSAGES /opt/csw/share/locale/cs /opt/csw/share/locale/cs/LC_MESSAGES -/opt/csw/share/locale/cs/LC_TIME /opt/csw/share/locale/da /opt/csw/share/locale/da/LC_MESSAGES -/opt/csw/share/locale/da/LC_TIME /opt/csw/share/locale/de /opt/csw/share/locale/de/LC_MESSAGES -/opt/csw/share/locale/de/LC_TIME /opt/csw/share/locale/el /opt/csw/share/locale/el/LC_MESSAGES -/opt/csw/share/locale/el/LC_TIME /opt/csw/share/locale/en at boldquot /opt/csw/share/locale/en at boldquot/LC_MESSAGES /opt/csw/share/locale/en at quot /opt/csw/share/locale/en at quot/LC_MESSAGES /opt/csw/share/locale/es /opt/csw/share/locale/es/LC_MESSAGES -/opt/csw/share/locale/es/LC_TIME /opt/csw/share/locale/et /opt/csw/share/locale/et/LC_MESSAGES /opt/csw/share/locale/eu @@ -76,12 +70,10 @@ /opt/csw/share/locale/fi/LC_MESSAGES /opt/csw/share/locale/fr /opt/csw/share/locale/fr/LC_MESSAGES -/opt/csw/share/locale/fr/LC_TIME /opt/csw/share/locale/ga /opt/csw/share/locale/ga/LC_MESSAGES /opt/csw/share/locale/gl /opt/csw/share/locale/gl/LC_MESSAGES -/opt/csw/share/locale/gl/LC_TIME /opt/csw/share/locale/he /opt/csw/share/locale/he/LC_MESSAGES /opt/csw/share/locale/hr @@ -92,50 +84,38 @@ /opt/csw/share/locale/id/LC_MESSAGES /opt/csw/share/locale/it /opt/csw/share/locale/it/LC_MESSAGES -/opt/csw/share/locale/it/LC_TIME /opt/csw/share/locale/ja /opt/csw/share/locale/ja/LC_MESSAGES -/opt/csw/share/locale/ja/LC_TIME /opt/csw/share/locale/ko /opt/csw/share/locale/ko/LC_MESSAGES -/opt/csw/share/locale/ko/LC_TIME /opt/csw/share/locale/lt /opt/csw/share/locale/lt/LC_MESSAGES /opt/csw/share/locale/nl /opt/csw/share/locale/nl/LC_MESSAGES -/opt/csw/share/locale/nl/LC_TIME /opt/csw/share/locale/nn /opt/csw/share/locale/nn/LC_MESSAGES /opt/csw/share/locale/no /opt/csw/share/locale/no/LC_MESSAGES -/opt/csw/share/locale/no/LC_TIME /opt/csw/share/locale/pl /opt/csw/share/locale/pl/LC_MESSAGES -/opt/csw/share/locale/pl/LC_TIME /opt/csw/share/locale/pt /opt/csw/share/locale/pt/LC_MESSAGES -/opt/csw/share/locale/pt/LC_TIME /opt/csw/share/locale/pt_BR /opt/csw/share/locale/pt_BR/LC_MESSAGES -/opt/csw/share/locale/pt_BR/LC_TIME /opt/csw/share/locale/ro /opt/csw/share/locale/ro/LC_MESSAGES /opt/csw/share/locale/ru /opt/csw/share/locale/ru/LC_MESSAGES -/opt/csw/share/locale/ru/LC_TIME /opt/csw/share/locale/sk /opt/csw/share/locale/sk/LC_MESSAGES -/opt/csw/share/locale/sk/LC_TIME /opt/csw/share/locale/sl /opt/csw/share/locale/sl/LC_MESSAGES -/opt/csw/share/locale/sl/LC_TIME /opt/csw/share/locale/sp /opt/csw/share/locale/sp/LC_MESSAGES /opt/csw/share/locale/sr /opt/csw/share/locale/sr/LC_MESSAGES /opt/csw/share/locale/sv /opt/csw/share/locale/sv/LC_MESSAGES -/opt/csw/share/locale/sv/LC_TIME /opt/csw/share/locale/tr /opt/csw/share/locale/tr/LC_MESSAGES /opt/csw/share/locale/uk @@ -146,7 +126,6 @@ /opt/csw/share/locale/wa/LC_MESSAGES /opt/csw/share/locale/zh /opt/csw/share/locale/zh/LC_MESSAGES -/opt/csw/share/locale/zh/LC_TIME /opt/csw/share/locale/zh_CN /opt/csw/share/locale/zh_CN.GB2312 /opt/csw/share/locale/zh_CN.GB2312/LC_MESSAGES Modified: csw/mgar/gar/v2-fortran/gar.conf.mk =================================================================== --- csw/mgar/gar/v2-fortran/gar.conf.mk 2011-01-12 19:01:53 UTC (rev 12514) +++ csw/mgar/gar/v2-fortran/gar.conf.mk 2011-01-12 19:26:11 UTC (rev 12515) @@ -631,13 +631,13 @@ # # Gnome -GNOME_PROJ ?= $(GARNAME) +GNOME_PROJ ?= $(NAME) GNOME_ROOT = http://ftp.gnome.org/pub/GNOME/sources -GNOME_SUBV = $(shell echo $(GARVERSION) | awk -F. '{print $$1"."$$2}') +GNOME_SUBV = $(shell echo $(VERSION) | awk -F. '{print $$1"."$$2}') GNOME_MIRROR = $(GNOME_ROOT)/$(GNOME_PROJ)/$(GNOME_SUBV)/ # SourceForge -SF_PROJ ?= $(GARNAME) +SF_PROJ ?= $(NAME) SF_MIRRORS ?= http://downloads.sourceforge.net/$(SF_PROJ)/ # Keep this for compatibility SF_MIRROR = $(firstword $(SF_MIRRORS)) @@ -645,18 +645,18 @@ UPSTREAM_USE_SF ?= 0 # Google Code -GOOGLE_PROJECT ?= $(GARNAME) +GOOGLE_PROJECT ?= $(NAME) GOOGLE_MIRROR ?= http://$(GOOGLE_PROJECT).googlecode.com/files/ # Berlios -BERLIOS_PROJECT ?= $(GARNAME) +BERLIOS_PROJECT ?= $(NAME) BERLIOS_MIRROR ?= http://download.berlios.de/$(BERLIOS_PROJECT)/ http://download2.berlios.de/$(BERLIOS_PROJECT)/ # GNU GNU_SITE = http://mirrors.kernel.org GNU_GNUROOT = $(GNU_SITE)/gnu GNU_NGNUROOT = $(GNU_SITE)/non-gnu -GNU_PROJ ?= $(GARNAME) +GNU_PROJ ?= $(NAME) GNU_MIRROR = $(GNU_GNUROOT)/$(GNU_PROJ)/ GNU_NMIRROR = $(GNU_NGNUROOT)/$(GNU_PROJ)/ @@ -671,7 +671,7 @@ CPAN_FIRST_MIRROR = $(firstword $(CPAN_SITES))/authors/id # Python Package Index -PYPI_PROJECT ?= $(GARNAME) +PYPI_PROJECT ?= $(NAME) PYPI_SUBDIR = $(shell echo $(PYPI_PROJECT) | cut -c 1) PYPI_MIRROR = http://pypi.python.org/packages/source/$(PYPI_SUBDIR)/$(PYPI_PROJECT)/ Modified: csw/mgar/gar/v2-fortran/gar.lib.mk =================================================================== --- csw/mgar/gar/v2-fortran/gar.lib.mk 2011-01-12 19:01:53 UTC (rev 12514) +++ csw/mgar/gar/v2-fortran/gar.lib.mk 2011-01-12 19:26:11 UTC (rev 12515) @@ -200,7 +200,7 @@ else \ if echo $(DISTFILES) | grep -w $$FILE >/dev/null; then \ PACKAGE_UP_TO_DATE=1; \ - echo "$(GARNAME) : Package is up-to-date. Current version is $$FILE" ; \ + echo "$(NAME) : Package is up-to-date. Current version is $$FILE" ; \ else \ NEW_FILES="$$FILE $$NEW_FILES"; \ fi; \ @@ -209,11 +209,11 @@ done; \ if test -z "$$NEW_FILES" ; then \ if [ ! -n '$(UFILES_REGEX)' ]; then \ - echo "$(GARNAME) : Warning UFILES_REGEX is not set : $(UFILES_REGEX)" ; \ + echo "$(NAME) : Warning UFILES_REGEX is not set : $(UFILES_REGEX)" ; \ # { echo ""; \ -# echo "Hello dear $(GARNAME) maintainer,"; \ +# echo "Hello dear $(NAME) maintainer,"; \ # echo ""; \ -# echo "The upstream notification job has detected that $(GARNAME) is not configured for automatic upstream file update detection."; \ +# echo "The upstream notification job has detected that $(NAME) is not configured for automatic upstream file update detection."; \ # echo ""; \ # echo "Please consider updating your package. Documentation is available from this link : http://www.opencsw.org" ; \ # echo ""; \ @@ -221,22 +221,22 @@ # echo ""; \ # echo "--"; \ # echo "Kindest regards"; \ -# echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ +# echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -s '[svn] $(NAME) upstream update notification' $(NAME); \ else \ if [ "$$PACKAGE_UP_TO_DATE" -eq "0" ]; then \ - echo "$(GARNAME) : Warning no files to check ! $(FILES2CHECK)" ; \ - echo "$(GARNAME) : UPSTREAM_MASTER_SITES is $(UPSTREAM_MASTER_SITES)" ; \ - echo "$(GARNAME) : DISTNAME is $(DISTNAME)" ; \ - echo "$(GARNAME) : UFILES_REGEX is : $(UFILES_REGEX)" ; \ - echo "$(GARNAME) : Please check configuration" ; \ + echo "$(NAME) : Warning no files to check ! $(FILES2CHECK)" ; \ + echo "$(NAME) : UPSTREAM_MASTER_SITES is $(UPSTREAM_MASTER_SITES)" ; \ + echo "$(NAME) : DISTNAME is $(DISTNAME)" ; \ + echo "$(NAME) : UFILES_REGEX is : $(UFILES_REGEX)" ; \ + echo "$(NAME) : Please check configuration" ; \ fi; \ fi; \ else \ - echo "$(GARNAME) : new upstream files available: $$NEW_FILES"; \ + echo "$(NAME) : new upstream files available: $$NEW_FILES"; \ { echo ""; \ - echo "Hello dear $(GARNAME) maintainer,"; \ + echo "Hello dear $(NAME) maintainer,"; \ echo ""; \ - echo "The upstream notification job has detected the availability of new files for $(GARNAME)."; \ + echo "The upstream notification job has detected the availability of new files for $(NAME)."; \ echo ""; \ echo "The following upstream file(s):"; \ echo " $$NEW_FILES"; \ @@ -250,7 +250,7 @@ echo ""; \ echo "--"; \ echo "Kindest regards"; \ - echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -s '[svn] $(GARNAME) upstream update notification' $(GARNAME); \ + echo "upstream notification job"; } | $(GARBIN)/mail2maintainer -s '[svn] $(NAME) upstream update notification' $(NAME); \ fi; \ fi @@ -266,7 +266,7 @@ else \ if echo $(DISTFILES) | grep -w $$FILE >/dev/null; then \ PACKAGE_UP_TO_DATE=1; \ - echo "$(GARNAME) : Package is up-to-date. Current version is $$FILE" ; \ + echo "$(NAME) : Package is up-to-date. Current version is $$FILE" ; \ else \ NEW_FILES="$$FILE $$NEW_FILES"; \ fi; \ @@ -275,18 +275,18 @@ done; \ if test -z "$$NEW_FILES" ; then \ if [ ! -n '$(UFILES_REGEX)' ]; then \ - echo "$(GARNAME) : Warning UFILES_REGEX is not set : $(UFILES_REGEX)" ; \ + echo "$(NAME) : Warning UFILES_REGEX is not set : $(UFILES_REGEX)" ; \ else \ if [ "$$PACKAGE_UP_TO_DATE" -eq "0" ]; then \ - echo "$(GARNAME) : Warning no files to check ! $(FILES2CHECK)" ; \ - echo "$(GARNAME) : UPSTREAM_MASTER_SITES is $(UPSTREAM_MASTER_SITES)" ; \ - echo "$(GARNAME) : DISTNAME is $(DISTNAME)" ; \ - echo "$(GARNAME) : UFILES_REGEX is : $(UFILES_REGEX)" ; \ - echo "$(GARNAME) : Please check configuration" ; \ + echo "$(NAME) : Warning no files to check ! $(FILES2CHECK)" ; \ + echo "$(NAME) : UPSTREAM_MASTER_SITES is $(UPSTREAM_MASTER_SITES)" ; \ + echo "$(NAME) : DISTNAME is $(DISTNAME)" ; \ + echo "$(NAME) : UFILES_REGEX is : $(UFILES_REGEX)" ; \ + echo "$(NAME) : Please check configuration" ; \ fi; \ fi; \ else \ - echo "$(GARNAME) : new upstream files available: $$NEW_FILES"; \ + echo "$(NAME) : new upstream files available: $$NEW_FILES"; \ fi; \ fi @@ -380,7 +380,7 @@ # to supply an alternate target at their discretion git-extract-%: @echo " ===> Extracting Git Repo $(DOWNLOADDIR)/$* (Treeish: $(call GIT_TREEISH,$*))" - git --bare archive --prefix=$(GARNAME)-$(GARVERSION)/ --remote=file://$(abspath $(DOWNLOADDIR))/$*/ $(call GIT_TREEISH,$*) | gtar -xf - -C $(EXTRACTDIR) + git --bare archive --prefix=$(NAME)-$(VERSION)/ --remote=file://$(abspath $(DOWNLOADDIR))/$*/ $(call GIT_TREEISH,$*) | gtar -xf - -C $(EXTRACTDIR) @$(MAKECOOKIE) # rule to extract files with unzip @@ -768,8 +768,8 @@ # pkg-config scripts install-%-config: - mkdir -p $(STAGINGDIR)/$(GARNAME) - cp -f $(DESTDIR)$(bindir)/$*-config $(STAGINGDIR)/$(GARNAME)/ + mkdir -p $(STAGINGDIR)/$(NAME) + cp -f $(DESTDIR)$(bindir)/$*-config $(STAGINGDIR)/$(NAME)/ $(MAKECOOKIE) ###################################### Modified: csw/mgar/gar/v2-fortran/gar.mk =================================================================== --- csw/mgar/gar/v2-fortran/gar.mk 2011-01-12 19:01:53 UTC (rev 12514) +++ csw/mgar/gar/v2-fortran/gar.mk 2011-01-12 19:26:11 UTC (rev 12515) @@ -15,6 +15,9 @@ $(error Your version of 'make' is too old: $(MAKE_VERSION). Please make sure you are using at least 3.81) endif +$(if $(GARNAME),$(error The deprecated variable 'GARNAME' is defined, please replace it with 'NAME')) +$(if $(GARVERSION),$(error The deprecated variable 'GARVERSION' is defined, please replace it with 'VERSION')) + # $(GARDIR) is pre-set by the top-level category.mk GARBIN = $(GARDIR)/bin @@ -33,7 +36,7 @@ PARALLELMFLAGS ?= $(MFLAGS) export PARALLELMFLAGS -DISTNAME ?= $(GARNAME)-$(GARVERSION) +DISTNAME ?= $(NAME)-$(VERSION) DYNSCRIPTS = $(foreach PKG,$(SPKG_SPECS),$(foreach SCR,$(ADMSCRIPTS),$(if $(value $(PKG)_$(SCR)), $(PKG).$(SCR)))) _LOCALFILES = $(notdir $(wildcard files/*)) @@ -57,9 +60,9 @@ # For rules that do nothing, display what dependencies they # successfully completed #DONADA = @echo " [$@] complete. Finished rules: $+" -#DONADA = @touch $(COOKIEDIR)/$@; echo " [$@] complete for $(GARNAME)." +#DONADA = @touch $(COOKIEDIR)/$@; echo " [$@] complete for $(NAME)." COOKIEFILE = $(COOKIEDIR)/$(patsubst $(COOKIEDIR)/%,%,$1) -DONADA = @touch $(call COOKIEFILE,$@); echo " [$@] complete for $(GARNAME)." +DONADA = @touch $(call COOKIEFILE,$@); echo " [$@] complete for $(NAME)." # TODO: write a stub rule to print out the name of a rule when it @@ -425,8 +428,8 @@ @( if [ -d "$(WORKSRC)" ]; then \ echo ' ==> Snapshotting extracted source tree with git'; \ cd $(WORKSRC); git init; git add .; \ - git commit -m "Upstream $(GARVERSION)"; \ - git tag -am "Upstream $(GARVERSION)" upstream-$(GARVERSION); \ + git commit -m "Upstream $(VERSION)"; \ + git tag -am "Upstream $(VERSION)" upstream-$(VERSION); \ git checkout -b csw; \ fi ) @$(MAKECOOKIE) @@ -441,7 +444,7 @@ _var_definitions = $(foreach VAR,$(shell perl -ne 'print "$$1 " if( /@([^@]+)@/ )' <$1),$(VAR)=$($(VAR))) expandvars-%: - $(call _var_definitions,$(WORKDIR)/$*) perl -i-unexpanded -npe 's/@([^@]+)@/$$ENV{$$1}/e' $(WORKDIR)/$* + $(call _var_definitions,$(WORKDIR)/$*) perl -i-unexpanded -npe 's/@([^@]+)@/$$ENV{$$1}/eg' $(WORKDIR)/$* @$(MAKECOOKIE) @@ -471,7 +474,7 @@ @( if [ -d "$(WORKSRC)/.git" ]; then \ echo "Tagging top of current csw patch stack..."; \ cd $(WORKSRC); \ - git tag -am "CSW $(GARVERSION)" csw-$(GARVERSION); \ + git tag -am "CSW $(VERSION)" csw-$(VERSION); \ fi ) @$(MAKECOOKIE) @@ -495,7 +498,7 @@ echo "Capturing changes..."; \ git commit $(GIT_COMMIT_OPTS) && \ ( NEXTPATCH=`git log --pretty=oneline master..HEAD | wc -l | tr -d '[[:space:]]'`; \ - git format-patch --start-number=$$NEXTPATCH csw-$(GARVERSION); \ + git format-patch --start-number=$$NEXTPATCH csw-$(VERSION); \ echo Add the following to your recipe and then; \ NEWPATCHES=`echo 00*-*patch`; \ FILES_PATCHES=`for p in $$NEWPATCHES; do echo files/$$p; done`; \ Modified: csw/mgar/gar/v2-fortran/gar.pkg.mk =================================================================== --- csw/mgar/gar/v2-fortran/gar.pkg.mk 2011-01-12 19:01:53 UTC (rev 12514) +++ csw/mgar/gar/v2-fortran/gar.pkg.mk 2011-01-12 19:26:11 UTC (rev 12515) @@ -22,8 +22,8 @@ PKGINFO ?= /usr/bin/pkginfo # You can use either PACKAGES with dynamic gspec-files or explicitly add gspec-files to DISTFILES. -# Do "PACKAGES = CSWmypkg" when you build a package whose GARNAME is not the package name. -# If no explicit gspec-files have been defined the default name for the package is CSW$(GARNAME). +# Do "PACKAGES = CSWmypkg" when you build a package whose NAME is not the package name. +# If no explicit gspec-files have been defined the default name for the package is CSW$(NAME). # The whole processing is done from _PKG_SPECS, which includes all packages to be build. # SRCPACKAGE_BASE is the name of the package containing the sourcefiles for all packages @@ -31,8 +31,8 @@ # SRCPACKAGE is the name of the package containing the sources ifeq ($(origin PACKAGES), undefined) -PACKAGES = $(if $(filter %.gspec,$(DISTFILES)),,CSW$(GARNAME)) -CATALOGNAME ?= $(if $(filter %.gspec,$(DISTFILES)),,$(GARNAME)) +PACKAGES = $(if $(filter %.gspec,$(DISTFILES)),,CSW$(NAME)) +CATALOGNAME ?= $(if $(filter %.gspec,$(DISTFILES)),,$(NAME)) SRCPACKAGE_BASE = $(firstword $(basename $(filter %.gspec,$(DISTFILES))) $(PACKAGES)) SRCPACKAGE ?= $(SRCPACKAGE_BASE)-src SPKG_SPECS ?= $(basename $(filter %.gspec,$(DISTFILES))) $(PACKAGES) $(if $(NOSOURCEPACKAGE),,$(SRCPACKAGE)) @@ -52,6 +52,7 @@ GARPKG_v1 = CSWgar-v1 GARPKG_v2 = CSWgar-v2 RUNTIME_DEP_PKGS_$(SRCPACKAGE) ?= $(or $(GARPKG_$(GARSYSTEMVERSION)),$(error GAR version $(GARSYSTEMVERSION) unknown)) +CATALOG_RELEASE ?= current _PKG_SPECS = $(filter-out $(NOPACKAGE),$(SPKG_SPECS)) @@ -78,7 +79,7 @@ _PKG_SPECS = $(filter-out $(NOPACKAGE),$(SPKG_SPECS)) -BUNDLE ?= $(GARNAME) +BUNDLE ?= $(NAME) # pkgname - Get the name of a package from a gspec-name or package-name # @@ -150,7 +151,7 @@ SPKG_DESC ?= $(DESCRIPTION) -SPKG_VERSION ?= $(GARVERSION) +SPKG_VERSION ?= $(VERSION) SPKG_CATEGORY ?= application SPKG_SOURCEURL ?= $(firstword $(VENDOR_URL) \ $(if $(filter $(GNU_MIRROR),$(MASTER_SITES)),http://www.gnu.org/software/$(GNU_PROJ)) \ @@ -194,6 +195,7 @@ # - set class for all config files _CSWCLASS_FILTER = | perl -ane '\ + $(foreach FILE,$(CPTEMPLATES),$$F[1] = "cswcptemplates" if( $$F[2] =~ m(^$(FILE)$$) );)\ $(foreach FILE,$(MIGRATECONF),$$F[1] = "cswmigrateconf" if( $$F[2] =~ m(^$(FILE)$$) );)\ $(foreach FILE,$(SAMPLECONF:%\.CSW=%),$$F[1] = "cswcpsampleconf" if ( $$F[2] =~ m(^$(FILE)\.CSW$$) );)\ $(foreach FILE,$(PRESERVECONF:%\.CSW=%),$$F[1] = "cswpreserveconf" if( $$F[2] =~ m(^$(FILE)\.CSW$$) );)\ @@ -248,7 +250,7 @@ # Where we find our mkpackage global templates PKGLIB = $(GARDIR)/pkglib -PKG_EXPORTS = GARNAME GARVERSION DESCRIPTION CATEGORIES GARCH GARDIR GARBIN +PKG_EXPORTS = NAME VERSION DESCRIPTION CATEGORIES GARCH GARDIR GARBIN PKG_EXPORTS += CURDIR WORKDIR WORKDIR_FIRSTMOD WORKSRC WORKSRC_FIRSTMOD PKGROOT PKG_EXPORTS += SPKG_REVSTAMP SPKG_PKGNAME SPKG_DESC SPKG_VERSION SPKG_CATEGORY PKG_EXPORTS += SPKG_VENDOR SPKG_EMAIL SPKG_PSTAMP SPKG_BASEDIR SPKG_CLASSES @@ -431,9 +433,9 @@ ) \ <$(PROTOTYPE); \ if [ -n "$(EXTRA_PKGFILES_$*)" ]; then echo "$(EXTRA_PKGFILES_$*)"; fi \ - ) $(call checkpkg_override_filter,$*) $(_CSWCLASS_FILTER) $(_PROTOTYPE_MODIFIERS) $(_PROTOTYPE_FILTER_$*) >$@; \ + ) $(call checkpkg_override_filter,$*) $(_CSWCLASS_FILTER) $(_CATEGORY_FILTER) $(_PROTOTYPE_MODIFIERS) $(_PROTOTYPE_FILTER_$*) >$@; \ else \ - cat $(PROTOTYPE) $(call checkpkg_override_filter,$*) $(_CSWCLASS_FILTER) $(_PROTOTYPE_MODIFIERS) $(_PROTOTYPE_FILTER_$*) >$@; \ + cat $(PROTOTYPE) $(call checkpkg_override_filter,$*) $(_CSWCLASS_FILTER) $(_CATEGORY_FILTER) $(_PROTOTYPE_MODIFIERS) $(_PROTOTYPE_FILTER_$*) >$@; \ fi $(if $(ALLOW_RELOCATE),$(call dontrelocate,opt,$(PROTOTYPE))) @@ -463,7 +465,7 @@ $(WORKDIR)/%.depend: $(WORKDIR)/$*.prototype $(WORKDIR)/%.depend: _EXTRA_GAR_PKGS += $(_CATEGORY_RUNTIME_DEP_PKGS) $(WORKDIR)/%.depend: _EXTRA_GAR_PKGS += $(if $(strip $(shell cat $(WORKDIR)/$*.prototype | perl -ane 'print "yes" if( $$F[1] eq "cswalternatives")')),CSWalternatives) -$(WORKDIR)/%.depend: _EXTRA_GAR_PKGS += $(if $(strip $(shell cat $(WORKDIR)/$*.prototype | perl -ane '$(foreach C,$(_CSWCLASSES),print "$C\n" if( $$F[1] eq "$C");)')),CSWcswclassutils) +$(WORKDIR)/%.depend: _EXTRA_GAR_PKGS += $(foreach P,$(strip $(shell cat $(WORKDIR)/$*.prototype | perl -ane '$(foreach C,$(filter-out ugfiles,$(_CSWCLASSES)),print "$C " if( $$F[1] eq "$C");)')),CSWcas-$(subst csw,,$(P))) $(WORKDIR)/%.depend: _DEP_PKGS=$(or $(RUNTIME_DEP_PKGS_ONLY_$*),$(RUNTIME_DEP_PKGS_ONLY),$(sort $(_EXTRA_GAR_PKGS)) $(or $(RUNTIME_DEP_PKGS_$*),$(RUNTIME_DEP_PKGS),$(DEP_PKGS_$*),$(DEP_PKGS))) $(WORKDIR)/%.depend: $(WORKDIR) @@ -484,7 +486,7 @@ # Dynamic gspec-files are constructed as follows: # - Packages using dynamic gspec-files must be listed in PACKAGES # - There is a default of PACKAGES containing one packages named CSW -# followed by the GARNAME. It can be changed by setting PACKAGES explicitly. +# followed by the NAME. It can be changed by setting PACKAGES explicitly. # - The name of the generated package is always the same as listed in PACKAGES # - The catalog name defaults to the suffix following CSW of the package name, # but can be customized by setting CATALOGNAME_ = @@ -708,7 +710,6 @@ merge-checkpkgoverrides-%: @echo "[ Generating checkpkg override for package $* ]" - $(_DBG)ginstall -d $(PKGROOT)/opt/csw/share/checkpkg/overrides $(_DBG)($(foreach O,$(or $(CHECKPKG_OVERRIDES_$*),$(CHECKPKG_OVERRIDES)) $(_CATEGORY_CHECKPKG_OVERRIDES),echo "$O";)) | \ perl -F'\|' -ane 'unshift @F,"$*"; $$F[0].=":"; print join(" ", at F );' \ > $(WORKDIR_GLOBAL)/checkpkg_override.$* @@ -843,7 +844,11 @@ # pkgcheck - check if the package is compliant # pkgcheck: $(foreach SPEC,$(_PKG_SPECS),package-$(SPEC)) - $(_DBG)( LC_ALL=C $(GARBIN)/checkpkg $(foreach SPEC,$(_PKG_SPECS),$(SPKG_EXPORT)/`$(call _PKG_ENV,$(SPEC)) mkpackage --tmpdir $(SPKG_TMPDIR) -qs $(WORKDIR)/$(SPEC).gspec -D pkgfile`.gz ) || exit 2;) + $(_DBG)( LC_ALL=C $(GARBIN)/checkpkg \ + --architecture "$(GARCH)" \ + --os-releases "$(SPKG_OSNAME)" \ + --catalog-release "$(CATALOG_RELEASE)" \ + $(foreach SPEC,$(_PKG_SPECS),$(SPKG_EXPORT)/`$(call _PKG_ENV,$(SPEC)) mkpackage --tmpdir $(SPKG_TMPDIR) -qs $(WORKDIR)/$(SPEC).gspec -D pkgfile`.gz ) || exit 2;) @$(MAKECOOKIE) pkgcheck-p: @@ -930,13 +935,13 @@ submitpkg-%: @$(if $(filter $(call _REVISION),UNCOMMITTED NOTVERSIONED NOSVN),\ $(error You have local files not in the repository. Please commit everything before submitting a package)) - $(SVN) -m "$(GARNAME): Tag as release $(SPKG_VERSION),$(SPKG_REVSTAMP)$(if $(filter default,$*),, for project '$*')" cp $(_PKGURL)/trunk $(_PKGURL)/tags/$(if $(filter default,$*),,$*_)$(GARNAME)-$(SPKG_VERSION),$(SPKG_REVSTAMP) + $(SVN) -m "$(NAME): Tag as release $(SPKG_VERSION),$(SPKG_REVSTAMP)$(if $(filter default,$*),, for project '$*')" cp $(_PKGURL)/trunk $(_PKGURL)/tags/$(if $(filter default,$*),,$*_)$(NAME)-$(SPKG_VERSION),$(SPKG_REVSTAMP) # dependb - update the dependency database # dependb: @dependb --db $(SPKG_DEPEND_DB) \ - --parent $(CATEGORIES)/$(GARNAME) \ + --parent $(CATEGORIES)/$(NAME) \ --add $(DEPENDS) # pkgenv - dump the packaging environment Modified: csw/mgar/gar/v2-fortran/gar.svn.mk =================================================================== --- csw/mgar/gar/v2-fortran/gar.svn.mk 2011-01-12 19:01:53 UTC (rev 12514) +++ csw/mgar/gar/v2-fortran/gar.svn.mk 2011-01-12 19:26:11 UTC (rev 12515) @@ -27,6 +27,6 @@ $(GARDIR)/bin/svnignore work cookies download scm-tag-release: - $(SVN) cp ../trunk ../tags/$(GARNAME)-$(GARVERSION)$(SPKG_REVSTAMP) + $(SVN) cp ../trunk ../tags/$(NAME)-$(VERSION)$(SPKG_REVSTAMP) .PHONY: scm-help scm-update-all scm-update-package scm-update-gar scm-update-ignores scm-tag-release Modified: csw/mgar/gar/v2-fortran/lib/python/README =================================================================== --- csw/mgar/gar/v2-fortran/lib/python/README 2011-01-12 19:01:53 UTC (rev 12514) +++ csw/mgar/gar/v2-fortran/lib/python/README 2011-01-12 19:26:11 UTC (rev 12515) @@ -1,29 +1,58 @@ -Python libraries, mostly related to checkpkg. +This directory contains Python libraries, mostly related to checkpkg. +==Checkpkg== + +Checks to implement: + - foo_bar != CSWfoo-bar -> error + - *dev(el)? -> error, suggest *-devel + - *-?rt -> error, suggest specific library packages + - empty package without 'transitional' in the name --> error, suggest + 'transitional' + - CSWpmfoo --> error, suggest CSWpm-foo + - Dependency on a transitional package --> error + ('transitional', 'stub', 'legacy') + - Dependency on CSWcas-initsmf + rc* files --> error + + Development plan for checkpkg: - -- Move the 'data' field of the srv4_file table to a separate table (should - speed up checking if stats are already collected) -- Store run history and display stats from each run +- Generalize dependency checking by adding NeedFile(file_list, reason) to + error_mgr. It's possible to need one of the listed files only, so files are + given as alternatives, but the reason is common. +- Display stats from each run - Shorten the on-screen output, add commands to display override lines - Move the set check stats outside of checking functions, remove the special - status of dependency checking functions; add a progress bar for it. + status of dependency checking functions; add a progress bar for it. - Restructure the error reporting, group them by errors. +- Sort all list data structures so that it's possible to diff the results of + pprint.pprint() and see meaningful results. This will be the new + implementation for comparepkg. +- Add fields to the srv4_file_stats table: + - source URL (for grouping by software) + - Description (to search for the word 'transitional') +- Don't suggest two packages for the same soname. +Also, see ticket list on trac: http://sourceforge.net/apps/trac/gar/report/1 +Items done: +- Move the 'data' field of the srv4_file table to a separate table (should + speed up checking if stats are already collected) +- Store run history + Known problems: - libmagic fails sometimes when processing the whole catalog +- hachoir_parser fails sometimes on i386 packages when examining them on sparc +Package dependencies: -Dependencies: - It's possible to develop checkpkg on a non-Solaris platform, using unit tests as means to run various bits of code. Here's the dependency list for Ubuntu. - python-cheetah - python-hachoir-parser - python-magic - python-mox - python-progressbar +sudo aptitude install \ + python-cheetah \ + python-hachoir-parser \ + python-magic \ + python-mox \ + python-progressbar \ + python-sqlobject \ python-yaml Modified: csw/mgar/gar/v2-fortran/lib/python/catalog.py =================================================================== --- csw/mgar/gar/v2-fortran/lib/python/catalog.py 2011-01-12 19:01:53 UTC (rev 12514) +++ csw/mgar/gar/v2-fortran/lib/python/catalog.py 2011-01-12 19:26:11 UTC (rev 12515) @@ -123,6 +123,7 @@ def _GetCatalogData(self, fd): catalog_data = [] for line in fd: + if line.startswith("#"): continue try: parsed = self._ParseCatalogLine(line) catalog_data.append(parsed) Modified: csw/mgar/gar/v2-fortran/lib/python/checkpkg.py =================================================================== --- csw/mgar/gar/v2-fortran/lib/python/checkpkg.py 2011-01-12 19:01:53 UTC (rev 12514) +++ csw/mgar/gar/v2-fortran/lib/python/checkpkg.py 2011-01-12 19:26:11 UTC (rev 12515) @@ -3,62 +3,33 @@ # This is the checkpkg library, common for all checkpkg tests written in # Python. -import copy -import cPickle -import errno import itertools import logging -import operator import optparse -import os import os.path import re import pprint import progressbar -import socket -import sqlite3 import sqlobject -import time -from sqlobject import sqlbuilder import subprocess -import textwrap -from Cheetah import Template import database -import package import inspective_package -import package_checks -import package_stats import models as m -import configuration as c -import tag +import common_constants +import package_stats -DEBUG_BREAK_PKGMAP_AFTER = False -SYSTEM_PKGMAP = "/var/sadm/install/contents" -NEEDED_SONAMES = "needed sonames" -RUNPATH = "runpath" -SONAME = "soname" -CONFIG_MTIME = "mtime" -CONFIG_DB_SCHEMA = "db_schema_version" -DO_NOT_REPORT_SURPLUS = set([u"CSWcommon", u"CSWcswclassutils", u"CSWisaexec"]) -DO_NOT_REPORT_MISSING = set([]) -DO_NOT_REPORT_MISSING_RE = [r"\*?SUNW.*"] -DUMP_BIN = "/usr/ccs/bin/dump" -PSTAMP_RE = r"(?P\w+)@(?P[\w\.-]+)-(?P\d+)" DESCRIPTION_RE = r"^([\S]+) - (.*)$" BAD_CONTENT_REGEXES = ( - # Slightly obfuscating these by using the default concatenation of - # strings. + # Slightly obfuscating these by using concatenation of strings. + r'/export' r'/home', r'/export' r'/medusa', r'/opt' r'/build', + r'/usr' r'/local', + r'/usr' r'/share', ) -SYSTEM_SYMLINKS = ( - ("/opt/csw/bdb4", ["/opt/csw/bdb42"]), - ("/64", ["/amd64", "/sparcv9"]), - ("/opt/csw/lib/i386", ["/opt/csw/lib"]), -) INSTALL_CONTENTS_AVG_LINE_LENGTH = 102.09710677919261 SYS_DEFAULT_RUNPATH = [ "/usr/lib/$ISALIST", @@ -67,80 +38,8 @@ "/lib", ] -CONTENT_PKG_RE = r"^\*?(CSW|SUNW)[0-9a-zA-Z\-]?[0-9a-z\-]+$" -MD5_RE = r"^[0123456789abcdef]{32}$" +MD5_RE = re.compile(r"^[0123456789abcdef]{32}$") -REPORT_TMPL = u"""#if $missing_deps or $surplus_deps or $orphan_sonames -Dependency issues of $pkgname: -#end if -#if $missing_deps -#for $pkg, $reasons in $sorted($missing_deps) -$pkg, reasons: -#for $reason in $reasons - - $reason -#end for -RUNTIME_DEP_PKGS_$pkgname += $pkg -#end for -#end if -#if $surplus_deps -If you don't know of any reasons to include these dependencies, you might remove them: -#for $pkg in $sorted($surplus_deps) -? $pkg -#end for -#end if -""" - -SCREEN_ERROR_REPORT_TMPL = u"""#if $errors -#if $debug -ERROR: One or more errors have been found by $name. -#end if -#for $pkgname in $errors -$pkgname: -#for $error in $errors[$pkgname] -#if $debug - $repr($error) -#elif $error.msg -$textwrap.fill($error.msg, 78, initial_indent="# ", subsequent_indent="# ") -# -> $repr($error) - -#end if -#end for -#end for -#else -#if $debug -OK: $repr($name) module found no problems. -#end if -#end if -#if $messages -#for $msg in $messages -$textwrap.fill($msg, 78, initial_indent=" * ", subsequent_indent=" ") -#end for -#end if -#if $gar_lines - -# Checkpkg suggests adding the following lines to the GAR recipe: -# This is a summary; see above for details. -#for $line in $gar_lines -$line -#end for -#end if -""" - -# http://www.cheetahtemplate.org/docs/users_guide_html_multipage/language.directives.closures.html -TAG_REPORT_TMPL = u"""#if $errors -# Tags reported by $name module -#for $pkgname in $errors -#for $tag in $errors[$pkgname] -#if $tag.msg -$textwrap.fill($tag.msg, 70, initial_indent="# ", subsequent_indent="# ") -#end if -$pkgname: ${tag.tag_name}#if $tag.tag_info# $tag.tag_info#end if# -#end for -#end for -#end if -""" - - class Error(Exception): pass @@ -157,11 +56,12 @@ pass +class SetupError(Error): + pass + + def GetOptions(): parser = optparse.OptionParser() - parser.add_option("-b", "--stats-basedir", dest="stats_basedir", - help=("The base directory with package statistics " - "in yaml format, e.g. ~/.checkpkg/stats")) parser.add_option("-d", "--debug", dest="debug", default=False, action="store_true", help="Turn on debugging messages") @@ -172,8 +72,6 @@ default=False, action="store_true", help=("Print less messages")) (options, args) = parser.parse_args() - if not options.stats_basedir: - raise ConfigurationError("ERROR: the -b option is missing.") # Using set() to make the arguments unique. return options, set(args) @@ -191,863 +89,13 @@ def ExtractBuildUsername(pkginfo): - m = re.match(PSTAMP_RE, pkginfo["PSTAMP"]) + m = re.match(common_constants.PSTAMP_RE, pkginfo["PSTAMP"]) return m.group("username") if m else None -class SystemPkgmap(database.DatabaseClient): - """A class to hold and manipulate the /var/sadm/install/contents file.""" - - STOP_PKGS = ["SUNWbcp", "SUNWowbcp", "SUNWucb"] - - def __init__(self, system_pkgmap_files=None, debug=False): - """There is no need to re-parse it each time. - - Read it slowly the first time and cache it for later.""" - super(SystemPkgmap, self).__init__(debug=debug) - self.cache = {} - self.pkgs_by_path_cache = {} - self.file_mtime = None - self.cache_mtime = None - self.initialized = False - if not system_pkgmap_files: - self.system_pkgmap_files = [SYSTEM_PKGMAP] - else: - self.system_pkgmap_files = system_pkgmap_files - self.csw_pkg_re = re.compile(CONTENT_PKG_RE) - self.digits_re = re.compile(r"^[0-9]+$") - - def _LazyInitializeDatabase(self): - if not self.initialized: - self.InitializeDatabase() - - def InitializeRawDb(self): - """It's necessary for low level operations.""" - if True: - logging.debug("Connecting to sqlite") - self.sqlite_conn = sqlite3.connect(self.GetDatabasePath()) - - def InitializeDatabase(self): - """Established the connection to the database. - - TODO: Refactor this class to first create CswFile with no primary key and - no indexes. - """ - need_to_create_tables = False - db_path = self.GetDatabasePath() - checkpkg_dir = os.path.join(os.environ["HOME"], self.CHECKPKG_DIR) - if not os.path.exists(db_path): - logging.info("Building the cache database %s.", self.system_pkgmap_files) - logging.info("The cache will be kept in %s.", db_path) - if not os.path.exists(checkpkg_dir): - logging.debug("Creating %s", checkpkg_dir) - os.mkdir(checkpkg_dir) - need_to_create_tables = True - self.InitializeRawDb() - self.InitializeSqlobject() - if not self.IsDatabaseGoodSchema(): - logging.info("Old database schema detected.") - self.PurgeDatabase(drop_tables=True) - need_to_create_tables = True - if need_to_create_tables: - self.CreateTables() - self.PerformInitialDataImport() - if not self.IsDatabaseUpToDate(): - logging.debug("Rebuilding the package cache, can take a few minutes.") - self.ClearTablesForUpdates() - self.RefreshDatabase() - self.initialized = True - - def RefreshDatabase(self): - for pkgmap_path in self.system_pkgmap_files: - self._ProcessSystemPkgmap(pkgmap_path) - self.PopulatePackagesTable() - self.SetDatabaseMtime() - - def PerformInitialDataImport(self): - """Imports data into the database. - - Original bit of code from checkpkg: - egrep -v 'SUNWbcp|SUNWowbcp|SUNWucb' /var/sadm/install/contents | - fgrep -f $EXTRACTDIR/liblist >$EXTRACTDIR/shortcatalog - """ - for pkgmap_path in self.system_pkgmap_files: - self._ProcessSystemPkgmap(pkgmap_path) - self.SetDatabaseSchemaVersion() - self.PopulatePackagesTable() - self.SetDatabaseMtime() - - def _ProcessSystemPkgmap(self, pkgmap_path): - """Update the database using data from pkgmap. - - The strategy to only update the necessary bits: - - for each new row - - look it up in the db - - if doesn't exist, create it - - if exists, check the - TODO: continue this description - """ - INSERT_SQL = """ - INSERT INTO csw_file (basename, path, line) - VALUES (?, ?, ?); - """ - sqlite_cursor = self.sqlite_conn.cursor() - break_after = DEBUG_BREAK_PKGMAP_AFTER - contents_length = os.stat(pkgmap_path).st_size - if break_after: - estimated_lines = break_after - else: - estimated_lines = contents_length / INSTALL_CONTENTS_AVG_LINE_LENGTH - # The progressbar library doesn't like handling larger numbers - # It displays up to 99% if we feed it a maxval in the range of hundreds of - # thousands. - progressbar_divisor = int(estimated_lines / 1000) - if progressbar_divisor < 1: - progressbar_divisor = 1 - update_period = 1L - # To help delete old records - system_pkgmap_fd = open(pkgmap_path, "r") - stop_re = re.compile("(%s)" % "|".join(self.STOP_PKGS)) - # Creating a data structure: - # soname - {: , : , ...} - logging.debug("Building database cache db of the %s file", - pkgmap_path) - logging.info("Processing %s, it can take a few minutes", pkgmap_path) - count = itertools.count() - bar = progressbar.ProgressBar() - bar.maxval = estimated_lines / progressbar_divisor - bar.start() - # I tried dropping the csw_file_basename_idx index to speed up operation, - # but after I measured the times, it turned out that it doesn't make any - # difference to the total runnng time. - # logging.info("Dropping csw_file_basename_idx") - # sqlite_cursor.execute("DROP INDEX csw_file_basename_idx;") - for line in system_pkgmap_fd: - i = count.next() - if not i % update_period and (i / progressbar_divisor) <= bar.maxval: - bar.update(i / progressbar_divisor) - if stop_re.search(line): - continue - if line.startswith("#"): - continue - fields = re.split(c.WS_RE, line) - pkgmap_entry_path = fields[0].split("=")[0] - pkgmap_entry_dir, pkgmap_entry_base_name = os.path.split(pkgmap_entry_path) - # The following SQLObject-driven inserts are 60 times slower than the raw - # sqlite API. - # pkgmap_entry = m.CswFile(basename=pkgmap_entry_base_name, - # path=pkgmap_entry_dir, line=line.strip()) - # This page has some hints: - # http://www.mail-archive.com/sqlobject-discuss at lists.sourceforge.net/msg04641.html - # "These are simple straightforward INSERTs without any additional - # high-level burden - no SELECT, no caching, nothing. Fire and forget." - # sql = self.sqo_conn.sqlrepr( - # sqlobject.sqlbuilder.Insert(m.CswFile.sqlmeta.table, values=record)) - # self.sqo_conn.query(sql) - # ...unfortunately, it isn't any faster in practice. - # The fastest way is: - sqlite_cursor.execute(INSERT_SQL, [pkgmap_entry_base_name, - pkgmap_entry_dir, - line.strip()]) - if break_after and i > break_after: - logging.warning("Breaking after %s for debugging purposes.", break_after) - break - bar.finish() - self.sqlite_conn.commit() - logging.debug("All lines of %s were processed.", pkgmap_path) - - def _ParsePkginfoLine(self, line): - fields = re.split(c.WS_RE, line) - pkgname = fields[1] - pkg_desc = u" ".join(fields[2:]) - return pkgname, pkg_desc - - def PopulatePackagesTable(self): - logging.info("Updating the packages table") - args = ["pkginfo"] - pkginfo_proc = subprocess.Popen(args, stdout=subprocess.PIPE) - stdout, stderr = pkginfo_proc.communicate() - ret = pkginfo_proc.wait() - lines = stdout.splitlines() - bar = progressbar.ProgressBar() - bar.maxval = len(lines) - bar.start() - count = itertools.count() - INSERT_SQL = """ - INSERT INTO pkginst (pkgname, pkg_desc) - VALUES (?, ?); - """ - # If self.GetInstalledPackages calls out to the initialization, - # the result is an infinite recursion. - installed_pkgs = self.GetInstalledPackages(initialize=False) - for line in stdout.splitlines(): - pkgname, pkg_desc = self._ParsePkginfoLine(line) - if pkgname not in installed_pkgs: - # This is slow: - # pkg = m.Pkginst(pkgname=pkgname, pkg_desc=pkg_desc) - # This is much faster: - self.sqlite_conn.execute(INSERT_SQL, [pkgname, pkg_desc]) - i = count.next() - bar.update(i) - # Need to commit, otherwise subsequent SQLObject calls will fail. - self.sqlite_conn.commit() - bar.finish() - - def SetDatabaseMtime(self): - mtime = self.GetFileMtime() - res = m.CswConfig.select(m.CswConfig.q.option_key==CONFIG_MTIME) - if res.count() == 0: - logging.debug("Inserting the mtime (%s) into the database.", mtime) - config_record = m.CswConfig(option_key=CONFIG_MTIME, float_value=mtime) - else: - logging.debug("Updating the mtime (%s) in the database.", mtime) - res.getOne().float_value = mtime - - def SetDatabaseSchemaVersion(self): - try: - config_option = m.CswConfig.select( - m.CswConfig.q.option_key==CONFIG_DB_SCHEMA).getOne() - config_option.int_value = database.DB_SCHEMA_VERSION - except sqlobject.main.SQLObjectNotFound, e: - version = m.CswConfig(option_key=CONFIG_DB_SCHEMA, - int_value=database.DB_SCHEMA_VERSION) - - def GetPkgmapLineByBasename(self, filename): - """Returns pkgmap lines by basename: - { - path1: line1, - path2: line2, - } - """ - if filename in self.cache: - return self.cache[filename] - self._LazyInitializeDatabase() - res = m.CswFile.select(m.CswFile.q.basename==filename) - lines = {} - for obj in res: - lines[obj.path] = obj.line - if len(lines) == 0: - logging.debug("Cache doesn't contain filename %s", filename) - self.cache[filename] = lines - return lines - - def _InferPackagesFromPkgmapLine(self, line): - """Given a pkgmap line, return all packages it contains.""" - line = line.strip() - parts = re.split(c.WS_RE, line) - pkgs = [] - if parts[1] == 'd': - parts = parts[6:] - while parts: - part = parts.pop() - if self.digits_re.match(part): - break - elif "none" == part: - break - pkgs.append(part) - # Make the packages appear in the same order as in the install/contents - # file. - pkgs.reverse() - return pkgs - - def GetPathsAndPkgnamesByBasename(self, filename): - """Returns paths and packages by basename. - - e.g. - {"/opt/csw/lib": ["CSWfoo", "CSWbar"], - "/opt/csw/1/lib": ["CSWfoomore"]} - """ - lines = self.GetPkgmapLineByBasename(filename) - pkgs = {} - # Infer packages - for file_path in lines: - pkgs[file_path] = self._InferPackagesFromPkgmapLine(lines[file_path]) - # self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libc.so.1').AndReturn({ - # "/usr/lib": (u"SUNWcsl",)}) - logging.debug("self.error_mgr_mock.GetPathsAndPkgnamesByBasename(%s).AndReturn(%s)", - repr(filename), pprint.pformat(pkgs)) - return pkgs - - def GetPkgByPath(self, full_path): - if full_path not in self.pkgs_by_path_cache: - self._LazyInitializeDatabase() - path, basename = os.path.split(full_path) - try: - obj = m.CswFile.select( - sqlobject.AND( - m.CswFile.q.path==path, - m.CswFile.q.basename==basename)).getOne() - self.pkgs_by_path_cache[full_path] = self._InferPackagesFromPkgmapLine( - obj.line) - except sqlobject.main.SQLObjectNotFound, e: - logging.debug("Couldn't find in the db: %s/%s", path, basename) - logging.debug(e) - self.pkgs_by_path_cache[full_path] = [] - logging.debug("self.error_mgr_mock.GetPkgByPath(%s).AndReturn(%s)", - repr(full_path), pprint.pformat(self.pkgs_by_path_cache[full_path])) - return self.pkgs_by_path_cache[full_path] - - def GetDatabaseMtime(self): - if not self.cache_mtime: - res = m.CswConfig.select(m.CswConfig.q.option_key==CONFIG_MTIME) - if res.count() == 1: - self.cache_mtime = res.getOne().float_value - elif res.count() < 1: - self.cache_mtime = 1 - logging.debug("GetDatabaseMtime() --> %s", self.cache_mtime) - return self.cache_mtime - - def GetFileMtime(self): - if not self.file_mtime: - stat_data = os.stat(SYSTEM_PKGMAP) - self.file_mtime = stat_data.st_mtime - return self.file_mtime - - def GetDatabaseSchemaVersion(self): - schema_on_disk = 1L - if not m.CswConfig.tableExists(): - return schema_on_disk; - res = m.CswConfig.select(m.CswConfig.q.option_key == CONFIG_DB_SCHEMA) - if res.count() < 1: - logging.debug("No db schema value found, assuming %s.", - schema_on_disk) - elif res.count() == 1: - schema_on_disk = res.getOne().int_value - return schema_on_disk - - def IsDatabaseUpToDate(self): - f_mtime_epoch = self.GetFileMtime() - d_mtime_epoch = self.GetDatabaseMtime() - f_mtime = time.gmtime(int(f_mtime_epoch)) - d_mtime = time.gmtime(int(d_mtime_epoch)) - logging.debug("IsDatabaseUpToDate: f_mtime %s, d_time: %s", f_mtime, d_mtime) - # Rounding up to integer seconds. There is a race condition: - # pkgadd finishes at 100.1 - # checkpkg reads /var/sadm/install/contents at 100.2 - # new pkgadd runs and finishes at 100.3 - # subsequent checkpkg runs won't pick up the last change. - # I don't expect pkgadd to run under 1s. - fresh = f_mtime <= d_mtime - good_version = self.GetDatabaseSchemaVersion() >= database.DB_SCHEMA_VERSION - logging.debug("IsDatabaseUpToDate: good_version=%s, fresh=%s", - repr(good_version), repr(fresh)) - return fresh and good_version - - def ClearTablesForUpdates(self): - for table in self.TABLES_THAT_NEED_UPDATES: - table.clearTable() - - def PurgeDatabase(self, drop_tables=False): - if drop_tables: - for table in self.TABLES: - if table.tableExists(): - table.dropTable() - else: - logging.debug("Truncating all tables") - for table in self.TABLES: - table.clearTable() - - def GetInstalledPackages(self, initialize=True): - """Returns a dictionary of all installed packages.""" - if initialize: - self._LazyInitializeDatabase() - res = m.Pkginst.select() - return dict([[str(x.pkgname), str(x.pkg_desc)] for x in res]) - - -class LddEmulator(object): - """A class to emulate ldd(1) - - Used primarily to resolve SONAMEs and detect package dependencies. - """ - def __init__(self): - self.runpath_expand_cache = {} - self.runpath_origin_expand_cache = {} - self.symlink_expand_cache = {} - self.symlink64_cache = {} - self.runpath_sanitize_cache = {} - - def ExpandRunpath(self, runpath, isalist, binary_path): - """Expands a signle runpath element. - - Args: - runpath: e.g. "/opt/csw/lib/$ISALIST" - isalist: isalist elements - binary_path: Necessary to expand $ORIGIN - """ - key = (runpath, tuple(isalist)) - if key not in self.runpath_expand_cache: - origin_present = False - # Emulating $ISALIST and $ORIGIN expansion - if '$ORIGIN' in runpath: - origin_present = True - if origin_present: - key_o = (runpath, tuple(isalist), binary_path) - if key_o in self.runpath_origin_expand_cache: - return self.runpath_origin_expand_cache[key_o] - else: - if not binary_path.startswith("/"): - binary_path = "/" + binary_path - runpath = runpath.replace('$ORIGIN', binary_path) - if '$ISALIST' in runpath: - expanded_list = [runpath.replace('/$ISALIST', '')] - expanded_list += [runpath.replace('$ISALIST', isa) for isa in isalist] - else: - expanded_list = [runpath] - expanded_list = [os.path.abspath(p) for p in expanded_list] - if not origin_present: - self.runpath_expand_cache[key] = expanded_list - else: - self.runpath_origin_expand_cache[key_o] = expanded_list - return self.runpath_origin_expand_cache[key_o] - return self.runpath_expand_cache[key] - - def ExpandSymlink(self, symlink, target, input_path): - key = (symlink, target, input_path) - if key not in self.symlink_expand_cache: - symlink_re = re.compile(r"%s(/|$)" % symlink) - if re.search(symlink_re, input_path): - result = input_path.replace(symlink, target) - else: - result = input_path - self.symlink_expand_cache[key] = result - return self.symlink_expand_cache[key] - - def Emulate64BitSymlinks(self, runpath_list): - """Need to emulate the 64 -> amd64, 64 -> sparcv9 symlink - - Since we don't know the architecture, we are adding both amd64 and - sparcv9. It should be safe - there are other checks that make sure - that right architectures are in the right directories. - """ - key = tuple(runpath_list) - if key not in self.symlink64_cache: - symlinked_list = [] - for runpath in runpath_list: - for symlink, expansion_list in SYSTEM_SYMLINKS: - for target in expansion_list: - expanded = self.ExpandSymlink(symlink, target, runpath) - if expanded not in symlinked_list: - symlinked_list.append(expanded) - self.symlink64_cache[key] = symlinked_list - return self.symlink64_cache[key] - - def SanitizeRunpath(self, runpath): - if runpath not in self.runpath_sanitize_cache: - self.runpath_sanitize_cache[runpath] = os.path.normpath(runpath) - return self.runpath_sanitize_cache[runpath] - - - def ResolveSoname(self, runpath_list, soname, isalist, - path_list, binary_path): - """Emulates ldd behavior, minimal implementation. - - runpath: e.g. ["/opt/csw/lib/$ISALIST", "/usr/lib"] - soname: e.g. "libfoo.so.1" - isalist: e.g. ["sparcv9", "sparcv8"] - path_list: A list of paths where the soname is present, e.g. - ["/opt/csw/lib", "/opt/csw/lib/sparcv9"] - - The function returns the one path. - """ - # Emulating the install time symlinks, for instance, if the prototype contains - # /opt/csw/lib/i386/foo.so.0 and /opt/csw/lib/i386 is a symlink to ".", - # the shared library ends up in /opt/csw/lib/foo.so.0 and should be - # findable even when RPATH does not contain $ISALIST. - original_paths_by_expanded_paths = {} - for p in path_list: - expanded_p_list = self.Emulate64BitSymlinks([p]) - # We can't just expand and return; we need to return one of the paths given - # in the path_list. - for expanded_p in expanded_p_list: - original_paths_by_expanded_paths[expanded_p] = p - logging.debug( - "%s: looking for %s in %s", - soname, runpath_list, original_paths_by_expanded_paths.keys()) - for runpath_expanded in runpath_list: - if runpath_expanded in original_paths_by_expanded_paths: - # logging.debug("Found %s", - # original_paths_by_expanded_paths[runpath_expanded]) - return original_paths_by_expanded_paths[runpath_expanded] - - -def ParseDumpOutput(dump_output): - binary_data = {RUNPATH: [], - NEEDED_SONAMES: []} - runpath = [] - rpath = [] - for line in dump_output.splitlines(): - fields = re.split(c.WS_RE, line) - if len(fields) < 3: - continue - if fields[1] == "NEEDED": - binary_data[NEEDED_SONAMES].append(fields[2]) - elif fields[1] == "RUNPATH": - runpath.extend(fields[2].split(":")) - elif fields[1] == "RPATH": - rpath.extend(fields[2].split(":")) - elif fields[1] == "SONAME": - binary_data[SONAME] = fields[2] - if runpath: - binary_data[RUNPATH].extend(runpath) - elif rpath: - binary_data[RUNPATH].extend(rpath) - - # Converting runpath to a tuple, which is a hashable data type and can act as - # a key in a dict. - binary_data[RUNPATH] = tuple(binary_data[RUNPATH]) - # the NEEDED list must not be modified, converting to a tuple. - binary_data[NEEDED_SONAMES] = tuple(binary_data[NEEDED_SONAMES]) - binary_data["RUNPATH RPATH the same"] = (runpath == rpath) - binary_data["RPATH set"] = bool(rpath) - binary_data["RUNPATH set"] = bool(runpath) - return binary_data - - -class CheckpkgManagerBase(object): - """Common functions between the older and newer calling functions.""" - - def __init__(self, name, stats_basedir, md5sum_list, debug=False): - self.debug = debug - self.name = name - self.md5sum_list = md5sum_list - self.stats_basedir = stats_basedir - self.errors = [] - self.individual_checks = [] - self.set_checks = [] - self.packages = [] - - def GetPackageStatsList(self): - return [package_stats.PackageStats(None, self.stats_basedir, x) - for x in self.md5sum_list] - - def FormatReports(self, errors, messages, gar_lines): - namespace = { - "name": self.name, - "errors": errors, - "debug": self.debug, - "textwrap": textwrap, - "messages": messages, - "gar_lines": gar_lines, - } - screen_t = Template.Template(SCREEN_ERROR_REPORT_TMPL, searchList=[namespace]) - tags_report_t = Template.Template(TAG_REPORT_TMPL, searchList=[namespace]) - return screen_t, tags_report_t - - def SetErrorsToDict(self, set_errors, a_dict): - # These were generated by a set, but are likely to be bound to specific - # packages. We'll try to preserve the package assignments. - errors = copy.copy(a_dict) - for tag in set_errors: - if tag.pkgname: - if not tag.pkgname in errors: - errors[tag.pkgname] = [] - errors[tag.pkgname].append(tag) - else: - if "package-set" not in errors: - errors["package-set"] = [] - errors["package-set"].append(tag) - return errors - - def GetOptimizedAllStats(self, stats_obj_list): - logging.info("Unwrapping candies...") - pkgs_data = [] - counter = itertools.count() - length = len(stats_obj_list) - bar = progressbar.ProgressBar() - bar.maxval = length - bar.start() - for stats_obj in stats_obj_list: - # pkg_data = {} - # This bit is tightly tied to the data structures returned by - # PackageStats. - # - # Python strings are already implementing the flyweight pattern. What's - # left is lists and dictionaries. - i = counter.next() - # logging.debug("Loading stats for %s (%s/%s)", - # stats_obj.md5sum, i, length) - raw_pkg_data = stats_obj.GetAllStats() - pkg_data = raw_pkg_data - pkgs_data.append(pkg_data) - bar.update(i) - bar.finish() - return pkgs_data - - def Run(self): - """Runs all the checks - - Returns a tuple of an exit code and a report. - """ - packages_data = self.GetPackageStatsList() - db_stat_objs_by_pkgname = {} - obj_id_list = [] - for pkg in packages_data: - db_obj = pkg.GetDbObject() - db_stat_objs_by_pkgname[db_obj.pkginst.pkgname] = db_obj - obj_id_list.append(db_obj.id) - logging.debug("Deleting old %s errors from the database.", - db_obj.pkginst.pkgname) - conn = sqlobject.sqlhub.processConnection - # It's the maximum number of ORs in a SQL statement. - # Slicing the long list up into s-sized segments. 1000 is too much. - obj_id_lists = SliceList(obj_id_list, 900) - for obj_id_list in obj_id_lists: - # WARNING: This is raw SQL, potentially breaking during a transition to - # another db. It's here for efficiency. - sql = ("DELETE FROM checkpkg_error_tag WHERE %s;" - % " OR ".join("srv4_file_id = %s" % x for x in obj_id_list)) - conn.query(sql) - # Need to construct the predicate by hand. Otherwise: - # File "/opt/csw/lib/python/site-packages/sqlobject/sqlbuilder.py", - # line 829, in OR - # return SQLOp("OR", op1, OR(*ops)) - # RuntimeError: maximum recursion depth exceeded while calling a Python object - # - # The following also tries to use recursion and fails. - # delete_predicate = sqlobject.OR(False) - # for pred in delete_predicate_list: - # delete_predicate = sqlobject.OR(delete_predicate, pred) - # conn.query( - # conn.sqlrepr(sqlbuilder.Delete(m.CheckpkgErrorTag.sqlmeta.table, - # delete_predicate - # ))) - # res = m.CheckpkgErrorTag.select(m.CheckpkgErrorTag.q.srv4_file==db_obj) - # for obj in res: - # obj.destroySelf() - errors, messages, gar_lines = self.GetAllTags(packages_data) - no_errors = len(errors) + 1 - bar = progressbar.ProgressBar() - bar.maxval = no_errors - count = itertools.count(1) - logging.info("Stuffing the candies under the pillow...") - bar.start() - for pkgname, es in errors.iteritems(): - logging.debug("Saving %s errors to the database.", pkgname) - for e in es: - db_error = m.CheckpkgErrorTag(srv4_file=db_stat_objs_by_pkgname[e.pkgname], - pkgname=e.pkgname, - tag_name=e.tag_name, - tag_info=e.tag_info, - msg=e.msg) - bar.update(count.next()) - bar.finish() - flat_error_list = reduce(operator.add, errors.values(), []) - screen_report, tags_report = self.FormatReports(errors, messages, gar_lines) - exit_code = 0 - return (exit_code, screen_report, tags_report) - - -class CheckInterfaceBase(object): - """Proxies interaction with checking functions. - - It wraps access to the /var/sadm/install/contents cache. - """ - - def __init__(self, system_pkgmap=None, lines_dict=None): - self.system_pkgmap = system_pkgmap - if not self.system_pkgmap: - self.system_pkgmap = SystemPkgmap() - self.common_paths = {} - if lines_dict: - self.lines_dict = lines_dict - else: - self.lines_dict = {} - - def GetPathsAndPkgnamesByBasename(self, basename): - """Proxies calls to self.system_pkgmap.""" - return self.system_pkgmap.GetPathsAndPkgnamesByBasename(basename) - - def GetPkgByPath(self, path): - """Proxies calls to self.system_pkgmap.""" - return self.system_pkgmap.GetPkgByPath(path) - - def GetInstalledPackages(self, initialize=True): - return self.system_pkgmap.GetInstalledPackages(initialize) - - def _GetPathsForArch(self, arch): - if not arch in self.lines_dict: - file_name = os.path.join( - os.path.dirname(__file__), "..", "..", "etc", "commondirs-%s" % arch) - logging.debug("opening %s", file_name) - f = open(file_name, "r") - self.lines_dict[arch] = f.read().splitlines() - f.close() - return self.lines_dict[arch] - - def GetCommonPaths(self, arch): - """Returns a list of paths for architecture, from gar/etc/commondirs*.""" - # TODO: If this was cached, it could save a significant amount of time. - if arch not in ('i386', 'sparc', 'all'): - logging.warn("Wrong arch: %s", repr(arch)) - return [] - if arch == 'all': - archs = ('i386', 'sparc') - else: - archs = [arch] - lines = [] - for arch in archs: - lines.extend(self._GetPathsForArch(arch)) - return lines - - -class IndividualCheckInterface(CheckInterfaceBase): - """To be passed to the checking functions. - - Wraps the creation of tag.CheckpkgTag objects. - """ - - def __init__(self, pkgname, system_pkgmap=None): - super(IndividualCheckInterface, self).__init__(system_pkgmap) - self.pkgname = pkgname - self.errors = [] - - def ReportError(self, tag_name, tag_info=None, msg=None): - logging.debug("self.error_mgr_mock.ReportError(%s, %s, %s)", - repr(tag_name), repr(tag_info), repr(msg)) - checkpkg_tag = tag.CheckpkgTag(self.pkgname, tag_name, tag_info, msg=msg) - self.errors.append(checkpkg_tag) - - -class SetCheckInterface(CheckInterfaceBase): - """To be passed to set checking functions.""" - - def __init__(self, system_pkgmap=None): - super(SetCheckInterface, self).__init__(system_pkgmap) - self.errors = [] - - def ReportError(self, pkgname, tag_name, tag_info=None, msg=None): - logging.debug("self.error_mgr_mock.ReportError(%s, %s, %s, %s)", - repr(pkgname), - repr(tag_name), repr(tag_info), repr(msg)) - checkpkg_tag = tag.CheckpkgTag(pkgname, tag_name, tag_info, msg=msg) - self.errors.append(checkpkg_tag) - - -class CheckpkgMessenger(object): - """Class responsible for passing messages from checks to the user.""" - def __init__(self): - self.messages = [] - self.one_time_messages = {} - self.gar_lines = [] - - def Message(self, m): - logging.debug("self.messenger.Message(%s)", repr(m)) - self.messages.append(m) - - def OneTimeMessage(self, key, m): - logging.debug("self.messenger.OneTimeMessage(%s, %s)", repr(key), repr(m)) - if key not in self.one_time_messages: - self.one_time_messages[key] = m - - def SuggestGarLine(self, m): - logging.debug("self.messenger.SuggestGarLine(%s)", repr(m)) - self.gar_lines.append(m) - - -class CheckpkgManager2(CheckpkgManagerBase): - """The second incarnation of the checkpkg manager. - - Implements the API to be used by checking functions. - - Its purpose is to reduce the amount of boilerplate code and allow for easier - unit test writing. - """ - def _RegisterIndividualCheck(self, function): - self.individual_checks.append(function) - - def _RegisterSetCheck(self, function): - self.set_checks.append(function) - - def _AutoregisterChecks(self): - """Autodetects all defined checks.""" - logging.debug("CheckpkgManager2._AutoregisterChecks()") - checkpkg_module = package_checks - members = dir(checkpkg_module) - for member_name in members: - logging.debug("Examining module member: %s", repr(member_name)) - member = getattr(checkpkg_module, member_name) - if callable(member): - if member_name.startswith("Check"): - logging.debug("Registering individual check %s", repr(member_name)) - self._RegisterIndividualCheck(member) - elif member_name.startswith("SetCheck"): - logging.debug("Registering set check %s", repr(member_name)) - self._RegisterSetCheck(member) - - def GetAllTags(self, stats_obj_list): - errors = {} - pkgmap = SystemPkgmap() - logging.debug("Loading all package statistics.") - pkgs_data = self.GetOptimizedAllStats(stats_obj_list) - logging.debug("All package statistics loaded.") - messenger = CheckpkgMessenger() - # Individual checks - count = itertools.count() - bar = progressbar.ProgressBar() - bar.maxval = len(pkgs_data) * len(self.individual_checks) - logging.info("Tasting candies one by one...") - bar.start() - for pkg_data in pkgs_data: - pkgname = pkg_data["basic_stats"]["pkgname"] - check_interface = IndividualCheckInterface(pkgname, pkgmap) - for function in self.individual_checks: - logger = logging.getLogger("%s-%s" % (pkgname, function.__name__)) - logger.debug("Calling %s", function.__name__) - function(pkg_data, check_interface, logger=logger, messenger=messenger) - if check_interface.errors: - errors[pkgname] = check_interface.errors - bar.update(count.next()) - bar.finish() - # Set checks - logging.info("Tasting them all at once...") - for function in self.set_checks: - logger = logging.getLogger(function.__name__) - check_interface = SetCheckInterface(pkgmap) - logger.debug("Calling %s", function.__name__) - function(pkgs_data, check_interface, logger=logger, messenger=messenger) - if check_interface.errors: - errors = self.SetErrorsToDict(check_interface.errors, errors) - messages = messenger.messages + messenger.one_time_messages.values() - return errors, messages, messenger.gar_lines - - def Run(self): - self._AutoregisterChecks() - return super(CheckpkgManager2, self).Run() - - -def GetIsalist(): - args = ["isalist"] - isalist_proc = subprocess.Popen(args, stdout=subprocess.PIPE) - stdout, stderr = isalist_proc.communicate() - ret = isalist_proc.wait() - if ret: - logging.error("Calling isalist has failed.") - isalist = re.split(r"\s+", stdout.strip()) - return tuple(isalist) - - -def ErrorTagsFromFile(file_name): - fd = open(file_name) - error_tags = [] - for line in fd: - if line.startswith("#"): - continue - pkgname, tag_name, tag_info = tag.ParseTagLine(line) - error_tags.append(tag.CheckpkgTag(pkgname, tag_name, tag_info)) - return error_tags - - -def SliceList(l, size): - """Trasforms a list into a list of lists.""" - idxes = xrange(0, len(l), size) - sliced = [l[i:i+size] for i in idxes] - return sliced - def IsMd5(s): # For optimization, move the compilation elsewhere. - md5_re = re.compile(MD5_RE) - return md5_re.match(s) + return MD5_RE.match(s) def GetPackageStatsByFilenamesOrMd5s(args, debug=False): filenames = [] @@ -1059,15 +107,15 @@ filenames.append(arg) srv4_pkgs = [inspective_package.InspectiveCswSrv4File(x) for x in filenames] pkgstat_objs = [] - bar = progressbar.ProgressBar() - bar.maxval = len(md5s) + len(srv4_pkgs) - bar.start() + pbar = progressbar.ProgressBar() + pbar.maxval = len(md5s) + len(srv4_pkgs) + pbar.start() counter = itertools.count() for pkg in srv4_pkgs: pkgstat_objs.append(package_stats.PackageStats(pkg, debug=debug)) - bar.update(counter.next()) + pbar.update(counter.next()) for md5 in md5s: pkgstat_objs.append(package_stats.PackageStats(None, md5sum=md5, debug=debug)) - bar.update(counter.next()) - bar.finish() + pbar.update(counter.next()) + pbar.finish() return pkgstat_objs Copied: csw/mgar/gar/v2-fortran/lib/python/checkpkg2.py (from rev 12514, csw/mgar/gar/v2/lib/python/checkpkg2.py) =================================================================== --- csw/mgar/gar/v2-fortran/lib/python/checkpkg2.py (rev 0) +++ csw/mgar/gar/v2-fortran/lib/python/checkpkg2.py 2011-01-12 19:26:11 UTC (rev 12515) @@ -0,0 +1,179 @@ +#!/usr/bin/env python2.6 +# +# checkpkg +# + +import logging +import operator +import optparse +import os +import sys +import textwrap +import configuration +import datetime +import database + +import package_stats +import checkpkg +import checkpkg_lib +import overrides +import models +import sqlobject + +USAGE = """%prog [ options ] pkg1 [ pkg2 [ ... ] ]""" +CHECKPKG_MODULE_NAME = "The main checking module." +BEFORE_OVERRIDES = """If any of the reported errors were false positives, you +can override them pasting the lines below to the GAR recipe.""" + +AFTER_OVERRIDES = """Please note that checkpkg isn't suggesting you should +simply add these overrides do the Makefile. It only informs what the overrides +could look like. You need to understand what are the reported issues about and +use your best judgement to decide whether to fix the underlying problems or +override them. For more information, scroll up and read the detailed +messages.""" + +UNAPPLIED_OVERRIDES = """WARNING: Some overrides did not match any errors. +They can be removed, as they don't take any effect anyway. If you're getting +errors at the same time, maybe you didn't specify the overrides correctly.""" + + +class Error(Exception): + """Generic error.""" + + +class UsageError(Error): + """Problem with usage, e.g. command line options.""" + + +def main(): + parser = optparse.OptionParser(USAGE) + parser.add_option("-d", "--debug", + dest="debug", + action="store_true", + default=False, + help="Switch on debugging messages") + parser.add_option("-q", "--quiet", + dest="quiet", + action="store_true", + default=False, + help="Display less messages") + parser.add_option("--catalog-release", + dest="catrel", + default="current", + help="A catalog release: current, unstable, testing, stable.") + parser.add_option("-r", "--os-releases", + dest="osrel_commas", + help=("Comma separated list of ['SunOS5.9', 'SunOS5.10'], " + "e.g. 'SunOS5.9,SunOS5.10'.")) + parser.add_option("-a", "--architecture", + dest="arch", + help="Architecture: i386, sparc.") + parser.add_option("--profile", dest="profile", + default=False, action="store_true", + help="Enable profiling (a developer option).") + options, args = parser.parse_args() + assert len(args), "The list of files or md5 sums must be not empty." + logging_level = logging.INFO + if options.quiet: + logging_level = logging.WARNING + elif options.debug: + # If both flags are set, debug wins. + logging_level = logging.DEBUG + logging.basicConfig(level=logging_level) + logging.debug("Starting.") + + configuration.SetUpSqlobjectConnection() + dm = database.DatabaseManager() + dm.AutoManage() + + + err_msg_list = [] + if not options.osrel_commas: + err_msg_list.append("Please specify --os-releases.") + if not options.arch: + err_msg_list.append("Please specify --architecture.") + if err_msg_list: + raise UsageError(" ".join(err_msg_list)) + + stats_list = [] + collector = package_stats.StatsCollector( + logger=logging, + debug=options.debug) + # We need to separate files and md5 sums. + md5_sums, file_list = [], [] + for arg in args: + if checkpkg.MD5_RE.match(arg): + md5_sums.append(arg) + else: + file_list.append(arg) + if file_list: + stats_list = collector.CollectStatsFromFiles(file_list, None) + # We need the md5 sums of these files + md5_sums.extend([x["basic_stats"]["md5_sum"] for x in stats_list]) + assert md5_sums, "The list of md5 sums must not be empty." + logging.debug("md5_sums: %s", md5_sums) + osrel_list = options.osrel_commas.split(",") + logging.debug("Reading packages data from the database.") + # This part might need improvements in order to handle a whole + # catalog. On the other hand, if we already have the whole catalog in + # the database, we can do it altogether differently. + # Transforming the result to a list in order to force object + # retrieval. + sqo_pkgs = list(models.Srv4FileStats.select( + sqlobject.IN(models.Srv4FileStats.q.md5_sum, md5_sums))) + tags_for_all_osrels = [] + sqo_arch = models.Architecture.selectBy(name=options.arch).getOne() + sqo_catrel = models.CatalogRelease.selectBy(name=options.catrel).getOne() + for osrel in osrel_list: + sqo_osrel = models.OsRelease.selectBy(short_name=osrel).getOne() + dm.VerifyContents(sqo_osrel, sqo_arch) + check_manager = checkpkg_lib.CheckpkgManager2( + CHECKPKG_MODULE_NAME, + sqo_pkgs, + osrel, @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From gadavis at users.sourceforge.net Wed Jan 12 20:35:45 2011 From: gadavis at users.sourceforge.net (gadavis at users.sourceforge.net) Date: Wed, 12 Jan 2011 19:35:45 +0000 Subject: [csw-devel] SF.net SVN: gar:[12516] csw/mgar/gar/v2-fortran/lib/python/ package_checks_test.py Message-ID: Revision: 12516 http://gar.svn.sourceforge.net/gar/?rev=12516&view=rev Author: gadavis Date: 2011-01-12 19:35:45 +0000 (Wed, 12 Jan 2011) Log Message: ----------- Force package_check_test.py to be v2 version - previous merge goofed up somehow Modified Paths: -------------- csw/mgar/gar/v2-fortran/lib/python/package_checks_test.py Modified: csw/mgar/gar/v2-fortran/lib/python/package_checks_test.py =================================================================== --- csw/mgar/gar/v2-fortran/lib/python/package_checks_test.py 2011-01-12 19:26:11 UTC (rev 12515) +++ csw/mgar/gar/v2-fortran/lib/python/package_checks_test.py 2011-01-12 19:35:45 UTC (rev 12516) @@ -1448,7 +1448,7 @@ unittest.TestCase): FUNCTION_NAME = 'CheckLicenseFilePlacement' def CheckpkgTest(self): - self.pkg_data = neon_stats[0] + self.pkg_data = copy.deepcopy(neon_stats[0]) self.pkg_data["pkgmap"].append({ "class": "none", "type": "f", "line": "", "user": "root", "group": "bin", "mode": '0755', @@ -1478,7 +1478,7 @@ "A random file should not trigger the message; only license files." FUNCTION_NAME = 'CheckLicenseFilePlacement' def CheckpkgTest(self): - self.pkg_data = neon_stats[0] + self.pkg_data = copy.deepcopy(neon_stats[0]) self.pkg_data["pkgmap"].append({ "class": "none", "type": "f", "line": "", "user": "root", "group": "bin", "mode": '0755', This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From maciej at opencsw.org Wed Jan 12 20:53:39 2011 From: maciej at opencsw.org (Maciej (Matchek) Blizinski) Date: Wed, 12 Jan 2011 19:53:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[12516] csw/mgar/gar/v2-fortran/lib/python/ package_checks_test.py In-Reply-To: References: Message-ID: No dia 12 de Janeiro de 2011 19:35, escreveu: > Revision: 12516 > ? ? ? ? ?http://gar.svn.sourceforge.net/gar/?rev=12516&view=rev > Author: ? gadavis > Date: ? ? 2011-01-12 19:35:45 +0000 (Wed, 12 Jan 2011) > > Log Message: > ----------- > Force package_check_test.py to be v2 version - previous merge goofed up somehow I don't see the svn merge info being updated in this submission. I'm wondering how it might affect subsequent merge from v2-fortran to v2. When you do that merge, make sure you're only modifying files you want to modify. From gadavis at users.sourceforge.net Wed Jan 12 22:44:39 2011 From: gadavis at users.sourceforge.net (gadavis at users.sourceforge.net) Date: Wed, 12 Jan 2011 21:44:39 +0000 Subject: [csw-devel] SF.net SVN: gar:[12517] csw/mgar/gar/v2 Message-ID: Revision: 12517 http://gar.svn.sourceforge.net/gar/?rev=12517&view=rev Author: gadavis Date: 2011-01-12 21:44:39 +0000 (Wed, 12 Jan 2011) Log Message: ----------- Add Fortran compatibility to GAR from the gar-fortran branch Modified Paths: -------------- csw/mgar/gar/v2/gar.conf.mk Property Changed: ---------------- csw/mgar/gar/v2/ csw/mgar/gar/v2/pkglib/csw/depend Property changes on: csw/mgar/gar/v2 ___________________________________________________________________ Modified: svn:mergeinfo - /csw/mgar/gar/v2:4936-6678 /csw/mgar/gar/v2-bwalton:9784-10011 /csw/mgar/gar/v2-checkpkg:7722-7855 /csw/mgar/gar/v2-checkpkg-override-relocation:10585-10737 /csw/mgar/gar/v2-checkpkg-stats:8454-8649 /csw/mgar/gar/v2-collapsed-modulations:6895 /csw/mgar/gar/v2-dirpackage:8125-8180 /csw/mgar/gar/v2-git/v2-relocate:7617 /csw/mgar/gar/v2-migrateconf:7082-7211 /csw/mgar/gar/v2-noexternals:11592-11745 /csw/mgar/gar/v2-relocate:5028-11738 /csw/mgar/gar/v2-skayser:6087-6132 /csw/mgar/gar/v2-sqlite:10434-10449 + /csw/mgar/gar/v2:4936-6678 /csw/mgar/gar/v2-bwalton:9