From bdwalton at users.sourceforge.net  Thu Jul  1 02:50:37 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Thu, 01 Jul 2010 00:50:37 +0000
Subject: [csw-devel] SF.net SVN: gar:[10397] csw/mgar/pkg/git/trunk/Makefile
Message-ID: <E1OU7zB-0004Ed-B0@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 10397
          http://gar.svn.sourceforge.net/gar/?rev=10397&view=rev
Author:   bdwalton
Date:     2010-07-01 00:50:37 +0000 (Thu, 01 Jul 2010)

Log Message:
-----------
git: prep for 1.7.2

Modified Paths:
--------------
    csw/mgar/pkg/git/trunk/Makefile

Modified: csw/mgar/pkg/git/trunk/Makefile
===================================================================
--- csw/mgar/pkg/git/trunk/Makefile	2010-06-30 19:48:00 UTC (rev 10396)
+++ csw/mgar/pkg/git/trunk/Makefile	2010-07-01 00:50:37 UTC (rev 10397)
@@ -1,6 +1,6 @@
 GARNAME = git
-GARVERSION = 1.7.1
-# PATCHLEVEL = rc1
+GARVERSION = 1.7.2
+PATCHLEVEL = rc1
 CATEGORIES = devel
 
 VENDOR_URL = http://git-scm.org/


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 Jul  1 04:32:41 2010
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Thu, 01 Jul 2010 02:32:41 +0000
Subject: [csw-devel] SF.net SVN: gar:[10398] csw/mgar/pkg
Message-ID: <E1OU9Zx-0005IZ-GM@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10398
          http://gar.svn.sourceforge.net/gar/?rev=10398&view=rev
Author:   wahwah
Date:     2010-07-01 02:32:41 +0000 (Thu, 01 Jul 2010)

Log Message:
-----------
clpbar: Initial commit

Modified Paths:
--------------
    csw/mgar/pkg/clpbar/trunk/Makefile
    csw/mgar/pkg/clpbar/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/clpbar/

Modified: csw/mgar/pkg/clpbar/trunk/Makefile
===================================================================
--- csw/mgar/pkg/template/trunk/Makefile	2010-06-18 14:52:57 UTC (rev 10253)
+++ csw/mgar/pkg/clpbar/trunk/Makefile	2010-07-01 02:32:41 UTC (rev 10398)
@@ -2,184 +2,18 @@
 # 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
-##
-GARNAME = mypkg
-GARVERSION = 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 = <please fill in>
-##
-## A longer description of the package. This is only for descriptive purposes
-## inside the Makefile and is not used elsewhere.
+GARNAME = bar
+GARVERSION = 1.10.9
+CATEGORIES = apps
+DESCRIPTION = A command line tool to display information about a data transfer stream
 define BLURB
-  <please fill in>
 endef
-##
-## Upstream URL that should show up in the VENDOR field as well as on
-## http://opencsw.org/packages/<packagename>.
-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 $(GARNAME). 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  = $(GARNAME)-$(GARVERSION).tar.gz
-##
-## We define upstream file regex so we can be notifed of new upstream software release
+SPKG_SOURCEURL = http://clpbar.sourceforge.net/
+MASTER_SITES = $(SF_MIRRORS)
+SF_PROJ = clpbar
+
+DISTFILES  = $(GARNAME)_$(GARVERSION).tar.gz
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
-##
-## Catalog name is the name to be used with pkg{-get,util} -i <pkgname>.
-## 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 = <file containing an entry for /etc/services>
-## INETDCONF = <file containing an inetd.conf formatted entry>
-## 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)/$(GARNAME)-$(GARVERSION)
-##
-## 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.
+TEST_TARGET = check
 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
+include gar/category.mk

Modified: csw/mgar/pkg/clpbar/trunk/checksums
===================================================================
--- csw/mgar/pkg/template/trunk/checksums	2010-06-18 14:52:57 UTC (rev 10253)
+++ csw/mgar/pkg/clpbar/trunk/checksums	2010-07-01 02:32:41 UTC (rev 10398)
@@ -0,0 +1 @@
+d824415b391a3f826b410c86223e54a5  bar_1.10.9.tar.gz


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From bdwalton at users.sourceforge.net  Thu Jul  1 14:14:13 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Thu, 01 Jul 2010 12:14:13 +0000
Subject: [csw-devel] SF.net SVN: gar:[10399]
	csw/mgar/gar/v2/bin/check_for_deps
Message-ID: <E1OUIej-0004PK-KM@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 10399
          http://gar.svn.sourceforge.net/gar/?rev=10399&view=rev
Author:   bdwalton
Date:     2010-07-01 12:14:13 +0000 (Thu, 01 Jul 2010)

Log Message:
-----------
gar/v2: add a basic external check for deps script

Added Paths:
-----------
    csw/mgar/gar/v2/bin/check_for_deps

Added: csw/mgar/gar/v2/bin/check_for_deps
===================================================================
--- csw/mgar/gar/v2/bin/check_for_deps	                        (rev 0)
+++ csw/mgar/gar/v2/bin/check_for_deps	2010-07-01 12:14:13 UTC (rev 10399)
@@ -0,0 +1,17 @@
+#!/usr/bin/perl -w
+
+use strict;
+
+my $status = 0;
+
+foreach my $pkg (@ARGV) {
+    print "==> Verifying installed package $pkg: ";
+    if ( ! -d "/var/sadm/pkg/$pkg" ) {
+	print "MISSING\n";
+	$status = 1;
+    } else {
+	print "ok\n";
+    }
+}
+
+exit $status;


Property changes on: csw/mgar/gar/v2/bin/check_for_deps
___________________________________________________________________
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  Thu Jul  1 23:44:00 2010
From: theferret at users.sourceforge.net (theferret at users.sourceforge.net)
Date: Thu, 01 Jul 2010 21:44:00 +0000
Subject: [csw-devel] SF.net SVN: gar:[10400]
	csw/mgar/pkg/cswutils/trunk/files/checkpkg
Message-ID: <E1OURY8-0002JH-Cn@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 10400
          http://gar.svn.sourceforge.net/gar/?rev=10400&view=rev
Author:   theferret
Date:     2010-07-01 21:44:00 +0000 (Thu, 01 Jul 2010)

Log Message:
-----------
cswutils: checkpkg -- added a few extra bad paths, and simplified

Modified Paths:
--------------
    csw/mgar/pkg/cswutils/trunk/files/checkpkg

Modified: csw/mgar/pkg/cswutils/trunk/files/checkpkg
===================================================================
--- csw/mgar/pkg/cswutils/trunk/files/checkpkg	2010-07-01 12:14:13 UTC (rev 10399)
+++ csw/mgar/pkg/cswutils/trunk/files/checkpkg	2010-07-01 21:44:00 UTC (rev 10400)
@@ -87,14 +87,15 @@
 	#
 	# Need to rewrite this whole thing to also
 	# check for badly set RUNPATHs. sigh.
-	#
-	badpaths="$(echo /rkcbeg/zrqhfn /bcg/ohvyq | gtr a-mn-z n-za-m)"
-	for badpath in $(badpaths) ; do
+	# 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"
+	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)'
+			print "($badpath found)"
 			exit 1
 		fi
 	done


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From bdwalton at users.sourceforge.net  Fri Jul  2 04:56:03 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Fri, 02 Jul 2010 02:56:03 +0000
Subject: [csw-devel] SF.net SVN: gar:[10401]
	csw/mgar/pkg/cswutils/trunk/checksums
Message-ID: <E1OUWQ7-0004va-GX@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10401
          http://gar.svn.sourceforge.net/gar/?rev=10401&view=rev
Author:   bdwalton
Date:     2010-07-02 02:56:03 +0000 (Fri, 02 Jul 2010)

Log Message:
-----------
cswutils: update checksums file once again

Modified Paths:
--------------
    csw/mgar/pkg/cswutils/trunk/checksums

Modified: csw/mgar/pkg/cswutils/trunk/checksums
===================================================================
--- csw/mgar/pkg/cswutils/trunk/checksums	2010-07-01 21:44:00 UTC (rev 10400)
+++ csw/mgar/pkg/cswutils/trunk/checksums	2010-07-02 02:56:03 UTC (rev 10401)
@@ -1,5 +1,5 @@
 091b12575ebc0e45cf8c3d8b43d8b638  COPYING
-d615d703006bd9c81919ca3f6ffcf233  checkpkg
+ab8a00cad3c3650318a3e552505e2715  checkpkg
 6ec3b6597e04714430987ccc199db3c4  checkpkg.8
 75f7b438f5f74208896c3fc2b9e77511  checkpkg.py
 2b5e6e6219b9ad9e48bcd119bd8a5f39  compare_pkgs.py-r133


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 Jul  2 10:10:47 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Fri, 02 Jul 2010 08:10:47 +0000
Subject: [csw-devel] SF.net SVN: gar:[10402] csw/mgar/pkg/x3270/tags
Message-ID: <E1OUbKh-00082g-47@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 10402
          http://gar.svn.sourceforge.net/gar/?rev=10402&view=rev
Author:   dmichelsen
Date:     2010-07-02 08:10:46 +0000 (Fri, 02 Jul 2010)

Log Message:
-----------
x32070: Add existing build recipe from Mike Arnold

Added Paths:
-----------
    csw/mgar/pkg/x3270/tags/legacy/
    csw/mgar/pkg/x3270/tags/legacy/x3270-3.3.6/
    csw/mgar/pkg/x3270/tags/legacy/x3270-3.3.6/1.prep
    csw/mgar/pkg/x3270/tags/legacy/x3270-3.3.6/2.packageS
    csw/mgar/pkg/x3270/tags/legacy/x3270-3.3.6/3.build
    csw/mgar/pkg/x3270/tags/legacy/x3270-3.3.6/4.install
    csw/mgar/pkg/x3270/tags/legacy/x3270-3.3.6/5.package
    csw/mgar/pkg/x3270/tags/legacy/x3270-3.3.6/BUILDREQS
    csw/mgar/pkg/x3270/tags/legacy/x3270-3.3.6/README
    csw/mgar/pkg/x3270/tags/legacy/x3270-3.3.6/README.CSW
    csw/mgar/pkg/x3270/tags/legacy/x3270-3.3.6/c3270-3.3_ncurses.patch
    csw/mgar/pkg/x3270/tags/legacy/x3270-3.3.6/env
    csw/mgar/pkg/x3270/tags/legacy/x3270-3.3.6/suite3270-3.3.6.tgz
    csw/mgar/pkg/x3270/tags/legacy/x3270-3.3.6/x3270/
    csw/mgar/pkg/x3270/tags/legacy/x3270-3.3.6/x3270/copyright
    csw/mgar/pkg/x3270/tags/legacy/x3270-3.3.6/x3270/depend
    csw/mgar/pkg/x3270/tags/legacy/x3270-3.3.6/x3270/pkginfo
    csw/mgar/pkg/x3270/tags/legacy/x3270-3.3.6/x3270/pkginfoS
    csw/mgar/pkg/x3270/tags/legacy/x3270-3.3.6/x3270/postinstall
    csw/mgar/pkg/x3270/tags/legacy/x3270-3.3.6/x3270/preremove
    csw/mgar/pkg/x3270/tags/legacy/x3270-3.3.6/x3270-3.3.6_DBCS.patch

Added: csw/mgar/pkg/x3270/tags/legacy/x3270-3.3.6/1.prep
===================================================================
--- csw/mgar/pkg/x3270/tags/legacy/x3270-3.3.6/1.prep	                        (rev 0)
+++ csw/mgar/pkg/x3270/tags/legacy/x3270-3.3.6/1.prep	2010-07-02 08:10:46 UTC (rev 10402)
@@ -0,0 +1,34 @@
+#!/opt/csw/bin/bash
+
+#export GCC=gcc3
+. ${HOME}/.pkgbuild
+. ${PKG_SOURCE_DIR}/CSW.env.sh
+. `dirname $0`/env
+
+set -x
+umask 022
+cd $PKG_BUILD_DIR
+
+rm -rf $PKG_PACKAGE_NAME
+mkdir $PKG_PACKAGE_NAME
+cd $PKG_PACKAGE_NAME
+/bin/gzip -dc ${PKG_SOURCE_DIR}/${PKG_TARBALL_NAME}-${PKG_PACKAGE_VERSION}.tgz | tar -xf -
+STATUS=$?
+if [ $STATUS -ne 0 ]; then
+  exit $STATUS
+fi
+#cd $PKG_PACKAGE_NV
+[ `/opt/csw/bin/gid | /opt/csw/bin/gsed 's/[^=]*=\([0-9][0-9]*\).*$/\1/'` = '0' ] && /opt/csw/bin/gchown -Rhf root .
+[ `/opt/csw/bin/gid | /opt/csw/bin/gsed 's/[^=]*=\([0-9][0-9]*\).*$/\1/'` = '0' ] && /opt/csw/bin/gchgrp -Rhf other .
+/opt/csw/bin/gchmod -Rf a+rX,g-w,o-w .
+
+echo "Applying c3270-3.3_ncurses.patch"
+patch -p0 -s -b -V t < ${PKG_SOURCE_DIR}/c3270-3.3_ncurses.patch
+echo "Applying x3270-3.3.6_DBCS.patch"
+patch -p0 -s -b -V t < ${PKG_SOURCE_DIR}/x3270-3.3.6_DBCS.patch
+
+cp -p ${PKG_SOURCE_DIR}/README.CSW .
+
+/opt/csw/bin/gfind . -perm 000 -exec /opt/csw/bin/gchmod +r {} \;
+
+exit 0


Property changes on: csw/mgar/pkg/x3270/tags/legacy/x3270-3.3.6/1.prep
___________________________________________________________________
Added: svn:executable
   + *

Added: csw/mgar/pkg/x3270/tags/legacy/x3270-3.3.6/2.packageS
===================================================================
--- csw/mgar/pkg/x3270/tags/legacy/x3270-3.3.6/2.packageS	                        (rev 0)
+++ csw/mgar/pkg/x3270/tags/legacy/x3270-3.3.6/2.packageS	2010-07-02 08:10:46 UTC (rev 10402)
@@ -0,0 +1,28 @@
+#!/opt/csw/bin/bash
+
+#export GCC=gcc3
+. ${HOME}/.pkgbuild
+. ${PKG_SOURCE_DIR}/CSW.env.sh
+. `dirname $0`/env
+
+set -x
+umask 022
+cd $PKG_BUILD_DIR
+
+cd $PKG_PACKAGE_NAME
+PGROUP=`/usr/xpg4/bin/id -n -g`
+pkgproto .=/opt/csw/src/${PKG_PACKAGE_NV} | sort -k3 | sed -e 's| opt| /opt|' -e "s/${LOGNAME} ${PGROUP}$/root bin/" > prototype
+cp -p ${PKG_SOURCE_DIR}/${PKG_PACKAGE_NAME}/copyright copyright
+echo "i copyright" >> prototype
+cp -p ${PKG_SOURCE_DIR}/${PKG_PACKAGE_NAME}/pkginfoS pkginfo
+echo "i pkginfo" >> prototype
+createspkg -r .
+STATUS=$?
+if [ $STATUS -ne 0 ]; then
+  exit $STATUS
+fi
+
+mv *.gz ${PKG_SPKG_DIR}
+rm prototype copyright pkginfo
+
+exit 0


Property changes on: csw/mgar/pkg/x3270/tags/legacy/x3270-3.3.6/2.packageS
___________________________________________________________________
Added: svn:executable
   + *

Added: csw/mgar/pkg/x3270/tags/legacy/x3270-3.3.6/3.build
===================================================================
--- csw/mgar/pkg/x3270/tags/legacy/x3270-3.3.6/3.build	                        (rev 0)
+++ csw/mgar/pkg/x3270/tags/legacy/x3270-3.3.6/3.build	2010-07-02 08:10:46 UTC (rev 10402)
@@ -0,0 +1,83 @@
+#!/opt/csw/bin/bash
+
+#export GCC=gcc3
+. ${HOME}/.pkgbuild
+. ${PKG_SOURCE_DIR}/CSW.env.sh
+. `dirname $0`/env
+
+set -x
+umask 022
+cd $PKG_BUILD_DIR
+
+cd $PKG_PACKAGE_NAME
+echo "Cleaning up patching..."
+find . -name \*.~?~ -exec rm -f {} \;
+
+LOGNAME=nobody
+cd c3270-${PKG_PACKAGE_SHORTVERSION}
+./configure --prefix=/opt/csw --mandir=/opt/csw/share/man
+STATUS=$?
+if [ $STATUS -ne 0 ]; then
+  exit $STATUS
+fi
+/opt/csw/bin/gmake
+STATUS=$?
+if [ $STATUS -ne 0 ]; then
+  exit $STATUS
+fi
+cd ..
+
+cd pr3287-${PKG_PACKAGE_SHORTVERSION}
+./configure --prefix=/opt/csw --mandir=/opt/csw/share/man
+STATUS=$?
+if [ $STATUS -ne 0 ]; then
+  exit $STATUS
+fi
+/opt/csw/bin/gmake
+STATUS=$?
+if [ $STATUS -ne 0 ]; then
+  exit $STATUS
+fi
+cd ..
+
+cd s3270-${PKG_PACKAGE_SHORTVERSION}
+./configure --prefix=/opt/csw --mandir=/opt/csw/share/man
+STATUS=$?
+if [ $STATUS -ne 0 ]; then
+  exit $STATUS
+fi
+/opt/csw/bin/gmake
+STATUS=$?
+if [ $STATUS -ne 0 ]; then
+  exit $STATUS
+fi
+cd ..
+
+cd tcl3270-${PKG_PACKAGE_SHORTVERSION}
+./configure --prefix=/opt/csw --mandir=/opt/csw/share/man --with-tcl=8.4
+STATUS=$?
+if [ $STATUS -ne 0 ]; then
+  exit $STATUS
+fi
+/opt/csw/bin/gmake
+STATUS=$?
+if [ $STATUS -ne 0 ]; then
+  exit $STATUS
+fi
+cd ..
+
+cd x3270-${PKG_PACKAGE_SHORTVERSION}
+PATH=$PATH:/usr/openwin/bin
+./configure --prefix=/opt/csw --mandir=/opt/csw/share/man --without-pr3287 --with-fontdir=/opt/csw/share/x3270
+STATUS=$?
+if [ $STATUS -ne 0 ]; then
+  exit $STATUS
+fi
+/opt/csw/bin/gmake
+STATUS=$?
+if [ $STATUS -ne 0 ]; then
+  exit $STATUS
+fi
+cd ..
+
+exit 0


Property changes on: csw/mgar/pkg/x3270/tags/legacy/x3270-3.3.6/3.build
___________________________________________________________________
Added: svn:executable
   + *

Added: csw/mgar/pkg/x3270/tags/legacy/x3270-3.3.6/4.install
===================================================================
--- csw/mgar/pkg/x3270/tags/legacy/x3270-3.3.6/4.install	                        (rev 0)
+++ csw/mgar/pkg/x3270/tags/legacy/x3270-3.3.6/4.install	2010-07-02 08:10:46 UTC (rev 10402)
@@ -0,0 +1,106 @@
+#!/opt/csw/bin/bash
+
+#export GCC=gcc3
+. ${HOME}/.pkgbuild
+. ${PKG_SOURCE_DIR}/CSW.env.sh
+. `dirname $0`/env
+
+set -x
+umask 022
+cd $PKG_BUILD_DIR
+
+cd $PKG_PACKAGE_NAME
+[ -n "$PKG_BUILD_ROOT" -a "$PKG_BUILD_ROOT" != / ] && /opt/csw/bin/grm -rf $PKG_BUILD_ROOT
+
+makeinstall() {
+  if [ -n "$1" ]; then VAR=".${1}"; fi
+  /opt/csw/bin/gmake \
+	prefix=/opt/csw \
+	exec_prefix=/opt/csw \
+	bindir=/opt/csw/bin \
+	sbindir=/opt/csw/sbin \
+	sysconfdir=/opt/csw/etc \
+	datadir=/opt/csw/share \
+	includedir=/opt/csw/include \
+	libdir=/opt/csw/lib \
+	libexecdir=/opt/csw/libexec \
+	localstatedir=/opt/csw/var \
+	sharedstatedir=/opt/csw/com \
+	mandir=/opt/csw/share/man \
+	infodir=/opt/csw/share/info \
+  install${VAR} INSTALLROOT=$PKG_BUILD_ROOT \
+          INSTALL_ROOT=$PKG_BUILD_ROOT \
+          DESTDIR=$PKG_BUILD_ROOT $2
+STATUS=$?
+if [ $STATUS -ne 0 ]; then
+  exit $STATUS
+fi
+unset VAR
+}
+
+cd c3270-${PKG_PACKAGE_SHORTVERSION}
+makeinstall
+makeinstall man
+/opt/csw/bin/ginstall -d ${PKG_BUILD_ROOT}${PKG_DOC_DIR}/${PKG_PACKAGE_NAME}/c3270
+/opt/csw/bin/gcp -pR html/ LICENSE README ${PKG_BUILD_ROOT}${PKG_DOC_DIR}/${PKG_PACKAGE_NAME}/c3270
+cd ..
+
+cd pr3287-${PKG_PACKAGE_SHORTVERSION}
+makeinstall
+makeinstall man
+/opt/csw/bin/ginstall -d ${PKG_BUILD_ROOT}${PKG_DOC_DIR}/${PKG_PACKAGE_NAME}/pr3287
+/opt/csw/bin/gcp -pR html/ LICENSE README ${PKG_BUILD_ROOT}${PKG_DOC_DIR}/${PKG_PACKAGE_NAME}/pr3287
+cd ..
+
+cd s3270-${PKG_PACKAGE_SHORTVERSION}
+makeinstall
+makeinstall man
+mkdir -p ${PKG_BUILD_ROOT}/opt/csw/lib/x3270
+cp -p x3270_glue.expect ${PKG_BUILD_ROOT}/opt/csw/lib/x3270/x3270_glue.expect
+  cd Examples
+  for X in `ls`; do
+    sed 's%/usr/local/bin/expect%/opt/csw/bin/expect%' $X > $X.out
+    mv -f $X.out $X
+  done
+  cd ..
+/opt/csw/bin/ginstall -d ${PKG_BUILD_ROOT}${PKG_DOC_DIR}/${PKG_PACKAGE_NAME}/s3270
+/opt/csw/bin/gcp -pR html/ Examples/ LICENSE README ${PKG_BUILD_ROOT}${PKG_DOC_DIR}/${PKG_PACKAGE_NAME}/s3270
+cd ..
+
+cd tcl3270-${PKG_PACKAGE_SHORTVERSION}
+makeinstall
+makeinstall man
+/opt/csw/bin/ginstall -d ${PKG_BUILD_ROOT}${PKG_DOC_DIR}/${PKG_PACKAGE_NAME}/tcl3270
+/opt/csw/bin/gcp -pR html/ Examples/ LICENSE README ${PKG_BUILD_ROOT}${PKG_DOC_DIR}/${PKG_PACKAGE_NAME}/tcl3270
+cd ..
+
+cd x3270-${PKG_PACKAGE_SHORTVERSION}
+PATH=$PATH:/usr/openwin/bin
+makeinstall byprefix
+#makeinstall "" "BINDIR=/opt/csw/bin MANDIR=/opt/csw/share/man/man1 LIBDIR=/opt/csw/lib/X11"
+#makeinstall man "BINDIR=/opt/csw/bin MANDIR=/opt/csw/share/man/man1 LIBDIR=/opt/csw/lib/X11"
+  cd Examples
+  for X in `ls`; do
+    sed 's%/usr/local/bin/expect%/opt/csw/bin/expect%' $X > $X.out
+    mv -f $X.out $X
+    sed 's%/usr/local/bin/bash%/bin/bash%' $X > $X.out
+    mv -f $X.out $X
+  done
+  cd ..
+/opt/csw/bin/ginstall -d ${PKG_BUILD_ROOT}${PKG_DOC_DIR}/${PKG_PACKAGE_NAME}/x3270
+/opt/csw/bin/gcp -pR html/ Examples/ LICENSE README ${PKG_BUILD_ROOT}${PKG_DOC_DIR}/${PKG_PACKAGE_NAME}/x3270
+cd ..
+
+for X in `/opt/csw/bin/gls ${PKG_BUILD_ROOT}/opt/csw/etc/x3270/*`; do
+  /opt/csw/bin/gmv ${X} ${X}.CSW
+done
+
+# installdoc ${PKG_SOURCE_DIR}/README.CSW
+/opt/csw/bin/ginstall -d ${PKG_BUILD_ROOT}${PKG_DOC_DIR}/${PKG_PACKAGE_NAME}
+/opt/csw/bin/gcp -pR ${PKG_SOURCE_DIR}/README.CSW ${PKG_BUILD_ROOT}${PKG_DOC_DIR}/${PKG_PACKAGE_NAME}
+
+${PKG_TOPDIR}/SOURCE/brp-strip /usr/ccs/bin/strip
+/opt/csw/bin/gchmod u+w ${PKG_BUILD_ROOT}${PKG_DOC_DIR}/${PKG_PACKAGE_NAME}/*/html/*
+/opt/csw/bin/gchmod a-wx ${PKG_BUILD_ROOT}/opt/csw/share/man/man?/*
+
+exit 0


Property changes on: csw/mgar/pkg/x3270/tags/legacy/x3270-3.3.6/4.install
___________________________________________________________________
Added: svn:executable
   + *

Added: csw/mgar/pkg/x3270/tags/legacy/x3270-3.3.6/5.package
===================================================================
--- csw/mgar/pkg/x3270/tags/legacy/x3270-3.3.6/5.package	                        (rev 0)
+++ csw/mgar/pkg/x3270/tags/legacy/x3270-3.3.6/5.package	2010-07-02 08:10:46 UTC (rev 10402)
@@ -0,0 +1,71 @@
+#!/opt/csw/bin/bash
+
+#export GCC=gcc3
+. ${HOME}/.pkgbuild
+. ${PKG_SOURCE_DIR}/CSW.env.sh
+. `dirname $0`/env
+
+set -x
+umask 022
+cd $PKG_BUILD_DIR
+
+rm -rf $PKG_PKGMK_ROOT
+mkdir $PKG_PKGMK_ROOT
+cd $PKG_BUILD_ROOT
+tar cf - * | (cd $PKG_PKGMK_ROOT; tar xvf -)
+cd $PKG_PKGMK_ROOT
+PGROUP=`/usr/xpg4/bin/id -n -g`
+pkgproto . | sort -k3 | sed -e 's| etc| /etc|' -e 's| opt| /opt|' -e 's| usr| /usr|' -e 's| var| /var|' -e "s/${LOGNAME} ${PGROUP}$/root bin/" > prototype
+CSWcommon="`awk '/CSWcommon/{print $1}' /var/sadm/install/contents | sed -e 's|=.*||'`"
+cp -p prototype /tmp/prototype.$$
+set +x
+# Pull out all paths found in CSWcommon
+for X in /opt $CSWcommon ; do
+  fgrep -v " ${X} " /tmp/prototype.$$ > /tmp/$$
+  mv /tmp/$$ /tmp/prototype.$$
+done
+# Do not specify owner and perms on paths that Solaris owns.
+for X in /etc /etc/init.d /etc/opt /var /var/opt /var/run ; do
+  Y=`echo $X | sed 's|/|\\\/|g'`
+  awk "\$3~/^$Y$/{print \$1,\$2,\$3,\"? ? ?\"}; \$3!~/^$Y$/{print \$0}" /tmp/prototype.$$ > /tmp/$$
+  mv /tmp/$$ /tmp/prototype.$$
+done
+# Do not specify owner and perms on paths that CSWcommon should own.
+for X in /opt/csw/etc /opt/csw/etc/default /opt/csw/etc/init.d /opt/csw/include /opt/csw/var/log ; do
+  Y=`echo $X | sed 's|/|\\\/|g'`
+  awk "\$3~/^$Y$/{print \$1,\$2,\$3,\"? ? ?\"}; \$3!~/^$Y$/{print \$0}" /tmp/prototype.$$ > /tmp/$$
+  mv /tmp/$$ /tmp/prototype.$$
+done
+set -x
+# Specify owner and group for certain hobbit files.
+#for X in /opt/csw/etc/hobbit /opt/csw/var/hobbit ; do
+#  Y=`echo $X | sed 's|/|\\\/|g'`
+#  awk "\$3~/^$Y$/{print \$1,\$2,\$3,\$4,\"hobbit hobbit\"}; \$3!~/^$Y$/{print \$0}" /tmp/prototype.$$ > /tmp/$$
+#  mv /tmp/$$ /tmp/prototype.$$
+#done
+mv /tmp/prototype.$$ prototype
+#cp -p ${PKG_SOURCE_DIR}/${PKG_PACKAGE_NAME}/prototype prototype
+cp -p ${PKG_SOURCE_DIR}/${PKG_PACKAGE_NAME}/copyright copyright
+echo "i copyright" >> prototype
+cp -p ${PKG_SOURCE_DIR}/${PKG_PACKAGE_NAME}/depend depend
+echo "i depend" >> prototype
+cp -p ${PKG_SOURCE_DIR}/${PKG_PACKAGE_NAME}/pkginfo pkginfo
+echo "i pkginfo" >> prototype
+#cp -p ${PKG_SOURCE_DIR}/${PKG_PACKAGE_NAME}/preinstall preinstall
+#echo "i preinstall" >> prototype
+cp -p ${PKG_SOURCE_DIR}/${PKG_PACKAGE_NAME}/postinstall postinstall
+echo "i postinstall" >> prototype
+cp -p ${PKG_SOURCE_DIR}/${PKG_PACKAGE_NAME}/preremove preremove
+echo "i preremove" >> prototype
+#cp -p ${PKG_SOURCE_DIR}/${PKG_PACKAGE_NAME}/postremove postremove
+#echo "i postremove" >> prototype
+
+createpkg -r .
+STATUS=$?
+if [ $STATUS -ne 0 ]; then
+  exit $STATUS
+fi
+
+mv *.gz $PKG_PKG_DIR
+
+exit 0


Property changes on: csw/mgar/pkg/x3270/tags/legacy/x3270-3.3.6/5.package
___________________________________________________________________
Added: svn:executable
   + *

Added: csw/mgar/pkg/x3270/tags/legacy/x3270-3.3.6/BUILDREQS
===================================================================
--- csw/mgar/pkg/x3270/tags/legacy/x3270-3.3.6/BUILDREQS	                        (rev 0)
+++ csw/mgar/pkg/x3270/tags/legacy/x3270-3.3.6/BUILDREQS	2010-07-02 08:10:46 UTC (rev 10402)
@@ -0,0 +1 @@
+/opt/csw/bin/pkg-get -i readline ncurses openssl libicu

Added: csw/mgar/pkg/x3270/tags/legacy/x3270-3.3.6/README
===================================================================
--- csw/mgar/pkg/x3270/tags/legacy/x3270-3.3.6/README	                        (rev 0)
+++ csw/mgar/pkg/x3270/tags/legacy/x3270-3.3.6/README	2010-07-02 08:10:46 UTC (rev 10402)
@@ -0,0 +1,2 @@
+http://prdownloads.sourceforge.net/x3270/suite3270-3.3.4p7.tgz?download
+http://easynews.dl.sourceforge.net/sourceforge/x3270/suite3270-3.3.4p7.tgz

Added: csw/mgar/pkg/x3270/tags/legacy/x3270-3.3.6/README.CSW
===================================================================
--- csw/mgar/pkg/x3270/tags/legacy/x3270-3.3.6/README.CSW	                        (rev 0)
+++ csw/mgar/pkg/x3270/tags/legacy/x3270-3.3.6/README.CSW	2010-07-02 08:10:46 UTC (rev 10402)
@@ -0,0 +1,23 @@
+$Id: README.CSW 832 2007-08-16 01:22:30Z mike $
+
+x3270 Terminal Emulator
+
+*** Supporting software:
+/opt/csw/bin/pkg-get -i bash shutils fileutils binutils findutils
+/opt/csw/bin/pkg-get -i gmake gcc3core ggrep gsed gnulinks
+/opt/csw/bin/pkg-get -i readline ncurses openssl libicu
+
+*** Patches applied:
+c3270-3.3_ncurses.patch
+
+*** Configured with:
+./c3270-3.3/configure --prefix=/opt/csw --mandir=/opt/csw/share/man
+./pr3287-3.3/configure --prefix=/opt/csw --mandir=/opt/csw/share/man
+./s3270-3.3/configure --prefix=/opt/csw --mandir=/opt/csw/share/man
+./tcl3270-3.3/configure --prefix=/opt/csw --mandir=/opt/csw/share/man \
+  --with-tcl=8.4
+./x3270-3.3/configure --prefix=/opt/csw --mandir=/opt/csw/share/man \
+  --without-pr3287 --with-fontdir=/opt/csw/share/x3270
+
+*** Upgrading:
+

Added: csw/mgar/pkg/x3270/tags/legacy/x3270-3.3.6/c3270-3.3_ncurses.patch
===================================================================
--- csw/mgar/pkg/x3270/tags/legacy/x3270-3.3.6/c3270-3.3_ncurses.patch	                        (rev 0)
+++ csw/mgar/pkg/x3270/tags/legacy/x3270-3.3.6/c3270-3.3_ncurses.patch	2010-07-02 08:10:46 UTC (rev 10402)
@@ -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 <ncurses/ncurses.h>
++#elif defined(HAVE_NCURSES_H) /*[*/
+ #include <ncurses.h>
+ #else /*][*/
+ #include <curses.h>
+--- 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 <ncurses/ncurses.h>
++#elif defined(HAVE_NCURSES_H) /*[*/
+ #include <ncurses.h>
+ #else /*][*/ 
+ #include <curses.h>

Added: csw/mgar/pkg/x3270/tags/legacy/x3270-3.3.6/env
===================================================================
--- csw/mgar/pkg/x3270/tags/legacy/x3270-3.3.6/env	                        (rev 0)
+++ csw/mgar/pkg/x3270/tags/legacy/x3270-3.3.6/env	2010-07-02 08:10:46 UTC (rev 10402)
@@ -0,0 +1,27 @@
+PKG_PACKAGE_NAME="x3270"
+PKG_PACKAGE_VERSION="3.3.6"
+PKG_PACKAGE_RELEASE="1.sol8.re"
+PKG_OPT_FLAGS="-O2"
+export PKG_PACKAGE_NAME PKG_PACKAGE_VERSION PKG_PACKAGE_RELEASE PKG_OPT_FLAGS
+
+PKG_TARBALL_NAME="suite3270"
+PKG_PACKAGE_SHORTVERSION="3.3"
+export PKG_TARBALL_NAME PKG_PACKAGE_SHORTVERSION
+
+PKG_ARCH=`uname -p`
+PKG_OS="solaris"
+PKG_DOC_DIR="/opt/csw/share/doc"
+export PKG_ARCH PKG_OS PKG_DOC_DIR
+
+PKG_PACKAGE_NV="${PKG_PACKAGE_NAME}-${PKG_PACKAGE_VERSION}"
+export PKG_PACKAGE_NV
+
+PKG_SOURCE_DIR="${PKG_SOURCE_DIR}/${PKG_PACKAGE_NV}"
+PKG_BUILD_ROOT="${PKG_TEMP_DIR}/${PKG_PACKAGE_NV}-${PKG_PACKAGE_RELEASE}-${PKG_ARCH}-root"
+PKG_PKGMK_ROOT="${PKG_PKGMK_DIR}/${PKG_PACKAGE_NV}-${PKG_PACKAGE_RELEASE}-${PKG_ARCH}-root"
+export PKG_SOURCE_DIR PKG_BUILD_ROOT PKG_PKGMK_ROOT
+
+CPPFLAGS="$PKG_OPT_FLAGS $CPPFLAGS"
+CFLAGS="$PKG_OPT_FLAGS $CFLAGS"
+export CFLAGS CPPFLAGS
+


Property changes on: csw/mgar/pkg/x3270/tags/legacy/x3270-3.3.6/env
___________________________________________________________________
Added: svn:executable
   + *

Added: csw/mgar/pkg/x3270/tags/legacy/x3270-3.3.6/suite3270-3.3.6.tgz
===================================================================
(Binary files differ)


Property changes on: csw/mgar/pkg/x3270/tags/legacy/x3270-3.3.6/suite3270-3.3.6.tgz
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: csw/mgar/pkg/x3270/tags/legacy/x3270-3.3.6/x3270/copyright
===================================================================
--- csw/mgar/pkg/x3270/tags/legacy/x3270-3.3.6/x3270/copyright	                        (rev 0)
+++ csw/mgar/pkg/x3270/tags/legacy/x3270-3.3.6/x3270/copyright	2010-07-02 08:10:46 UTC (rev 10402)
@@ -0,0 +1,6 @@
+
+x3270 is copyrighted (C) 1993-2007 by Paul Mattes.
+
+x3270 is Open Source software, made available under a NO WARRANTY license.
+See the file LICENSE for details and for other copyright notices.
+

Added: csw/mgar/pkg/x3270/tags/legacy/x3270-3.3.6/x3270/depend
===================================================================
--- csw/mgar/pkg/x3270/tags/legacy/x3270-3.3.6/x3270/depend	                        (rev 0)
+++ csw/mgar/pkg/x3270/tags/legacy/x3270-3.3.6/x3270/depend	2010-07-02 08:10:46 UTC (rev 10402)
@@ -0,0 +1,11 @@
+P CSWcommon	common - common files and dirs for CSW packages
+P CSWreadline	readline - library to enable interactive line editing
+P CSWosslrt	openssl_rt - Openssl runtime libraries
+P CSWlibicu	libicu - International Components for Unicode
+P CSWncurses	ncurses - ncurses library and utilities
+P CSWtcl	tcl - Tool Command Language
+P SUNWcsl	Core Solaris, (Shared Libs)
+P SUNWlibms	Sun WorkShop Bundled shared libm
+P SUNWxwice	ICE components
+P SUNWxwplt	X Window System platform software
+P SUNWxwrtl	X Window System & Graphics Runtime Library Links in /usr/lib

Added: csw/mgar/pkg/x3270/tags/legacy/x3270-3.3.6/x3270/pkginfo
===================================================================
--- csw/mgar/pkg/x3270/tags/legacy/x3270-3.3.6/x3270/pkginfo	                        (rev 0)
+++ csw/mgar/pkg/x3270/tags/legacy/x3270-3.3.6/x3270/pkginfo	2010-07-02 08:10:46 UTC (rev 10402)
@@ -0,0 +1,8 @@
+PKG=CSWx3270
+NAME=x3270 - TN3270 Terminal Emulator
+CATEGORY=application
+VERSION=3.3.6
+VENDOR=http://www.geocities.com/SiliconValley/Peaks/7814/ packaged for CSW by Mike Arnold
+HOTLINE=http://www.blastwave.org/bugtrack/
+EMAIL=mike at blastwave.org
+DESC=An IBM 3270 terminal emulator.

Added: csw/mgar/pkg/x3270/tags/legacy/x3270-3.3.6/x3270/pkginfoS
===================================================================
--- csw/mgar/pkg/x3270/tags/legacy/x3270-3.3.6/x3270/pkginfoS	                        (rev 0)
+++ csw/mgar/pkg/x3270/tags/legacy/x3270-3.3.6/x3270/pkginfoS	2010-07-02 08:10:46 UTC (rev 10402)
@@ -0,0 +1,9 @@
+PKG=CSWx3270S
+NAME=x3270 - TN3270 Terminal Emulator (Source)
+CATEGORY=application
+VERSION=3.3.6
+VENDOR=http://www.geocities.com/SiliconValley/Peaks/7814/ packaged for CSW by Mike Arnold
+HOTLINE=http://www.blastwave.org/bugtrack/
+EMAIL=mike at blastwave.org
+DESC=An IBM 3270 terminal emulator. (Source)
+ARCH=all

Added: csw/mgar/pkg/x3270/tags/legacy/x3270-3.3.6/x3270/postinstall
===================================================================
--- csw/mgar/pkg/x3270/tags/legacy/x3270-3.3.6/x3270/postinstall	                        (rev 0)
+++ csw/mgar/pkg/x3270/tags/legacy/x3270-3.3.6/x3270/postinstall	2010-07-02 08:10:46 UTC (rev 10402)
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+if [ "$PKG_INSTALL_ROOT" = "" ] ; then
+	PKG_INSTALL_ROOT="/"
+fi
+
+echo "Installing config files"
+for X in `${PKG_INSTALL_ROOT}/usr/bin/ls ${PKG_INSTALL_ROOT}/opt/csw/etc/x3270/*.CSW`; do
+  Y=`echo "$X" | ${PKG_INSTALL_ROOT}/usr/bin/sed 's|.CSW||'`
+  if [ ! -f $Y ]; then
+    ${PKG_INSTALL_ROOT}/usr/bin/cp -p $X $Y
+  fi
+done
+
+exit 0


Property changes on: csw/mgar/pkg/x3270/tags/legacy/x3270-3.3.6/x3270/postinstall
___________________________________________________________________
Added: svn:executable
   + *

Added: csw/mgar/pkg/x3270/tags/legacy/x3270-3.3.6/x3270/preremove
===================================================================
--- csw/mgar/pkg/x3270/tags/legacy/x3270-3.3.6/x3270/preremove	                        (rev 0)
+++ csw/mgar/pkg/x3270/tags/legacy/x3270-3.3.6/x3270/preremove	2010-07-02 08:10:46 UTC (rev 10402)
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+if [ "$PKG_INSTALL_ROOT" = "" ] ; then
+	PKG_INSTALL_ROOT="/"
+fi
+
+echo "Removing unmodified config files"
+for X in `${PKG_INSTALL_ROOT}/usr/bin/ls ${PKG_INSTALL_ROOT}/opt/csw/etc/x3270/*.CSW`; do
+  Y=`echo "$X" | ${PKG_INSTALL_ROOT}/usr/bin/sed 's|.CSW||'`
+  if ${PKG_INSTALL_ROOT}/usr/bin/cmp -s $X $Y; then
+    ${PKG_INSTALL_ROOT}/usr/bin/rm $Y
+  fi
+done
+
+exit 0


Property changes on: csw/mgar/pkg/x3270/tags/legacy/x3270-3.3.6/x3270/preremove
___________________________________________________________________
Added: svn:executable
   + *

Added: csw/mgar/pkg/x3270/tags/legacy/x3270-3.3.6/x3270-3.3.6_DBCS.patch
===================================================================
--- csw/mgar/pkg/x3270/tags/legacy/x3270-3.3.6/x3270-3.3.6_DBCS.patch	                        (rev 0)
+++ csw/mgar/pkg/x3270/tags/legacy/x3270-3.3.6/x3270-3.3.6_DBCS.patch	2010-07-02 08:10:46 UTC (rev 10402)
@@ -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 theferret at users.sourceforge.net  Fri Jul  2 20:03:22 2010
From: theferret at users.sourceforge.net (theferret at users.sourceforge.net)
Date: Fri, 02 Jul 2010 18:03:22 +0000
Subject: [csw-devel] SF.net SVN: gar:[10403] csw/mgar/pkg/openbox/trunk
Message-ID: <E1OUkaA-0007gJ-VR@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 10403
          http://gar.svn.sourceforge.net/gar/?rev=10403&view=rev
Author:   theferret
Date:     2010-07-02 18:03:22 +0000 (Fri, 02 Jul 2010)

Log Message:
-----------
openbox: added patch to remove /usr/share, and tweaked README a bit

Modified Paths:
--------------
    csw/mgar/pkg/openbox/trunk/README
    csw/mgar/pkg/openbox/trunk/patchfile.preconf

Modified: csw/mgar/pkg/openbox/trunk/README
===================================================================
--- csw/mgar/pkg/openbox/trunk/README	2010-07-02 08:10:46 UTC (rev 10402)
+++ csw/mgar/pkg/openbox/trunk/README	2010-07-02 18:03:22 UTC (rev 10403)
@@ -1,20 +1,19 @@
+Random notes for compilation and patching...
+
 This compile  is a bit odd.
 It is "intelligent" and adds -I/usr/openwin/include, but that actually
-breaks us.
-make sure to REMOVE it.
+breaks us. make sure to REMOVE it.
+ Turns out we can deal with it by setting X_CFLAGS on config line.
 
-it also "helpfully" adds a buncha junk such as -L /usr/openwin/lib.
-kill it
-
-
 Note that this package will benefit by having "obconf", and
 "openbox_themes" installed as well
 
-
-
 This thing passes in defines on the COMMAND LINE  (-Dxxx) 
 instead of having a civilized config.h file
 
 
+The "ShapeInput" ifdefs, are inspired by sawfish ifdefs that I saw.
 
-the "ShapeInput" ifdefs, are inspired by sawfish ifdefs that I saw.
+See also
+http://openbox.org/wiki/Help:Contents#Cool_programs_to_run_with_Openbox
+

Modified: csw/mgar/pkg/openbox/trunk/patchfile.preconf
===================================================================
--- csw/mgar/pkg/openbox/trunk/patchfile.preconf	2010-07-02 08:10:46 UTC (rev 10402)
+++ csw/mgar/pkg/openbox/trunk/patchfile.preconf	2010-07-02 18:03:22 UTC (rev 10403)
@@ -88,3 +88,23 @@
  
          g_free(program);
          g_strfreev(argv);
+--- parser/parse.c.orig	Fri Jul  2 19:59:36 2010
++++ parser/parse.c	Fri Jul  2 20:00:14 2010
+@@ -429,16 +429,7 @@
+         xdg_data_dir_paths = slist_path_add(xdg_data_dir_paths,
+                                             g_strdup(DATADIR),
+                                             (GSListFunc) g_slist_append);
+-        xdg_data_dir_paths = slist_path_add(xdg_data_dir_paths,
+-                                            g_build_filename
+-                                            (G_DIR_SEPARATOR_S,
+-                                             "usr", "local", "share", NULL),
+-                                            (GSListFunc) g_slist_append);
+-        xdg_data_dir_paths = slist_path_add(xdg_data_dir_paths,
+-                                            g_build_filename
+-                                            (G_DIR_SEPARATOR_S,
+-                                             "usr", "share", NULL),
+-                                            (GSListFunc) g_slist_append);
++	/* opencsw: removed /usr/share hardcodes. badbadbad */
+     }
+     xdg_data_dir_paths = slist_path_add(xdg_data_dir_paths,
+                                         g_strdup(xdg_data_home_path),


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From theferret at users.sourceforge.net  Fri Jul  2 20:11:02 2010
From: theferret at users.sourceforge.net (theferret at users.sourceforge.net)
Date: Fri, 02 Jul 2010 18:11:02 +0000
Subject: [csw-devel] SF.net SVN: gar:[10404]
	csw/mgar/pkg/openbox/trunk/patchfile.preconf
Message-ID: <E1OUkha-0002Xv-Ag@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 10404
          http://gar.svn.sourceforge.net/gar/?rev=10404&view=rev
Author:   theferret
Date:     2010-07-02 18:11:02 +0000 (Fri, 02 Jul 2010)

Log Message:
-----------
openbox: additional patch

Modified Paths:
--------------
    csw/mgar/pkg/openbox/trunk/patchfile.preconf

Modified: csw/mgar/pkg/openbox/trunk/patchfile.preconf
===================================================================
--- csw/mgar/pkg/openbox/trunk/patchfile.preconf	2010-07-02 18:03:22 UTC (rev 10403)
+++ csw/mgar/pkg/openbox/trunk/patchfile.preconf	2010-07-02 18:11:02 UTC (rev 10404)
@@ -89,8 +89,16 @@
          g_free(program);
          g_strfreev(argv);
 --- parser/parse.c.orig	Fri Jul  2 19:59:36 2010
-+++ parser/parse.c	Fri Jul  2 20:00:14 2010
-@@ -429,16 +429,7 @@
++++ parser/parse.c	Fri Jul  2 20:09:11 2010
+@@ -415,6 +415,7 @@
+         xdg_config_dir_paths = slist_path_add(xdg_config_dir_paths,
+                                               g_build_filename
+                                               (G_DIR_SEPARATOR_S,
++					      "opt","csw",
+                                                "etc", "xdg", NULL),
+                                               (GSListFunc) g_slist_append);
+     }
+@@ -429,16 +430,7 @@
          xdg_data_dir_paths = slist_path_add(xdg_data_dir_paths,
                                              g_strdup(DATADIR),
                                              (GSListFunc) g_slist_append);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From theferret at users.sourceforge.net  Fri Jul  2 22:38:30 2010
From: theferret at users.sourceforge.net (theferret at users.sourceforge.net)
Date: Fri, 02 Jul 2010 20:38:30 +0000
Subject: [csw-devel] SF.net SVN: gar:[10405] csw/mgar/pkg/gnome_themes/trunk
Message-ID: <E1OUn0I-0002BX-N3@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 10405
          http://gar.svn.sourceforge.net/gar/?rev=10405&view=rev
Author:   theferret
Date:     2010-07-02 20:38:30 +0000 (Fri, 02 Jul 2010)

Log Message:
-----------
gnome_themes: rename and rebuild

Added Paths:
-----------
    csw/mgar/pkg/gnome_themes/trunk/Makefile
    csw/mgar/pkg/gnome_themes/trunk/copyright
    csw/mgar/pkg/gnome_themes/trunk/depend
    csw/mgar/pkg/gnome_themes/trunk/pkginfo
    csw/mgar/pkg/gnome_themes/trunk/prototype

Removed Paths:
-------------
    csw/mgar/pkg/gnome_themes/trunk/legacy/

Property Changed:
----------------
    csw/mgar/pkg/gnome_themes/trunk/


Property changes on: csw/mgar/pkg/gnome_themes/trunk
___________________________________________________________________
Added: svn:ignore
   + cookies
download
work
cswstage
build


Added: csw/mgar/pkg/gnome_themes/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gnome_themes/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/gnome_themes/trunk/Makefile	2010-07-02 20:38:30 UTC (rev 10405)
@@ -0,0 +1,237 @@
+# This file is from TEMPLATES/createpkg/Makefile.lib
+# You MUST build this with gnu make, unfortunately.
+# Mainly just because of the ARCH expansion, but also for "?="
+
+
+# If you do NOT want to build 64bit libs, remove the $(ARCH)-64 from
+# the "all:" target. Or just use Makefile.lib32
+
+# If you DO want to, then leave it in, and also customize your
+#  the build/.stage-$(ARCH)-64.done    target(s),
+# PLUS, customize your prototype file(s) as needed
+# Dont forget to handle any 64bit pkg-config .pc files properly!!
+
+# Organization: variable defintions up top,
+# targets in second half.
+# Note that assignments with "?=" mean "assign if not already assigned.
+
+# just for intltool
+PATH := /opt/csw/gnu:$(PATH)
+
+# Where do we keep local downloads of software src files
+ARCHIVEDIR ?= /home/src
+ARCHIVENAME ?= gnome-themes-2.30.2.tar.bz2 
+EXTRACTPROG ?= /usr/sfw/bin/gtar jfx
+
+# Only use ONE here. The name is used for compat with 'gar'.
+MASTER_SITES ?= http://ftp.gnome.org/pub/GNOME/sources/gnome-themes/2.30
+
+ARCH := $(shell /bin/uname -p)
+
+LDFLAGS_COMMON :=
+
+SRCDIR= build/*
+
+# DO NOT specify the arch-64 stuff such as -m64 here.
+# the individual targets will do that.
+
+CFLAGS_COMMON   ?= -mt -xnorunpath -xO2
+CXXFLAGS_COMMON ?= -mt -norunpath  -xO2
+CFLAGS_sparc    ?= -xarch=v8
+CFLAGS_i386     ?= -xarch=386
+
+# Keep this arch-neutral if possible. add arch-specific tweaks
+# to arch-specific target
+CONFIGURE=./configure --prefix=/opt/csw
+
+LIBDIR64_sparc:=/opt/csw/lib/sparcv9
+LIBDIR64_i386 :=/opt/csw/lib/amd64
+
+CONFIGURE_64_$(ARCH) := --libdir=$(LIBDIR64_$(ARCH))
+CONFIGURE_64_EXTRAS  := $(CONFIGURE_64_$(ARCH))
+
+LDFLAGS_64_$(ARCH) := -R$(LIBDIR64_$(ARCH)) -L$(LIBDIR64_$(ARCH))
+
+
+
+CREATEPKG=createpkg -r `pwd`/build/*/cswstage
+
+
+all:	$(ARCH)-32 build/.stage1 $(ARCH)-64 package
+#all:	$(ARCH)-32 package
+
+# ARCH-XX handles configure, build, and stage for its own combo
+# 
+
+EXTRACTPROG ?= /bin/echo ERROR: need to set EXTRACTPROG ; exit 1 ;
+
+
+
+extract:	build/.extract.done
+
+build/.extract.done:
+	test -d build || mkdir build
+	@if test -f  $(ARCHIVEDIR)/$(ARCHIVENAME) ; then \
+		echo Extracting $(ARCHIVENAME) under build dir... ;\
+		( cd build && $(EXTRACTPROG) $(ARCHIVEDIR)/$(ARCHIVENAME) ) ; \
+	else echo Cannot extract - $(ARCHIVEDIR)/$(ARCHIVENAME) does not exist ;\
+		exit 1; \
+	fi
+	touch build/.extract.done
+	
+
+clean distclean:
+	@echo Calling $@ in $(SRCDIR)
+	$(MAKE) -C $(SRCDIR) $@
+
+# This is a bit of a hack.. it does a "make clean", 
+# only when we're between 32bit and 64bit builds, when doing "make all".
+# Once we're IN the 64bit builds, it should not be automatically called.
+build/.stage1:
+	@echo Doing inter 32-64 bit cleanup
+	$(MAKE) -C $(SRCDIR) distclean
+	touch $@
+	
+
+reallyclean:	distclean
+	@echo Removing any milestone files in build as well...
+	@rm -f build/.??*
+	@echo '(However, leaving src tree intact, with any patches in it)'
+	@echo '(If you want, you could rm -r build, then make extract once more)'
+
+garchive:
+	@echo Call the fetch target instead: it does the same thing.
+
+
+# Downloads the source code to the common ARCHIVEDIR
+fetch:	$(ARCHIVEDIR)/$(ARCHIVENAME)
+	@echo fetch done
+
+$(ARCHIVEDIR)/$(ARCHIVENAME):
+	wget -P $(ARCHIVEDIR) $(MASTER_SITES)/$(ARCHIVENAME)
+
+patch:
+	@echo patch: patching is handled automatically as part of the configure phase.
+
+stage-preserved:
+	@if test -f preserve-$(ARCH).tar ; then \
+		echo Copying preserved arch-specific files; \
+		cat preserve-$(ARCH).tar |(cd $(SRCDIR)/cswstage && tar xvf -);\
+	fi
+	@if test -f preserve.tar ; then \
+		echo Copying preserved arch-neutral files; \
+		cat preserve.tar |(cd $(SRCDIR)/cswstage && tar xvf -);\
+	fi
+		
+package:	stage-preserved
+	$(CREATEPKG)
+
+
+# split out generic $(ARCH) sections to platform-specific sections if needed.
+# but it usually should not be neccessary
+
+
+$(ARCH)-32 ::   configure-$(ARCH)-32 build-$(ARCH)-32 stage-$(ARCH)-32
+	@echo Completed $(ARCH)-32 configure, build and stage
+	touch build/.$(ARCH)-32.done
+
+
+$(ARCH)-64 ::  stage-$(ARCH)-32 configure-$(ARCH)-64 build-$(ARCH)-64 stage-$(ARCH)-64
+	@echo Completed $@ configure, build and stage
+	touch build/.$(ARCH)-64.done
+
+build/.$(ARCH)-32.done:	$(ARCH)-32
+
+build/.$(ARCH)-64.done:	$(ARCH)-64
+
+# Since we share the same src tree, we should only need to
+# pre-configure patching one time for all.
+build/.patch-preconf.done:	build/.extract.done
+	if test -f patchfile.preconf ; then \
+	 gpatch -d $(SRCDIR) -p0  <patchfile.preconf ; fi
+	touch $@
+
+
+#Note: I WANT to use LDFLAGS=-R$$ORIGIN, but stupid libtool
+# wont allow it! so force it at build time
+build/.configure-$(ARCH)-32.done:	build/.patch-preconf.done
+	@echo handling $@ target
+	(cd $(SRCDIR) ; \
+	  CFLAGS="$(CFLAGS_COMMON) $(CFLAGS_$(ARCH))" \
+	  CXXFLAGS="$(CXXFLAGS_COMMON)" \
+	  LDFLAGS='-R/opt/csw/lib -L/opt/csw/lib' \
+	  $(CONFIGURE) )
+	if test -f patchfile.postconf ; then \
+	 gpatch -d $(SRCDIR) -p0  <patchfile.postconf ; fi
+	touch $@
+
+build/.configure-$(ARCH)-64.done:	build/.patch-preconf.done
+	if test "$(ARCH)" = "i386" -a "`uname -r`" != "5.10" ; then \
+		echo Error: do 64bit for i386 on sol10 only ; exit 1 ; fi
+	@echo handling $@ target
+	(cd $(SRCDIR) ; \
+	  CFLAGS="$(CFLAGS_COMMON) -m64"  \
+	  CXXFLAGS="$(CXXFLAGS_COMMON) -m64" \
+	  LDFLAGS="$(LDFLAGS_64_$(ARCH))" \
+	  PKG_CONFIG_PATH=/opt/csw/lib/64/pkgconfig \
+	  $(CONFIGURE) $(CONFIGURE_64_EXTRAS)  )
+	if test -f patchfile.postconf ; then \
+	 gpatch -d $(SRCDIR) -p0  <patchfile.postconf ; fi
+	touch $@
+
+
+# See note about LDFLAGS and ORIGIN, higher up	
+build/.build-$(ARCH)-32.done build/.build-$(ARCH)-64.done:
+	@echo handling $@ target
+	LD_OPTIONS='-R$$ORIGIN' $(MAKE) -C $(SRCDIR) $(MFLAGS)
+	touch $@
+
+
+
+## NOTE: This is a DESTRUCTIVE target build!!
+## 'stagepkg'  will destroy any prior "cswstage" directory!!!
+## So, we remove all 64bit milestones
+build/.stage-$(ARCH)-32.done:
+	@echo Handling stage of $(ARCH)-32
+	(cd $(SRCDIR) ; MAKE=gmake stagepkg)
+	(cd  $(SRCDIR); cp COPYING cswstage/.)
+	@rm -f build/.*64.done
+	touch $@
+
+
+# Note: This is the tricky bit. we cannot just call 
+#  "stagepkg": we dont usually want EVERYTHING; just the
+# libs that are rebuilt in 64bit, and we need them to go to
+# the subdirs, not the regular place!
+# SOME things, will have a clean libdir, and respect --libdir,
+# and do the right thing easily. However, many will not!
+# SO, odds are you'll have to write a customized target
+build/.stage-$(ARCH)-64.done:	$(SRCDIR)/cswstage
+	@echo ""
+	rm -rf cd $(SRCDIR)/tmpdest
+	cd $(SRCDIR) &&  $(MAKE) DESTDIR=`/bin/pwd`/tmpdest install
+	(cd $(SRCDIR)/tmpdest; tar cf - ./$(LIBDIR64_$(ARCH)) )| \
+	    (cd $(SRCDIR)/cswstage; tar xvf -)
+	@echo ""
+	touch $@
+
+
+
+#These are the easy-to-type targets. They just trigger the real ones.
+configure-$(ARCH)-32:	build/.configure-$(ARCH)-32.done
+	@echo $@ done
+build-$(ARCH)-32:	build/.build-$(ARCH)-32.done
+	@echo $@ done
+stage-$(ARCH)-32:	build/.stage-$(ARCH)-32.done
+	@echo $@ done
+configure-$(ARCH)-64:	build/.configure-$(ARCH)-64.done
+	@echo $@ done
+build-$(ARCH)-64:	build/.build-$(ARCH)-64.done
+	@echo $@ done
+stage-$(ARCH)-64:	build/.stage-$(ARCH)-64.done
+	@echo $@ done
+
+# manual targets
+pkgproto:
+	cat $(SRCDIR)/cswstage/prototype | sed 's/root root$$/root bin/'>prototype
+	echo 'f none /opt/csw/share/themes/COPYING.gnome_themes=COPYING 0644 root bin'>>prototype

Added: csw/mgar/pkg/gnome_themes/trunk/copyright
===================================================================
--- csw/mgar/pkg/gnome_themes/trunk/copyright	                        (rev 0)
+++ csw/mgar/pkg/gnome_themes/trunk/copyright	2010-07-02 20:38:30 UTC (rev 10405)
@@ -0,0 +1,2 @@
+Please see /opt/csw/share/themes/COPYING.gnome_themes for full license
+(LGPL 2)

Added: csw/mgar/pkg/gnome_themes/trunk/depend
===================================================================
Added: csw/mgar/pkg/gnome_themes/trunk/pkginfo
===================================================================
--- csw/mgar/pkg/gnome_themes/trunk/pkginfo	                        (rev 0)
+++ csw/mgar/pkg/gnome_themes/trunk/pkginfo	2010-07-02 20:38:30 UTC (rev 10405)
@@ -0,0 +1,9 @@
+PKG=CSWgnomethemes
+NAME=gnome_themes - Official themes for the GNOME desktop environment
+ARCH=all
+VERSION=2.30.2,REV=2010.07.02
+CATEGORY=system
+VENDOR=http://www.gnome.org/ packaged for CSW by Philip Brown
+HOTLINE=http://www.opencsw.org/bugtrack/
+EMAIL=phil at opencsw.org
+OPENCSW_REPOSITORY=https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/pkg/gnome_themes/trunk

Added: csw/mgar/pkg/gnome_themes/trunk/prototype
===================================================================
--- csw/mgar/pkg/gnome_themes/trunk/prototype	                        (rev 0)
+++ csw/mgar/pkg/gnome_themes/trunk/prototype	2010-07-02 20:38:30 UTC (rev 10405)
@@ -0,0 +1,3098 @@
+i pkginfo
+i copyright
+i depend
+d none /opt/csw/share 0755 root bin
+d none /opt/csw/share/icons 0755 root bin
+d none /opt/csw/share/icons/LargePrint 0755 root bin
+f none /opt/csw/share/icons/LargePrint/index.theme 0644 root bin
+d none /opt/csw/share/icons/Crux 0755 root bin
+d none /opt/csw/share/icons/Crux/24x24 0755 root bin
+d none /opt/csw/share/icons/Crux/24x24/actions 0755 root bin
+s none /opt/csw/share/icons/Crux/24x24/actions/gtk-go-forward-ltr.png=go-next.png
+s none /opt/csw/share/icons/Crux/24x24/actions/gtk-refresh.png=view-refresh.png
+s none /opt/csw/share/icons/Crux/24x24/actions/next.png=go-next.png
+s none /opt/csw/share/icons/Crux/24x24/actions/kfm_home.png=go-home.png
+s none /opt/csw/share/icons/Crux/24x24/actions/stock_top.png=go-top.png
+s none /opt/csw/share/icons/Crux/24x24/actions/forward.png=go-next.png
+f none /opt/csw/share/icons/Crux/24x24/actions/go-up.png 0644 root bin
+f none /opt/csw/share/icons/Crux/24x24/actions/go-bottom.png 0644 root bin
+s none /opt/csw/share/icons/Crux/24x24/actions/gtk-goto-last-ltr.png=go-last.png
+s none /opt/csw/share/icons/Crux/24x24/actions/stock_right.png=go-next.png
+s none /opt/csw/share/icons/Crux/24x24/actions/redhat-home.png=go-home.png
+s none /opt/csw/share/icons/Crux/24x24/actions/gtk-home.png=go-home.png
+s none /opt/csw/share/icons/Crux/24x24/actions/stock_home.png=go-home.png
+s none /opt/csw/share/icons/Crux/24x24/actions/top.png=go-top.png
+s none /opt/csw/share/icons/Crux/24x24/actions/reload_all_tabs.png=view-refresh.png
+s none /opt/csw/share/icons/Crux/24x24/actions/gtk-go-up.png=go-up.png
+f none /opt/csw/share/icons/Crux/24x24/actions/go-down.png 0644 root bin
+s none /opt/csw/share/icons/Crux/24x24/actions/gtk-goto-last-rtl.png=go-first.png
+s none /opt/csw/share/icons/Crux/24x24/actions/previous.png=go-previous.png
+s none /opt/csw/share/icons/Crux/24x24/actions/stock_last.png=go-last.png
+s none /opt/csw/share/icons/Crux/24x24/actions/start.png=go-first.png
+s none /opt/csw/share/icons/Crux/24x24/actions/stock_refresh.png=view-refresh.png
+s none /opt/csw/share/icons/Crux/24x24/actions/gtk-go-forward-rtl.png=go-previous.png
+s none /opt/csw/share/icons/Crux/24x24/actions/back.png=go-previous.png
+s none /opt/csw/share/icons/Crux/24x24/actions/stock_bottom.png=go-bottom.png
+s none /opt/csw/share/icons/Crux/24x24/actions/gtk-goto-bottom.png=go-bottom.png
+s none /opt/csw/share/icons/Crux/24x24/actions/gtk-go-back-ltr.png=go-previous.png
+s none /opt/csw/share/icons/Crux/24x24/actions/bottom.png=go-bottom.png
+s none /opt/csw/share/icons/Crux/24x24/actions/gohome.png=go-home.png
+s none /opt/csw/share/icons/Crux/24x24/actions/reload_page.png=view-refresh.png
+f none /opt/csw/share/icons/Crux/24x24/actions/go-next.png 0644 root bin
+s none /opt/csw/share/icons/Crux/24x24/actions/up.png=go-up.png
+f none /opt/csw/share/icons/Crux/24x24/actions/go-top.png 0644 root bin
+s none /opt/csw/share/icons/Crux/24x24/actions/down.png=go-down.png
+s none /opt/csw/share/icons/Crux/24x24/actions/reload.png=view-refresh.png
+s none /opt/csw/share/icons/Crux/24x24/actions/gtk-goto-first-ltr.png=go-first.png
+f none /opt/csw/share/icons/Crux/24x24/actions/go-last.png 0644 root bin
+s none /opt/csw/share/icons/Crux/24x24/actions/stock_left.png=go-previous.png
+f none /opt/csw/share/icons/Crux/24x24/actions/document-open.png 0644 root bin
+f none /opt/csw/share/icons/Crux/24x24/actions/view-refresh.png 0644 root bin
+f none /opt/csw/share/icons/Crux/24x24/actions/go-previous.png 0644 root bin
+s none /opt/csw/share/icons/Crux/24x24/actions/gtk-goto-first-rtl.png=go-last.png
+s none /opt/csw/share/icons/Crux/24x24/actions/reload3.png=view-refresh.png
+s none /opt/csw/share/icons/Crux/24x24/actions/stock_first.png=go-first.png
+s none /opt/csw/share/icons/Crux/24x24/actions/gtk-goto-top.png=go-top.png
+s none /opt/csw/share/icons/Crux/24x24/actions/stock_up.png=go-up.png
+f none /opt/csw/share/icons/Crux/24x24/actions/go-home.png 0644 root bin
+f none /opt/csw/share/icons/Crux/24x24/actions/go-first.png 0644 root bin
+s none /opt/csw/share/icons/Crux/24x24/actions/gtk-go-down.png=go-down.png
+s none /opt/csw/share/icons/Crux/24x24/actions/finish.png=go-last.png
+s none /opt/csw/share/icons/Crux/24x24/actions/stock_down.png=go-down.png
+s none /opt/csw/share/icons/Crux/24x24/actions/gtk-open.png=document-open.png
+s none /opt/csw/share/icons/Crux/24x24/actions/gtk-go-back-rtl.png=go-next.png
+s none /opt/csw/share/icons/Crux/24x24/actions/fileopen.png=document-open.png
+d none /opt/csw/share/icons/Crux/24x24/status 0755 root bin
+s none /opt/csw/share/icons/Crux/24x24/status/folder_open.png=folder-open.png
+f none /opt/csw/share/icons/Crux/24x24/status/folder-visiting.png 0644 root bin
+s none /opt/csw/share/icons/Crux/24x24/status/stock_open.png=folder-open.png
+s none /opt/csw/share/icons/Crux/24x24/status/gnome-fs-directory-accept.png=folder-drag-accept.png
+f none /opt/csw/share/icons/Crux/24x24/status/folder-drag-accept.png 0644 root bin
+f none /opt/csw/share/icons/Crux/24x24/status/folder-open.png 0644 root bin
+s none /opt/csw/share/icons/Crux/24x24/status/gnome-fs-directory-visiting.png=folder-visiting.png
+d none /opt/csw/share/icons/Crux/24x24/places 0755 root bin
+f none /opt/csw/share/icons/Crux/24x24/places/user-home.png 0644 root bin
+s none /opt/csw/share/icons/Crux/24x24/places/gnome-fs-nfs.png=folder-remote.png
+s none /opt/csw/share/icons/Crux/24x24/places/inode-directory.png=folder.png
+s none /opt/csw/share/icons/Crux/24x24/places/network.png=folder-remote.png
+s none /opt/csw/share/icons/Crux/24x24/places/application-x-gnome-saved-search.png=folder-saved-search.png
+s none /opt/csw/share/icons/Crux/24x24/places/gnome-mime-x-directory-smb-share.png=folder-remote.png
+s none /opt/csw/share/icons/Crux/24x24/places/gtk-directory.png=folder.png
+s none /opt/csw/share/icons/Crux/24x24/places/folder_home.png=user-home.png
+s none /opt/csw/share/icons/Crux/24x24/places/gnome-fs-home.png=user-home.png
+s none /opt/csw/share/icons/Crux/24x24/places/gnome-fs-ssh.png=folder-remote.png
+s none /opt/csw/share/icons/Crux/24x24/places/stock_folder.png=folder.png
+f none /opt/csw/share/icons/Crux/24x24/places/folder-saved-search.png 0644 root bin
+s none /opt/csw/share/icons/Crux/24x24/places/gnome-fs-smb.png=folder-remote.png
+f none /opt/csw/share/icons/Crux/24x24/places/folder.png 0644 root bin
+s none /opt/csw/share/icons/Crux/24x24/places/gnome-fs-directory.png=folder.png
+s none /opt/csw/share/icons/Crux/24x24/places/gnome-fs-share.png=folder-remote.png
+s none /opt/csw/share/icons/Crux/24x24/places/gnome-fs-ftp.png=folder-remote.png
+f none /opt/csw/share/icons/Crux/24x24/places/folder-remote.png 0644 root bin
+d none /opt/csw/share/icons/Crux/scalable 0755 root bin
+d none /opt/csw/share/icons/Crux/scalable/actions 0755 root bin
+s none /opt/csw/share/icons/Crux/scalable/actions/back.svg=go-previous.svg
+s none /opt/csw/share/icons/Crux/scalable/actions/reload.svg=view-refresh.svg
+f none /opt/csw/share/icons/Crux/scalable/actions/go-top.svg 0644 root bin
+s none /opt/csw/share/icons/Crux/scalable/actions/gtk-goto-first-rtl.svg=go-last.svg
+s none /opt/csw/share/icons/Crux/scalable/actions/reload_all_tabs.svg=view-refresh.svg
+s none /opt/csw/share/icons/Crux/scalable/actions/stock_top.svg=go-top.svg
+f none /opt/csw/share/icons/Crux/scalable/actions/go-bottom.svg 0644 root bin
+s none /opt/csw/share/icons/Crux/scalable/actions/bottom.svg=go-bottom.svg
+f none /opt/csw/share/icons/Crux/scalable/actions/go-up.svg 0644 root bin
+s none /opt/csw/share/icons/Crux/scalable/actions/stock_last.svg=go-last.svg
+f none /opt/csw/share/icons/Crux/scalable/actions/document-open.svg 0644 root bin
+s none /opt/csw/share/icons/Crux/scalable/actions/up.svg=go-up.svg
+s none /opt/csw/share/icons/Crux/scalable/actions/gohome.svg=go-home.svg
+s none /opt/csw/share/icons/Crux/scalable/actions/gtk-go-up.svg=go-up.svg
+s none /opt/csw/share/icons/Crux/scalable/actions/gtk-open.svg=document-open.svg
+s none /opt/csw/share/icons/Crux/scalable/actions/finish.svg=go-last.svg
+s none /opt/csw/share/icons/Crux/scalable/actions/top.svg=go-top.svg
+s none /opt/csw/share/icons/Crux/scalable/actions/fileopen.svg=document-open.svg
+f none /opt/csw/share/icons/Crux/scalable/actions/go-first.svg 0644 root bin
+s none /opt/csw/share/icons/Crux/scalable/actions/redhat-home.svg=go-home.svg
+s none /opt/csw/share/icons/Crux/scalable/actions/stock_bottom.svg=go-bottom.svg
+s none /opt/csw/share/icons/Crux/scalable/actions/stock_right.svg=go-next.svg
+s none /opt/csw/share/icons/Crux/scalable/actions/forward.svg=go-next.svg
+s none /opt/csw/share/icons/Crux/scalable/actions/gtk-goto-first-ltr.svg=go-first.svg
+s none /opt/csw/share/icons/Crux/scalable/actions/stock_up.svg=go-up.svg
+s none /opt/csw/share/icons/Crux/scalable/actions/start.svg=go-first.svg
+s none /opt/csw/share/icons/Crux/scalable/actions/stock_home.svg=go-home.svg
+s none /opt/csw/share/icons/Crux/scalable/actions/gtk-refresh.svg=view-refresh.svg
+s none /opt/csw/share/icons/Crux/scalable/actions/next.svg=go-next.svg
+f none /opt/csw/share/icons/Crux/scalable/actions/go-down.svg 0644 root bin
+s none /opt/csw/share/icons/Crux/scalable/actions/stock_refresh.svg=view-refresh.svg
+s none /opt/csw/share/icons/Crux/scalable/actions/reload3.svg=view-refresh.svg
+s none /opt/csw/share/icons/Crux/scalable/actions/gtk-goto-last-rtl.svg=go-first.svg
+s none /opt/csw/share/icons/Crux/scalable/actions/gtk-home.svg=go-home.svg
+s none /opt/csw/share/icons/Crux/scalable/actions/gtk-go-down.svg=go-down.svg
+s none /opt/csw/share/icons/Crux/scalable/actions/stock_left.svg=go-previous.svg
+s none /opt/csw/share/icons/Crux/scalable/actions/gtk-go-back-ltr.svg=go-previous.svg
+f none /opt/csw/share/icons/Crux/scalable/actions/go-home.svg 0644 root bin
+s none /opt/csw/share/icons/Crux/scalable/actions/gtk-goto-bottom.svg=go-bottom.svg
+s none /opt/csw/share/icons/Crux/scalable/actions/gtk-go-forward-rtl.svg=go-previous.svg
+s none /opt/csw/share/icons/Crux/scalable/actions/kfm_home.svg=go-home.svg
+s none /opt/csw/share/icons/Crux/scalable/actions/stock_down.svg=go-down.svg
+f none /opt/csw/share/icons/Crux/scalable/actions/go-previous.svg 0644 root bin
+s none /opt/csw/share/icons/Crux/scalable/actions/stock_first.svg=go-first.svg
+s none /opt/csw/share/icons/Crux/scalable/actions/gtk-go-back-rtl.svg=go-next.svg
+s none /opt/csw/share/icons/Crux/scalable/actions/gtk-go-forward-ltr.svg=go-next.svg
+f none /opt/csw/share/icons/Crux/scalable/actions/go-next.svg 0644 root bin
+s none /opt/csw/share/icons/Crux/scalable/actions/down.svg=go-down.svg
+s none /opt/csw/share/icons/Crux/scalable/actions/gtk-goto-last-ltr.svg=go-last.svg
+s none /opt/csw/share/icons/Crux/scalable/actions/reload_page.svg=view-refresh.svg
+f none /opt/csw/share/icons/Crux/scalable/actions/view-refresh.svg 0644 root bin
+s none /opt/csw/share/icons/Crux/scalable/actions/previous.svg=go-previous.svg
+s none /opt/csw/share/icons/Crux/scalable/actions/gtk-goto-top.svg=go-top.svg
+f none /opt/csw/share/icons/Crux/scalable/actions/go-last.svg 0644 root bin
+d none /opt/csw/share/icons/Crux/scalable/places 0755 root bin
+s none /opt/csw/share/icons/Crux/scalable/places/network.svg=folder-remote.svg
+s none /opt/csw/share/icons/Crux/scalable/places/folder_home.svg=user-home.svg
+f none /opt/csw/share/icons/Crux/scalable/places/folder.svg 0644 root bin
+s none /opt/csw/share/icons/Crux/scalable/places/gnome-fs-share.svg=folder-remote.svg
+s none /opt/csw/share/icons/Crux/scalable/places/gnome-fs-nfs.svg=folder-remote.svg
+s none /opt/csw/share/icons/Crux/scalable/places/gnome-fs-directory.svg=folder.svg
+f none /opt/csw/share/icons/Crux/scalable/places/folder-remote.svg 0644 root bin
+s none /opt/csw/share/icons/Crux/scalable/places/gnome-mime-x-directory-smb-share.svg=folder-remote.svg
+s none /opt/csw/share/icons/Crux/scalable/places/application-x-gnome-saved-search.svg=folder-saved-search.svg
+s none /opt/csw/share/icons/Crux/scalable/places/stock_folder.svg=folder.svg
+f none /opt/csw/share/icons/Crux/scalable/places/user-home.svg 0644 root bin
+s none /opt/csw/share/icons/Crux/scalable/places/gnome-fs-ssh.svg=folder-remote.svg
+s none /opt/csw/share/icons/Crux/scalable/places/gnome-fs-ftp.svg=folder-remote.svg
+s none /opt/csw/share/icons/Crux/scalable/places/gnome-fs-home.svg=user-home.svg
+f none /opt/csw/share/icons/Crux/scalable/places/folder-saved-search.svg 0644 root bin
+s none /opt/csw/share/icons/Crux/scalable/places/gtk-directory.svg=folder.svg
+s none /opt/csw/share/icons/Crux/scalable/places/inode-directory.svg=folder.svg
+s none /opt/csw/share/icons/Crux/scalable/places/gnome-fs-smb.svg=folder-remote.svg
+d none /opt/csw/share/icons/Crux/scalable/status 0755 root bin
+f none /opt/csw/share/icons/Crux/scalable/status/folder-visiting.svg 0644 root bin
+f none /opt/csw/share/icons/Crux/scalable/status/folder-open.svg 0644 root bin
+s none /opt/csw/share/icons/Crux/scalable/status/stock_open.svg=folder-open.svg
+f none /opt/csw/share/icons/Crux/scalable/status/folder-drag-accept.svg 0644 root bin
+s none /opt/csw/share/icons/Crux/scalable/status/gnome-fs-directory-accept.svg=folder-drag-accept.svg
+s none /opt/csw/share/icons/Crux/scalable/status/folder_open.svg=folder-open.svg
+s none /opt/csw/share/icons/Crux/scalable/status/gnome-fs-directory-visiting.svg=folder-visiting.svg
+f none /opt/csw/share/icons/Crux/index.theme 0644 root bin
+d none /opt/csw/share/icons/Crux/32x32 0755 root bin
+d none /opt/csw/share/icons/Crux/32x32/status 0755 root bin
+s none /opt/csw/share/icons/Crux/32x32/status/gnome-fs-directory-visiting.png=folder-visiting.png
+f none /opt/csw/share/icons/Crux/32x32/status/folder-open.png 0644 root bin
+s none /opt/csw/share/icons/Crux/32x32/status/gnome-fs-directory-accept.png=folder-drag-accept.png
+s none /opt/csw/share/icons/Crux/32x32/status/stock_open.png=folder-open.png
+s none /opt/csw/share/icons/Crux/32x32/status/folder_open.png=folder-open.png
+f none /opt/csw/share/icons/Crux/32x32/status/folder-visiting.png 0644 root bin
+f none /opt/csw/share/icons/Crux/32x32/status/folder-drag-accept.png 0644 root bin
+d none /opt/csw/share/icons/Crux/32x32/places 0755 root bin
+s none /opt/csw/share/icons/Crux/32x32/places/gnome-fs-ftp.png=folder-remote.png
+s none /opt/csw/share/icons/Crux/32x32/places/inode-directory.png=folder.png
+f none /opt/csw/share/icons/Crux/32x32/places/user-home.png 0644 root bin
+s none /opt/csw/share/icons/Crux/32x32/places/gnome-fs-smb.png=folder-remote.png
+s none /opt/csw/share/icons/Crux/32x32/places/stock_folder.png=folder.png
+s none /opt/csw/share/icons/Crux/32x32/places/gnome-fs-share.png=folder-remote.png
+f none /opt/csw/share/icons/Crux/32x32/places/folder-remote.png 0644 root bin
+s none /opt/csw/share/icons/Crux/32x32/places/gnome-fs-ssh.png=folder-remote.png
+s none /opt/csw/share/icons/Crux/32x32/places/application-x-gnome-saved-search.png=folder-saved-search.png
+f none /opt/csw/share/icons/Crux/32x32/places/folder-saved-search.png 0644 root bin
+s none /opt/csw/share/icons/Crux/32x32/places/gnome-mime-x-directory-smb-share.png=folder-remote.png
+s none /opt/csw/share/icons/Crux/32x32/places/folder_home.png=user-home.png
+f none /opt/csw/share/icons/Crux/32x32/places/folder.png 0644 root bin
+s none /opt/csw/share/icons/Crux/32x32/places/gtk-directory.png=folder.png
+s none /opt/csw/share/icons/Crux/32x32/places/gnome-fs-home.png=user-home.png
+s none /opt/csw/share/icons/Crux/32x32/places/network.png=folder-remote.png
+s none /opt/csw/share/icons/Crux/32x32/places/gnome-fs-directory.png=folder.png
+s none /opt/csw/share/icons/Crux/32x32/places/gnome-fs-nfs.png=folder-remote.png
+d none /opt/csw/share/icons/Crux/32x32/actions 0755 root bin
+s none /opt/csw/share/icons/Crux/32x32/actions/gtk-open.png=document-open.png
+s none /opt/csw/share/icons/Crux/32x32/actions/fileopen.png=document-open.png
+f none /opt/csw/share/icons/Crux/32x32/actions/document-open.png 0644 root bin
+d none /opt/csw/share/icons/Crux/22x22 0755 root bin
+d none /opt/csw/share/icons/Crux/22x22/actions 0755 root bin
+s none /opt/csw/share/icons/Crux/22x22/actions/previous.png=go-previous.png
+f none /opt/csw/share/icons/Crux/22x22/actions/go-home.png 0644 root bin
+s none /opt/csw/share/icons/Crux/22x22/actions/start.png=go-first.png
+s none /opt/csw/share/icons/Crux/22x22/actions/stock_home.png=go-home.png
+s none /opt/csw/share/icons/Crux/22x22/actions/gtk-go-back-rtl.png=go-next.png
+s none /opt/csw/share/icons/Crux/22x22/actions/stock_bottom.png=go-bottom.png
+s none /opt/csw/share/icons/Crux/22x22/actions/reload_page.png=view-refresh.png
+s none /opt/csw/share/icons/Crux/22x22/actions/reload3.png=view-refresh.png
+s none /opt/csw/share/icons/Crux/22x22/actions/up.png=go-up.png
+s none /opt/csw/share/icons/Crux/22x22/actions/gtk-goto-first-rtl.png=go-last.png
+s none /opt/csw/share/icons/Crux/22x22/actions/stock_refresh.png=view-refresh.png
+s none /opt/csw/share/icons/Crux/22x22/actions/down.png=go-down.png
+s none /opt/csw/share/icons/Crux/22x22/actions/top.png=go-top.png
+f none /opt/csw/share/icons/Crux/22x22/actions/go-up.png 0644 root bin
+s none /opt/csw/share/icons/Crux/22x22/actions/stock_last.png=go-last.png
+s none /opt/csw/share/icons/Crux/22x22/actions/kfm_home.png=go-home.png
+s none /opt/csw/share/icons/Crux/22x22/actions/gtk-goto-first-ltr.png=go-first.png
+s none /opt/csw/share/icons/Crux/22x22/actions/gtk-go-down.png=go-down.png
+f none /opt/csw/share/icons/Crux/22x22/actions/go-last.png 0644 root bin
+s none /opt/csw/share/icons/Crux/22x22/actions/gtk-goto-bottom.png=go-bottom.png
+s none /opt/csw/share/icons/Crux/22x22/actions/gtk-go-back-ltr.png=go-previous.png
+s none /opt/csw/share/icons/Crux/22x22/actions/gtk-home.png=go-home.png
+s none /opt/csw/share/icons/Crux/22x22/actions/stock_first.png=go-first.png
+f none /opt/csw/share/icons/Crux/22x22/actions/go-next.png 0644 root bin
+f none /opt/csw/share/icons/Crux/22x22/actions/go-previous.png 0644 root bin
+s none /opt/csw/share/icons/Crux/22x22/actions/stock_up.png=go-up.png
+f none /opt/csw/share/icons/Crux/22x22/actions/document-open.png 0644 root bin
+s none /opt/csw/share/icons/Crux/22x22/actions/gtk-go-forward-rtl.png=go-previous.png
+s none /opt/csw/share/icons/Crux/22x22/actions/gtk-goto-top.png=go-top.png
+s none /opt/csw/share/icons/Crux/22x22/actions/finish.png=go-last.png
+s none /opt/csw/share/icons/Crux/22x22/actions/stock_right.png=go-next.png
+s none /opt/csw/share/icons/Crux/22x22/actions/redhat-home.png=go-home.png
+s none /opt/csw/share/icons/Crux/22x22/actions/next.png=go-next.png
+f none /opt/csw/share/icons/Crux/22x22/actions/view-refresh.png 0644 root bin
+s none /opt/csw/share/icons/Crux/22x22/actions/fileopen.png=document-open.png
+s none /opt/csw/share/icons/Crux/22x22/actions/gtk-open.png=document-open.png
+s none /opt/csw/share/icons/Crux/22x22/actions/gtk-goto-last-rtl.png=go-first.png
+f none /opt/csw/share/icons/Crux/22x22/actions/go-first.png 0644 root bin
+s none /opt/csw/share/icons/Crux/22x22/actions/gtk-refresh.png=view-refresh.png
+s none /opt/csw/share/icons/Crux/22x22/actions/stock_down.png=go-down.png
+s none /opt/csw/share/icons/Crux/22x22/actions/forward.png=go-next.png
+s none /opt/csw/share/icons/Crux/22x22/actions/gtk-goto-last-ltr.png=go-last.png
+s none /opt/csw/share/icons/Crux/22x22/actions/reload.png=view-refresh.png
+f none /opt/csw/share/icons/Crux/22x22/actions/go-down.png 0644 root bin
+f none /opt/csw/share/icons/Crux/22x22/actions/go-top.png 0644 root bin
+s none /opt/csw/share/icons/Crux/22x22/actions/reload_all_tabs.png=view-refresh.png
+s none /opt/csw/share/icons/Crux/22x22/actions/gtk-go-up.png=go-up.png
+s none /opt/csw/share/icons/Crux/22x22/actions/back.png=go-previous.png
+s none /opt/csw/share/icons/Crux/22x22/actions/gohome.png=go-home.png
+s none /opt/csw/share/icons/Crux/22x22/actions/stock_left.png=go-previous.png
+s none /opt/csw/share/icons/Crux/22x22/actions/bottom.png=go-bottom.png
+f none /opt/csw/share/icons/Crux/22x22/actions/go-bottom.png 0644 root bin
+s none /opt/csw/share/icons/Crux/22x22/actions/stock_top.png=go-top.png
+s none /opt/csw/share/icons/Crux/22x22/actions/gtk-go-forward-ltr.png=go-next.png
+d none /opt/csw/share/icons/Crux/22x22/places 0755 root bin
+s none /opt/csw/share/icons/Crux/22x22/places/inode-directory.png=folder.png
+f none /opt/csw/share/icons/Crux/22x22/places/folder-remote.png 0644 root bin
+s none /opt/csw/share/icons/Crux/22x22/places/gnome-fs-nfs.png=folder-remote.png
+s none /opt/csw/share/icons/Crux/22x22/places/gnome-fs-directory.png=folder.png
+s none /opt/csw/share/icons/Crux/22x22/places/folder_home.png=user-home.png
+s none /opt/csw/share/icons/Crux/22x22/places/gnome-fs-smb.png=folder-remote.png
+s none /opt/csw/share/icons/Crux/22x22/places/gnome-fs-home.png=user-home.png
+s none /opt/csw/share/icons/Crux/22x22/places/gtk-directory.png=folder.png
+s none /opt/csw/share/icons/Crux/22x22/places/application-x-gnome-saved-search.png=folder-saved-search.png
+s none /opt/csw/share/icons/Crux/22x22/places/gnome-fs-ftp.png=folder-remote.png
+f none /opt/csw/share/icons/Crux/22x22/places/folder.png 0644 root bin
+s none /opt/csw/share/icons/Crux/22x22/places/gnome-mime-x-directory-smb-share.png=folder-remote.png
+f none /opt/csw/share/icons/Crux/22x22/places/folder-saved-search.png 0644 root bin
+f none /opt/csw/share/icons/Crux/22x22/places/user-home.png 0644 root bin
+s none /opt/csw/share/icons/Crux/22x22/places/gnome-fs-share.png=folder-remote.png
+s none /opt/csw/share/icons/Crux/22x22/places/gnome-fs-ssh.png=folder-remote.png
+s none /opt/csw/share/icons/Crux/22x22/places/stock_folder.png=folder.png
+s none /opt/csw/share/icons/Crux/22x22/places/network.png=folder-remote.png
+d none /opt/csw/share/icons/Crux/22x22/status 0755 root bin
+s none /opt/csw/share/icons/Crux/22x22/status/gnome-fs-directory-accept.png=folder-drag-accept.png
+s none /opt/csw/share/icons/Crux/22x22/status/folder_open.png=folder-open.png
+s none /opt/csw/share/icons/Crux/22x22/status/gnome-fs-directory-visiting.png=folder-visiting.png
+f none /opt/csw/share/icons/Crux/22x22/status/folder-drag-accept.png 0644 root bin
+s none /opt/csw/share/icons/Crux/22x22/status/stock_open.png=folder-open.png
+f none /opt/csw/share/icons/Crux/22x22/status/folder-open.png 0644 root bin
+f none /opt/csw/share/icons/Crux/22x22/status/folder-visiting.png 0644 root bin
+d none /opt/csw/share/icons/Crux/16x16 0755 root bin
+d none /opt/csw/share/icons/Crux/16x16/actions 0755 root bin
+f none /opt/csw/share/icons/Crux/16x16/actions/go-previous.png 0644 root bin
+f none /opt/csw/share/icons/Crux/16x16/actions/go-up.png 0644 root bin
+s none /opt/csw/share/icons/Crux/16x16/actions/stock_left.png=go-previous.png
+s none /opt/csw/share/icons/Crux/16x16/actions/bottom.png=go-bottom.png
+s none /opt/csw/share/icons/Crux/16x16/actions/kfm_home.png=go-home.png
+s none /opt/csw/share/icons/Crux/16x16/actions/gtk-go-back-ltr.png=go-previous.png
+s none /opt/csw/share/icons/Crux/16x16/actions/stock_first.png=go-first.png
+s none /opt/csw/share/icons/Crux/16x16/actions/gtk-goto-bottom.png=go-bottom.png
+s none /opt/csw/share/icons/Crux/16x16/actions/gohome.png=go-home.png
+s none /opt/csw/share/icons/Crux/16x16/actions/next.png=go-next.png
+s none /opt/csw/share/icons/Crux/16x16/actions/gtk-go-forward-ltr.png=go-next.png
+s none /opt/csw/share/icons/Crux/16x16/actions/gtk-go-up.png=go-up.png
+s none /opt/csw/share/icons/Crux/16x16/actions/reload.png=view-refresh.png
+s none /opt/csw/share/icons/Crux/16x16/actions/stock_down.png=go-down.png
+f none /opt/csw/share/icons/Crux/16x16/actions/go-top.png 0644 root bin
+s none /opt/csw/share/icons/Crux/16x16/actions/gtk-go-down.png=go-down.png
+s none /opt/csw/share/icons/Crux/16x16/actions/forward.png=go-next.png
+f none /opt/csw/share/icons/Crux/16x16/actions/go-down.png 0644 root bin
+f none /opt/csw/share/icons/Crux/16x16/actions/go-bottom.png 0644 root bin
+s none /opt/csw/share/icons/Crux/16x16/actions/stock_top.png=go-top.png
+s none /opt/csw/share/icons/Crux/16x16/actions/gtk-home.png=go-home.png
+s none /opt/csw/share/icons/Crux/16x16/actions/start.png=go-first.png
+s none /opt/csw/share/icons/Crux/16x16/actions/previous.png=go-previous.png
+s none /opt/csw/share/icons/Crux/16x16/actions/gtk-go-forward-rtl.png=go-previous.png
+s none /opt/csw/share/icons/Crux/16x16/actions/stock_bottom.png=go-bottom.png
+s none /opt/csw/share/icons/Crux/16x16/actions/reload_page.png=view-refresh.png
+s none /opt/csw/share/icons/Crux/16x16/actions/back.png=go-previous.png
+s none /opt/csw/share/icons/Crux/16x16/actions/finish.png=go-last.png
+s none /opt/csw/share/icons/Crux/16x16/actions/top.png=go-top.png
+f none /opt/csw/share/icons/Crux/16x16/actions/document-open.png 0644 root bin
+s none /opt/csw/share/icons/Crux/16x16/actions/gtk-go-back-rtl.png=go-next.png
+s none /opt/csw/share/icons/Crux/16x16/actions/gtk-goto-last-ltr.png=go-last.png
+s none /opt/csw/share/icons/Crux/16x16/actions/down.png=go-down.png
+f none /opt/csw/share/icons/Crux/16x16/actions/go-next.png 0644 root bin
+s none /opt/csw/share/icons/Crux/16x16/actions/gtk-goto-first-ltr.png=go-first.png
+s none /opt/csw/share/icons/Crux/16x16/actions/stock_last.png=go-last.png
+f none /opt/csw/share/icons/Crux/16x16/actions/go-last.png 0644 root bin
+s none /opt/csw/share/icons/Crux/16x16/actions/reload_all_tabs.png=view-refresh.png
+s none /opt/csw/share/icons/Crux/16x16/actions/gtk-refresh.png=view-refresh.png
+s none /opt/csw/share/icons/Crux/16x16/actions/stock_refresh.png=view-refresh.png
+s none /opt/csw/share/icons/Crux/16x16/actions/stock_up.png=go-up.png
+s none /opt/csw/share/icons/Crux/16x16/actions/reload3.png=view-refresh.png
+s none /opt/csw/share/icons/Crux/16x16/actions/gtk-open.png=document-open.png
+s none /opt/csw/share/icons/Crux/16x16/actions/gtk-goto-first-rtl.png=go-last.png
+s none /opt/csw/share/icons/Crux/16x16/actions/redhat-home.png=go-home.png
+s none /opt/csw/share/icons/Crux/16x16/actions/fileopen.png=document-open.png
+s none /opt/csw/share/icons/Crux/16x16/actions/stock_right.png=go-next.png
+f none /opt/csw/share/icons/Crux/16x16/actions/go-home.png 0644 root bin
+f none /opt/csw/share/icons/Crux/16x16/actions/view-refresh.png 0644 root bin
+s none /opt/csw/share/icons/Crux/16x16/actions/stock_home.png=go-home.png
+s none /opt/csw/share/icons/Crux/16x16/actions/gtk-goto-last-rtl.png=go-first.png
+s none /opt/csw/share/icons/Crux/16x16/actions/up.png=go-up.png
+f none /opt/csw/share/icons/Crux/16x16/actions/go-first.png 0644 root bin
+s none /opt/csw/share/icons/Crux/16x16/actions/gtk-goto-top.png=go-top.png
+d none /opt/csw/share/icons/Crux/16x16/places 0755 root bin
+f none /opt/csw/share/icons/Crux/16x16/places/user-home.png 0644 root bin
+s none /opt/csw/share/icons/Crux/16x16/places/gnome-fs-ftp.png=folder-remote.png
+s none /opt/csw/share/icons/Crux/16x16/places/gnome-fs-smb.png=folder-remote.png
+s none /opt/csw/share/icons/Crux/16x16/places/stock_folder.png=folder.png
+s none /opt/csw/share/icons/Crux/16x16/places/inode-directory.png=folder.png
+f none /opt/csw/share/icons/Crux/16x16/places/folder-remote.png 0644 root bin
+s none /opt/csw/share/icons/Crux/16x16/places/gnome-fs-ssh.png=folder-remote.png
+f none /opt/csw/share/icons/Crux/16x16/places/folder-saved-search.png 0644 root bin
+s none /opt/csw/share/icons/Crux/16x16/places/folder_home.png=user-home.png
+s none /opt/csw/share/icons/Crux/16x16/places/gnome-fs-share.png=folder-remote.png
+s none /opt/csw/share/icons/Crux/16x16/places/network.png=folder-remote.png
+s none /opt/csw/share/icons/Crux/16x16/places/gtk-directory.png=folder.png
+s none /opt/csw/share/icons/Crux/16x16/places/gnome-fs-directory.png=folder.png
+s none /opt/csw/share/icons/Crux/16x16/places/application-x-gnome-saved-search.png=folder-saved-search.png
+s none /opt/csw/share/icons/Crux/16x16/places/gnome-fs-nfs.png=folder-remote.png
+s none /opt/csw/share/icons/Crux/16x16/places/gnome-fs-home.png=user-home.png
+f none /opt/csw/share/icons/Crux/16x16/places/folder.png 0644 root bin
+s none /opt/csw/share/icons/Crux/16x16/places/gnome-mime-x-directory-smb-share.png=folder-remote.png
+d none /opt/csw/share/icons/Crux/16x16/status 0755 root bin
+s none /opt/csw/share/icons/Crux/16x16/status/stock_open.png=folder-open.png
+s none /opt/csw/share/icons/Crux/16x16/status/folder_open.png=folder-open.png
+f none /opt/csw/share/icons/Crux/16x16/status/folder-visiting.png 0644 root bin
+s none /opt/csw/share/icons/Crux/16x16/status/gnome-fs-directory-accept.png=folder-drag-accept.png
+f none /opt/csw/share/icons/Crux/16x16/status/folder-drag-accept.png 0644 root bin
+s none /opt/csw/share/icons/Crux/16x16/status/gnome-fs-directory-visiting.png=folder-visiting.png
+f none /opt/csw/share/icons/Crux/16x16/status/folder-open.png 0644 root bin
+d none /opt/csw/share/icons/HighContrastInverse 0755 root bin
+f none /opt/csw/share/icons/HighContrastInverse/index.theme 0644 root bin
+d none /opt/csw/share/icons/HighContrastLargePrintInverse 0755 root bin
+d none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48 0755 root bin
+d none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes 0755 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-font-linux-psf.png=font-x-generic.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/unknown.png=text-x-generic.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-bzip.png=package-x-generic.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/package_editors.png=text-x-generic.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-image.png=image-x-generic.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-postscript.png=x-office-document.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/image.png=image-x-generic.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-tex.png=x-office-document.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/deb.png=package-x-generic.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/plan.png=x-office-calendar.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-lzma.png=package-x-generic.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/package.png=package-x-generic.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-x-font-afm.png=font-x-generic.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-rar.png=package-x-generic.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/vcard.png=x-office-address-book.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-text.png=text-x-generic.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-font-ttf.png=font-x-generic.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-wordperfect.png=x-office-document.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-font-bdf.png=font-x-generic.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-magicpoint.png=x-office-presentation.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/font_type1.png=font-x-generic.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/tar.png=package-x-generic.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/rpm.png=package-x-generic.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-compress.png=package-x-generic.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/stock_calendar.png=x-office-calendar.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-applix-word.png=x-office-document.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/package_wordprocessing.png=x-office-document.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-jar.png=package-x-generic.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-font-afm.png=font-x-generic.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-executable.png=application-x-executable.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-archive.png=package-x-generic.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-vnd.oasis.opendocument.text.png=x-office-document.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-font-pcf.png=font-x-generic.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-lzma-compressed-tar.png=package-x-generic.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/kpresenter_kpr.png=x-office-presentation.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-compressed-tar.png=package-x-generic.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-vnd.stardivision.writer.png=x-office-document.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/font_truetype.png=font-x-generic.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/package-x-generic.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-7z-compressed.png=package-x-generic.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-text-x-vcalendar.png=x-office-calendar.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/image-x-generic.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/empty.png=text-x-generic.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/application-vnd.openxmlformats-officedocument.wordprocessingml.document.png=x-office-document.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/font-x-generic.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/ascii.png=text-x-generic.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/video.png=video-x-generic.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/misc.png=text-x-generic.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-video.png=video-x-generic.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-vnd.oasis.opendocument.presentation.png=x-office-presentation.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/video-x-generic.png 0644 root bin
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/text-x-generic-template.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/font.png=font-x-generic.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/txt.png=text-x-generic.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-killustrator.png=image-x-generic.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/application-vnd.ms-powerpoint.presentation.macroEnabled.12.png=x-office-presentation.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/txt2.png=text-x-generic.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-vnd.rn-realmedia-secure.png=video-x-generic.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/wordprocessing.png=x-office-document.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/audio-x-generic.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-fs-regular.png=text-x-preview.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/application-vnd.ms-word.document.macroEnabled.12.png=x-office-document.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-package.png=package-x-generic.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-audio.png=audio-x-generic.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-dvi.png=x-office-document.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-tarz.png=package-x-generic.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/folder_tar.png=package-x-generic.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-gzip.png=package-x-generic.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/font_bitmap.png=font-x-generic.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-gzpostscript.png=x-office-document.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-vnd.ms-powerpoint.png=x-office-presentation.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/document.png=x-office-document.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/application-vnd.openxmlformats-officedocument.presentationml.presentation.png=x-office-presentation.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-core-file.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-rtf.png=x-office-document.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-abiword.png=x-office-document.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/contents2.png=x-office-address-book.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-text-x-vcard.png=x-office-address-book.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-stuffit.png=package-x-generic.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-shockwave-flash.png=video-x-generic.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-kpresenter.png=x-office-presentation.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/tgz.png=package-x-generic.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-scribus.png=x-office-document.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-pdf.png=x-office-document.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-msword.png=x-office-document.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-vnd.sun.xml.writer.png=x-office-document.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/x-office-address-book.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-ogg.png=audio-x-generic.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-fs-executable.png=application-x-executable.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-font-sunos-news.png=font-x-generic.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gtk-file.png=text-x-preview.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-cpio-compressed.png=package-x-generic.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/x-office-document.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/exec.png=application-x-executable.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-bzip-compressed-tar.png=package-x-generic.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-vnd.stardivision.impress.png=x-office-presentation.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-deb.png=package-x-generic.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/text-x-generic.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-vnd.sun.xml.impress.png=x-office-presentation.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-arj.png=package-x-generic.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-ms-dos-executable.png=application-x-executable.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/binary.png=application-x-executable.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/x-office-presentation.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-kword.png=x-office-document.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-zip.png=package-x-generic.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/vcalendar.png=x-office-calendar.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/text-x-preview.png 0644 root bin
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/x-office-calendar.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/stock_addressbook.png=x-office-address-book.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-cpio.png=package-x-generic.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-lhz.png=package-x-generic.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/zip.png=package-x-generic.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-rpm.png=package-x-generic.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-tar.png=package-x-generic.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-vnd.rn-realmedia-vbr.png=video-x-generic.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/sound.png=audio-x-generic.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/template_source.png=text-x-generic-template.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/mime_ascii.png=text-x-generic.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-x-lha.png=package-x-generic.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/application-x-executable.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/mimetypes/gnome-mime-application-vnd.rn-realmedia.png=video-x-generic.png
+d none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/status 0755 root bin
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/status/network-transmit-receive.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/status/stock_shuffle.png=media-playlist-shuffle.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/status/stock_weather-few-clouds.png=weather-few-clouds.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/status/media-playlist-repeat.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/status/sunny.png=weather-clear.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/status/stock_weather-showers.png=weather-showers.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/status/stock_weather-snow.png=weather-snow.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/status/gnome-netstatus-tx.png=network-transmit.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/status/stock_volume-0.png=audio-volume-low.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/status/gnome-netstatus-idle.png=network-idle.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/status/network-transmit.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/status/nm-no-connection.png=network-offline.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/status/stock_weather-night-few-clouds.png=weather-few-clouds-night.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/status/folder-drag-accept.png 0644 root bin
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/status/printer-printing.png 0644 root bin
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/status/battery-low.png 0644 root bin
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/status/weather-showers-scattered.png 0644 root bin
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/status/weather-clear.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/status/gnome-stock-trash-full.png=user-trash-full.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/status/folder-drag-accept.icon 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/status/stock_volume-min.png=audio-volume-low.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/status/weather-fog.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/status/stock_repeat.png=media-playlist-repeat.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/status/gnome-fs-trash-full.png=user-trash-full.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/status/weather-overcast.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/status/stock_weather-night-clear.png=weather-clear-night.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/status/weather-few-clouds.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/status/stock_volume.png=audio-volume-high.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/status/audio-volume-low.png 0644 root bin
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/status/weather-clear-night.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/status/xfce-trash_full.png=user-trash-full.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/status/stock_weather-storm.png=weather-storm.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/status/weather-snow.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/status/stock_weather-cloudy.png=weather-overcast.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/status/printer-error.png 0644 root bin
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/status/media-playlist-shuffle.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/status/stock_volume-med.png=audio-volume-medium.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/status/stock_volume-max.png=audio-volume-high.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/status/connect_no.png=network-offline.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/status/stock_volume-mute.png=audio-volume-muted.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/status/trashcan_full.png=user-trash-full.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/status/stock_trash_full.png=user-trash-full.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/status/network-idle.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/status/stock_weather-sunny.png=weather-clear.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/status/gnome-fs-directory-accept.icon=folder-drag-accept.icon
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/status/network-offline.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/status/nm-device-wireless.png=network-idle.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/status/weather-few-clouds-night.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/status/gnome-fs-directory-accept.png=folder-drag-accept.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/status/weather-storm.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/status/gnome-netstatus-disconn.png=network-offline.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/status/audio-volume-high.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/status/edittrash.png=user-trash-full.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/status/connect_creating.png=network-transmit-receive.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/status/gnome-netstatus-error.png=network-error.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/status/nm-adhoc.png=network-idle.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/status/audio-volume-medium.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/status/connect_established.png=network-idle.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/status/battery-caution.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/status/nm-device-wired.png=network-idle.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/status/network-error.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/status/stock_weather-fog.png=weather-fog.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/status/gnome-netstatus-rx.png=network-receive.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/status/weather-showers.png 0644 root bin
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/status/user-trash-full.png 0644 root bin
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/status/audio-volume-muted.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/status/gnome-netstatus-txrx.png=network-transmit-receive.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/status/network-receive.png 0644 root bin
+d none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/places 0755 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/places/gtk-directory.icon=folder.icon
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/places/distributor-logo.png=start-here.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/places/folder-remote.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/places/gnome-fs-ssh.png=folder-remote.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/places/network.png=folder-remote.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/places/gnome-fs-directory.icon=folder.icon
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/places/gnome-fs-trash-empty.png=user-trash.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/places/gnome-mime-x-directory-smb-workgroup.png=network-workgroup.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/places/gnome-fs-directory.png=folder.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/places/network-server.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/places/stock_folder.png=folder.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/places/network-workgroup.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/places/novell-button.png=start-here.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/places/gnome-mime-x-directory-smb-server.png=network-server.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/places/folder_home.png=user-home.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/places/user-desktop.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/places/gnome-stock-trash.png=user-trash.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/places/gnome-fs-smb.png=folder-remote.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/places/xfce-trash_empty.png=user-trash.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/places/network_local.png=network-workgroup.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/places/start-here.png 0644 root bin
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/places/user-home.png 0644 root bin
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/places/folder.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/places/gnome-fs-ftp.png=folder-remote.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/places/gnome-fs-desktop.png=user-desktop.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/places/inode-directory.icon=folder.icon
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/places/gnome-fs-nfs.png=folder-remote.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/places/gnome-fs-home.png=user-home.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/places/gnome-mime-x-directory-smb-share.png=folder-remote.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/places/folder.icon 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/places/gtk-network.png=network-workgroup.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/places/gnome-fs-network.png=network-workgroup.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/places/gnome-mime-x-directory-nfs-server.png=network-server.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/places/redhat-network-server.png=network-server.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/places/gtk-directory.png=folder.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/places/trashcan_empty.png=user-trash.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/places/gnome-fs-server.png=network-server.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/places/stock_folder.icon=folder.icon
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/places/emptytrash.png=user-trash.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/places/desktop.png=user-desktop.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/places/user-trash.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/places/inode-directory.png=folder.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/places/gnome-main-menu.png=start-here.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/places/server.png=network-server.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/places/gnome-fs-share.png=folder-remote.png
+d none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/actions 0755 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/actions/gtk-home.png=go-home.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/actions/stock_refresh.png=view-refresh.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/actions/search.png=system-search.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/actions/go-home.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/actions/kfind.png=system-search.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/actions/gtk-execute.png=system-run.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/actions/reload3.png=view-refresh.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/actions/insert-text.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/actions/gtk-media-pause.png=media-playback-pause.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/actions/kfm_home.png=go-home.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/actions/reload_all_tabs.png=view-refresh.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/actions/stock_mail-send-receive.png=mail-send-receive.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/actions/gtk-refresh.png=view-refresh.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/actions/exit.png=system-log-out.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/actions/gnome-searchtool.png=system-search.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/actions/redhat-home.png=go-home.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/actions/view-refresh.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/actions/gnome-shutdown.png=system-shutdown.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/actions/system-search.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/actions/stock_home.png=go-home.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/actions/reload.png=view-refresh.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/actions/gohome.png=go-home.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/actions/mail-send-receive.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/actions/gnome-run.png=system-run.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/actions/system-run.png 0644 root bin
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/actions/system-shutdown.png 0644 root bin
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/actions/stock_new-tab.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/actions/reload_page.png=view-refresh.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/actions/stock_media-pause.png=media-playback-pause.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/actions/media-playback-pause.png 0644 root bin
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/actions/system-log-out.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/actions/player_pause.png=media-playback-pause.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/actions/insert-image.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/actions/gnome-logout.png=system-log-out.png
+d none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/emblems 0755 root bin
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/emblems/emblem-important.png 0644 root bin
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/emblems/emblem-desktop.png 0644 root bin
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/emblems/emblem-special.png 0644 root bin
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/emblems/emblem-unreadable.png 0644 root bin
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/emblems/emblem-default.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/emblems/emblem-noread.png=emblem-unreadable.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/emblems/emblem-personal.png 0644 root bin
+d none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/categories 0755 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/categories/kcontrol.png=preferences-desktop.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/categories/stock_internet.png=applications-internet.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/categories/gnome-devel.png=applications-development.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/categories/xfce-games.png=applications-games.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/categories/preferences-desktop-personal.png 0644 root bin
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/categories/applications-development.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/categories/package_multimedia.png=applications-multimedia.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/categories/xfce4-settings.png=preferences-desktop.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/categories/redhat-programming.png=applications-development.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/categories/applications-other.png 0644 root bin
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/categories/applications-science.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/categories/redhat-system_settings.png=preferences-system.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/categories/gnome-joystick.png=applications-games.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/categories/xfce-utils.png=applications-accessories.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/categories/applications-office.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/categories/redhat-office.png=applications-office.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/categories/applications-system.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/categories/package_utilities.png=applications-accessories.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/categories/gtk-preferences.png=preferences-desktop.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/categories/redhat-sound_video.png=applications-multimedia.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/categories/gnome-util.png=applications-accessories.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/categories/gnome-applications.png=applications-office.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/categories/xfce-internet.png=applications-internet.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/categories/gnome-graphics.png=applications-graphics.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/categories/xfce-graphics.png=applications-graphics.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/categories/preferences-system-network.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/categories/xfce-office.png=applications-office.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/categories/gnome-globe.png=applications-internet.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/categories/redhat-games.png=applications-games.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/categories/applications-multimedia.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/categories/gnome-multimedia.png=applications-multimedia.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/categories/xfce-multimedia.png=applications-multimedia.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/categories/gnome-settings.png=preferences-desktop.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/categories/preferences-desktop.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/categories/redhat-accessories.png=applications-accessories.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/categories/preferences-system.png 0644 root bin
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/categories/preferences-desktop-peripherals.png 0644 root bin
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/categories/applications-engineering.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/categories/input_devices_settings.png=preferences-desktop-peripherals.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/categories/package_network.png=applications-internet.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/categories/applications-accessories.png 0644 root bin
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/categories/preferences-other.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/categories/redhat-graphics.png=applications-graphics.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/categories/gnome-other.png=applications-other.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/categories/redhat-internet.png=applications-internet.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/categories/package_development.png=applications-development.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/categories/gnome-system.png=applications-system.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/categories/redhat-preferences.png=preferences-desktop.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/categories/gnome-control-center.png=preferences-desktop.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/categories/package_office.png=applications-office.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/categories/package_graphics.png=applications-graphics.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/categories/redhat-system_tools.png=applications-system.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/categories/package_system.png=applications-system.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/categories/package_games.png=applications-games.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/categories/xfce-system-settings.png=preferences-system.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/categories/applications-internet.png 0644 root bin
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/categories/applications-games.png 0644 root bin
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/categories/applications-utilities.png 0644 root bin
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/categories/applications-graphics.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/categories/package_settings.png=preferences-system.png
+d none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/devices 0755 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-cdrom.png=drive-optical.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-mouse-optical.png=input-mouse.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/devices/drive-harddisk.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-removable.png=drive-removable-media.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-computer.png=computer.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-wavelan.png=network-wireless.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-disc-dvdr.png=media-optical.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-harddisk-usb.png=drive-harddisk.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/devices/drive-cdrom.png=drive-optical.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/devices/printer1.png=printer.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/devices/xfce4-mouse.png=input-mouse.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-floppy.png=media-floppy.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/devices/media-optical.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-removable-1394.png=drive-removable-media.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/devices/kxkb.png=input-keyboard.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/devices/dvd_unmount.png=media-optical.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-cdrom-audio.png=media-optical.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/devices/yast_mouse.png=input-mouse.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-printer-network.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/devices/yast_HD.png=drive-harddisk.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/devices/input-mouse.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-dvd.png=drive-optical.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-printer-new.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/devices/cdwriter_unmount.png=media-optical.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/devices/media-cdrom.png=media-optical.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-removable-usb.png=drive-removable-media.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/devices/gtk-floppy.png=media-floppy.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-printer.png=printer.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/devices/printmgr.png=printer.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/devices/hdd_unmount.png=drive-harddisk.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/devices/keyboard.png=input-keyboard.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/devices/network-wireless.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/devices/mouse.png=input-mouse.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-disc-cdrw.png=media-optical.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/devices/drive-removable-media.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/devices/gtk-cdrom.png=media-optical.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/devices/media-floppy.png 0644 root bin
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/devices/drive-optical.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-disc-dvdrom.png=media-optical.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/devices/gtk-harddisk.png=drive-harddisk.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-disc-dvdr-plus.png=media-optical.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/devices/stock_printers.png=printer.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-mouse-ball.png=input-mouse.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-disc-dvdram.png=media-optical.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-disc-cdr.png=media-optical.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-disc-dvdrw.png=media-optical.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/devices/xfce4-keyboard.png=input-keyboard.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-fs-client.png=computer.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-keyboard.png=input-keyboard.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/devices/printer.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/devices/printer-remote.png=printer.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/devices/cdrom_unmount.png=media-optical.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/devices/system.png=computer.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/devices/input-keyboard.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/devices/yast_printer.png=printer.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/devices/system-floppy.png=media-floppy.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-harddisk-1394.png=drive-harddisk.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/devices/computer.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/devices/xfce-printer.png=printer.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/devices/yast_idetude.png=drive-harddisk.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/devices/kjobviewer.png=printer.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/devices/harddrive.png=drive-harddisk.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/devices/gnome-dev-harddisk.png=drive-harddisk.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/devices/3floppy_unmount.png=media-floppy.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/devices/usbpendrive_unmount.png=drive-removable-media.png
+d none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps 0755 root bin
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-settings-default-applications.png 0644 root bin
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/eog.png 0644 root bin
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/gimp.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/ksysguard.png=utilities-system-monitor.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/firefox-icon.png 0644 root bin
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-audio2.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-monitor.png=utilities-system-monitor.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/config-language.png=preferences-desktop-locale.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-settings-accessibility-technologies.png=preferences-desktop-accessibility.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/utilities-system-monitor.png 0644 root bin
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/accessories-text-editor.png 0644 root bin
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/launcher-program.png 0644 root bin
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/utilities-terminal.png 0644 root bin
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/applets-screenshooter.png 0644 root bin
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/preferences-desktop-font.png 0644 root bin
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/evolution.png 0644 root bin
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-mailcheck.png 0644 root bin
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/preferences-desktop-accessibility.png 0644 root bin
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-grecord.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/kcmkwm.png=preferences-system-windows.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/multimedia.png=multimedia-volume-control.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-settings-background.png=preferences-desktop-wallpaper.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-terminal.png=utilities-terminal.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/kcharselect.png=accessories-character-map.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/sound-juicer.png 0644 root bin
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-logo-icon-transparent.png 0644 root bin
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-searchtool-animation.png 0644 root bin
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/file-roller.png 0644 root bin
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/panel-force-quit.png 0644 root bin
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/display-capplet.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/konsole.png=utilities-terminal.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-ccmime.png 0644 root bin
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-log.png 0644 root bin
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-calc3.png 0644 root bin
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-workspace.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/susehelpcenter.png=help-browser.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/ax-applet.png=preferences-desktop-accessibility.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-ccscreensaver.png 0644 root bin
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/ghex.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/xfce4-mixer.png=multimedia-volume-control.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/preferences-desktop-keyboard-shortcuts.png 0644 root bin
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-starthere.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/background.png=preferences-desktop-wallpaper.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-home.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/file-manager.png=system-file-manager.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/clock.png 0644 root bin
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-settings-accessibility-keyboard.png 0644 root bin
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/preferences-desktop-keyboard.png 0644 root bin
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/smc.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/accessibility-directory.png=preferences-desktop-accessibility.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-settings-keybindings.png=preferences-desktop-keyboard-shortcuts.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/xfwm4.png=preferences-system-windows.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/perfmeter.png 0644 root bin
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/panel-drawer.png 0644 root bin
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-folder-generic.png 0644 root bin
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/preferences-desktop-wallpaper.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-settings-font.png=preferences-desktop-font.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-mixer.png=multimedia-volume-control.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-settings-theme.png=preferences-desktop-theme.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-panel.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/style.png=preferences-desktop-theme.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/kcmsound.png=multimedia-volume-control.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-cd.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/wallpaper.png=preferences-desktop-wallpaper.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/system-file-manager.png 0644 root bin
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-application-generic.png 0644 root bin
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/accessories-dictionary.png 0644 root bin
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-mixer-applet.png 0644 root bin
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/accessories-calculator.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/terminal.png=utilities-terminal.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/rhythmbox.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/xfce4-sound.png=preferences-desktop-sound.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/advanced-directory.png 0644 root bin
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/mozilla-icon.png 0644 root bin
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/preferences-system-windows.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/xfce-terminal.png=utilities-terminal.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/locale.png=preferences-desktop-locale.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/gucharmap.png=accessories-character-map.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/window-capplet.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/redhat-filemanager.png=system-file-manager.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/preferences-desktop-sound.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-session.png=preferences-system-session.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/xfce4-session.png=preferences-system-session.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/kwin.png=preferences-system-windows.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/access.png=preferences-desktop-accessibility.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/key_bindings.png=preferences-desktop-keyboard-shortcuts.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/kedit.png=accessories-text-editor.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/help-browser.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/xfce4-backdrop.png=preferences-desktop-wallpaper.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/xfce-filemanager.png=system-file-manager.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/volume-knob.png=multimedia-volume-control.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/brasero.png 0644 root bin
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/star.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-window-manager.png=preferences-system-windows.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/preferences-desktop-theme.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/fonts.png=preferences-desktop-font.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/kcalc.png=accessories-calculator.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/totem.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/session-properties.png=preferences-system-session.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-calculator.png=accessories-calculator.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-searchtool-animation-rest.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-help.png=help-browser.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-windows.png 0644 root bin
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-mini-commander.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/calc.png=accessories-calculator.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/orca.png 0644 root bin
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-settings-ui-behavior.png 0644 root bin
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/accessories-character-map.png 0644 root bin
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/charpick.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/text-editor.png=accessories-text-editor.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/openterm.png=utilities-terminal.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/gkb.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/arts.png=multimedia-volume-control.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/kfm.png=system-file-manager.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/knotify.png=preferences-desktop-sound.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/gok.png 0644 root bin
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-info.png 0644 root bin
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/multimedia-volume-control.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-character-map.png=accessories-character-map.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/preferences-system-session.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-settings-sound.png=preferences-desktop-sound.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/evince.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/khelpcenter.png=help-browser.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/48x48/apps/preferences-desktop-locale.png 0644 root bin
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/index.theme 0644 root bin
+d none /opt/csw/share/icons/HighContrastLargePrintInverse/36x36 0755 root bin
+d none /opt/csw/share/icons/HighContrastLargePrintInverse/36x36/animations 0755 root bin
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/36x36/animations/process-working.png 0644 root bin
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/36x36/animations/gnome-spinner.png=process-working.png
+s none /opt/csw/share/icons/HighContrastLargePrintInverse/36x36/animations/gnome-spinner-rest.png=process-idle.png
+f none /opt/csw/share/icons/HighContrastLargePrintInverse/36x36/animations/process-idle.png 0644 root bin
+d none /opt/csw/share/icons/Mist 0755 root bin
+d none /opt/csw/share/icons/Mist/scalable 0755 root bin
+d none /opt/csw/share/icons/Mist/scalable/places 0755 root bin
+f none /opt/csw/share/icons/Mist/scalable/places/user-home.svg 0644 root bin
+s none /opt/csw/share/icons/Mist/scalable/places/stock_folder.svg=folder.svg
+s none /opt/csw/share/icons/Mist/scalable/places/gnome-fs-directory.svg=folder.svg
+s none /opt/csw/share/icons/Mist/scalable/places/network.svg=folder-remote.svg
+f none /opt/csw/share/icons/Mist/scalable/places/folder-new.svg 0644 root bin
+s none /opt/csw/share/icons/Mist/scalable/places/gnome-fs-ssh.svg=folder-remote.svg
+s none /opt/csw/share/icons/Mist/scalable/places/gnome-fs-ftp.svg=folder-remote.svg
+s none /opt/csw/share/icons/Mist/scalable/places/gnome-fs-share.svg=folder-remote.svg
+f none /opt/csw/share/icons/Mist/scalable/places/folder-remote.svg 0644 root bin
+f none /opt/csw/share/icons/Mist/scalable/places/folder-saved-search.svg 0644 root bin
+s none /opt/csw/share/icons/Mist/scalable/places/gnome-fs-smb.svg=folder-remote.svg
+f none /opt/csw/share/icons/Mist/scalable/places/folder.svg 0644 root bin

@@ 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 theferret at users.sourceforge.net  Fri Jul  2 23:23:00 2010
From: theferret at users.sourceforge.net (theferret at users.sourceforge.net)
Date: Fri, 02 Jul 2010 21:23:00 +0000
Subject: [csw-devel] SF.net SVN: gar:[10406] csw/mgar/pkg
Message-ID: <E1OUnhM-0002Yy-QE@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 10406
          http://gar.svn.sourceforge.net/gar/?rev=10406&view=rev
Author:   theferret
Date:     2010-07-02 21:23:00 +0000 (Fri, 02 Jul 2010)

Log Message:
-----------
gnome_theme_extras: mv and rebuild

Added Paths:
-----------
    csw/mgar/pkg/gnome_theme_extras/
    csw/mgar/pkg/gnome_theme_extras/Makefile
    csw/mgar/pkg/gnome_theme_extras/trunk/
    csw/mgar/pkg/gnome_theme_extras/trunk/Makefile
    csw/mgar/pkg/gnome_theme_extras/trunk/copyright
    csw/mgar/pkg/gnome_theme_extras/trunk/depend
    csw/mgar/pkg/gnome_theme_extras/trunk/pkginfo
    csw/mgar/pkg/gnome_theme_extras/trunk/prototype

Added: csw/mgar/pkg/gnome_theme_extras/Makefile
===================================================================
--- csw/mgar/pkg/gnome_theme_extras/Makefile	                        (rev 0)
+++ csw/mgar/pkg/gnome_theme_extras/Makefile	2010-07-02 21:23:00 UTC (rev 10406)
@@ -0,0 +1,15 @@
+
+# This is somewhat of a "stub" Makefile, for 
+# directories managed by the "createpkg" TEMPLATES.
+#
+# Not all of targets listed here may actualy be supported by
+# the subdir in question. But they are a goal
+
+DEFAULT_DIR=trunk
+
+
+# The -C means you must use gmake, unfortunately.
+
+all package build garchive extract configure clean distclean reallyclean :
+	@echo Going to make $@ in $(DEFAULT_DIR)
+	$(MAKE) -C  $(DEFAULT_DIR) $@


Property changes on: csw/mgar/pkg/gnome_theme_extras/trunk
___________________________________________________________________
Added: svn:ignore
   + cookies
download
work
cswstage
build


Added: csw/mgar/pkg/gnome_theme_extras/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gnome_theme_extras/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/gnome_theme_extras/trunk/Makefile	2010-07-02 21:23:00 UTC (rev 10406)
@@ -0,0 +1,237 @@
+# This file is from TEMPLATES/createpkg/Makefile.lib
+# You MUST build this with gnu make, unfortunately.
+# Mainly just because of the ARCH expansion, but also for "?="
+
+
+# If you do NOT want to build 64bit libs, remove the $(ARCH)-64 from
+# the "all:" target. Or just use Makefile.lib32
+
+# If you DO want to, then leave it in, and also customize your
+#  the build/.stage-$(ARCH)-64.done    target(s),
+# PLUS, customize your prototype file(s) as needed
+# Dont forget to handle any 64bit pkg-config .pc files properly!!
+
+# Organization: variable defintions up top,
+# targets in second half.
+# Note that assignments with "?=" mean "assign if not already assigned.
+
+# just for intltool
+PATH := /opt/csw/gnu:$(PATH)
+
+# Where do we keep local downloads of software src files
+ARCHIVEDIR ?= /home/src
+ARCHIVENAME ?= gnome-themes-extras-2.22.0.tar.bz2 
+EXTRACTPROG ?= /usr/sfw/bin/gtar jfx
+
+# Only use ONE here. The name is used for compat with 'gar'.
+MASTER_SITES ?= http://ftp.gnome.org/pub/GNOME/sources/gnome-themes-extras/2.22
+
+ARCH := $(shell /bin/uname -p)
+
+LDFLAGS_COMMON :=
+
+SRCDIR= build/*
+
+# DO NOT specify the arch-64 stuff such as -m64 here.
+# the individual targets will do that.
+
+CFLAGS_COMMON   ?= -mt -xnorunpath -xO2
+CXXFLAGS_COMMON ?= -mt -norunpath  -xO2
+CFLAGS_sparc    ?= -xarch=v8
+CFLAGS_i386     ?= -xarch=386
+
+# Keep this arch-neutral if possible. add arch-specific tweaks
+# to arch-specific target
+CONFIGURE=./configure --prefix=/opt/csw
+
+LIBDIR64_sparc:=/opt/csw/lib/sparcv9
+LIBDIR64_i386 :=/opt/csw/lib/amd64
+
+CONFIGURE_64_$(ARCH) := --libdir=$(LIBDIR64_$(ARCH))
+CONFIGURE_64_EXTRAS  := $(CONFIGURE_64_$(ARCH))
+
+LDFLAGS_64_$(ARCH) := -R$(LIBDIR64_$(ARCH)) -L$(LIBDIR64_$(ARCH))
+
+
+
+CREATEPKG=createpkg -b `pwd`/build/*/cswstage/opt/csw
+
+
+all:	$(ARCH)-32 build/.stage1 $(ARCH)-64 package
+#all:	$(ARCH)-32 package
+
+# ARCH-XX handles configure, build, and stage for its own combo
+# 
+
+EXTRACTPROG ?= /bin/echo ERROR: need to set EXTRACTPROG ; exit 1 ;
+
+
+
+extract:	build/.extract.done
+
+build/.extract.done:
+	test -d build || mkdir build
+	@if test -f  $(ARCHIVEDIR)/$(ARCHIVENAME) ; then \
+		echo Extracting $(ARCHIVENAME) under build dir... ;\
+		( cd build && $(EXTRACTPROG) $(ARCHIVEDIR)/$(ARCHIVENAME) ) ; \
+	else echo Cannot extract - $(ARCHIVEDIR)/$(ARCHIVENAME) does not exist ;\
+		exit 1; \
+	fi
+	touch build/.extract.done
+	
+
+clean distclean:
+	@echo Calling $@ in $(SRCDIR)
+	$(MAKE) -C $(SRCDIR) $@
+
+# This is a bit of a hack.. it does a "make clean", 
+# only when we're between 32bit and 64bit builds, when doing "make all".
+# Once we're IN the 64bit builds, it should not be automatically called.
+build/.stage1:
+	@echo Doing inter 32-64 bit cleanup
+	$(MAKE) -C $(SRCDIR) distclean
+	touch $@
+	
+
+reallyclean:	distclean
+	@echo Removing any milestone files in build as well...
+	@rm -f build/.??*
+	@echo '(However, leaving src tree intact, with any patches in it)'
+	@echo '(If you want, you could rm -r build, then make extract once more)'
+
+garchive:
+	@echo Call the fetch target instead: it does the same thing.
+
+
+# Downloads the source code to the common ARCHIVEDIR
+fetch:	$(ARCHIVEDIR)/$(ARCHIVENAME)
+	@echo fetch done
+
+$(ARCHIVEDIR)/$(ARCHIVENAME):
+	wget -P $(ARCHIVEDIR) $(MASTER_SITES)/$(ARCHIVENAME)
+
+patch:
+	@echo patch: patching is handled automatically as part of the configure phase.
+
+stage-preserved:
+	@if test -f preserve-$(ARCH).tar ; then \
+		echo Copying preserved arch-specific files; \
+		cat preserve-$(ARCH).tar |(cd $(SRCDIR)/cswstage && tar xvf -);\
+	fi
+	@if test -f preserve.tar ; then \
+		echo Copying preserved arch-neutral files; \
+		cat preserve.tar |(cd $(SRCDIR)/cswstage && tar xvf -);\
+	fi
+		
+package:	stage-preserved
+	$(CREATEPKG)
+
+
+# split out generic $(ARCH) sections to platform-specific sections if needed.
+# but it usually should not be neccessary
+
+
+$(ARCH)-32 ::   configure-$(ARCH)-32 build-$(ARCH)-32 stage-$(ARCH)-32
+	@echo Completed $(ARCH)-32 configure, build and stage
+	touch build/.$(ARCH)-32.done
+
+
+$(ARCH)-64 ::  stage-$(ARCH)-32 configure-$(ARCH)-64 build-$(ARCH)-64 stage-$(ARCH)-64
+	@echo Completed $@ configure, build and stage
+	touch build/.$(ARCH)-64.done
+
+build/.$(ARCH)-32.done:	$(ARCH)-32
+
+build/.$(ARCH)-64.done:	$(ARCH)-64
+
+# Since we share the same src tree, we should only need to
+# pre-configure patching one time for all.
+build/.patch-preconf.done:	build/.extract.done
+	if test -f patchfile.preconf ; then \
+	 gpatch -d $(SRCDIR) -p0  <patchfile.preconf ; fi
+	touch $@
+
+
+#Note: I WANT to use LDFLAGS=-R$$ORIGIN, but stupid libtool
+# wont allow it! so force it at build time
+build/.configure-$(ARCH)-32.done:	build/.patch-preconf.done
+	@echo handling $@ target
+	(cd $(SRCDIR) ; \
+	  CFLAGS="$(CFLAGS_COMMON) $(CFLAGS_$(ARCH))" \
+	  CXXFLAGS="$(CXXFLAGS_COMMON)" \
+	  LDFLAGS='-R/opt/csw/lib -L/opt/csw/lib' \
+	  $(CONFIGURE) )
+	if test -f patchfile.postconf ; then \
+	 gpatch -d $(SRCDIR) -p0  <patchfile.postconf ; fi
+	touch $@
+
+build/.configure-$(ARCH)-64.done:	build/.patch-preconf.done
+	if test "$(ARCH)" = "i386" -a "`uname -r`" != "5.10" ; then \
+		echo Error: do 64bit for i386 on sol10 only ; exit 1 ; fi
+	@echo handling $@ target
+	(cd $(SRCDIR) ; \
+	  CFLAGS="$(CFLAGS_COMMON) -m64"  \
+	  CXXFLAGS="$(CXXFLAGS_COMMON) -m64" \
+	  LDFLAGS="$(LDFLAGS_64_$(ARCH))" \
+	  PKG_CONFIG_PATH=/opt/csw/lib/64/pkgconfig \
+	  $(CONFIGURE) $(CONFIGURE_64_EXTRAS)  )
+	if test -f patchfile.postconf ; then \
+	 gpatch -d $(SRCDIR) -p0  <patchfile.postconf ; fi
+	touch $@
+
+
+# See note about LDFLAGS and ORIGIN, higher up	
+build/.build-$(ARCH)-32.done build/.build-$(ARCH)-64.done:
+	@echo handling $@ target
+	LD_OPTIONS='-R$$ORIGIN' $(MAKE) -C $(SRCDIR) $(MFLAGS)
+	touch $@
+
+
+
+## NOTE: This is a DESTRUCTIVE target build!!
+## 'stagepkg'  will destroy any prior "cswstage" directory!!!
+## So, we remove all 64bit milestones
+build/.stage-$(ARCH)-32.done:
+	@echo Handling stage of $(ARCH)-32
+	(cd $(SRCDIR) ; MAKE=gmake stagepkg)
+	(cd  $(SRCDIR); cp COPYING cswstage/opt/csw/.)
+	@rm -f build/.*64.done
+	touch $@
+
+
+# Note: This is the tricky bit. we cannot just call 
+#  "stagepkg": we dont usually want EVERYTHING; just the
+# libs that are rebuilt in 64bit, and we need them to go to
+# the subdirs, not the regular place!
+# SOME things, will have a clean libdir, and respect --libdir,
+# and do the right thing easily. However, many will not!
+# SO, odds are you'll have to write a customized target
+build/.stage-$(ARCH)-64.done:	$(SRCDIR)/cswstage
+	@echo ""
+	rm -rf cd $(SRCDIR)/tmpdest
+	cd $(SRCDIR) &&  $(MAKE) DESTDIR=`/bin/pwd`/tmpdest install
+	(cd $(SRCDIR)/tmpdest; tar cf - ./$(LIBDIR64_$(ARCH)) )| \
+	    (cd $(SRCDIR)/cswstage; tar xvf -)
+	@echo ""
+	touch $@
+
+
+
+#These are the easy-to-type targets. They just trigger the real ones.
+configure-$(ARCH)-32:	build/.configure-$(ARCH)-32.done
+	@echo $@ done
+build-$(ARCH)-32:	build/.build-$(ARCH)-32.done
+	@echo $@ done
+stage-$(ARCH)-32:	build/.stage-$(ARCH)-32.done
+	@echo $@ done
+configure-$(ARCH)-64:	build/.configure-$(ARCH)-64.done
+	@echo $@ done
+build-$(ARCH)-64:	build/.build-$(ARCH)-64.done
+	@echo $@ done
+stage-$(ARCH)-64:	build/.stage-$(ARCH)-64.done
+	@echo $@ done
+
+# manual targets
+pkgproto:
+	cat $(SRCDIR)/cswstage/prototype | sed 's/root root$$/root bin/'>prototype
+	echo 'f none  share/themes/COPYING.gnome_theme_extras=COPYING 0644 root bin'>>prototype

Added: csw/mgar/pkg/gnome_theme_extras/trunk/copyright
===================================================================
--- csw/mgar/pkg/gnome_theme_extras/trunk/copyright	                        (rev 0)
+++ csw/mgar/pkg/gnome_theme_extras/trunk/copyright	2010-07-02 21:23:00 UTC (rev 10406)
@@ -0,0 +1,3 @@
+please see /opt/csw/share/themes/COPYING.gnome_theme_extras for full
+license text
+(LGPL 2)

Added: csw/mgar/pkg/gnome_theme_extras/trunk/depend
===================================================================
Added: csw/mgar/pkg/gnome_theme_extras/trunk/pkginfo
===================================================================
--- csw/mgar/pkg/gnome_theme_extras/trunk/pkginfo	                        (rev 0)
+++ csw/mgar/pkg/gnome_theme_extras/trunk/pkginfo	2010-07-02 21:23:00 UTC (rev 10406)
@@ -0,0 +1,9 @@
+PKG=CSWgnomethemes
+NAME=gnome_themes - Official themes for the GNOME desktop environment
+ARCH=all
+VERSION=2.22.0,REV=2010.07.02
+CATEGORY=system
+VENDOR=http://www.gnome.org/ packaged for CSW by Philip Brown
+HOTLINE=http://www.opencsw.org/bugtrack/
+EMAIL=phil at opencsw.org
+OPENCSW_REPOSITORY=https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/pkg/gnome_themes/trunk

Added: csw/mgar/pkg/gnome_theme_extras/trunk/prototype
===================================================================
--- csw/mgar/pkg/gnome_theme_extras/trunk/prototype	                        (rev 0)
+++ csw/mgar/pkg/gnome_theme_extras/trunk/prototype	2010-07-02 21:23:00 UTC (rev 10406)
@@ -0,0 +1,5711 @@
+i pkginfo
+i copyright
+i depend
+d none share 0755 root bin
+d none share/locale 0755 root bin
+d none share/locale/ca 0755 root bin
+d none share/locale/ca/LC_MESSAGES 0755 root bin
+f none share/locale/ca/LC_MESSAGES/gnome-themes-extras.mo 0644 root bin
+d none share/locale/en_GB 0755 root bin
+d none share/locale/en_GB/LC_MESSAGES 0755 root bin
+f none share/locale/en_GB/LC_MESSAGES/gnome-themes-extras.mo 0644 root bin
+d none share/locale/sv 0755 root bin
+d none share/locale/sv/LC_MESSAGES 0755 root bin
+f none share/locale/sv/LC_MESSAGES/gnome-themes-extras.mo 0644 root bin
+d none share/locale/eu 0755 root bin
+d none share/locale/eu/LC_MESSAGES 0755 root bin
+f none share/locale/eu/LC_MESSAGES/gnome-themes-extras.mo 0644 root bin
+d none share/themes 0755 root bin
+d none share/themes/Darklooks 0755 root bin
+d none share/themes/Darklooks/gtk-2.0 0755 root bin
+f none share/themes/Darklooks/gtk-2.0/gtkrc 0644 root bin
+f none share/themes/Darklooks/index.theme 0644 root bin
+d none share/themes/Unity 0755 root bin
+d none share/themes/Unity/metacity-1 0755 root bin
+f none share/themes/Unity/metacity-1/metacity-theme-1.xml 0644 root bin
+f none share/themes/Unity/index.theme 0644 root bin
+d none share/themes/Unity/gtk-2.0 0755 root bin
+f none share/themes/Unity/gtk-2.0/gtkrc 0644 root bin
+d none share/icons 0755 root bin
+d none share/icons/Neu 0755 root bin
+d none share/icons/Neu/48x48 0755 root bin
+d none share/icons/Neu/48x48/devices 0755 root bin
+f none share/icons/Neu/48x48/devices/media-cdrw.png 0644 root bin
+s none share/icons/Neu/48x48/devices/gnome-dev-keyboard.png=input-keyboard.png
+s none share/icons/Neu/48x48/devices/gnome-dev-removable.png=drive-removable-media.png
+s none share/icons/Neu/48x48/devices/yast_mouse.png=input-mouse.png
+s none share/icons/Neu/48x48/devices/keyboard.png=input-keyboard.png
+f none share/icons/Neu/48x48/devices/video-display.png 0644 root bin
+s none share/icons/Neu/48x48/devices/gnome-dev-mouse-ball.png=input-mouse.png
+s none share/icons/Neu/48x48/devices/gnome-dev-removable-1394.png=drive-removable-media.png
+f none share/icons/Neu/48x48/devices/input-keyboard.png 0644 root bin
+s none share/icons/Neu/48x48/devices/harddrive.png=drive-harddisk.png
+s none share/icons/Neu/48x48/devices/printmgr.png=printer.png
+s none share/icons/Neu/48x48/devices/xfce4-display.png=video-display.png
+s none share/icons/Neu/48x48/devices/gnome-dev-harddisk.png=drive-harddisk.png
+s none share/icons/Neu/48x48/devices/chardevice.png=video-display.png
+s none share/icons/Neu/48x48/devices/printer-remote.png=printer.png
+s none share/icons/Neu/48x48/devices/xfce4-keyboard.png=input-keyboard.png
+s none share/icons/Neu/48x48/devices/gnome-dev-printer.png=printer.png
+s none share/icons/Neu/48x48/devices/display.png=video-display.png
+s none share/icons/Neu/48x48/devices/gnome-dev-harddisk-1394.png=drive-harddisk.png
+s none share/icons/Neu/48x48/devices/gtk-harddisk.png=drive-harddisk.png
+s none share/icons/Neu/48x48/devices/printer1.png=printer.png
+s none share/icons/Neu/48x48/devices/gtk-floppy.png=media-floppy.png
+s none share/icons/Neu/48x48/devices/mouse.png=input-mouse.png
+f none share/icons/Neu/48x48/devices/printer.png 0644 root bin
+f none share/icons/Neu/48x48/devices/media-cdrom-audio.png 0644 root bin
+f none share/icons/Neu/48x48/devices/media-floppy.png 0644 root bin
+s none share/icons/Neu/48x48/devices/gnome-dev-computer.png=computer.png
+s none share/icons/Neu/48x48/devices/gnome-dev-removable-usb.png=drive-removable-media.png
+f none share/icons/Neu/48x48/devices/media-cdrom.png 0644 root bin
+s none share/icons/Neu/48x48/devices/stock_printers.png=printer.png
+s none share/icons/Neu/48x48/devices/gnome-fs-client.png=computer.png
+f none share/icons/Neu/48x48/devices/input-mouse.png 0644 root bin
+s none share/icons/Neu/48x48/devices/xfce4-mouse.png=input-mouse.png
+s none share/icons/Neu/48x48/devices/system-floppy.png=media-floppy.png
+f none share/icons/Neu/48x48/devices/computer.png 0644 root bin
+s none share/icons/Neu/48x48/devices/gnome-dev-mouse-optical.png=input-mouse.png
+s none share/icons/Neu/48x48/devices/gnome-dev-harddisk-usb.png=drive-harddisk.png
+f none share/icons/Neu/48x48/devices/media-dvdrw.png 0644 root bin
+f none share/icons/Neu/48x48/devices/drive-cdrom.png 0644 root bin
+f none share/icons/Neu/48x48/devices/media-dvd.png 0644 root bin
+f none share/icons/Neu/48x48/devices/battery.png 0644 root bin
+s none share/icons/Neu/48x48/devices/xfce-printer.png=printer.png
+s none share/icons/Neu/48x48/devices/3floppy_unmount.png=media-floppy.png
+s none share/icons/Neu/48x48/devices/yast_idetude.png=drive-harddisk.png
+s none share/icons/Neu/48x48/devices/yast_printer.png=printer.png
+s none share/icons/Neu/48x48/devices/yast_HD.png=drive-harddisk.png
+s none share/icons/Neu/48x48/devices/gnome-dev-battery.png=battery.png
+s none share/icons/Neu/48x48/devices/kxkb.png=input-keyboard.png
+s none share/icons/Neu/48x48/devices/gnome-dev-floppy.png=media-floppy.png
+s none share/icons/Neu/48x48/devices/kjobviewer.png=printer.png
+s none share/icons/Neu/48x48/devices/hdd_unmount.png=drive-harddisk.png
+f none share/icons/Neu/48x48/devices/drive-removable-media.png 0644 root bin
+s none share/icons/Neu/48x48/devices/usbpendrive_unmount.png=drive-removable-media.png
+f none share/icons/Neu/48x48/devices/drive-harddisk.png 0644 root bin
+s none share/icons/Neu/48x48/devices/system.png=computer.png
+d none share/icons/Neu/48x48/categories 0755 root bin
+s none share/icons/Neu/48x48/categories/xfce-utils.png=applications-accessories.png
+s none share/icons/Neu/48x48/categories/gnome-other.png=applications-other.png
+f none share/icons/Neu/48x48/categories/applications-games.png 0644 root bin
+s none share/icons/Neu/48x48/categories/redhat-system_settings.png=preferences-system.png
+f none share/icons/Neu/48x48/categories/applications-accessories.png 0644 root bin
+s none share/icons/Neu/48x48/categories/gnome-multimedia.png=applications-multimedia.png
+s none share/icons/Neu/48x48/categories/package_system.png=applications-system.png
+s none share/icons/Neu/48x48/categories/xfce-games.png=applications-games.png
+s none share/icons/Neu/48x48/categories/package_office.png=applications-office.png
+f none share/icons/Neu/48x48/categories/applications-graphics.png 0644 root bin
+s none share/icons/Neu/48x48/categories/package_development.png=applications-development.png
+s none share/icons/Neu/48x48/categories/xfce-multimedia.png=applications-multimedia.png
+f none share/icons/Neu/48x48/categories/applications-internet.png 0644 root bin
+s none share/icons/Neu/48x48/categories/redhat-system_tools.png=applications-system.png
+s none share/icons/Neu/48x48/categories/xfce-system-settings.png=preferences-system.png
+s none share/icons/Neu/48x48/categories/redhat-preferences.png=preferences-desktop.png
+s none share/icons/Neu/48x48/categories/package_games.png=applications-games.png
+s none share/icons/Neu/48x48/categories/redhat-games.png=applications-games.png
+s none share/icons/Neu/48x48/categories/gnome-util.png=applications-accessories.png
+s none share/icons/Neu/48x48/categories/gnome-control-center.png=preferences-desktop.png
+f none share/icons/Neu/48x48/categories/preferences-system.png 0644 root bin
+s none share/icons/Neu/48x48/categories/gtk-preferences.png=preferences-desktop.png
+s none share/icons/Neu/48x48/categories/gnome-system.png=applications-system.png
+s none share/icons/Neu/48x48/categories/redhat-office.png=applications-office.png
+s none share/icons/Neu/48x48/categories/package_graphics.png=applications-graphics.png
+s none share/icons/Neu/48x48/categories/redhat-accessories.png=applications-accessories.png
+s none share/icons/Neu/48x48/categories/gnome-settings.png=preferences-desktop.png
+f none share/icons/Neu/48x48/categories/preferences-desktop-peripherals.png 0644 root bin
+f none share/icons/Neu/48x48/categories/applications-development.png 0644 root bin
+s none share/icons/Neu/48x48/categories/gnome-graphics.png=applications-graphics.png
+f none share/icons/Neu/48x48/categories/applications-system.png 0644 root bin
+s none share/icons/Neu/48x48/categories/package_settings.png=preferences-system.png
+f none share/icons/Neu/48x48/categories/applications-office.png 0644 root bin
+s none share/icons/Neu/48x48/categories/package_utilities.png=applications-accessories.png
+s none share/icons/Neu/48x48/categories/input_devices_settings.png=preferences-desktop-peripherals.png
+s none share/icons/Neu/48x48/categories/gnome-devel.png=applications-development.png
+s none share/icons/Neu/48x48/categories/gnome-applications.png=applications-office.png
+s none share/icons/Neu/48x48/categories/package_network.png=applications-internet.png
+s none share/icons/Neu/48x48/categories/kcontrol.png=preferences-desktop.png
+s none share/icons/Neu/48x48/categories/gnome-joystick.png=applications-games.png
+s none share/icons/Neu/48x48/categories/redhat-sound_video.png=applications-multimedia.png
+s none share/icons/Neu/48x48/categories/redhat-programming.png=applications-development.png
+f none share/icons/Neu/48x48/categories/applications-other.png 0644 root bin
+s none share/icons/Neu/48x48/categories/xfce4-settings.png=preferences-desktop.png
+s none share/icons/Neu/48x48/categories/gnome-globe.png=applications-internet.png
+f none share/icons/Neu/48x48/categories/applications-multimedia.png 0644 root bin
+s none share/icons/Neu/48x48/categories/xfce-office.png=applications-office.png
+s none share/icons/Neu/48x48/categories/redhat-internet.png=applications-internet.png
+s none share/icons/Neu/48x48/categories/xfce-internet.png=applications-internet.png
+f none share/icons/Neu/48x48/categories/preferences-desktop.png 0644 root bin
+s none share/icons/Neu/48x48/categories/redhat-graphics.png=applications-graphics.png
+s none share/icons/Neu/48x48/categories/xfce-graphics.png=applications-graphics.png
+s none share/icons/Neu/48x48/categories/package_multimedia.png=applications-multimedia.png
+s none share/icons/Neu/48x48/categories/stock_internet.png=applications-internet.png
+d none share/icons/Neu/48x48/status 0755 root bin
+s none share/icons/Neu/48x48/status/trashcan_full.png=user-trash-full.png
+s none share/icons/Neu/48x48/status/stock_dialog-error.png=dialog-error.png
+s none share/icons/Neu/48x48/status/stock_volume-med.png=audio-volume-medium.png
+s none share/icons/Neu/48x48/status/gtk-dialog-info.png=dialog-information.png
+s none share/icons/Neu/48x48/status/stock_dialog-question.png=dialog-question.png
+s none share/icons/Neu/48x48/status/stock_volume-max.png=audio-volume-high.png
+s none share/icons/Neu/48x48/status/gnome-netstatus-tx.png=network-transmit.png
+s none share/icons/Neu/48x48/status/gtk-dialog-authentication.png=dialog-password.png
+s none share/icons/Neu/48x48/status/gnome-fs-loading-icon.png=image-loading.png
+f none share/icons/Neu/48x48/status/network-idle.png 0644 root bin
+f none share/icons/Neu/48x48/status/folder-drag-accept.png 0644 root bin
+s none share/icons/Neu/48x48/status/gnome-fs-trash-full.png=user-trash-full.png
+s none share/icons/Neu/48x48/status/gnome-netstatus-idle.png=network-idle.png
+s none share/icons/Neu/48x48/status/gtk-dialog-warning.png=dialog-warning.png
+s none share/icons/Neu/48x48/status/stock_trash_full.png=user-trash-full.png
+f none share/icons/Neu/48x48/status/dialog-information.png 0644 root bin
+s none share/icons/Neu/48x48/status/stock_volume-0.png=audio-volume-low.png
+f none share/icons/Neu/48x48/status/folder-visiting.png 0644 root bin
+f none share/icons/Neu/48x48/status/audio-volume-zero.png 0644 root bin
+s none share/icons/Neu/48x48/status/xfce-trash_full.png=user-trash-full.png
+s none share/icons/Neu/48x48/status/gnome-netstatus-disconn.png=network-offline.png
+s none share/icons/Neu/48x48/status/stock_dialog-info.png=dialog-information.png
+s none share/icons/Neu/48x48/status/messagebox_info.png=dialog-information.png
+s none share/icons/Neu/48x48/status/folder_open.png=folder-open.png
+s none share/icons/Neu/48x48/status/connect_creating.png=network-transmit-receive.png
+f none share/icons/Neu/48x48/status/dialog-password.png 0644 root bin
+f none share/icons/Neu/48x48/status/dialog-warning.png 0644 root bin
+f none share/icons/Neu/48x48/status/network-error.png 0644 root bin
+s none share/icons/Neu/48x48/status/messagebox_critical.png=dialog-error.png
+f none share/icons/Neu/48x48/status/image-missing.png 0644 root bin
+s none share/icons/Neu/48x48/status/gnome-fs-directory-visiting.png=folder-visiting.png
+s none share/icons/Neu/48x48/status/important.png=dialog-warning.png
+s none share/icons/Neu/48x48/status/gnome-netstatus-error.png=network-error.png
+s none share/icons/Neu/48x48/status/stock_open.png=folder-open.png
+f none share/icons/Neu/48x48/status/audio-volume-high.png 0644 root bin
+f none share/icons/Neu/48x48/status/audio-volume-medium.png 0644 root bin
+s none share/icons/Neu/48x48/status/connect_established.png=network-idle.png
+s none share/icons/Neu/48x48/status/nm-device-wireless.png=network-idle.png
+f none share/icons/Neu/48x48/status/battery-caution.png 0644 root bin
+s none share/icons/Neu/48x48/status/nm-device-wired.png=network-idle.png
+f none share/icons/Neu/48x48/status/folder-open.png 0644 root bin
+s none share/icons/Neu/48x48/status/stock_dialog-warning.png=dialog-warning.png
+f none share/icons/Neu/48x48/status/network-transmit.png 0644 root bin
+s none share/icons/Neu/48x48/status/gnome-fs-directory-accept.png=folder-drag-accept.png
+f none share/icons/Neu/48x48/status/user-trash-full.png 0644 root bin
+s none share/icons/Neu/48x48/status/nm-no-connection.png=network-offline.png
+f none share/icons/Neu/48x48/status/network-receive.png 0644 root bin
+s none share/icons/Neu/48x48/status/gnome-stock-trash-full.png=user-trash-full.png
+s none share/icons/Neu/48x48/status/connect_no.png=network-offline.png
+f none share/icons/Neu/48x48/status/image-loading.png 0644 root bin
+f none share/icons/Neu/48x48/status/network-transmit-receive.png 0644 root bin
+s none share/icons/Neu/48x48/status/edittrash.png=user-trash-full.png
+s none share/icons/Neu/48x48/status/gnome-netstatus-txrx.png=network-transmit-receive.png
+s none share/icons/Neu/48x48/status/stock_volume.png=audio-volume-high.png
+s none share/icons/Neu/48x48/status/error.png=dialog-error.png
+s none share/icons/Neu/48x48/status/stock_volume-mute.png=audio-volume-muted.png
+s none share/icons/Neu/48x48/status/nm-adhoc.png=network-idle.png
+s none share/icons/Neu/48x48/status/gtk-dialog-error.png=dialog-error.png
+s none share/icons/Neu/48x48/status/messagebox_warning.png=dialog-warning.png
+f none share/icons/Neu/48x48/status/audio-volume-muted.png 0644 root bin
+s none share/icons/Neu/48x48/status/info.png=dialog-information.png
+s none share/icons/Neu/48x48/status/gtk-dialog-question.png=dialog-question.png
+s none share/icons/Neu/48x48/status/stock_volume-min.png=audio-volume-low.png
+s none share/icons/Neu/48x48/status/gtk-missing-image.png=image-missing.png
+s none share/icons/Neu/48x48/status/gnome-netstatus-rx.png=network-receive.png
+f none share/icons/Neu/48x48/status/network-offline.png 0644 root bin
+f none share/icons/Neu/48x48/status/printer-error.png 0644 root bin
+f none share/icons/Neu/48x48/status/audio-volume-low.png 0644 root bin
+f none share/icons/Neu/48x48/status/dialog-error.png 0644 root bin
+f none share/icons/Neu/48x48/status/dialog-question.png 0644 root bin
+d none share/icons/Neu/48x48/places 0755 root bin
+f none share/icons/Neu/48x48/places/network-workgroup.png 0644 root bin
+s none share/icons/Neu/48x48/places/gnome-fs-network.png=network-workgroup.png
+s none share/icons/Neu/48x48/places/gnome-mime-x-directory-smb-workgroup.png=network-workgroup.png
+s none share/icons/Neu/48x48/places/gnome-fs-ssh.png=folder-remote.png
+f none share/icons/Neu/48x48/places/folder-saved-search.png 0644 root bin
+s none share/icons/Neu/48x48/places/stock_folder.png=folder.png
+f none share/icons/Neu/48x48/places/folder.png 0644 root bin
+s none share/icons/Neu/48x48/places/gnome-mime-x-directory-smb-share.png=folder-remote.png
+s none share/icons/Neu/48x48/places/gtk-directory.png=folder.png
+s none share/icons/Neu/48x48/places/redhat-network-server.png=network-server.png
+s none share/icons/Neu/48x48/places/trashcan_empty.png=user-trash.png
+f none share/icons/Neu/48x48/places/user-trash.png 0644 root bin
+s none share/icons/Neu/48x48/places/application-x-gnome-saved-search.png=folder-saved-search.png
+s none share/icons/Neu/48x48/places/gnome-mime-x-directory-nfs-server.png=network-server.png
+f none share/icons/Neu/48x48/places/user-desktop.png 0644 root bin
+s none share/icons/Neu/48x48/places/gnome-fs-smb.png=folder-remote.png
+s none share/icons/Neu/48x48/places/network.png=folder-remote.png
+s none share/icons/Neu/48x48/places/gnome-fs-trash-empty.png=user-trash.png
+s none share/icons/Neu/48x48/places/emptytrash.png=user-trash.png
+s none share/icons/Neu/48x48/places/gnome-fs-ftp.png=folder-remote.png
+f none share/icons/Neu/48x48/places/user-home.png 0644 root bin
+s none share/icons/Neu/48x48/places/folder_home.png=user-home.png
+s none share/icons/Neu/48x48/places/gnome-fs-share.png=folder-remote.png
+s none share/icons/Neu/48x48/places/gnome-fs-home.png=user-home.png
+s none share/icons/Neu/48x48/places/gnome-stock-trash.png=user-trash.png
+s none share/icons/Neu/48x48/places/desktop.png=user-desktop.png
+s none share/icons/Neu/48x48/places/gnome-mime-x-directory-smb-server.png=network-server.png
+s none share/icons/Neu/48x48/places/gnome-fs-server.png=network-server.png
+s none share/icons/Neu/48x48/places/gnome-fs-nfs.png=folder-remote.png
+s none share/icons/Neu/48x48/places/distributor-logo.png=start-here.png
+s none share/icons/Neu/48x48/places/network_local.png=network-workgroup.png
+s none share/icons/Neu/48x48/places/gtk-network.png=network-workgroup.png
+f none share/icons/Neu/48x48/places/network-server.png 0644 root bin
+s none share/icons/Neu/48x48/places/server.png=network-server.png
+s none share/icons/Neu/48x48/places/gnome-fs-directory.png=folder.png
+s none share/icons/Neu/48x48/places/inode-directory.png=folder.png
+s none share/icons/Neu/48x48/places/gnome-main-menu.png=start-here.png
+s none share/icons/Neu/48x48/places/novell-button.png=start-here.png
+s none share/icons/Neu/48x48/places/xfce-trash_empty.png=user-trash.png
+f none share/icons/Neu/48x48/places/start-here.png 0644 root bin
+s none share/icons/Neu/48x48/places/gnome-fs-desktop.png=user-desktop.png
+f none share/icons/Neu/48x48/places/folder-remote.png 0644 root bin
+d none share/icons/Neu/48x48/mimetypes 0755 root bin
+s none share/icons/Neu/48x48/mimetypes/gnome-mime-application-x-font-linux-psf.png=font-x-generic.png
+s none share/icons/Neu/48x48/mimetypes/gnome-mime-image.png=image-x-generic.png
+s none share/icons/Neu/48x48/mimetypes/gnome-mime-application-x-cpio.png=package-x-generic.png
+s none share/icons/Neu/48x48/mimetypes/gnome-mime-text-x-vcard.png=x-office-address-book.png
+s none share/icons/Neu/48x48/mimetypes/gnome-mime-application-vnd.stardivision.calc.png=x-office-spreadsheet.png
+s none share/icons/Neu/48x48/mimetypes/package.png=package-x-generic.png
+f none share/icons/Neu/48x48/mimetypes/text-x-script.png 0644 root bin
+s none share/icons/Neu/48x48/mimetypes/gnome-mime-application-zip.png=package-x-generic.png
+s none share/icons/Neu/48x48/mimetypes/sound.png=audio-x-generic.png
+s none share/icons/Neu/48x48/mimetypes/gnome-mime-application-x-7z-compressed.png=package-x-generic.png
+s none share/icons/Neu/48x48/mimetypes/gnome-mime-application-x-gnumeric.png=x-office-spreadsheet.png
+s none share/icons/Neu/48x48/mimetypes/unknown.png=text-x-generic.png
+s none share/icons/Neu/48x48/mimetypes/folder_tar.png=package-x-generic.png
+s none share/icons/Neu/48x48/mimetypes/gnome-mime-application-vnd.sun.xml.writer.png=x-office-document.png
+s none share/icons/Neu/48x48/mimetypes/www.png=text-html.png
+s none share/icons/Neu/48x48/mimetypes/gnome-mime-application-x-php.png=text-html.png
+f none share/icons/Neu/48x48/mimetypes/x-office-document.png 0644 root bin
+s none share/icons/Neu/48x48/mimetypes/application-vnd.openxmlformats-officedocument.spreadsheetml.sheet.png=x-office-spreadsheet.png
+s none share/icons/Neu/48x48/mimetypes/gnome-mime-application-x-dvi.png=x-office-document.png
+s none share/icons/Neu/48x48/mimetypes/txt.png=text-x-generic.png
+s none share/icons/Neu/48x48/mimetypes/html.png=text-html.png
+f none share/icons/Neu/48x48/mimetypes/x-office-spreadsheet.png 0644 root bin
+s none share/icons/Neu/48x48/mimetypes/stock_certificate.png=application-certificate.png
+s none share/icons/Neu/48x48/mimetypes/gnome-mime-application-vnd.rn-realmedia-secure.png=video-x-generic.png
+f none share/icons/Neu/48x48/mimetypes/text-x-generic.png 0644 root bin
+s none share/icons/Neu/48x48/mimetypes/application-vnd.openxmlformats-officedocument.wordprocessingml.document.png=x-office-document.png
+s none share/icons/Neu/48x48/mimetypes/gnome-mime-application-x-compressed-tar.png=package-x-generic.png
+f none share/icons/Neu/48x48/mimetypes/application-x-executable.png 0644 root bin
+s none share/icons/Neu/48x48/mimetypes/exec.png=application-x-executable.png
+s none share/icons/Neu/48x48/mimetypes/gnome-mime-application-x-lha.png=package-x-generic.png
+s none share/icons/Neu/48x48/mimetypes/gnome-mime-application-x-rpm.png=package-x-generic.png
+s none share/icons/Neu/48x48/mimetypes/spreadsheet.png=x-office-spreadsheet.png
+s none share/icons/Neu/48x48/mimetypes/gnome-mime-application-x-tar.png=package-x-generic.png
+f none share/icons/Neu/48x48/mimetypes/application-certificate.png 0644 root bin
+s none share/icons/Neu/48x48/mimetypes/gnome-mime-text-html.png=text-html.png
+s none share/icons/Neu/48x48/mimetypes/gnome-mime-application-x-lhz.png=package-x-generic.png
+s none share/icons/Neu/48x48/mimetypes/gnome-mime-application-msword.png=x-office-document.png
+s none share/icons/Neu/48x48/mimetypes/gnome-mime-text-x-zsh.png=text-x-script.png
+s none share/icons/Neu/48x48/mimetypes/deb.png=package-x-generic.png
+s none share/icons/Neu/48x48/mimetypes/gnome-mime-application-x-perl.png=text-x-script.png
+s none share/icons/Neu/48x48/mimetypes/application-vnd.ms-excel.sheet.macroEnabled.12.png=x-office-spreadsheet.png
+s none share/icons/Neu/48x48/mimetypes/gnome-mime-text-x-sh.png=text-x-script.png
+s none share/icons/Neu/48x48/mimetypes/gnome-mime-application-x-archive.png=package-x-generic.png
+s none share/icons/Neu/48x48/mimetypes/gnome-mime-application-x-killustrator.png=image-x-generic.png
+s none share/icons/Neu/48x48/mimetypes/gnome-mime-application-pdf.png=x-office-document.png
+s none share/icons/Neu/48x48/mimetypes/gnome-mime-application-xhtml+xml.png=text-html.png
+s none share/icons/Neu/48x48/mimetypes/gnome-mime-video.png=video-x-generic.png
+s none share/icons/Neu/48x48/mimetypes/gnome-mime-application-ogg.png=audio-x-generic.png
+s none share/icons/Neu/48x48/mimetypes/gnome-mime-application-x-arj.png=package-x-generic.png
+s none share/icons/Neu/48x48/mimetypes/gnome-mime-application-x-tarz.png=package-x-generic.png
+s none share/icons/Neu/48x48/mimetypes/gnome-mime-text-x-csh.png=text-x-script.png
+s none share/icons/Neu/48x48/mimetypes/gnome-mime-application-x-shockwave-flash.png=video-x-generic.png
+s none share/icons/Neu/48x48/mimetypes/gnome-mime-application-x-kspread.png=x-office-spreadsheet.png
+s none share/icons/Neu/48x48/mimetypes/gnome-mime-application-vnd.stardivision.writer.png=x-office-document.png
+s none share/icons/Neu/48x48/mimetypes/gnome-mime-application-x-deb.png=package-x-generic.png
+s none share/icons/Neu/48x48/mimetypes/gnome-mime-application-rtf.png=x-office-document.png
+s none share/icons/Neu/48x48/mimetypes/gnome-mime-application-x-gzip.png=package-x-generic.png
+s none share/icons/Neu/48x48/mimetypes/stock_addressbook.png=x-office-address-book.png
+s none share/icons/Neu/48x48/mimetypes/gnome-package.png=package-x-generic.png
+s none share/icons/Neu/48x48/mimetypes/rpm.png=package-x-generic.png
+s none share/icons/Neu/48x48/mimetypes/tar.png=package-x-generic.png
+s none share/icons/Neu/48x48/mimetypes/mime_ascii.png=text-x-generic.png
+s none share/icons/Neu/48x48/mimetypes/gnome-mime-application-x-bzip-compressed-tar.png=package-x-generic.png
+s none share/icons/Neu/48x48/mimetypes/gnome-mime-application-x-font-sunos-news.png=font-x-generic.png
+s none share/icons/Neu/48x48/mimetypes/gnome-mime-application-x-cpio-compressed.png=package-x-generic.png
+s none share/icons/Neu/48x48/mimetypes/gnome-mime-x-font-afm.png=font-x-generic.png
+s none share/icons/Neu/48x48/mimetypes/stock_script.png=text-x-script.png
+f none share/icons/Neu/48x48/mimetypes/misc-cd-image.png 0644 root bin
+s none share/icons/Neu/48x48/mimetypes/package_editors.png=text-x-generic.png
+s none share/icons/Neu/48x48/mimetypes/gnome-mime-application-wordperfect.png=x-office-document.png
+s none share/icons/Neu/48x48/mimetypes/gnome-mime-application-x-jar.png=package-x-generic.png
+s none share/icons/Neu/48x48/mimetypes/gnome-mime-application-x-gzpostscript.png=x-office-document.png
+s none share/icons/Neu/48x48/mimetypes/gnome-mime-application-x-executable.png=application-x-executable.png
+s none share/icons/Neu/48x48/mimetypes/gnome-fs-executable.png=application-x-executable.png
+s none share/icons/Neu/48x48/mimetypes/gnome-mime-audio.png=audio-x-generic.png
+s none share/icons/Neu/48x48/mimetypes/gnome-mime-application-x-font-pcf.png=font-x-generic.png
+s none share/icons/Neu/48x48/mimetypes/video.png=video-x-generic.png
+s none share/icons/Neu/48x48/mimetypes/gnome-mime-application-vnd.sun.xml.calc.png=x-office-spreadsheet.png
+s none share/icons/Neu/48x48/mimetypes/package_wordprocessing.png=x-office-document.png
+s none share/icons/Neu/48x48/mimetypes/gnome-mime-application-x-rar.png=package-x-generic.png
+s none share/icons/Neu/48x48/mimetypes/font_type1.png=font-x-generic.png
+s none share/icons/Neu/48x48/mimetypes/document.png=x-office-document.png
+s none share/icons/Neu/48x48/mimetypes/gnome-mime-application-x-kword.png=x-office-document.png
+f none share/icons/Neu/48x48/mimetypes/empty.png 0644 root bin
+s none share/icons/Neu/48x48/mimetypes/ascii.png=text-x-generic.png
+s none share/icons/Neu/48x48/mimetypes/gnome-mime-application-x-python-bytecode.png=text-x-script.png
+s none share/icons/Neu/48x48/mimetypes/gnome-mime-application-x-tex.png=x-office-document.png
+s none share/icons/Neu/48x48/mimetypes/gnome-mime-application-x-shellscript.png=text-x-script.png
+s none share/icons/Neu/48x48/mimetypes/gnome-mime-text.png=text-x-generic.png
+s none share/icons/Neu/48x48/mimetypes/zip.png=package-x-generic.png
+s none share/icons/Neu/48x48/mimetypes/gnome-mime-application-x-applix-spreadsheet.png=x-office-spreadsheet.png
+s none share/icons/Neu/48x48/mimetypes/gnome-mime-application-x-applix-word.png=x-office-document.png
+s none share/icons/Neu/48x48/mimetypes/font_bitmap.png=font-x-generic.png
+s none share/icons/Neu/48x48/mimetypes/gnome-mime-application-vnd.lotus-1-2-3.png=x-office-spreadsheet.png
+s none share/icons/Neu/48x48/mimetypes/binary.png=application-x-executable.png
+f none share/icons/Neu/48x48/mimetypes/text-html.png 0644 root bin
+s none share/icons/Neu/48x48/mimetypes/font_truetype.png=font-x-generic.png
+f none share/icons/Neu/48x48/mimetypes/package-x-generic.png 0644 root bin
+f none share/icons/Neu/48x48/mimetypes/text-x-source.png 0644 root bin
+s none share/icons/Neu/48x48/mimetypes/contents2.png=x-office-address-book.png
+s none share/icons/Neu/48x48/mimetypes/gnome-mime-application-postscript.png=x-office-document.png
+f none share/icons/Neu/48x48/mimetypes/x-office-address-book.png 0644 root bin
+f none share/icons/Neu/48x48/mimetypes/font-x-generic.png 0644 root bin
+s none share/icons/Neu/48x48/mimetypes/gnome-mime-text-x-python.png=text-x-script.png
+s none share/icons/Neu/48x48/mimetypes/gnome-mime-application-vnd.oasis.opendocument.spreadsheet.png=x-office-spreadsheet.png
+f none share/icons/Neu/48x48/mimetypes/image-x-generic.png 0644 root bin
+s none share/icons/Neu/48x48/mimetypes/gnome-mime-application-vnd.ms-excel.png=x-office-spreadsheet.png
+s none share/icons/Neu/48x48/mimetypes/vcard.png=x-office-address-book.png
+s none share/icons/Neu/48x48/mimetypes/gnome-mime-application-x-bzip.png=package-x-generic.png
+s none share/icons/Neu/48x48/mimetypes/font.png=font-x-generic.png
+s none share/icons/Neu/48x48/mimetypes/shellscript.png=text-x-script.png
+s none share/icons/Neu/48x48/mimetypes/gnome-mime-application-x-font-afm.png=font-x-generic.png
+s none share/icons/Neu/48x48/mimetypes/misc.png=text-x-generic.png
+f none share/icons/Neu/48x48/mimetypes/video-x-generic.png 0644 root bin
+s none share/icons/Neu/48x48/mimetypes/gnome-mime-application-x-compress.png=package-x-generic.png
+s none share/icons/Neu/48x48/mimetypes/gnome-mime-application-x-scribus.png=x-office-document.png
+s none share/icons/Neu/48x48/mimetypes/gnome-mime-application-x-font-bdf.png=font-x-generic.png
+s none share/icons/Neu/48x48/mimetypes/wordprocessing.png=x-office-document.png
+s none share/icons/Neu/48x48/mimetypes/gnome-mime-text-vnd.wap.wml.png=text-html.png
+s none share/icons/Neu/48x48/mimetypes/gnome-mime-application-vnd.oasis.opendocument.text.png=x-office-document.png
+s none share/icons/Neu/48x48/mimetypes/gnome-mime-application-vnd.rn-realmedia-vbr.png=video-x-generic.png
+s none share/icons/Neu/48x48/mimetypes/application-vnd.ms-word.document.macroEnabled.12.png=x-office-document.png
+s none share/icons/Neu/48x48/mimetypes/gnome-mime-application-x-lzma.png=package-x-generic.png
+s none share/icons/Neu/48x48/mimetypes/gnome-mime-application-x-font-ttf.png=font-x-generic.png
+s none share/icons/Neu/48x48/mimetypes/gnome-mime-application-vnd.oasis.opendocument.text-web.png=text-html.png
+s none share/icons/Neu/48x48/mimetypes/image.png=image-x-generic.png
+s none share/icons/Neu/48x48/mimetypes/gnome-mime-application-x-stuffit.png=package-x-generic.png
+s none share/icons/Neu/48x48/mimetypes/tgz.png=package-x-generic.png
+s none share/icons/Neu/48x48/mimetypes/gnome-mime-application-x-ms-dos-executable.png=application-x-executable.png
+s none share/icons/Neu/48x48/mimetypes/gnome-mime-application-vnd.rn-realmedia.png=video-x-generic.png
+s none share/icons/Neu/48x48/mimetypes/txt2.png=text-x-generic.png
+s none share/icons/Neu/48x48/mimetypes/gnome-mime-application-x-abiword.png=x-office-document.png
+s none share/icons/Neu/48x48/mimetypes/gnome-mime-application-x-lzma-compressed-tar.png=package-x-generic.png
+f none share/icons/Neu/48x48/mimetypes/audio-x-generic.png 0644 root bin
+d none share/icons/Neu/48x48/emblems 0755 root bin
+s none share/icons/Neu/48x48/emblems/emblem-noread.png=emblem-unreadable.png
+f none share/icons/Neu/48x48/emblems/emblem-symbolic-link.png 0644 root bin
+f none share/icons/Neu/48x48/emblems/emblem-important.png 0644 root bin
+f none share/icons/Neu/48x48/emblems/emblem-web.png 0644 root bin
+s none share/icons/Neu/48x48/emblems/emblem-nowrite.png=emblem-readonly.png
+f none share/icons/Neu/48x48/emblems/emblem-system.png 0644 root bin
+f none share/icons/Neu/48x48/emblems/emblem-pictures.png 0644 root bin
+f none share/icons/Neu/48x48/emblems/emblem-unreadable.png 0644 root bin
+f none share/icons/Neu/48x48/emblems/emblem-readonly.png 0644 root bin
+d none share/icons/Neu/48x48/actions 0755 root bin
+s none share/icons/Neu/48x48/actions/gtk-print.png=document-print.png
+s none share/icons/Neu/48x48/actions/gtk-print-preview.png=document-print-preview.png
+s none share/icons/Neu/48x48/actions/stock_search-and-replace.png=edit-find-replace.png
+s none share/icons/Neu/48x48/actions/filenew.png=document-new.png
+f none share/icons/Neu/48x48/actions/mail-message-new.png 0644 root bin
+s none share/icons/Neu/48x48/actions/stock_undo.png=edit-undo.png
+s none share/icons/Neu/48x48/actions/gnome-stock-mail-new.png=mail-message-new.png
+f none share/icons/Neu/48x48/actions/system-run.png 0644 root bin
+s none share/icons/Neu/48x48/actions/gtk-redo-ltr.png=edit-redo.png
+s none share/icons/Neu/48x48/actions/stock_text_bold.png=format-text-bold.png
+s none share/icons/Neu/48x48/actions/editclear.png=edit-clear.png
+s none share/icons/Neu/48x48/actions/gnome-stock-text-unindent.png=format-indent-less.png
+s none share/icons/Neu/48x48/actions/kfind.png=system-search.png
+f none share/icons/Neu/48x48/actions/format-indent-more.png 0644 root bin
+f none share/icons/Neu/48x48/actions/document-new.png 0644 root bin
+f none share/icons/Neu/48x48/actions/document-save-as.png 0644 root bin
+s none share/icons/Neu/48x48/actions/gtk-goto-last-ltr.png=go-last.png
+s none share/icons/Neu/48x48/actions/stock_right.png=go-next.png
+s none share/icons/Neu/48x48/actions/gtk-go-back-rtl.png=go-next.png
+s none share/icons/Neu/48x48/actions/stock_text_underlined.png=format-text-underline.png
+s none share/icons/Neu/48x48/actions/reload3.png=view-refresh.png
+s none share/icons/Neu/48x48/actions/redhat-home.png=go-home.png
+s none share/icons/Neu/48x48/actions/exit.png=system-log-out.png
+s none share/icons/Neu/48x48/actions/gtk-bold.png=format-text-bold.png
+f none share/icons/Neu/48x48/actions/format-justify-fill.png 0644 root bin
+s none share/icons/Neu/48x48/actions/stock_home.png=go-home.png
+s none share/icons/Neu/48x48/actions/gtk-save-as.png=document-save-as.png
+s none share/icons/Neu/48x48/actions/stock_mail-reply-to-all.png=mail-reply-all.png
+f none share/icons/Neu/48x48/actions/system-log-out.png 0644 root bin
+s none share/icons/Neu/48x48/actions/gtk-goto-first-rtl.png=go-last.png
+f none share/icons/Neu/48x48/actions/system-shutdown.png 0644 root bin
+s none share/icons/Neu/48x48/actions/search.png=system-search.png
+s none share/icons/Neu/48x48/actions/stock_new-appointment.png=appointment-new.png
+s none share/icons/Neu/48x48/actions/gtk-underline.png=format-text-underline.png
+s none share/icons/Neu/48x48/actions/folder_new.png=folder-new.png
+s none share/icons/Neu/48x48/actions/gtk-clear.png=edit-clear.png
+s none share/icons/Neu/48x48/actions/editcut.png=edit-cut.png
+f none share/icons/Neu/48x48/actions/go-home.png 0644 root bin
+s none share/icons/Neu/48x48/actions/bookmarks_list_add.png=bookmark-new.png
+f none share/icons/Neu/48x48/actions/edit-find.png 0644 root bin
+s none share/icons/Neu/48x48/actions/gtk-refresh.png=view-refresh.png
+s none share/icons/Neu/48x48/actions/window_new.png=window-new.png
+s none share/icons/Neu/48x48/actions/stock_text_justify.png=format-justify-fill.png
+s none share/icons/Neu/48x48/actions/lock.png=system-lock-screen.png
+s none share/icons/Neu/48x48/actions/fileprint.png=document-print.png
+s none share/icons/Neu/48x48/actions/stock_mail-reply.png=mail-reply-sender.png
+s none share/icons/Neu/48x48/actions/gtk-unindent-rtl.png=format-indent-more.png
+f none share/icons/Neu/48x48/actions/list-remove.png 0644 root bin
+s none share/icons/Neu/48x48/actions/editdelete.png=edit-delete.png
+s none share/icons/Neu/48x48/actions/stock_stop.png=process-stop.png
+s none share/icons/Neu/48x48/actions/find.png=edit-find.png
+s none share/icons/Neu/48x48/actions/gtk-paste.png=edit-paste.png
+f none share/icons/Neu/48x48/actions/format-justify-right.png 0644 root bin
+s none share/icons/Neu/48x48/actions/gtk-remove.png=list-remove.png
+s none share/icons/Neu/48x48/actions/stock_text_center.png=format-justify-center.png
+s none share/icons/Neu/48x48/actions/gtk-unindent-ltr.png=format-indent-less.png
+f none share/icons/Neu/48x48/actions/go-next.png 0644 root bin
+s none share/icons/Neu/48x48/actions/stock_bottom.png=go-bottom.png
+s none share/icons/Neu/48x48/actions/gtk-cancel.png=dialog-cancel.png
+s none share/icons/Neu/48x48/actions/stock_save-as.png=document-save-as.png
+s none share/icons/Neu/48x48/actions/stock_cut.png=edit-cut.png
+s none share/icons/Neu/48x48/actions/stock_about.png=help-about.png
+f none share/icons/Neu/48x48/actions/dialog-ok.png 0644 root bin
+s none share/icons/Neu/48x48/actions/stock_copy.png=edit-copy.png
+s none share/icons/Neu/48x48/actions/stock_refresh.png=view-refresh.png
+s none share/icons/Neu/48x48/actions/filesaveas.png=document-save-as.png
+s none share/icons/Neu/48x48/actions/gnome-stock-mail-fwd.png=mail-forward.png
+s none share/icons/Neu/48x48/actions/gtk-justify-center.png=format-justify-center.png
+s none share/icons/Neu/48x48/actions/stock_redo.png=edit-redo.png
+f none share/icons/Neu/48x48/actions/go-jump.png 0644 root bin
+s none share/icons/Neu/48x48/actions/stock_up.png=go-up.png
+s none share/icons/Neu/48x48/actions/stock_new-window.png=window-new.png
+s none share/icons/Neu/48x48/actions/filequickprint.png=document-print-preview.png
+s none share/icons/Neu/48x48/actions/add.png=list-add.png
+s none share/icons/Neu/48x48/actions/stock_text_italic.png=format-text-italic.png
+s none share/icons/Neu/48x48/actions/gtk-cut.png=edit-cut.png
+s none share/icons/Neu/48x48/actions/gtk-goto-first-ltr.png=go-first.png
+s none share/icons/Neu/48x48/actions/down.png=go-down.png
+s none share/icons/Neu/48x48/actions/stock_text_left.png=format-justify-left.png
+s none share/icons/Neu/48x48/actions/editpaste.png=edit-paste.png
+s none share/icons/Neu/48x48/actions/gtk-find.png=edit-find.png
+s none share/icons/Neu/48x48/actions/centrejust.png=format-justify-center.png
+f none share/icons/Neu/48x48/actions/mail-reply-sender.png 0644 root bin
+s none share/icons/Neu/48x48/actions/stock_add-bookmark.png=bookmark-new.png
+f none share/icons/Neu/48x48/actions/document-save.png 0644 root bin
+s none share/icons/Neu/48x48/actions/gtk-goto-last-rtl.png=go-first.png
+s none share/icons/Neu/48x48/actions/gtk-go-up.png=go-up.png
+f none share/icons/Neu/48x48/actions/edit-delete.png 0644 root bin
+s none share/icons/Neu/48x48/actions/gtk-go-back-ltr.png=go-previous.png
+f none share/icons/Neu/48x48/actions/go-first.png 0644 root bin
+f none share/icons/Neu/48x48/actions/go-last.png 0644 root bin
+f none share/icons/Neu/48x48/actions/address-book-new.png 0644 root bin
+s none share/icons/Neu/48x48/actions/gtk-goto-bottom.png=go-bottom.png
+s none share/icons/Neu/48x48/actions/filefind.png=edit-find.png
+s none share/icons/Neu/48x48/actions/gtk-undo-ltr.png=edit-undo.png
+s none share/icons/Neu/48x48/actions/fileopen.png=document-open.png
+s none share/icons/Neu/48x48/actions/gtk-justify-left.png=format-justify-left.png
+s none share/icons/Neu/48x48/actions/gnome-lockscreen.png=system-lock-screen.png
+f none share/icons/Neu/48x48/actions/window-new.png 0644 root bin
+s none share/icons/Neu/48x48/actions/stock_text_unindent.png=format-indent-less.png
+s none share/icons/Neu/48x48/actions/gtk-execute.png=system-run.png
+f none share/icons/Neu/48x48/actions/mail-reply-all.png 0644 root bin
+s none share/icons/Neu/48x48/actions/stock_save.png=document-save.png
+f none share/icons/Neu/48x48/actions/go-bottom.png 0644 root bin
+s none share/icons/Neu/48x48/actions/gnome-logout.png=system-log-out.png
+f none share/icons/Neu/48x48/actions/folder-new.png 0644 root bin
+f none share/icons/Neu/48x48/actions/appointment-new.png 0644 root bin
+s none share/icons/Neu/48x48/actions/gtk-open.png=document-open.png
+s none share/icons/Neu/48x48/actions/stock_top.png=go-top.png
+s none share/icons/Neu/48x48/actions/stock_last.png=go-last.png
+s none share/icons/Neu/48x48/actions/stock_new-bcard.png=contact-new.png
+f none share/icons/Neu/48x48/actions/document-print.png 0644 root bin
+s none share/icons/Neu/48x48/actions/stock_print.png=document-print.png
+s none share/icons/Neu/48x48/actions/text_under.png=format-text-underline.png
+f none share/icons/Neu/48x48/actions/format-justify-center.png 0644 root bin
+f none share/icons/Neu/48x48/actions/dialog-close.png 0644 root bin
+f none share/icons/Neu/48x48/actions/edit-redo.png 0644 root bin
+f none share/icons/Neu/48x48/actions/format-justify-left.png 0644 root bin
+s none share/icons/Neu/48x48/actions/gnome-stock-text-indent.png=format-indent-more.png
+s none share/icons/Neu/48x48/actions/gtk-italic.png=format-text-italic.png
+f none share/icons/Neu/48x48/actions/edit-copy.png 0644 root bin
+s none share/icons/Neu/48x48/actions/gtk-add.png=list-add.png
+f none share/icons/Neu/48x48/actions/document-properties.png 0644 root bin
+s none share/icons/Neu/48x48/actions/back.png=go-previous.png
+f none share/icons/Neu/48x48/actions/document-print-preview.png 0644 root bin
+s none share/icons/Neu/48x48/actions/gohome.png=go-home.png
+s none share/icons/Neu/48x48/actions/stock_help-add-bookmark.png=bookmark-new.png
+s none share/icons/Neu/48x48/actions/xfce-system-lock.png=system-lock-screen.png
+f none share/icons/Neu/48x48/actions/edit-find-replace.png 0644 root bin
+s none share/icons/Neu/48x48/actions/stock_mail-forward.png=mail-forward.png
+s none share/icons/Neu/48x48/actions/mail_reply.png=mail-reply-sender.png
+s none share/icons/Neu/48x48/actions/kfm_home.png=go-home.png
+f none share/icons/Neu/48x48/actions/edit-cut.png 0644 root bin
+s none share/icons/Neu/48x48/actions/bookmark_add.png=bookmark-new.png
+s none share/icons/Neu/48x48/actions/mail_forward.png=mail-forward.png
+s none share/icons/Neu/48x48/actions/gtk-go-forward-rtl.png=go-previous.png
+s none share/icons/Neu/48x48/actions/bottom.png=go-bottom.png
+s none share/icons/Neu/48x48/actions/stock_new-dir.png=folder-new.png
+f none share/icons/Neu/48x48/actions/go-up.png 0644 root bin
+s none share/icons/Neu/48x48/actions/gtk-indent-rtl.png=format-indent-less.png
+f none share/icons/Neu/48x48/actions/bookmark-new.png 0644 root bin
+f none share/icons/Neu/48x48/actions/format-indent-less.png 0644 root bin
+s none share/icons/Neu/48x48/actions/reload_page.png=view-refresh.png
+f none share/icons/Neu/48x48/actions/list-add.png 0644 root bin
+f none share/icons/Neu/48x48/actions/edit-paste.png 0644 root bin
+s none share/icons/Neu/48x48/actions/gtk-find-and-replace.png=edit-find-replace.png
+s none share/icons/Neu/48x48/actions/stock_properties.png=document-properties.png
+s none share/icons/Neu/48x48/actions/up.png=go-up.png
+s none share/icons/Neu/48x48/actions/gtk-home.png=go-home.png
+s none share/icons/Neu/48x48/actions/gnome-stock-mail-rpl.png=mail-reply-sender.png
+s none share/icons/Neu/48x48/actions/undo.png=edit-undo.png
+f none share/icons/Neu/48x48/actions/mail-send-receive.png 0644 root bin
+s none share/icons/Neu/48x48/actions/button_cancel.png=dialog-cancel.png
+f none share/icons/Neu/48x48/actions/dialog-cancel.png 0644 root bin
+s none share/icons/Neu/48x48/actions/top.png=go-top.png
+s none share/icons/Neu/48x48/actions/gtk-delete.png=edit-delete.png
+s none share/icons/Neu/48x48/actions/stock_text_indent.png=format-indent-more.png
+s none share/icons/Neu/48x48/actions/stock_print-preview.png=document-print-preview.png
+s none share/icons/Neu/48x48/actions/gtk-jump-to-ltr.png=go-jump.png
+s none share/icons/Neu/48x48/actions/reload.png=view-refresh.png
+s none share/icons/Neu/48x48/actions/stock_mail-send-receive.png=mail-send-receive.png
+s none share/icons/Neu/48x48/actions/stock_select-all.png=edit-select-all.png
+f none share/icons/Neu/48x48/actions/go-top.png 0644 root bin
+s none share/icons/Neu/48x48/actions/stock_new-address-book.png=address-book-new.png
+s none share/icons/Neu/48x48/actions/gtk-justify-right.png=format-justify-right.png
+f none share/icons/Neu/48x48/actions/format-text-bold.png 0644 root bin
+s none share/icons/Neu/48x48/actions/appointment.png=appointment-new.png
+s none share/icons/Neu/48x48/actions/gnome-shutdown.png=system-shutdown.png
+s none share/icons/Neu/48x48/actions/stock_paste.png=edit-paste.png
+s none share/icons/Neu/48x48/actions/gtk-stop.png=process-stop.png
+f none share/icons/Neu/48x48/actions/mail-forward.png 0644 root bin
+s none share/icons/Neu/48x48/actions/gtk-jump-to-rtl.png=go-jump.png
+s none share/icons/Neu/48x48/actions/gtk-new.png=document-new.png
+f none share/icons/Neu/48x48/actions/edit-select-all.png 0644 root bin
+f none share/icons/Neu/48x48/actions/contact-new.png 0644 root bin
+f none share/icons/Neu/48x48/actions/process-stop.png 0644 root bin
+f none share/icons/Neu/48x48/actions/system-lock-screen.png 0644 root bin
+f none share/icons/Neu/48x48/actions/edit-clear.png 0644 root bin
+s none share/icons/Neu/48x48/actions/gtk-about.png=help-about.png
+s none share/icons/Neu/48x48/actions/gtk-copy.png=edit-copy.png
+s none share/icons/Neu/48x48/actions/stock_text_right.png=format-justify-right.png
+f none share/icons/Neu/48x48/actions/edit-undo.png 0644 root bin
+s none share/icons/Neu/48x48/actions/stock_left.png=go-previous.png
+s none share/icons/Neu/48x48/actions/mail_replyall.png=mail-reply-all.png
+s none share/icons/Neu/48x48/actions/previous.png=go-previous.png
+s none share/icons/Neu/48x48/actions/start.png=go-first.png
+s none share/icons/Neu/48x48/actions/gtk-justify-fill.png=format-justify-fill.png
+s none share/icons/Neu/48x48/actions/remove.png=list-remove.png
+s none share/icons/Neu/48x48/actions/mail_new.png=mail-message-new.png
+s none share/icons/Neu/48x48/actions/gtk-go-down.png=go-down.png
+s none share/icons/Neu/48x48/actions/reload_all_tabs.png=view-refresh.png
+f none share/icons/Neu/48x48/actions/system-search.png 0644 root bin
+s none share/icons/Neu/48x48/actions/stock_mail-compose.png=mail-message-new.png
+s none share/icons/Neu/48x48/actions/cancel.png=dialog-cancel.png
+s none share/icons/Neu/48x48/actions/gtk-properties.png=document-properties.png
+s none share/icons/Neu/48x48/actions/stop.png=process-stop.png
+s none share/icons/Neu/48x48/actions/gtk-goto-top.png=go-top.png
+s none share/icons/Neu/48x48/actions/text_bold.png=format-text-bold.png
+s none share/icons/Neu/48x48/actions/stock_file-properites.png=document-properties.png
+f none share/icons/Neu/48x48/actions/document-open.png 0644 root bin
+f none share/icons/Neu/48x48/actions/help-about.png 0644 root bin
+s none share/icons/Neu/48x48/actions/gtk-go-forward-ltr.png=go-next.png
+s none share/icons/Neu/48x48/actions/gnome-run.png=system-run.png
+f none share/icons/Neu/48x48/actions/format-text-italic.png 0644 root bin
+s none share/icons/Neu/48x48/actions/text_italic.png=format-text-italic.png
+s none share/icons/Neu/48x48/actions/stock_new-text.png=document-new.png
+s none share/icons/Neu/48x48/actions/gtk-indent-ltr.png=format-indent-more.png
+s none share/icons/Neu/48x48/actions/rightjust.png=format-justify-right.png
+f none share/icons/Neu/48x48/actions/go-down.png 0644 root bin
+s none share/icons/Neu/48x48/actions/finish.png=go-last.png
+f none share/icons/Neu/48x48/actions/view-refresh.png 0644 root bin
+s none share/icons/Neu/48x48/actions/stock_search.png=edit-find.png
+f none share/icons/Neu/48x48/actions/go-previous.png 0644 root bin
+s none share/icons/Neu/48x48/actions/leftjust.png=format-justify-left.png
+s none share/icons/Neu/48x48/actions/filesave.png=document-save.png
+s none share/icons/Neu/48x48/actions/redo.png=edit-redo.png
+f none share/icons/Neu/48x48/actions/format-text-underline.png 0644 root bin
+s none share/icons/Neu/48x48/actions/forward.png=go-next.png
+s none share/icons/Neu/48x48/actions/next.png=go-next.png
+s none share/icons/Neu/48x48/actions/gtk-save.png=document-save.png
+s none share/icons/Neu/48x48/actions/stock_delete.png=edit-delete.png
+s none share/icons/Neu/48x48/actions/stock_first.png=go-first.png
+s none share/icons/Neu/48x48/actions/stock_down.png=go-down.png
+s none share/icons/Neu/48x48/actions/gnome-searchtool.png=system-search.png
+s none share/icons/Neu/48x48/actions/gtk-select-all.png=edit-select-all.png
+s none share/icons/Neu/48x48/actions/editcopy.png=edit-copy.png
+d none share/icons/Neu/48x48/apps 0755 root bin
+f none share/icons/Neu/48x48/apps/preferences-desktop-accessibility.png 0644 root bin
+f none share/icons/Neu/48x48/apps/help-browser.png 0644 root bin
+f none share/icons/Neu/48x48/apps/system-users.png 0644 root bin
+s none share/icons/Neu/48x48/apps/redhat-filemanager.png=system-file-manager.png
+f none share/icons/Neu/48x48/apps/utilities-system-monitor.png 0644 root bin
+s none share/icons/Neu/48x48/apps/xfwm4.png=preferences-system-windows.png
+s none share/icons/Neu/48x48/apps/config-users.png=system-users.png
+s none share/icons/Neu/48x48/apps/kuser.png=system-users.png
+s none share/icons/Neu/48x48/apps/gnome-terminal.png=utilities-terminal.png
+s none share/icons/Neu/48x48/apps/konsole.png=utilities-terminal.png
+s none share/icons/Neu/48x48/apps/gnome-window-manager.png=preferences-system-windows.png
+f none share/icons/Neu/48x48/apps/internet-web-browser.png 0644 root bin
+f none share/icons/Neu/48x48/apps/preferences-system-network-proxy.png 0644 root bin
+s none share/icons/Neu/48x48/apps/proxy-config.png=preferences-system-network-proxy.png
+s none share/icons/Neu/48x48/apps/kscreensaver.png=preferences-desktop-screensaver.png
+s none share/icons/Neu/48x48/apps/xfce4-mixer.png=multimedia-volume-control.png
+s none share/icons/Neu/48x48/apps/gnome-help.png=help-browser.png
+s none share/icons/Neu/48x48/apps/kfm.png=system-file-manager.png
+f none share/icons/Neu/48x48/apps/preferences-desktop-font.png 0644 root bin
+s none share/icons/Neu/48x48/apps/proxy.png=preferences-system-network-proxy.png
+s none share/icons/Neu/48x48/apps/gnome-settings-background.png=preferences-desktop-wallpaper.png
+s none share/icons/Neu/48x48/apps/kcharselect.png=accessories-character-map.png
+f none share/icons/Neu/48x48/apps/graphics-svg-editor.png 0644 root bin
+s none share/icons/Neu/48x48/apps/gucharmap.png=accessories-character-map.png
+f none share/icons/Neu/48x48/apps/graphics-image-editor.png 0644 root bin
+s none share/icons/Neu/48x48/apps/krfb.png=preferences-desktop-remote-desktop.png
+s none share/icons/Neu/48x48/apps/zen-icon.png=system-software-update.png
+s none share/icons/Neu/48x48/apps/gnome-monitor.png=utilities-system-monitor.png
+f none share/icons/Neu/48x48/apps/preferences-desktop-remote-desktop.png 0644 root bin
+f none share/icons/Neu/48x48/apps/system-installer.png 0644 root bin
+s none share/icons/Neu/48x48/apps/wallpaper.png=preferences-desktop-wallpaper.png
+f none share/icons/Neu/48x48/apps/gimp.png 0644 root bin
+f none share/icons/Neu/48x48/apps/internet-mail.png 0644 root bin
+s none share/icons/Neu/48x48/apps/kcmkwm.png=preferences-system-windows.png
+s none share/icons/Neu/48x48/apps/susehelpcenter.png=help-browser.png
+f none share/icons/Neu/48x48/apps/epiphany-bookmarks.png 0644 root bin
+s none share/icons/Neu/48x48/apps/system-config-users.png=system-users.png
+s none share/icons/Neu/48x48/apps/xfce-filemanager.png=system-file-manager.png
+s none share/icons/Neu/48x48/apps/web-browser.png=internet-web-browser.png
+f none share/icons/Neu/48x48/apps/system-lock-screen.png 0644 root bin
+s none share/icons/Neu/48x48/apps/screensaver.png=preferences-desktop-screensaver.png
+f none share/icons/Neu/48x48/apps/multimedia-volume-control.png 0644 root bin
+s none share/icons/Neu/48x48/apps/khelpcenter.png=help-browser.png
+s none share/icons/Neu/48x48/apps/arts.png=multimedia-volume-control.png
+s none share/icons/Neu/48x48/apps/xscreensaver.png=preferences-desktop-screensaver.png
+s none share/icons/Neu/48x48/apps/redhat-email.png=internet-mail.png
+f none share/icons/Neu/48x48/apps/internet-group-chat.png 0644 root bin
+s none share/icons/Neu/48x48/apps/text-editor.png=accessories-text-editor.png
+s none share/icons/Neu/48x48/apps/background.png=preferences-desktop-wallpaper.png
+f none share/icons/Neu/48x48/apps/accessories-character-map.png 0644 root bin
+f none share/icons/Neu/48x48/apps/system-software-update.png 0644 root bin
+f none share/icons/Neu/48x48/apps/preferences-desktop-screensaver.png 0644 root bin
+s none share/icons/Neu/48x48/apps/fonts.png=preferences-desktop-font.png
+s none share/icons/Neu/48x48/apps/file-manager.png=system-file-manager.png
+f none share/icons/Neu/48x48/apps/preferences-user-information.png 0644 root bin
+s none share/icons/Neu/48x48/apps/volume-knob.png=multimedia-volume-control.png
+f none share/icons/Neu/48x48/apps/utilities-terminal.png 0644 root bin
+f none share/icons/Neu/48x48/apps/gaim.png 0644 root bin
+s none share/icons/Neu/48x48/apps/gnome-character-map.png=accessories-character-map.png
+s none share/icons/Neu/48x48/apps/mail_generic.png=internet-mail.png
+s none share/icons/Neu/48x48/apps/redhat-web-browser.png=internet-web-browser.png
+s none share/icons/Neu/48x48/apps/email.png=internet-mail.png
+s none share/icons/Neu/48x48/apps/kedit.png=accessories-text-editor.png
+s none share/icons/Neu/48x48/apps/accessibility-directory.png=preferences-desktop-accessibility.png
+f none share/icons/Neu/48x48/apps/preferences-system-windows.png 0644 root bin
+s none share/icons/Neu/48x48/apps/openterm.png=utilities-terminal.png
+s none share/icons/Neu/48x48/apps/update-manager.png=system-software-update.png
+s none share/icons/Neu/48x48/apps/gnome-settings-font.png=preferences-desktop-font.png
+s none share/icons/Neu/48x48/apps/terminal.png=utilities-terminal.png
+s none share/icons/Neu/48x48/apps/multimedia.png=multimedia-volume-control.png
+f none share/icons/Neu/48x48/apps/evolution.png 0644 root bin
+s none share/icons/Neu/48x48/apps/gnome-settings-accessibility-technologies.png=preferences-desktop-accessibility.png
+s none share/icons/Neu/48x48/apps/kwin.png=preferences-system-windows.png
+f none share/icons/Neu/48x48/apps/graphics-image-viewer.png 0644 root bin
+f none share/icons/Neu/48x48/apps/system-file-manager.png 0644 root bin
+f none share/icons/Neu/48x48/apps/accessories-text-editor.png 0644 root bin
+f none share/icons/Neu/48x48/apps/preferences-desktop-assistive-technology.png 0644 root bin
+s none share/icons/Neu/48x48/apps/kcmsound.png=multimedia-volume-control.png
+s none share/icons/Neu/48x48/apps/gnome-remote-desktop.png=preferences-desktop-remote-desktop.png
+s none share/icons/Neu/48x48/apps/browser.png=internet-web-browser.png
+s none share/icons/Neu/48x48/apps/xfce4-session.png=preferences-system-session.png
+s none share/icons/Neu/48x48/apps/gnome-session.png=preferences-system-session.png
+s none share/icons/Neu/48x48/apps/ksysguard.png=utilities-system-monitor.png
+s none share/icons/Neu/48x48/apps/access.png=preferences-desktop-accessibility.png
+f none share/icons/Neu/48x48/apps/preferences-system-session.png 0644 root bin
+s none share/icons/Neu/48x48/apps/stock_proxy.png=preferences-system-network-proxy.png
+s none share/icons/Neu/48x48/apps/xfce-mail.png=internet-mail.png
+s none share/icons/Neu/48x48/apps/xfce-terminal.png=utilities-terminal.png
+f none share/icons/Neu/48x48/apps/sound-juicer.png 0644 root bin
+s none share/icons/Neu/48x48/apps/xfce4-backdrop.png=preferences-desktop-wallpaper.png
+s none share/icons/Neu/48x48/apps/gnome-mixer.png=multimedia-volume-control.png
+f none share/icons/Neu/48x48/apps/preferences-desktop-wallpaper.png 0644 root bin
+d none share/icons/Neu/24x24 0755 root bin
+d none share/icons/Neu/24x24/places 0755 root bin
+s none share/icons/Neu/24x24/places/gtk-directory.png=folder.png
+s none share/icons/Neu/24x24/places/redhat-network-server.png=network-server.png
+s none share/icons/Neu/24x24/places/emptytrash.png=user-trash.png
+s none share/icons/Neu/24x24/places/gnome-fs-nfs.png=folder-remote.png
+f none share/icons/Neu/24x24/places/user-trash.png 0644 root bin
+s none share/icons/Neu/24x24/places/gnome-fs-network.png=network-workgroup.png
+f none share/icons/Neu/24x24/places/folder-saved-search.png 0644 root bin
+f none share/icons/Neu/24x24/places/network-server.png 0644 root bin
+s none share/icons/Neu/24x24/places/desktop.png=user-desktop.png
+s none share/icons/Neu/24x24/places/gnome-fs-trash-empty.png=user-trash.png
+s none share/icons/Neu/24x24/places/gnome-fs-home.png=user-home.png
+s none share/icons/Neu/24x24/places/gtk-network.png=network-workgroup.png
+s none share/icons/Neu/24x24/places/server.png=network-server.png
+s none share/icons/Neu/24x24/places/gnome-mime-x-directory-smb-server.png=network-server.png
+s none share/icons/Neu/24x24/places/novell-button.png=start-here.png
+f none share/icons/Neu/24x24/places/start-here.png 0644 root bin
+s none share/icons/Neu/24x24/places/folder_home.png=user-home.png
+s none share/icons/Neu/24x24/places/gnome-mime-x-directory-smb-workgroup.png=network-workgroup.png
+s none share/icons/Neu/24x24/places/gnome-fs-ssh.png=folder-remote.png
+s none share/icons/Neu/24x24/places/gnome-fs-directory.png=folder.png
+s none share/icons/Neu/24x24/places/stock_folder.png=folder.png
+s none share/icons/Neu/24x24/places/distributor-logo.png=start-here.png
+f none share/icons/Neu/24x24/places/folder-remote.png 0644 root bin
+s none share/icons/Neu/24x24/places/gnome-mime-x-directory-nfs-server.png=network-server.png
+s none share/icons/Neu/24x24/places/gnome-stock-trash.png=user-trash.png
+s none share/icons/Neu/24x24/places/gnome-fs-desktop.png=user-desktop.png
+s none share/icons/Neu/24x24/places/gnome-fs-server.png=network-server.png
+f none share/icons/Neu/24x24/places/network-workgroup.png 0644 root bin
+s none share/icons/Neu/24x24/places/trashcan_empty.png=user-trash.png
+f none share/icons/Neu/24x24/places/folder.png 0644 root bin
+s none share/icons/Neu/24x24/places/network.png=folder-remote.png
+f none share/icons/Neu/24x24/places/user-desktop.png 0644 root bin
+s none share/icons/Neu/24x24/places/gnome-fs-smb.png=folder-remote.png
+s none share/icons/Neu/24x24/places/gnome-fs-ftp.png=folder-remote.png
+s none share/icons/Neu/24x24/places/network_local.png=network-workgroup.png
+s none share/icons/Neu/24x24/places/xfce-trash_empty.png=user-trash.png
+s none share/icons/Neu/24x24/places/gnome-mime-x-directory-smb-share.png=folder-remote.png
+s none share/icons/Neu/24x24/places/gnome-main-menu.png=start-here.png
+s none share/icons/Neu/24x24/places/inode-directory.png=folder.png
+f none share/icons/Neu/24x24/places/user-home.png 0644 root bin
+s none share/icons/Neu/24x24/places/gnome-fs-share.png=folder-remote.png
+s none share/icons/Neu/24x24/places/application-x-gnome-saved-search.png=folder-saved-search.png
+d none share/icons/Neu/24x24/status 0755 root bin
+s none share/icons/Neu/24x24/status/gnome-netstatus-idle.png=network-idle.png
+s none share/icons/Neu/24x24/status/stock_dialog-question.png=dialog-question.png
+s none share/icons/Neu/24x24/status/gnome-fs-loading-icon.png=image-loading.png
+s none share/icons/Neu/24x24/status/edittrash.png=user-trash-full.png
+s none share/icons/Neu/24x24/status/trashcan_full.png=user-trash-full.png
+s none share/icons/Neu/24x24/status/stock_trash_full.png=user-trash-full.png
+f none share/icons/Neu/24x24/status/network-receive.png 0644 root bin
+f none share/icons/Neu/24x24/status/user-trash-full.png 0644 root bin
+s none share/icons/Neu/24x24/status/gnome-netstatus-rx.png=network-receive.png
+s none share/icons/Neu/24x24/status/stock_open.png=folder-open.png
+s none share/icons/Neu/24x24/status/folder_open.png=folder-open.png
+f none share/icons/Neu/24x24/status/network-idle.png 0644 root bin
+s none share/icons/Neu/24x24/status/error.png=dialog-error.png
+s none share/icons/Neu/24x24/status/nm-device-wired.png=network-idle.png
+f none share/icons/Neu/24x24/status/audio-volume-muted.png 0644 root bin
+f none share/icons/Neu/24x24/status/battery-caution.png 0644 root bin
+s none share/icons/Neu/24x24/status/messagebox_warning.png=dialog-warning.png
+s none share/icons/Neu/24x24/status/stock_volume-max.png=audio-volume-high.png
+s none share/icons/Neu/24x24/status/messagebox_critical.png=dialog-error.png
+s none share/icons/Neu/24x24/status/nm-adhoc.png=network-idle.png
+s none share/icons/Neu/24x24/status/stock_volume-med.png=audio-volume-medium.png
+s none share/icons/Neu/24x24/status/stock_dialog-info.png=dialog-information.png
+f none share/icons/Neu/24x24/status/audio-volume-zero.png 0644 root bin
+f none share/icons/Neu/24x24/status/dialog-question.png 0644 root bin
+s none share/icons/Neu/24x24/status/important.png=dialog-warning.png
+s none share/icons/Neu/24x24/status/nm-device-wireless.png=network-idle.png
+s none share/icons/Neu/24x24/status/connect_no.png=network-offline.png
+s none share/icons/Neu/24x24/status/gnome-fs-trash-full.png=user-trash-full.png
+f none share/icons/Neu/24x24/status/network-offline.png 0644 root bin
+f none share/icons/Neu/24x24/status/network-error.png 0644 root bin
+f none share/icons/Neu/24x24/status/image-missing.png 0644 root bin
+s none share/icons/Neu/24x24/status/gtk-dialog-authentication.png=dialog-password.png
+f none share/icons/Neu/24x24/status/network-transmit-receive.png 0644 root bin
+s none share/icons/Neu/24x24/status/connect_creating.png=network-transmit-receive.png
+s none share/icons/Neu/24x24/status/gnome-stock-trash-full.png=user-trash-full.png
+s none share/icons/Neu/24x24/status/gnome-netstatus-error.png=network-error.png
+f none share/icons/Neu/24x24/status/network-transmit.png 0644 root bin
+s none share/icons/Neu/24x24/status/xfce-trash_full.png=user-trash-full.png
+f none share/icons/Neu/24x24/status/folder-visiting.png 0644 root bin
+s none share/icons/Neu/24x24/status/nm-no-connection.png=network-offline.png
+s none share/icons/Neu/24x24/status/gtk-dialog-question.png=dialog-question.png
+f none share/icons/Neu/24x24/status/dialog-warning.png 0644 root bin
+s none share/icons/Neu/24x24/status/gtk-missing-image.png=image-missing.png
+s none share/icons/Neu/24x24/status/gtk-dialog-info.png=dialog-information.png
+s none share/icons/Neu/24x24/status/stock_dialog-warning.png=dialog-warning.png
+s none share/icons/Neu/24x24/status/stock_volume-mute.png=audio-volume-muted.png
+f none share/icons/Neu/24x24/status/audio-volume-low.png 0644 root bin
+s none share/icons/Neu/24x24/status/gnome-netstatus-tx.png=network-transmit.png
+s none share/icons/Neu/24x24/status/gnome-fs-directory-accept.png=folder-drag-accept.png
+s none share/icons/Neu/24x24/status/stock_dialog-error.png=dialog-error.png
+f none share/icons/Neu/24x24/status/image-loading.png 0644 root bin
+s none share/icons/Neu/24x24/status/gnome-fs-directory-visiting.png=folder-visiting.png
+f none share/icons/Neu/24x24/status/audio-volume-medium.png 0644 root bin
+s none share/icons/Neu/24x24/status/connect_established.png=network-idle.png
+s none share/icons/Neu/24x24/status/stock_volume.png=audio-volume-high.png
+s none share/icons/Neu/24x24/status/stock_volume-0.png=audio-volume-low.png
+s none share/icons/Neu/24x24/status/gtk-dialog-warning.png=dialog-warning.png
+s none share/icons/Neu/24x24/status/gnome-netstatus-txrx.png=network-transmit-receive.png
+f none share/icons/Neu/24x24/status/folder-drag-accept.png 0644 root bin
+s none share/icons/Neu/24x24/status/info.png=dialog-information.png
+s none share/icons/Neu/24x24/status/gnome-netstatus-disconn.png=network-offline.png
+f none share/icons/Neu/24x24/status/audio-volume-high.png 0644 root bin
+f none share/icons/Neu/24x24/status/printer-error.png 0644 root bin
+f none share/icons/Neu/24x24/status/dialog-information.png 0644 root bin
+f none share/icons/Neu/24x24/status/dialog-password.png 0644 root bin
+s none share/icons/Neu/24x24/status/messagebox_info.png=dialog-information.png
+f none share/icons/Neu/24x24/status/dialog-error.png 0644 root bin
+s none share/icons/Neu/24x24/status/gtk-dialog-error.png=dialog-error.png
+s none share/icons/Neu/24x24/status/stock_volume-min.png=audio-volume-low.png
+f none share/icons/Neu/24x24/status/folder-open.png 0644 root bin
+d none share/icons/Neu/24x24/categories 0755 root bin
+s none share/icons/Neu/24x24/categories/redhat-system_settings.png=preferences-system.png
+f none share/icons/Neu/24x24/categories/applications-games.png 0644 root bin
+s none share/icons/Neu/24x24/categories/package_system.png=applications-system.png
+s none share/icons/Neu/24x24/categories/xfce-system-settings.png=preferences-system.png
+s none share/icons/Neu/24x24/categories/package_office.png=applications-office.png
+f none share/icons/Neu/24x24/categories/applications-multimedia.png 0644 root bin
+s none share/icons/Neu/24x24/categories/xfce-games.png=applications-games.png
+s none share/icons/Neu/24x24/categories/package_network.png=applications-internet.png
+f none share/icons/Neu/24x24/categories/applications-accessories.png 0644 root bin
+s none share/icons/Neu/24x24/categories/xfce-utils.png=applications-accessories.png
+s none share/icons/Neu/24x24/categories/gnome-control-center.png=preferences-desktop.png
+s none share/icons/Neu/24x24/categories/redhat-office.png=applications-office.png
+s none share/icons/Neu/24x24/categories/redhat-games.png=applications-games.png
+s none share/icons/Neu/24x24/categories/redhat-graphics.png=applications-graphics.png
+f none share/icons/Neu/24x24/categories/applications-system.png 0644 root bin
+f none share/icons/Neu/24x24/categories/applications-office.png 0644 root bin
+s none share/icons/Neu/24x24/categories/redhat-internet.png=applications-internet.png
+s none share/icons/Neu/24x24/categories/xfce-graphics.png=applications-graphics.png
+s none share/icons/Neu/24x24/categories/xfce-internet.png=applications-internet.png
+s none share/icons/Neu/24x24/categories/gnome-other.png=applications-other.png
+s none share/icons/Neu/24x24/categories/gnome-multimedia.png=applications-multimedia.png
+s none share/icons/Neu/24x24/categories/redhat-preferences.png=preferences-desktop.png
+s none share/icons/Neu/24x24/categories/gnome-util.png=applications-accessories.png
+f none share/icons/Neu/24x24/categories/applications-graphics.png 0644 root bin
+f none share/icons/Neu/24x24/categories/applications-internet.png 0644 root bin
+f none share/icons/Neu/24x24/categories/preferences-system.png 0644 root bin
+f none share/icons/Neu/24x24/categories/preferences-desktop.png 0644 root bin
+s none share/icons/Neu/24x24/categories/gnome-graphics.png=applications-graphics.png
+s none share/icons/Neu/24x24/categories/redhat-accessories.png=applications-accessories.png
+s none share/icons/Neu/24x24/categories/gnome-globe.png=applications-internet.png
+f none share/icons/Neu/24x24/categories/applications-development.png 0644 root bin
+s none share/icons/Neu/24x24/categories/gnome-applications.png=applications-office.png
+s none share/icons/Neu/24x24/categories/package_development.png=applications-development.png
+s none share/icons/Neu/24x24/categories/gtk-preferences.png=preferences-desktop.png
+s none share/icons/Neu/24x24/categories/input_devices_settings.png=preferences-desktop-peripherals.png
+s none share/icons/Neu/24x24/categories/xfce-office.png=applications-office.png
+s none share/icons/Neu/24x24/categories/gnome-settings.png=preferences-desktop.png
+s none share/icons/Neu/24x24/categories/kcontrol.png=preferences-desktop.png
+s none share/icons/Neu/24x24/categories/package_utilities.png=applications-accessories.png
+s none share/icons/Neu/24x24/categories/redhat-programming.png=applications-development.png
+f none share/icons/Neu/24x24/categories/applications-other.png 0644 root bin
+s none share/icons/Neu/24x24/categories/redhat-system_tools.png=applications-system.png
+s none share/icons/Neu/24x24/categories/stock_internet.png=applications-internet.png
+s none share/icons/Neu/24x24/categories/redhat-sound_video.png=applications-multimedia.png
+s none share/icons/Neu/24x24/categories/package_settings.png=preferences-system.png
+f none share/icons/Neu/24x24/categories/preferences-desktop-peripherals.png 0644 root bin
+s none share/icons/Neu/24x24/categories/xfce-multimedia.png=applications-multimedia.png
+s none share/icons/Neu/24x24/categories/gnome-joystick.png=applications-games.png
+s none share/icons/Neu/24x24/categories/gnome-system.png=applications-system.png
+s none share/icons/Neu/24x24/categories/package_multimedia.png=applications-multimedia.png
+s none share/icons/Neu/24x24/categories/xfce4-settings.png=preferences-desktop.png
+s none share/icons/Neu/24x24/categories/package_graphics.png=applications-graphics.png
+s none share/icons/Neu/24x24/categories/package_games.png=applications-games.png
+s none share/icons/Neu/24x24/categories/gnome-devel.png=applications-development.png
+d none share/icons/Neu/24x24/apps 0755 root bin
+s none share/icons/Neu/24x24/apps/xfce-terminal.png=utilities-terminal.png
+s none share/icons/Neu/24x24/apps/system-config-users.png=system-users.png
+s none share/icons/Neu/24x24/apps/kfm.png=system-file-manager.png
+s none share/icons/Neu/24x24/apps/kwin.png=preferences-system-windows.png
+s none share/icons/Neu/24x24/apps/browser.png=internet-web-browser.png
+s none share/icons/Neu/24x24/apps/wallpaper.png=preferences-desktop-wallpaper.png
+s none share/icons/Neu/24x24/apps/proxy.png=preferences-system-network-proxy.png
+s none share/icons/Neu/24x24/apps/xfce4-session.png=preferences-system-session.png
+s none share/icons/Neu/24x24/apps/gnome-session.png=preferences-system-session.png
+s none share/icons/Neu/24x24/apps/kcmsound.png=multimedia-volume-control.png
+s none share/icons/Neu/24x24/apps/gnome-mixer.png=multimedia-volume-control.png
+s none share/icons/Neu/24x24/apps/xfwm4.png=preferences-system-windows.png
+s none share/icons/Neu/24x24/apps/stock_proxy.png=preferences-system-network-proxy.png
+s none share/icons/Neu/24x24/apps/kuser.png=system-users.png
+s none share/icons/Neu/24x24/apps/proxy-config.png=preferences-system-network-proxy.png
+s none share/icons/Neu/24x24/apps/kscreensaver.png=preferences-desktop-screensaver.png
+f none share/icons/Neu/24x24/apps/help-browser.png 0644 root bin
+f none share/icons/Neu/24x24/apps/system-users.png 0644 root bin
+f none share/icons/Neu/24x24/apps/graphics-svg-editor.png 0644 root bin
+s none share/icons/Neu/24x24/apps/terminal.png=utilities-terminal.png
+s none share/icons/Neu/24x24/apps/gucharmap.png=accessories-character-map.png
+f none share/icons/Neu/24x24/apps/preferences-system-network-proxy.png 0644 root bin
+s none share/icons/Neu/24x24/apps/config-users.png=system-users.png
+s none share/icons/Neu/24x24/apps/background.png=preferences-desktop-wallpaper.png
+s none share/icons/Neu/24x24/apps/gnome-terminal.png=utilities-terminal.png
+s none share/icons/Neu/24x24/apps/openterm.png=utilities-terminal.png
+f none share/icons/Neu/24x24/apps/preferences-user-information.png 0644 root bin
+f none share/icons/Neu/24x24/apps/utilities-terminal.png 0644 root bin
+s none share/icons/Neu/24x24/apps/redhat-web-browser.png=internet-web-browser.png
+s none share/icons/Neu/24x24/apps/text-editor.png=accessories-text-editor.png
+s none share/icons/Neu/24x24/apps/arts.png=multimedia-volume-control.png
+f none share/icons/Neu/24x24/apps/system-software-update.png 0644 root bin
+s none share/icons/Neu/24x24/apps/screensaver.png=preferences-desktop-screensaver.png
+s none share/icons/Neu/24x24/apps/khelpcenter.png=help-browser.png
+s none share/icons/Neu/24x24/apps/susehelpcenter.png=help-browser.png
+f none share/icons/Neu/24x24/apps/internet-web-browser.png 0644 root bin
+s none share/icons/Neu/24x24/apps/multimedia.png=multimedia-volume-control.png
+s none share/icons/Neu/24x24/apps/kcmkwm.png=preferences-system-windows.png
+f none share/icons/Neu/24x24/apps/gaim.png 0644 root bin
+f none share/icons/Neu/24x24/apps/multimedia-volume-control.png 0644 root bin
+f none share/icons/Neu/24x24/apps/preferences-desktop-assistive-technology.png 0644 root bin
+f none share/icons/Neu/24x24/apps/accessories-character-map.png 0644 root bin
+s none share/icons/Neu/24x24/apps/volume-knob.png=multimedia-volume-control.png
+s none share/icons/Neu/24x24/apps/gnome-window-manager.png=preferences-system-windows.png
+s none share/icons/Neu/24x24/apps/xfce-mail.png=internet-mail.png
+s none share/icons/Neu/24x24/apps/mail_generic.png=internet-mail.png
+s none share/icons/Neu/24x24/apps/fonts.png=preferences-desktop-font.png
+s none share/icons/Neu/24x24/apps/gnome-settings-accessibility-technologies.png=preferences-desktop-accessibility.png
+s none share/icons/Neu/24x24/apps/krfb.png=preferences-desktop-remote-desktop.png
+s none share/icons/Neu/24x24/apps/gnome-help.png=help-browser.png
+s none share/icons/Neu/24x24/apps/update-manager.png=system-software-update.png
+f none share/icons/Neu/24x24/apps/utilities-system-monitor.png 0644 root bin
+s none share/icons/Neu/24x24/apps/accessibility-directory.png=preferences-desktop-accessibility.png
+s none share/icons/Neu/24x24/apps/kedit.png=accessories-text-editor.png
+s none share/icons/Neu/24x24/apps/email.png=internet-mail.png
+s none share/icons/Neu/24x24/apps/file-manager.png=system-file-manager.png
+f none share/icons/Neu/24x24/apps/system-installer.png 0644 root bin
+s none share/icons/Neu/24x24/apps/ksysguard.png=utilities-system-monitor.png
+f none share/icons/Neu/24x24/apps/epiphany-bookmarks.png 0644 root bin
+f none share/icons/Neu/24x24/apps/internet-mail.png 0644 root bin
+s none share/icons/Neu/24x24/apps/kcharselect.png=accessories-character-map.png
+f none share/icons/Neu/24x24/apps/preferences-desktop-font.png 0644 root bin
+f none share/icons/Neu/24x24/apps/preferences-system-windows.png 0644 root bin
+s none share/icons/Neu/24x24/apps/web-browser.png=internet-web-browser.png
+f none share/icons/Neu/24x24/apps/system-file-manager.png 0644 root bin
+f none share/icons/Neu/24x24/apps/accessories-archiver.png 0644 root bin
+s none share/icons/Neu/24x24/apps/zen-icon.png=system-software-update.png
+s none share/icons/Neu/24x24/apps/gnome-monitor.png=utilities-system-monitor.png
+s none share/icons/Neu/24x24/apps/gnome-settings-background.png=preferences-desktop-wallpaper.png
+f none share/icons/Neu/24x24/apps/preferences-desktop-wallpaper.png 0644 root bin
+s none share/icons/Neu/24x24/apps/gnome-remote-desktop.png=preferences-desktop-remote-desktop.png
+s none share/icons/Neu/24x24/apps/gnome-settings-font.png=preferences-desktop-font.png
+s none share/icons/Neu/24x24/apps/xscreensaver.png=preferences-desktop-screensaver.png
+f none share/icons/Neu/24x24/apps/gimp.png 0644 root bin
+s none share/icons/Neu/24x24/apps/xfce-filemanager.png=system-file-manager.png
+f none share/icons/Neu/24x24/apps/evolution.png 0644 root bin
+s none share/icons/Neu/24x24/apps/redhat-email.png=internet-mail.png
+s none share/icons/Neu/24x24/apps/gnome-character-map.png=accessories-character-map.png
+s none share/icons/Neu/24x24/apps/xfce4-mixer.png=multimedia-volume-control.png
+f none share/icons/Neu/24x24/apps/sound-juicer.png 0644 root bin
+s none share/icons/Neu/24x24/apps/xfce4-backdrop.png=preferences-desktop-wallpaper.png
+f none share/icons/Neu/24x24/apps/graphics-image-viewer.png 0644 root bin
+f none share/icons/Neu/24x24/apps/internet-news-reader.png 0644 root bin
+f none share/icons/Neu/24x24/apps/preferences-desktop-screensaver.png 0644 root bin
+s none share/icons/Neu/24x24/apps/access.png=preferences-desktop-accessibility.png
+s none share/icons/Neu/24x24/apps/konsole.png=utilities-terminal.png
+f none share/icons/Neu/24x24/apps/preferences-desktop-accessibility.png 0644 root bin
+f none share/icons/Neu/24x24/apps/preferences-system-session.png 0644 root bin
+s none share/icons/Neu/24x24/apps/redhat-filemanager.png=system-file-manager.png
+f none share/icons/Neu/24x24/apps/accessories-text-editor.png 0644 root bin
+f none share/icons/Neu/24x24/apps/preferences-desktop-remote-desktop.png 0644 root bin
+f none share/icons/Neu/24x24/apps/internet-group-chat.png 0644 root bin
+d none share/icons/Neu/24x24/actions 0755 root bin
+s none share/icons/Neu/24x24/actions/gnome-logout.png=system-log-out.png
+f none share/icons/Neu/24x24/actions/edit-redo.png 0644 root bin
+s none share/icons/Neu/24x24/actions/finish.png=go-last.png
+f none share/icons/Neu/24x24/actions/go-next.png 0644 root bin
+s none share/icons/Neu/24x24/actions/gtk-underline.png=format-text-underline.png
+f none share/icons/Neu/24x24/actions/edit-copy.png 0644 root bin
+s none share/icons/Neu/24x24/actions/gtk-find.png=edit-find.png
+f none share/icons/Neu/24x24/actions/go-first.png 0644 root bin
+s none share/icons/Neu/24x24/actions/up.png=go-up.png
+f none share/icons/Neu/24x24/actions/go-up.png 0644 root bin
+s none share/icons/Neu/24x24/actions/filefind.png=edit-find.png
+s none share/icons/Neu/24x24/actions/gtk-unindent-ltr.png=format-indent-less.png
+s none share/icons/Neu/24x24/actions/gnome-stock-text-unindent.png=format-indent-less.png
+s none share/icons/Neu/24x24/actions/undo.png=edit-undo.png
+s none share/icons/Neu/24x24/actions/stock_print-preview.png=document-print-preview.png
+f none share/icons/Neu/24x24/actions/go-jump.png 0644 root bin
+s none share/icons/Neu/24x24/actions/gtk-go-forward-ltr.png=go-next.png
+f none share/icons/Neu/24x24/actions/mail-reply-sender.png 0644 root bin
+s none share/icons/Neu/24x24/actions/gtk-goto-last-rtl.png=go-first.png
+s none share/icons/Neu/24x24/actions/add.png=list-add.png
+s none share/icons/Neu/24x24/actions/gtk-undo-ltr.png=edit-undo.png
+s none share/icons/Neu/24x24/actions/stock_about.png=help-about.png
+s none share/icons/Neu/24x24/actions/fileopen.png=document-open.png
+s none share/icons/Neu/24x24/actions/gtk-cut.png=edit-cut.png
+s none share/icons/Neu/24x24/actions/gtk-open.png=document-open.png
+f none share/icons/Neu/24x24/actions/mail-reply-all.png 0644 root bin
+f none share/icons/Neu/24x24/actions/format-text-italic.png 0644 root bin
+s none share/icons/Neu/24x24/actions/stock_left.png=go-previous.png
+s none share/icons/Neu/24x24/actions/stock_new-window.png=window-new.png
+s none share/icons/Neu/24x24/actions/stock_new-appointment.png=appointment-new.png
+f none share/icons/Neu/24x24/actions/edit-clear.png 0644 root bin
+f none share/icons/Neu/24x24/actions/edit-delete.png 0644 root bin
+f none share/icons/Neu/24x24/actions/format-justify-left.png 0644 root bin
+f none share/icons/Neu/24x24/actions/document-properties.png 0644 root bin
+s none share/icons/Neu/24x24/actions/remove.png=list-remove.png
+f none share/icons/Neu/24x24/actions/system-lock-screen.png 0644 root bin
+f none share/icons/Neu/24x24/actions/go-last.png 0644 root bin
+s none share/icons/Neu/24x24/actions/stock_text_underlined.png=format-text-underline.png
+s none share/icons/Neu/24x24/actions/stock_mail-compose.png=mail-message-new.png
+s none share/icons/Neu/24x24/actions/stock_text_italic.png=format-text-italic.png
+f none share/icons/Neu/24x24/actions/help-about.png 0644 root bin
+f none share/icons/Neu/24x24/actions/address-book-new.png 0644 root bin
+s none share/icons/Neu/24x24/actions/cancel.png=dialog-cancel.png
+s none share/icons/Neu/24x24/actions/reload_all_tabs.png=view-refresh.png
+s none share/icons/Neu/24x24/actions/back.png=go-previous.png
+s none share/icons/Neu/24x24/actions/stock_bottom.png=go-bottom.png
+s none share/icons/Neu/24x24/actions/gtk-jump-to-rtl.png=go-jump.png
+s none share/icons/Neu/24x24/actions/stock_text_center.png=format-justify-center.png
+s none share/icons/Neu/24x24/actions/gnome-lockscreen.png=system-lock-screen.png
+s none share/icons/Neu/24x24/actions/stock_down.png=go-down.png
+s none share/icons/Neu/24x24/actions/gtk-justify-left.png=format-justify-left.png
+f none share/icons/Neu/24x24/actions/edit-select-all.png 0644 root bin
+s none share/icons/Neu/24x24/actions/filequickprint.png=document-print-preview.png
+s none share/icons/Neu/24x24/actions/stock_up.png=go-up.png
+s none share/icons/Neu/24x24/actions/gtk-execute.png=system-run.png
+s none share/icons/Neu/24x24/actions/start.png=go-first.png
+s none share/icons/Neu/24x24/actions/stock_mail-reply-to-all.png=mail-reply-all.png
+s none share/icons/Neu/24x24/actions/gtk-jump-to-ltr.png=go-jump.png
+f none share/icons/Neu/24x24/actions/mail-message-new.png 0644 root bin
+s none share/icons/Neu/24x24/actions/gtk-bold.png=format-text-bold.png
+s none share/icons/Neu/24x24/actions/reload.png=view-refresh.png
+s none share/icons/Neu/24x24/actions/filenew.png=document-new.png
+s none share/icons/Neu/24x24/actions/gtk-italic.png=format-text-italic.png
+s none share/icons/Neu/24x24/actions/stop.png=process-stop.png
+s none share/icons/Neu/24x24/actions/text_under.png=format-text-underline.png
+f none share/icons/Neu/24x24/actions/go-top.png 0644 root bin
+f none share/icons/Neu/24x24/actions/system-log-out.png 0644 root bin
+f none share/icons/Neu/24x24/actions/document-save.png 0644 root bin
+f none share/icons/Neu/24x24/actions/edit-undo.png 0644 root bin
+s none share/icons/Neu/24x24/actions/next.png=go-next.png
+f none share/icons/Neu/24x24/actions/document-save-as.png 0644 root bin
+s none share/icons/Neu/24x24/actions/gtk-about.png=help-about.png
+s none share/icons/Neu/24x24/actions/stock_search-and-replace.png=edit-find-replace.png
+s none share/icons/Neu/24x24/actions/reload3.png=view-refresh.png
+s none share/icons/Neu/24x24/actions/redhat-home.png=go-home.png
+s none share/icons/Neu/24x24/actions/stock_right.png=go-next.png
+s none share/icons/Neu/24x24/actions/mail_reply.png=mail-reply-sender.png
+s none share/icons/Neu/24x24/actions/redo.png=edit-redo.png
+s none share/icons/Neu/24x24/actions/gtk-go-forward-rtl.png=go-previous.png
+s none share/icons/Neu/24x24/actions/gtk-goto-last-ltr.png=go-last.png
+s none share/icons/Neu/24x24/actions/text_bold.png=format-text-bold.png
+s none share/icons/Neu/24x24/actions/gnome-run.png=system-run.png
+s none share/icons/Neu/24x24/actions/stock_mail-forward.png=mail-forward.png
+s none share/icons/Neu/24x24/actions/stock_refresh.png=view-refresh.png
+s none share/icons/Neu/24x24/actions/bottom.png=go-bottom.png
+f none share/icons/Neu/24x24/actions/format-indent-less.png 0644 root bin
+f none share/icons/Neu/24x24/actions/edit-paste.png 0644 root bin
+s none share/icons/Neu/24x24/actions/rightjust.png=format-justify-right.png
+s none share/icons/Neu/24x24/actions/gtk-save-as.png=document-save-as.png
+f none share/icons/Neu/24x24/actions/document-new.png 0644 root bin
+s none share/icons/Neu/24x24/actions/gtk-redo-ltr.png=edit-redo.png
+s none share/icons/Neu/24x24/actions/gtk-refresh.png=view-refresh.png
+s none share/icons/Neu/24x24/actions/stock_new-bcard.png=contact-new.png
+s none share/icons/Neu/24x24/actions/gtk-print-preview.png=document-print-preview.png
+s none share/icons/Neu/24x24/actions/stock_save-as.png=document-save-as.png
+s none share/icons/Neu/24x24/actions/gtk-find-and-replace.png=edit-find-replace.png
+s none share/icons/Neu/24x24/actions/gohome.png=go-home.png
+s none share/icons/Neu/24x24/actions/gnome-stock-mail-rpl.png=mail-reply-sender.png
+f none share/icons/Neu/24x24/actions/go-home.png 0644 root bin
+f none share/icons/Neu/24x24/actions/list-remove.png 0644 root bin
+s none share/icons/Neu/24x24/actions/editcut.png=edit-cut.png
+s none share/icons/Neu/24x24/actions/gtk-unindent-rtl.png=format-indent-more.png
+s none share/icons/Neu/24x24/actions/stock_mail-reply.png=mail-reply-sender.png
+s none share/icons/Neu/24x24/actions/gtk-delete.png=edit-delete.png
+s none share/icons/Neu/24x24/actions/stock_delete.png=edit-delete.png
+s none share/icons/Neu/24x24/actions/gtk-print.png=document-print.png
+s none share/icons/Neu/24x24/actions/gtk-properties.png=document-properties.png
+s none share/icons/Neu/24x24/actions/gtk-cancel.png=dialog-cancel.png
+s none share/icons/Neu/24x24/actions/kfind.png=system-search.png
+s none share/icons/Neu/24x24/actions/stock_paste.png=edit-paste.png
+f none share/icons/Neu/24x24/actions/format-justify-fill.png 0644 root bin
+s none share/icons/Neu/24x24/actions/stock_new-text.png=document-new.png
+f none share/icons/Neu/24x24/actions/contact-new.png 0644 root bin
+s none share/icons/Neu/24x24/actions/stock_search.png=edit-find.png
+f none share/icons/Neu/24x24/actions/view-refresh.png 0644 root bin
+f none share/icons/Neu/24x24/actions/appointment-new.png 0644 root bin
+s none share/icons/Neu/24x24/actions/gtk-remove.png=list-remove.png
+f none share/icons/Neu/24x24/actions/document-print-preview.png 0644 root bin
+s none share/icons/Neu/24x24/actions/gtk-indent-ltr.png=format-indent-more.png
+s none share/icons/Neu/24x24/actions/gtk-new.png=document-new.png
+s none share/icons/Neu/24x24/actions/gnome-stock-mail-fwd.png=mail-forward.png
+s none share/icons/Neu/24x24/actions/stock_stop.png=process-stop.png
+s none share/icons/Neu/24x24/actions/leftjust.png=format-justify-left.png
+s none share/icons/Neu/24x24/actions/stock_add-bookmark.png=bookmark-new.png
+s none share/icons/Neu/24x24/actions/editclear.png=edit-clear.png
+s none share/icons/Neu/24x24/actions/lock.png=system-lock-screen.png
+s none share/icons/Neu/24x24/actions/filesave.png=document-save.png
+s none share/icons/Neu/24x24/actions/gtk-justify-fill.png=format-justify-fill.png
+s none share/icons/Neu/24x24/actions/stock_text_right.png=format-justify-right.png
+s none share/icons/Neu/24x24/actions/stock_text_left.png=format-justify-left.png
+s none share/icons/Neu/24x24/actions/stock_redo.png=edit-redo.png
+f none share/icons/Neu/24x24/actions/format-justify-right.png 0644 root bin
+s none share/icons/Neu/24x24/actions/gtk-goto-bottom.png=go-bottom.png
+s none share/icons/Neu/24x24/actions/gtk-goto-top.png=go-top.png
+s none share/icons/Neu/24x24/actions/filesaveas.png=document-save-as.png
+s none share/icons/Neu/24x24/actions/editcopy.png=edit-copy.png
+s none share/icons/Neu/24x24/actions/stock_copy.png=edit-copy.png
+s none share/icons/Neu/24x24/actions/gtk-select-all.png=edit-select-all.png
+s none share/icons/Neu/24x24/actions/button_cancel.png=dialog-cancel.png
+f none share/icons/Neu/24x24/actions/dialog-cancel.png 0644 root bin
+s none share/icons/Neu/24x24/actions/gtk-save.png=document-save.png
+s none share/icons/Neu/24x24/actions/gtk-go-back-ltr.png=go-previous.png
+s none share/icons/Neu/24x24/actions/gtk-go-down.png=go-down.png
+s none share/icons/Neu/24x24/actions/gtk-justify-center.png=format-justify-center.png
+f none share/icons/Neu/24x24/actions/go-down.png 0644 root bin
+s none share/icons/Neu/24x24/actions/gtk-stop.png=process-stop.png
+s none share/icons/Neu/24x24/actions/gtk-goto-first-ltr.png=go-first.png
+s none share/icons/Neu/24x24/actions/stock_new-dir.png=folder-new.png
+s none share/icons/Neu/24x24/actions/centrejust.png=format-justify-center.png
+s none share/icons/Neu/24x24/actions/text_italic.png=format-text-italic.png
+s none share/icons/Neu/24x24/actions/previous.png=go-previous.png
+s none share/icons/Neu/24x24/actions/stock_last.png=go-last.png
+f none share/icons/Neu/24x24/actions/format-justify-center.png 0644 root bin
+s none share/icons/Neu/24x24/actions/gtk-clear.png=edit-clear.png
+f none share/icons/Neu/24x24/actions/folder-new.png 0644 root bin
+f none share/icons/Neu/24x24/actions/go-previous.png 0644 root bin
+f none share/icons/Neu/24x24/actions/process-stop.png 0644 root bin
+s none share/icons/Neu/24x24/actions/exit.png=system-log-out.png
+s none share/icons/Neu/24x24/actions/gtk-copy.png=edit-copy.png
+s none share/icons/Neu/24x24/actions/stock_save.png=document-save.png
+f none share/icons/Neu/24x24/actions/edit-find.png 0644 root bin
+s none share/icons/Neu/24x24/actions/stock_new-address-book.png=address-book-new.png
+s none share/icons/Neu/24x24/actions/gnome-searchtool.png=system-search.png
+s none share/icons/Neu/24x24/actions/fileprint.png=document-print.png
+s none share/icons/Neu/24x24/actions/stock_first.png=go-first.png
+f none share/icons/Neu/24x24/actions/window-new.png 0644 root bin
+s none share/icons/Neu/24x24/actions/mail_new.png=mail-message-new.png
+s none share/icons/Neu/24x24/actions/forward.png=go-next.png
+f none share/icons/Neu/24x24/actions/mail-forward.png 0644 root bin
+s none share/icons/Neu/24x24/actions/gtk-paste.png=edit-paste.png
+s none share/icons/Neu/24x24/actions/bookmarks_list_add.png=bookmark-new.png
+s none share/icons/Neu/24x24/actions/gtk-home.png=go-home.png
+f none share/icons/Neu/24x24/actions/list-add.png 0644 root bin
+s none share/icons/Neu/24x24/actions/stock_print.png=document-print.png
+f none share/icons/Neu/24x24/actions/format-text-underline.png 0644 root bin
+f none share/icons/Neu/24x24/actions/system-run.png 0644 root bin
+s none share/icons/Neu/24x24/actions/stock_text_indent.png=format-indent-more.png
+s none share/icons/Neu/24x24/actions/gtk-justify-right.png=format-justify-right.png
+s none share/icons/Neu/24x24/actions/stock_undo.png=edit-undo.png
+s none share/icons/Neu/24x24/actions/xfce-system-lock.png=system-lock-screen.png
+s none share/icons/Neu/24x24/actions/stock_text_justify.png=format-justify-fill.png
+s none share/icons/Neu/24x24/actions/gtk-add.png=list-add.png
+s none share/icons/Neu/24x24/actions/stock_mail-send-receive.png=mail-send-receive.png
+f none share/icons/Neu/24x24/actions/dialog-ok.png 0644 root bin
+s none share/icons/Neu/24x24/actions/stock_file-properites.png=document-properties.png
+f none share/icons/Neu/24x24/actions/mail-send-receive.png 0644 root bin
+s none share/icons/Neu/24x24/actions/stock_cut.png=edit-cut.png
+s none share/icons/Neu/24x24/actions/gnome-stock-mail-new.png=mail-message-new.png
+f none share/icons/Neu/24x24/actions/document-open.png 0644 root bin
+f none share/icons/Neu/24x24/actions/system-shutdown.png 0644 root bin
+s none share/icons/Neu/24x24/actions/gtk-goto-first-rtl.png=go-last.png
+s none share/icons/Neu/24x24/actions/gnome-shutdown.png=system-shutdown.png
+s none share/icons/Neu/24x24/actions/stock_text_unindent.png=format-indent-less.png
+s none share/icons/Neu/24x24/actions/search.png=system-search.png
+f none share/icons/Neu/24x24/actions/document-print.png 0644 root bin
+s none share/icons/Neu/24x24/actions/mail_replyall.png=mail-reply-all.png
+s none share/icons/Neu/24x24/actions/editpaste.png=edit-paste.png
+s none share/icons/Neu/24x24/actions/gtk-go-up.png=go-up.png
+f none share/icons/Neu/24x24/actions/bookmark-new.png 0644 root bin
+s none share/icons/Neu/24x24/actions/stock_text_bold.png=format-text-bold.png
+s none share/icons/Neu/24x24/actions/reload_page.png=view-refresh.png
+s none share/icons/Neu/24x24/actions/top.png=go-top.png
+s none share/icons/Neu/24x24/actions/stock_properties.png=document-properties.png
+s none share/icons/Neu/24x24/actions/stock_help-add-bookmark.png=bookmark-new.png
+f none share/icons/Neu/24x24/actions/format-indent-more.png 0644 root bin
+f none share/icons/Neu/24x24/actions/edit-find-replace.png 0644 root bin
+s none share/icons/Neu/24x24/actions/bookmark_add.png=bookmark-new.png
+f none share/icons/Neu/24x24/actions/system-search.png 0644 root bin
+s none share/icons/Neu/24x24/actions/stock_home.png=go-home.png
+s none share/icons/Neu/24x24/actions/find.png=edit-find.png
+s none share/icons/Neu/24x24/actions/gtk-go-back-rtl.png=go-next.png
+s none share/icons/Neu/24x24/actions/gnome-stock-text-indent.png=format-indent-more.png
+s none share/icons/Neu/24x24/actions/mail_forward.png=mail-forward.png
+s none share/icons/Neu/24x24/actions/editdelete.png=edit-delete.png
+s none share/icons/Neu/24x24/actions/down.png=go-down.png
+f none share/icons/Neu/24x24/actions/edit-cut.png 0644 root bin
+s none share/icons/Neu/24x24/actions/window_new.png=window-new.png
+s none share/icons/Neu/24x24/actions/kfm_home.png=go-home.png

@@ 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 theferret at users.sourceforge.net  Fri Jul  2 23:24:56 2010
From: theferret at users.sourceforge.net (theferret at users.sourceforge.net)
Date: Fri, 02 Jul 2010 21:24:56 +0000
Subject: [csw-devel] SF.net SVN: gar:[10407]
	csw/mgar/pkg/gnome_theme_extras/trunk/pkginfo
Message-ID: <E1OUnjE-0002aQ-6m@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 10407
          http://gar.svn.sourceforge.net/gar/?rev=10407&view=rev
Author:   theferret
Date:     2010-07-02 21:24:56 +0000 (Fri, 02 Jul 2010)

Log Message:
-----------
gnome_theme_extras: oopsie. slight bugfix

Modified Paths:
--------------
    csw/mgar/pkg/gnome_theme_extras/trunk/pkginfo

Modified: csw/mgar/pkg/gnome_theme_extras/trunk/pkginfo
===================================================================
--- csw/mgar/pkg/gnome_theme_extras/trunk/pkginfo	2010-07-02 21:23:00 UTC (rev 10406)
+++ csw/mgar/pkg/gnome_theme_extras/trunk/pkginfo	2010-07-02 21:24:56 UTC (rev 10407)
@@ -1,5 +1,5 @@
-PKG=CSWgnomethemes
-NAME=gnome_themes - Official themes for the GNOME desktop environment
+PKG=CSWgnomethemeextras
+NAME=gnome_theme_extras - Extra themes for the GNOME desktop environment
 ARCH=all
 VERSION=2.22.0,REV=2010.07.02
 CATEGORY=system


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From theferret at users.sourceforge.net  Fri Jul  2 23:45:38 2010
From: theferret at users.sourceforge.net (theferret at users.sourceforge.net)
Date: Fri, 02 Jul 2010 21:45:38 +0000
Subject: [csw-devel] SF.net SVN: gar:[10408] csw/mgar/pkg/libgegl/trunk
Message-ID: <E1OUo3G-0002qn-7q@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 10408
          http://gar.svn.sourceforge.net/gar/?rev=10408&view=rev
Author:   theferret
Date:     2010-07-02 21:45:38 +0000 (Fri, 02 Jul 2010)

Log Message:
-----------
libgegl: added patch to fix missing powf()

Modified Paths:
--------------
    csw/mgar/pkg/libgegl/trunk/patchfile.preconf
    csw/mgar/pkg/libgegl/trunk/pkginfo

Modified: csw/mgar/pkg/libgegl/trunk/patchfile.preconf
===================================================================
--- csw/mgar/pkg/libgegl/trunk/patchfile.preconf	2010-07-02 21:24:56 UTC (rev 10407)
+++ csw/mgar/pkg/libgegl/trunk/patchfile.preconf	2010-07-02 21:45:38 UTC (rev 10408)
@@ -28,3 +28,14 @@
  #else
    void  *functions[MAX_N_FUNCTIONS];
    int    n_functions    = 0;
+--- operations/generated/gamma.c.orig	2010-02-07 15:44:37.000000000 +0100
++++ operations/generated/gamma.c	2010-06-28 21:21:36.338178685 +0200
+@@ -36,7 +36,7 @@
+ #include "gegl-chant.h"
+ 
+ #include <math.h>
+-#ifdef _MSC_VER
++#if defined(_MSC_VER) || defined(__sun)
+ #define powf(a,b) ((gfloat)pow(a,b))
+ #endif
+ 

Modified: csw/mgar/pkg/libgegl/trunk/pkginfo
===================================================================
--- csw/mgar/pkg/libgegl/trunk/pkginfo	2010-07-02 21:24:56 UTC (rev 10407)
+++ csw/mgar/pkg/libgegl/trunk/pkginfo	2010-07-02 21:45:38 UTC (rev 10408)
@@ -1,6 +1,6 @@
 PKG=CSWlibgegl
 NAME=libgegl - generic graphics library required by GIMP
-VERSION=0.1.2,REV=2010.06.12
+VERSION=0.1.2,REV=2010.06.28
 CATEGORY=system
 VENDOR=http://www.gegl.org/ packaged for CSW by Philip Brown
 HOTLINE=http://www.opencsw.org/bugtrack/


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From bdwalton at users.sourceforge.net  Sat Jul  3 17:57:24 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Sat, 03 Jul 2010 15:57:24 +0000
Subject: [csw-devel] SF.net SVN: gar:[10409] csw/mgar/gar/v2/gar.mk
Message-ID: <E1OV55o-0003bt-Il@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10409
          http://gar.svn.sourceforge.net/gar/?rev=10409&view=rev
Author:   bdwalton
Date:     2010-07-03 15:57:24 +0000 (Sat, 03 Jul 2010)

Log Message:
-----------
gar/v2: enable use of external script for pre-req dep checks

Modified Paths:
--------------
    csw/mgar/gar/v2/gar.mk

Modified: csw/mgar/gar/v2/gar.mk
===================================================================
--- csw/mgar/gar/v2/gar.mk	2010-07-02 21:45:38 UTC (rev 10408)
+++ csw/mgar/gar/v2/gar.mk	2010-07-03 15:57:24 UTC (rev 10409)
@@ -294,13 +294,17 @@
 	@echo "[===== NOW BUILDING: $(DISTNAME) MODULATION $(MODULATION): $(foreach M,$(MODULATORS),$M=$($M)) =====]"
 
 # prerequisite	- Make sure that the system is in a sane state for building the package
-PREREQUISITE_TARGETS = $(addprefix prerequisitepkg-,$(PREREQUISITE_BASE_PKGS) $(BUILD_DEP_PKGS) $(DEP_PKGS) $(foreach S,$(_PKG_SPECS),$(DEP_PKGS_$S))) $(addprefix prerequisite-,$(PREREQUISITE_SCRIPTS))
+ALL_PREREQ_PKGS = $(PREREQUISITE_BASE_PKGS) $(BUILD_DEP_PKGS) $(DEP_PKGS) $(foreach S,$(_PKG_SPECS),$(DEP_PKGS_$S))
+PREREQUISITE_TARGETS =  $(addprefix prerequisite-,$(PREREQUISITE_SCRIPTS))
 
 # Force to be called in global modulation
-prerequisite: $(if $(filter global,$(MODULATION)),announce pre-everything $(COOKIEDIR) $(DOWNLOADDIR) $(PARTIALDIR) $(addprefix dep-$(GARDIR)/,$(FETCHDEPS)) pre-prerequisite $(PREREQUISITE_TARGETS) post-prerequisite)
+prerequisite: $(if $(filter global,$(MODULATION)),announce pre-everything $(COOKIEDIR) $(DOWNLOADDIR) $(PARTIALDIR) $(addprefix dep-$(GARDIR)/,$(FETCHDEPS)) pre-prerequisite check-prereqs $(PREREQUISITE_TARGETS) post-prerequisite)
 	$(if $(filter-out global,$(MODULATION)),$(MAKE) -s MODULATION=global prerequisite)
 	$(DONADA)
 
+check-prereqs:
+	@$(abspath $(GARBIN)/check_for_deps) $(ALL_PREREQ_PKGS)
+
 prerequisitepkg-%:
 	@echo " ==> Verifying for installed package $*: \c"
 	@(pkginfo -q $*; if [ $$? -eq 0 ]; then echo "installed"; else echo "MISSING"; exit 1; fi)


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 Jul  3 22:12:12 2010
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Sat, 03 Jul 2010 20:12:12 +0000
Subject: [csw-devel] SF.net SVN: gar:[10410] csw/mgar/gar/v2/lib/python
Message-ID: <E1OV94O-0007Ok-96@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10410
          http://gar.svn.sourceforge.net/gar/?rev=10410&view=rev
Author:   wahwah
Date:     2010-07-03 20:12:11 +0000 (Sat, 03 Jul 2010)

Log Message:
-----------
mGAR v2: checkpkg, checking binary architectures, sparcv8 vs sparcv8+ vs sparcv9.

Modified Paths:
--------------
    csw/mgar/gar/v2/lib/python/checkpkg.py
    csw/mgar/gar/v2/lib/python/opencsw.py
    csw/mgar/gar/v2/lib/python/package_checks.py
    csw/mgar/gar/v2/lib/python/package_checks_test.py

Added Paths:
-----------
    csw/mgar/gar/v2/lib/python/testdata/stats/46/461a24f02dd5020b4aa014b76f3ec2cc/files_metadata.yml

Modified: csw/mgar/gar/v2/lib/python/checkpkg.py
===================================================================
--- csw/mgar/gar/v2/lib/python/checkpkg.py	2010-07-03 15:57:24 UTC (rev 10409)
+++ csw/mgar/gar/v2/lib/python/checkpkg.py	2010-07-03 20:12:11 UTC (rev 10410)
@@ -29,7 +29,7 @@
 
 DEBUG_BREAK_PKGMAP_AFTER = False
 DB_SCHEMA_VERSION = 3L
-PACKAGE_STATS_VERSION = 5L
+PACKAGE_STATS_VERSION = 6L
 SYSTEM_PKGMAP = "/var/sadm/install/contents"
 WS_RE = re.compile(r"\s+")
 NEEDED_SONAMES = "needed sonames"
@@ -204,11 +204,8 @@
 
 
 class SystemPkgmap(object):
-  """A class to hold and manipulate the /var/sadm/install/contents file.
+  """A class to hold and manipulate the /var/sadm/install/contents file."""
 
-  TODO: Implement timestamp checking and refreshing the cache.
-  """
-
   STOP_PKGS = ["SUNWbcp", "SUNWowbcp", "SUNWucb"]
   CHECKPKG_DIR = ".checkpkg"
   SQLITE3_DBNAME_TMPL = "var-sadm-install-contents-cache-%s"
@@ -1033,6 +1030,7 @@
       # This entry needs to be last because of the assumption in the
       # CollectStats() function.
       "basic_stats",
+      "files_metadata",
   ]
 
   def __init__(self, srv4_pkg, stats_basedir=None, md5sum=None):
@@ -1282,6 +1280,7 @@
     # in one of the previous runs, the basic_stats.pickle file is not there
     # or not updated, and the collection is started again.
     self.DumpObject(self.GetBasicStats(), "basic_stats")
+    self.DumpObject(dir_pkg.GetFilesMetadata(), "files_metadata")
     logging.debug("Statistics of %s have been collected.", repr(dir_pkg.pkgname))
 
   def GetAllStats(self):

Modified: csw/mgar/gar/v2/lib/python/opencsw.py
===================================================================
--- csw/mgar/gar/v2/lib/python/opencsw.py	2010-07-03 15:57:24 UTC (rev 10409)
+++ csw/mgar/gar/v2/lib/python/opencsw.py	2010-07-03 20:12:11 UTC (rev 10410)
@@ -12,14 +12,11 @@
 # the terms of the GNU General Public License version 2 as published by the
 # Free Software Foundation.
 
-ENABLE_HACHOIR = False
-
 import copy
 import datetime
 import difflib
-if ENABLE_HACHOIR:
-  import hachoir_parser as hp
-  import hachoir_core as hc
+import hachoir_parser as hp
+import hachoir_core as hc
 import hashlib
 import magic
 import logging
@@ -45,7 +42,10 @@
 PKG_URL_TMPL = "http://www.opencsw.org/packages/%s"
 CATALOG_URL = "http://mirror.opencsw.org/opencsw/current/i386/5.10/catalog"
 WS_RE = re.compile(r"\s+")
-
+BIN_MIMETYPES = (
+    'application/x-executable',
+    'application/x-sharedlib',
+)
 ADMIN_FILE_CONTENT = """
 basedir=default
 runlevel=nocheck
@@ -90,6 +90,7 @@
 Generated by submitpkg
 """
 
+
 class Error(Exception):
   pass
 
@@ -653,7 +654,6 @@
 
   Allows some read-write operations.
   """
-
   def __init__(self, directory):
     self.directory = directory
     self.pkgname = os.path.basename(directory)
@@ -813,30 +813,23 @@
       magic_cookie.load()
       magic_cookie.setflags(magic.MAGIC_MIME)
       for file_path in all_files:
+        full_path = unicode(self.MakeAbsolutePath(file_path))
         file_info = {
             "path": StripRe(file_path, root_re),
-            "mime_type": None,
+            "mime_type": magic_cookie.file(full_path),
         }
-        full_path = unicode(self.MakeAbsolutePath(file_path))
-        if ENABLE_HACHOIR:
+        if IsBinary(file_info):
           parser = hp.createParser(full_path)
           if not parser:
-            print "Can't parse file %s" % (file_path)
+            logging.warning("Can't parse file %s", file_path)
           else:
-            print "found file: %s, it's a %s" % (file_path, parser.mime_type)
-            file_info["mime_type"] = parser.mime_type
-            f =  parser["/header/machine"]
-            print "/header/machine: ", (f, f.display, f.value)
-            i = 0
-            while True:
-              try:
-                f = parser["/header"].getField(i)
-                print "Field", i, ": ", (f, f.display, f.value)
-              except hc.field.field.MissingField:
-                print "No field number", i
-                break
-              i += 1
-        file_info["mime_type"] = magic_cookie.file(full_path)
+            file_info["mime_type_by_hachoir"] = parser.mime_type
+            machine_id = parser["/header/machine"].value
+            file_info["machine_id"] = machine_id
+            file_info["endian"] = parser["/header/endian"].display
+        else:
+          logging.debug("%s is not a binary, or hachoir is disabled.",
+                        full_path)
         self.files_metadata.append(file_info)
     return self.files_metadata
 
@@ -861,19 +854,14 @@
     Now that there are files_metadata, this function can safely go away, once
     all its callers are modified to use files_metadata instead.
     """
-    bin_mimetypes = (
-        'application/x-executable',
-        'application/x-sharedlib',
-    )
     if self.binaries is None:
       self.CheckPkgpathExists()
       files_metadata = self.GetFilesMetadata()
       self.binaries = []
       # The nested for-loop looks inefficient.
       for file_info in files_metadata:
-        for mimetype in bin_mimetypes:
-          if mimetype in file_info["mime_type"]:
-            self.binaries.append(file_info["path"])
+        if IsBinary(file_info):
+          self.binaries.append(file_info["path"])
       self.binaries.sort()
     return self.binaries
 
@@ -1193,3 +1181,13 @@
           logging.error("%s is missing the file_basename field", d)
         self.by_basename[d["file_basename"]] = d
     return self.by_basename
+
+def IsBinary(file_info):
+  """Returns True or False depending on file metadata."""
+  is_a_binary = False
+  logging.debug("IsBinary(%s)", repr(file_info))
+  for mimetype in BIN_MIMETYPES:
+    if mimetype in file_info["mime_type"]:
+      is_a_binary = True
+      break
+  return is_a_binary

Modified: csw/mgar/gar/v2/lib/python/package_checks.py
===================================================================
--- csw/mgar/gar/v2/lib/python/package_checks.py	2010-07-03 15:57:24 UTC (rev 10409)
+++ csw/mgar/gar/v2/lib/python/package_checks.py	2010-07-03 20:12:11 UTC (rev 10410)
@@ -86,7 +86,27 @@
 # Valid URLs in the VENDOR field in pkginfo
 VENDORURL_RE = r"^(http|ftp)s?\://.+\..+$"
 
+BASE_BINARY_PATHS = ('bin', 'lib', 'libexec')
+SPARCV8_PATHS = BASE_BINARY_PATHS + ('sparcv8', 'sparcv8-fsmuld',
+                                     'sparcv7', 'sparc')
+SPARCV8PLUS_PATHS = ('sparcv8plus+vis2', 'sparcv8plus+vis', 'sparcv8plus')
+SPARCV9_PATHS = ('sparcv9+vis2', 'sparcv9+vis', 'sparcv9')
+INTEL_386_PATHS = BASE_BINARY_PATHS + ('pentium_pro+mmx', 'pentium_pro',
+                                       'pentium+mmx', 'pentium',
+                                       'i486', 'i386', 'i86')
+AMD64_PATHS = ('amd64',)
+HACHOIR_MACHINES = {
+    # id: (name, allowed_paths)
+    -1: ("Unknown",   ()),
+     2: ("sparcv8",   SPARCV8_PATHS),
+     3: ("i386",      INTEL_386_PATHS),
+     6: ("i486",      INTEL_386_PATHS),
+    18: ("sparcv8+",  SPARCV8PLUS_PATHS),
+    43: ("sparcv9",   SPARCV9_PATHS),
+    62: ("amd64",     AMD64_PATHS),
+}
 
+
 def CatalognameLowercase(pkg_data, error_mgr, logger, messenger):
   catalogname = pkg_data["basic_stats"]["catalogname"]
   if catalogname != catalogname.lower():
@@ -771,3 +791,28 @@
         "For example, %s. "
         "However, the catalogname doesn't start with 'py_'."
         % repr(example_py_file))
+
+
+def CheckArchitecture(pkg_data, error_mgr, logger, messenger):
+  pkgname = pkg_data["basic_stats"]["pkgname"]
+  for metadata in pkg_data["files_metadata"]:
+    if "machine_id" not in metadata:
+      continue
+    logger.debug("CheckArchitecture(): %s", metadata)
+    cpu_type, allowed_paths = HACHOIR_MACHINES[metadata["machine_id"]]
+    binary_path, unused_binary_name = os.path.split(metadata["path"])
+    unused_dir, binary_subdir = os.path.split(binary_path)
+    if binary_subdir not in allowed_paths:
+      error_mgr.ReportError(
+          "binary-wrong-architecture",
+          "id=%s name=%s subdir=%s" % (
+            metadata["machine_id"],
+            cpu_type,
+            binary_subdir))
+      messenger.Message(
+          "Files compiled for specific architectures must be placed in "
+          "subdirectories that match the architecture.  For more "
+          "information, visit "
+          "http://www.opencsw.org/extend-it/contribute-packages/"
+          "build-standards/"
+          "architecture-optimization-using-isaexec-and-isalist/")

Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py
===================================================================
--- csw/mgar/gar/v2/lib/python/package_checks_test.py	2010-07-03 15:57:24 UTC (rev 10409)
+++ csw/mgar/gar/v2/lib/python/package_checks_test.py	2010-07-03 20:12:11 UTC (rev 10410)
@@ -655,7 +655,49 @@
         'This path is already provided by CSWcommon '
         'or is not allowed for other reasons.')
 
+class TestCheckArchitecture_sparcv8plus(CheckpkgUnitTestHelper,
+                                        unittest.TestCase):
+  FUNCTION_NAME = "CheckArchitecture"
+  def CheckpkgTest(self):
+    self.pkg_data["files_metadata"] = [
+       {'endian': 'Big endian',
+        'machine_id': 18,
+        'mime_type': 'application/x-executable; charset=binary',
+        'mime_type_by_hachoir': u'application/x-executable',
+        'path': 'opt/csw/bin/tree'},
+       {'mime_type': 'text/troff; charset=us-ascii',
+        'path': 'opt/csw/share/man/man1/tree.1'},
+       {'mime_type': 'text/plain; charset=us-ascii',
+        'path': 'opt/csw/share/doc/tree/license'}]
+    self.error_mgr_mock.ReportError('binary-wrong-architecture',
+                                    'id=18 name=sparcv8+ subdir=bin')
 
+
+class TestCheckArchitecture_sparcv8plus(CheckpkgUnitTestHelper,
+                                        unittest.TestCase):
+  FUNCTION_NAME = "CheckArchitecture"
+  def CheckpkgTest(self):
+    self.pkg_data["files_metadata"] = [
+       {'endian': 'Big endian',
+        'machine_id': 18,
+        'mime_type': 'application/x-executable; charset=binary',
+        'mime_type_by_hachoir': u'application/x-executable',
+        'path': 'opt/csw/bin/sparcv8plus/tree'},
+       ]
+
+
+class TestCheckArchitecture_sparcv8(CheckpkgUnitTestHelper,
+                                    unittest.TestCase):
+  FUNCTION_NAME = "CheckArchitecture"
+  def CheckpkgTest(self):
+    self.pkg_data["files_metadata"] = [
+       {'endian': 'Big endian',
+        'machine_id': 2,
+        'mime_type': 'application/x-executable; charset=binary',
+        'mime_type_by_hachoir': u'application/x-executable',
+        'path': 'opt/csw/bin/tree'}]
+
+
 class TestConflictingFiles(CheckpkgUnitTestHelper,
                            unittest.TestCase):
   """Throw an error if there's a conflicting file in the package set."""

Added: csw/mgar/gar/v2/lib/python/testdata/stats/46/461a24f02dd5020b4aa014b76f3ec2cc/files_metadata.yml
===================================================================

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 Jul  3 22:40:53 2010
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Sat, 03 Jul 2010 20:40:53 +0000
Subject: [csw-devel] SF.net SVN: gar:[10411] csw/mgar/pkg/clpbar/trunk
Message-ID: <E1OV9W9-0006wH-2c@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 10411
          http://gar.svn.sourceforge.net/gar/?rev=10411&view=rev
Author:   wahwah
Date:     2010-07-03 20:40:52 +0000 (Sat, 03 Jul 2010)

Log Message:
-----------
clpbar: Allowing to modify CFLAGS

Modified Paths:
--------------
    csw/mgar/pkg/clpbar/trunk/Makefile
    csw/mgar/pkg/clpbar/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/clpbar/trunk/files/0001-Allowing-to-modify-CFLAGS.patch

Modified: csw/mgar/pkg/clpbar/trunk/Makefile
===================================================================
--- csw/mgar/pkg/clpbar/trunk/Makefile	2010-07-03 20:12:11 UTC (rev 10410)
+++ csw/mgar/pkg/clpbar/trunk/Makefile	2010-07-03 20:40:52 UTC (rev 10411)
@@ -11,6 +11,7 @@
 SPKG_SOURCEURL = http://clpbar.sourceforge.net/
 MASTER_SITES = $(SF_MIRRORS)
 SF_PROJ = clpbar
+PATCHFILES += 0001-Allowing-to-modify-CFLAGS.patch
 
 DISTFILES  = $(GARNAME)_$(GARVERSION).tar.gz
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz

Modified: csw/mgar/pkg/clpbar/trunk/checksums
===================================================================
--- csw/mgar/pkg/clpbar/trunk/checksums	2010-07-03 20:12:11 UTC (rev 10410)
+++ csw/mgar/pkg/clpbar/trunk/checksums	2010-07-03 20:40:52 UTC (rev 10411)
@@ -1 +1,2 @@
+0fc824259a4b259263856af54f76b605  0001-Allowing-to-modify-CFLAGS.patch
 d824415b391a3f826b410c86223e54a5  bar_1.10.9.tar.gz

Added: csw/mgar/pkg/clpbar/trunk/files/0001-Allowing-to-modify-CFLAGS.patch
===================================================================
--- csw/mgar/pkg/clpbar/trunk/files/0001-Allowing-to-modify-CFLAGS.patch	                        (rev 0)
+++ csw/mgar/pkg/clpbar/trunk/files/0001-Allowing-to-modify-CFLAGS.patch	2010-07-03 20:40:52 UTC (rev 10411)
@@ -0,0 +1,52 @@
+From c0f3d3cfdff8a4838b903eb80bd63c2966f511a2 Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Sat, 3 Jul 2010 22:37:03 +0200
+Subject: [PATCH] Allowing to modify CFLAGS
+
+---
+ Makefile.am |    4 ++--
+ Makefile.in |    4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index e6fcc76..b667595 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -12,10 +12,10 @@
+ #
+ 
+ # CFLAGS =
+-CFLAGS = -O2
++CFLAGS ?= -O2
+ # CFLAGS = -g -Wall
+ 
+-LDFLAGS = -s
++LDFLAGS ?= -s
+ # LDFLAGS =
+ 
+ bin_PROGRAMS =
+diff --git a/Makefile.in b/Makefile.in
+index 9166e52..6f72858 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -128,7 +128,7 @@ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ 
+ # CFLAGS =
+-CFLAGS = -O2
++CFLAGS ?= -O2
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CYGPATH_W = @CYGPATH_W@
+@@ -150,7 +150,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ # CFLAGS = -g -Wall
+-LDFLAGS = -s
++LDFLAGS ?= -s
+ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@
+ LN_S = @LN_S@
+-- 
+1.7.1
+


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 Jul  4 00:37:54 2010
From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net)
Date: Sat, 03 Jul 2010 22:37:54 +0000
Subject: [csw-devel] SF.net SVN: gar:[10412] csw/mgar/pkg/dbus/trunk
Message-ID: <E1OVBLO-0000Dk-GG@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 10412
          http://gar.svn.sourceforge.net/gar/?rev=10412&view=rev
Author:   wbonnet
Date:     2010-07-03 22:37:54 +0000 (Sat, 03 Jul 2010)

Log Message:
-----------
Upgrade to 1.3.1 and add /opt/csw/share to XDG_DATA_DIRS

Modified Paths:
--------------
    csw/mgar/pkg/dbus/trunk/Makefile
    csw/mgar/pkg/dbus/trunk/checksums
    csw/mgar/pkg/dbus/trunk/files/dbus-sysdeps-unix.c.diff

Added Paths:
-----------
    csw/mgar/pkg/dbus/trunk/files/dbus-sysdeps.h.diff

Modified: csw/mgar/pkg/dbus/trunk/Makefile
===================================================================
--- csw/mgar/pkg/dbus/trunk/Makefile	2010-07-03 20:40:52 UTC (rev 10411)
+++ csw/mgar/pkg/dbus/trunk/Makefile	2010-07-03 22:37:54 UTC (rev 10412)
@@ -1,5 +1,5 @@
 GARNAME      = dbus
-GARVERSION   = 1.3.0
+GARVERSION   = 1.3.1
 CATEGORIES   = lib
 
 DESCRIPTION  = DBus Message Bus System
@@ -48,6 +48,7 @@
 BUILD64 = 1
 
 PATCHFILES += dbus-sysdeps-unix.c.diff
+PATCHFILES += dbus-sysdeps.h.diff
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz

Modified: csw/mgar/pkg/dbus/trunk/checksums
===================================================================
--- csw/mgar/pkg/dbus/trunk/checksums	2010-07-03 20:40:52 UTC (rev 10411)
+++ csw/mgar/pkg/dbus/trunk/checksums	2010-07-03 22:37:54 UTC (rev 10412)
@@ -1,4 +1,5 @@
 6e26e51243c4551ac222112edf67b5db  CSWdbus.preinstall
 9222a44088c837eba62822e330de713f  cswdbus
-b3298d5ce0e4ad4731b1e4e1787d56bb  dbus-1.3.0.tar.gz
-be9b69b240bb99b4d71d643a77ad10e6  dbus-sysdeps-unix.c.diff
+1aab02bdcac4d662d3760896790f0ede  dbus-1.3.1.tar.gz
+02b4d3880e26c0c190ce4f2cca78fe36  dbus-sysdeps-unix.c.diff
+5d584064f7e6a50bf54750ae56d7e29e  dbus-sysdeps.h.diff

Modified: csw/mgar/pkg/dbus/trunk/files/dbus-sysdeps-unix.c.diff
===================================================================
--- csw/mgar/pkg/dbus/trunk/files/dbus-sysdeps-unix.c.diff	2010-07-03 20:40:52 UTC (rev 10411)
+++ csw/mgar/pkg/dbus/trunk/files/dbus-sysdeps-unix.c.diff	2010-07-03 22:37:54 UTC (rev 10412)
@@ -1,5 +1,5 @@
---- dbus-1.3.0.orig/dbus/dbus-sysdeps-unix.c    2009-07-16 16:04:55.000000000 +0200
-+++ dbus-1.3.0/dbus/dbus-sysdeps-unix.c         2010-02-28 16:49:51.561773000 +0100
+--- dbus-1.3.1.orig/dbus/dbus-sysdeps-unix.c    2009-07-16 16:04:55.000000000 +0200
++++ dbus-1.3.1/dbus/dbus-sysdeps-unix.c         2010-02-28 16:49:51.561773000 +0100
 @@ -54,6 +54,9 @@
  #include <netinet/in.h>
  #include <netdb.h>
@@ -19,3 +19,21 @@
    if (!cloexec_done)
  #endif
      {
+@@ -3268,7 +3271,7 @@
+     }
+   else
+     {
+-      if (!_dbus_string_append (&servicedir_path, "/usr/local/share:/usr/share:"))
++      if (!_dbus_string_append (&servicedir_path, "/opt/csw/share:/usr/local/share:/usr/share:"))
+         goto oom;
+     }
+
+@@ -3355,7 +3358,7 @@
+     }
+   else
+     {
+-      if (!_dbus_string_append (&servicedir_path, "/usr/local/share:/usr/share:"))
++      if (!_dbus_string_append (&servicedir_path, "/opt/csw/share:/usr/local/share:/usr/share:"))
+         goto oom;
+     }
+

Added: csw/mgar/pkg/dbus/trunk/files/dbus-sysdeps.h.diff
===================================================================
--- csw/mgar/pkg/dbus/trunk/files/dbus-sysdeps.h.diff	                        (rev 0)
+++ csw/mgar/pkg/dbus/trunk/files/dbus-sysdeps.h.diff	2010-07-03 22:37:54 UTC (rev 10412)
@@ -0,0 +1,13 @@
+diff --speed-large-files --minimal -Nru  dbus-sysdeps.h.orig dbus-sysdeps.h
+--- dbus-1.3.1.orig/dbus/dbus-sysdeps.h 2010-07-03 23:01:04.802652103 +0200
++++ dbus-1.3.1/dbus/dbus-sysdeps.h      2010-07-03 23:01:16.801332639 +0200
+@@ -27,6 +27,8 @@
+
+ #include "config.h"
+
++#include <link.h>
++
+ #ifdef HAVE_STDINT_H
+ #include <stdint.h>
+ #endif
+


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 Jul  4 02:12:14 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Sun, 04 Jul 2010 00:12:14 +0000
Subject: [csw-devel] SF.net SVN: gar:[10413] csw/mgar/gar/v2/gar.mk
Message-ID: <E1OVCog-0002ED-2m@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10413
          http://gar.svn.sourceforge.net/gar/?rev=10413&view=rev
Author:   bdwalton
Date:     2010-07-04 00:12:13 +0000 (Sun, 04 Jul 2010)

Log Message:
-----------
gar/v2: add some 'svn add' helper text to git makepatch support

Modified Paths:
--------------
    csw/mgar/gar/v2/gar.mk

Modified: csw/mgar/gar/v2/gar.mk
===================================================================
--- csw/mgar/gar/v2/gar.mk	2010-07-03 22:37:54 UTC (rev 10412)
+++ csw/mgar/gar/v2/gar.mk	2010-07-04 00:12:13 UTC (rev 10413)
@@ -482,10 +482,16 @@
 			( NEXTPATCH=`git log --pretty=oneline master..HEAD | wc -l | tr -d '[[:space:]]'`; \
 			git format-patch --start-number=$$NEXTPATCH csw-$(GARVERSION); \
 			echo Add the following to your recipe and then; \
+			NEWPATCHES=`echo 00*-*patch`; \
+			FILES_PATCHES=`for p in $$NEWPATCHES; do echo files/$$p; done`; \
 			echo rerun: gmake makesums; \
-			echo PATCHFILES +=  000$${NEXTPATCH}*; \
+			echo PATCHFILES +=  $$NEWPATCHES; \
 			echo "(or maybe PATCHFILES_$(MODULATION) ??)"; \
-			mv 000$${NEXTPATCH}*patch $(abspath $(FILEDIR)); ) \
+			echo "Don't forget:"; \
+			echo; \
+			echo "	svn add" $$FILES_PATCHES; \
+			echo; \
+			mv $$NEWPATCHES $(abspath $(FILEDIR)); ) \
 		fi; \
 	    else \
 		echo "No extracted sources so we can't create patches..."; \


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 Jul  4 09:33:16 2010
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Sun, 04 Jul 2010 07:33:16 +0000
Subject: [csw-devel] SF.net SVN: gar:[10414] csw/mgar/gar/v2/lib/python
Message-ID: <E1OVJhU-0003mJ-Ee@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 10414
          http://gar.svn.sourceforge.net/gar/?rev=10414&view=rev
Author:   wahwah
Date:     2010-07-04 07:33:16 +0000 (Sun, 04 Jul 2010)

Log Message:
-----------
mGAR v2: checkpkg, performance optimizations, making the whole catalog run feasible

Modified Paths:
--------------
    csw/mgar/gar/v2/lib/python/checkpkg.py
    csw/mgar/gar/v2/lib/python/opencsw.py
    csw/mgar/gar/v2/lib/python/package_checks.py

Modified: csw/mgar/gar/v2/lib/python/checkpkg.py
===================================================================
--- csw/mgar/gar/v2/lib/python/checkpkg.py	2010-07-04 00:12:13 UTC (rev 10413)
+++ csw/mgar/gar/v2/lib/python/checkpkg.py	2010-07-04 07:33:16 UTC (rev 10414)
@@ -1122,9 +1122,6 @@
       binary_data["soname_guessed"] = False
       binary_data["base_name"] = binary_base_name
       if SONAME not in binary_data:
-        logging.debug("The %s binary doesn't provide a SONAME. "
-                      "(It might be an executable)",
-                     binary_base_name)
         # The binary doesn't tell its SONAME.  We're guessing it's the
         # same as the base file name.
         binary_data[SONAME] = binary_base_name

Modified: csw/mgar/gar/v2/lib/python/opencsw.py
===================================================================
--- csw/mgar/gar/v2/lib/python/opencsw.py	2010-07-04 00:12:13 UTC (rev 10413)
+++ csw/mgar/gar/v2/lib/python/opencsw.py	2010-07-04 07:33:16 UTC (rev 10414)
@@ -460,11 +460,17 @@
     if not os.path.isdir(destdir):
       raise PackageError("%s doesn't exist or is not a directory" % destdir)
     args = [os.path.join(os.path.dirname(__file__), "custom-pkgtrans"),
-           src_file, destdir, pkgname ]
-    pkgtrans_proc = subprocess.Popen(args)
-    pkgtrans_proc.communicate()
+            src_file,
+            destdir,
+            pkgname ]
+    pkgtrans_proc = subprocess.Popen(args,
+                                     stdout=subprocess.PIPE,
+                                     stderr=subprocess.PIPE)
+    stdout, stderr = pkgtrans_proc.communicate()
     ret = pkgtrans_proc.wait()
     if ret:
+      logging.error(stdout)
+      logging.error(stderr)
       logging.error("% has failed" % args)
 
   def GetPkgname(self):
@@ -827,9 +833,6 @@
             machine_id = parser["/header/machine"].value
             file_info["machine_id"] = machine_id
             file_info["endian"] = parser["/header/endian"].display
-        else:
-          logging.debug("%s is not a binary, or hachoir is disabled.",
-                        full_path)
         self.files_metadata.append(file_info)
     return self.files_metadata
 
@@ -970,7 +973,7 @@
       if strip:
         strip_re = re.compile(r"^%s" % strip)
         fields = [re.sub(strip_re, "", x) for x in fields]
-      logging.debug(fields)
+      # logging.debug(fields)
       line_to_add = None
       installed_path = None
       prototype_class = None
@@ -1185,7 +1188,6 @@
 def IsBinary(file_info):
   """Returns True or False depending on file metadata."""
   is_a_binary = False
-  logging.debug("IsBinary(%s)", repr(file_info))
   for mimetype in BIN_MIMETYPES:
     if mimetype in file_info["mime_type"]:
       is_a_binary = True

Modified: csw/mgar/gar/v2/lib/python/package_checks.py
===================================================================
--- csw/mgar/gar/v2/lib/python/package_checks.py	2010-07-04 00:12:13 UTC (rev 10413)
+++ csw/mgar/gar/v2/lib/python/package_checks.py	2010-07-04 07:33:16 UTC (rev 10414)
@@ -23,13 +23,17 @@
 
 PATHS_ALLOWED_ONLY_IN = {
     # Leading slash must be removed.
-    "CSWcommon":  [r"opt",
-                   r"opt/csw/man.*",
-                   r"opt/csw/doc",
-                   r"opt/csw/info",
-                   r"opt/csw/share/locale/locale.alias"],
-    "CSWiconv":   [r"opt/csw/lib/charset.alias"],
-    "CSWtexinfo": [r"opt/csw/share/info/dir"],
+    # Using strings where possible for performance.
+    "CSWcommon":  {"string": [
+                       r"opt",
+                       r"opt/csw/man",
+                       r"opt/csw/doc",
+                       r"opt/csw/info",
+                       r"opt/csw/share/locale/locale.alias",
+                   ],
+                   "regex": [r"opt/csw/man/.*"]},
+    "CSWiconv":   {"string": [r"opt/csw/lib/charset.alias"]},
+    "CSWtexinfo": {"string": [r"opt/csw/share/info/dir"]},
 }
 MAX_DESCRIPTION_LENGTH = 100
 LICENSE_TMPL = "/opt/csw/share/doc/%s/license"
@@ -69,14 +73,14 @@
     'subdir2': r"(?P<subdir2>/[\w\-\.]+)",
 }
 RPATH_WHITELIST = [
-    ("^"
-     "%(prefix)s"
-     "%(prefix_extra)s"
-     "/(lib|libexec)"
-     "%(subdirs)s"
-     "%(isalist)s?"
-     "%(subdir2)s?"
-     "$") % RPATH_PARTS,
+    (r"^"
+     r"%(prefix)s"
+     r"%(prefix_extra)s"
+     r"/(lib|libexec)"
+     r"%(subdirs)s"
+     r"%(isalist)s?"
+     r"%(subdir2)s?"
+     r"$") % RPATH_PARTS,
     r"^\$ORIGIN$",
     r"^/usr(/(ccs|dt|openwin))?/lib(/sparcv9)?$",
 ]
@@ -106,7 +110,28 @@
     62: ("amd64",     AMD64_PATHS),
 }
 
+def RemovePackagesUnderInstallation(paths_and_pkgs_by_soname,
+                                    pkgs_to_be_installed):
+  """Emulates uninstallation of packages prior to installation
+  of the new ones.
+  {'libfoo.so.1': {u'/opt/csw/lib': [u'CSWlibfoo']}}
+  """
+  # for brevity
+  ptbi = set(pkgs_to_be_installed)
+  ppbs = paths_and_pkgs_by_soname
+  new_ppbs = {}
+  for soname in ppbs:
+    if soname not in new_ppbs:
+      new_ppbs[soname] = {}
+    for binary_path in ppbs[soname]:
+      for pkgname in ppbs[soname][binary_path]:
+        if pkgname not in ptbi:
+          if binary_path not in new_ppbs[soname]:
+            new_ppbs[soname][binary_path] = []
+          new_ppbs[soname][binary_path].append(pkgname)
+  return new_ppbs
 
+
 def CatalognameLowercase(pkg_data, error_mgr, logger, messenger):
   catalogname = pkg_data["basic_stats"]["catalogname"]
   if catalogname != catalogname.lower():
@@ -201,28 +226,6 @@
           entry["path"])
 
 
-def RemovePackagesUnderInstallation(paths_and_pkgs_by_soname,
-                                    pkgs_to_be_installed):
-  """Emulates uninstallation of packages prior to installation
-  of the new ones.
-  {'libfoo.so.1': {u'/opt/csw/lib': [u'CSWlibfoo']}}
-  """
-  # for brevity
-  ptbi = set(pkgs_to_be_installed)
-  ppbs = paths_and_pkgs_by_soname
-  new_ppbs = {}
-  for soname in ppbs:
-    if soname not in new_ppbs:
-      new_ppbs[soname] = {}
-    for binary_path in ppbs[soname]:
-      for pkgname in ppbs[soname][binary_path]:
-        if pkgname not in ptbi:
-          if binary_path not in new_ppbs[soname]:
-            new_ppbs[soname][binary_path] = []
-          new_ppbs[soname][binary_path].append(pkgname)
-  return new_ppbs
-
-
 def SetCheckLibraries(pkgs_data, error_mgr, logger, messenger):
   """Second version of the library checking code.
 
@@ -588,7 +591,16 @@
       common_path = common_path[1:]
     common_paths.append(common_path)
   paths_only_allowed_in = copy.copy(PATHS_ALLOWED_ONLY_IN)
-  paths_only_allowed_in["CSWcommon"] += common_paths
+  ss = paths_only_allowed_in["CSWcommon"]["string"]
+  paths_only_allowed_in["CSWcommon"]["string"] = set(ss).union(common_paths)
+  # Compile all the regex expressions ahead of time.
+  for pkgname in paths_only_allowed_in:
+    if "regex" in paths_only_allowed_in[pkgname]:
+      regexes = paths_only_allowed_in[pkgname]["regex"]
+      paths_only_allowed_in[pkgname]["regex"] = map(re.compile, regexes)
+    if "string" in paths_only_allowed_in[pkgname]:
+      paths_only_allowed_in[pkgname]["string"] = set(
+          paths_only_allowed_in[pkgname]["string"])
   paths_in_pkg = set()
   for entry in pkg_data["pkgmap"]:
     entry_path = entry["path"]
@@ -599,14 +611,23 @@
     paths_in_pkg.add(entry_path)
   for pkgname in paths_only_allowed_in:
     if pkgname != pkg_data["basic_stats"]["pkgname"]:
-      for disallowed_path in paths_only_allowed_in[pkgname]:
-        disallowed_re = re.compile(r"^%s$" % disallowed_path)
-        for path_in_pkg in paths_in_pkg:
-          if disallowed_re.match(path_in_pkg):
-            error_mgr.ReportError(
-                "disallowed-path", path_in_pkg,
-                "This path is already provided by %s "
-                "or is not allowed for other reasons." % pkgname)
+      if "string" in paths_only_allowed_in[pkgname]:
+        ss = paths_only_allowed_in[pkgname]["string"]
+        intersection =  ss.intersection(paths_in_pkg)
+        for path_in_pkg in intersection:
+          error_mgr.ReportError(
+              "disallowed-path", path_in_pkg,
+              "This path is already provided by %s "
+              "or is not allowed for other reasons." % pkgname)
+      if "regex" in paths_only_allowed_in[pkgname]:
+        rr = paths_only_allowed_in[pkgname]["regex"]
+        for disallowed_re in rr:
+          badpaths = filter(disallowed_re.match, paths_in_pkg)
+          for path_in_pkg in badpaths:
+              error_mgr.ReportError(
+                  "disallowed-path", path_in_pkg,
+                  "This path is already provided by %s "
+                  "or is not allowed for other reasons." % pkgname)
 
 
 def CheckLinkingAgainstSunX11(pkg_data, error_mgr, logger, messenger):
@@ -629,7 +650,7 @@
                                 entry["path"])
 
 
-def CheckBadPaths(pkg_data, error_mgr, logger, messenger):
+def CheckBadContent(pkg_data, error_mgr, logger, messenger):
   for regex in pkg_data["bad_paths"]:
     for file_name in pkg_data["bad_paths"][regex]:
       messenger.Message("File %s contains bad content: %s. "


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 Jul  4 12:12:13 2010
From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net)
Date: Sun, 04 Jul 2010 10:12:13 +0000
Subject: [csw-devel] SF.net SVN: gar:[10415] csw/mgar/pkg/dbus/trunk
Message-ID: <E1OVMBJ-0006qA-Up@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 10415
          http://gar.svn.sourceforge.net/gar/?rev=10415&view=rev
Author:   wbonnet
Date:     2010-07-04 10:12:13 +0000 (Sun, 04 Jul 2010)

Log Message:
-----------
Fix patch and XDG_DATA_DIRS

Modified Paths:
--------------
    csw/mgar/pkg/dbus/trunk/checksums
    csw/mgar/pkg/dbus/trunk/files/dbus-sysdeps-unix.c.diff

Modified: csw/mgar/pkg/dbus/trunk/checksums
===================================================================
--- csw/mgar/pkg/dbus/trunk/checksums	2010-07-04 07:33:16 UTC (rev 10414)
+++ csw/mgar/pkg/dbus/trunk/checksums	2010-07-04 10:12:13 UTC (rev 10415)
@@ -1,5 +1,5 @@
 6e26e51243c4551ac222112edf67b5db  CSWdbus.preinstall
 9222a44088c837eba62822e330de713f  cswdbus
 1aab02bdcac4d662d3760896790f0ede  dbus-1.3.1.tar.gz
-02b4d3880e26c0c190ce4f2cca78fe36  dbus-sysdeps-unix.c.diff
+6856e34f9fb52f9fd569a80576556543  dbus-sysdeps-unix.c.diff
 5d584064f7e6a50bf54750ae56d7e29e  dbus-sysdeps.h.diff

Modified: csw/mgar/pkg/dbus/trunk/files/dbus-sysdeps-unix.c.diff
===================================================================
--- csw/mgar/pkg/dbus/trunk/files/dbus-sysdeps-unix.c.diff	2010-07-04 07:33:16 UTC (rev 10414)
+++ csw/mgar/pkg/dbus/trunk/files/dbus-sysdeps-unix.c.diff	2010-07-04 10:12:13 UTC (rev 10415)
@@ -10,21 +10,12 @@
 
  #ifdef HAVE_ERRNO_H
  #include <errno.h>
-@@ -3043,7 +3043,7 @@
-     return -1;
-   }
-
--#ifndef F_DUPFD_CLOEXEC
-+#ifdef F_DUPFD_CLOEXEC
-   if (!cloexec_done)
- #endif
-     {
 @@ -3268,7 +3271,7 @@
      }
    else
      {
 -      if (!_dbus_string_append (&servicedir_path, "/usr/local/share:/usr/share:"))
-+      if (!_dbus_string_append (&servicedir_path, "/opt/csw/share:/usr/local/share:/usr/share:"))
++      if (!_dbus_string_append (&servicedir_path, "/opt/csw/share:"))
          goto oom;
      }
 
@@ -33,7 +24,7 @@
    else
      {
 -      if (!_dbus_string_append (&servicedir_path, "/usr/local/share:/usr/share:"))
-+      if (!_dbus_string_append (&servicedir_path, "/opt/csw/share:/usr/local/share:/usr/share:"))
++      if (!_dbus_string_append (&servicedir_path, "/opt/csw/share:"))
          goto oom;
      }
 


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 Jul  4 12:34:56 2010
From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net)
Date: Sun, 04 Jul 2010 10:34:56 +0000
Subject: [csw-devel] SF.net SVN: gar:[10416] csw/mgar/pkg/dbus/trunk/Makefile
Message-ID: <E1OVMXI-0007As-Pb@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 10416
          http://gar.svn.sourceforge.net/gar/?rev=10416&view=rev
Author:   wbonnet
Date:     2010-07-04 10:34:56 +0000 (Sun, 04 Jul 2010)

Log Message:
-----------
Fix Makefile

Modified Paths:
--------------
    csw/mgar/pkg/dbus/trunk/Makefile

Modified: csw/mgar/pkg/dbus/trunk/Makefile
===================================================================
--- csw/mgar/pkg/dbus/trunk/Makefile	2010-07-04 10:12:13 UTC (rev 10415)
+++ csw/mgar/pkg/dbus/trunk/Makefile	2010-07-04 10:34:56 UTC (rev 10416)
@@ -33,9 +33,13 @@
 PKGFILES_CSWlibdbus     = $(PKGFILES_RT)
 
 # Dependencies tracking
-RUNTIME_DEP_PKGS_CSWdbus        = CSWexpat CSWlibdbus CSWlibsm CSWlibice CSWlibx11 CSWcswclassutils
+RUNTIME_DEP_PKGS_CSWdbus        = CSWexpat CSWlibdbus CSWcswclassutils
 RUNTIME_DEP_PKGS_CSWlibdbusdev  = CSWlibdbus
 
+CHECKPKG_OVERRIDES_CSWlibdbusdev += surplus-dependency|CSWlibdbus
+CHECKPKG_OVERRIDES_CSWdbus += action-class-only-in-pkginfo|cswinitsmf
+CHECKPKG_OVERRIDES_CSWdbus += action-class-only-in-pkginfo|cswcpsampleconf
+
 # SMF support
 SPKG_CLASSES_CSWdbus = none cswcpsampleconf cswinitsmf 
 PROTOTYPE_FILTER  = awk '$$$$3 ~ /\/init.d\/cswdbus$$$$/ { $$$$2 = "cswinitsmf" } $$$$3 ~ /\/system.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } $$$$3 ~ /\/session.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } { print }'


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 Jul  4 13:15:08 2010
From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net)
Date: Sun, 04 Jul 2010 11:15:08 +0000
Subject: [csw-devel] SF.net SVN: gar:[10417]
	csw/mgar/pkg/dbus/tags/dbus-1.3.1, REV=2010.07.04/
Message-ID: <E1OVNAC-0008RA-JD@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 10417
          http://gar.svn.sourceforge.net/gar/?rev=10417&view=rev
Author:   wbonnet
Date:     2010-07-04 11:15:08 +0000 (Sun, 04 Jul 2010)

Log Message:
-----------
dbus: Tag as release 1.3.1,REV=2010.07.04

Added Paths:
-----------
    csw/mgar/pkg/dbus/tags/dbus-1.3.1,REV=2010.07.04/


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 Jul  4 13:25:11 2010
From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net)
Date: Sun, 04 Jul 2010 11:25:11 +0000
Subject: [csw-devel] SF.net SVN: gar:[10418]
	csw/mgar/pkg/dbus-glib/trunk/Makefile
Message-ID: <E1OVNJv-0007y9-Nb@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 10418
          http://gar.svn.sourceforge.net/gar/?rev=10418&view=rev
Author:   wbonnet
Date:     2010-07-04 11:25:11 +0000 (Sun, 04 Jul 2010)

Log Message:
-----------
Upgrade to 0.86

Modified Paths:
--------------
    csw/mgar/pkg/dbus-glib/trunk/Makefile

Modified: csw/mgar/pkg/dbus-glib/trunk/Makefile
===================================================================
--- csw/mgar/pkg/dbus-glib/trunk/Makefile	2010-07-04 11:15:08 UTC (rev 10417)
+++ csw/mgar/pkg/dbus-glib/trunk/Makefile	2010-07-04 11:25:11 UTC (rev 10418)
@@ -1,5 +1,5 @@
 GARNAME      = dbus-glib
-GARVERSION   = 0.84
+GARVERSION   = 0.86
 CATEGORIES   = lib
 
 DESCRIPTION  = DBus GLib Bindings


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 Jul  4 13:26:21 2010
From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net)
Date: Sun, 04 Jul 2010 11:26:21 +0000
Subject: [csw-devel] SF.net SVN: gar:[10419]
	csw/mgar/pkg/dbus-glib/trunk/checksums
Message-ID: <E1OVNL3-0000Hn-Rc@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 10419
          http://gar.svn.sourceforge.net/gar/?rev=10419&view=rev
Author:   wbonnet
Date:     2010-07-04 11:26:21 +0000 (Sun, 04 Jul 2010)

Log Message:
-----------
Upgrade to 0.86

Modified Paths:
--------------
    csw/mgar/pkg/dbus-glib/trunk/checksums

Modified: csw/mgar/pkg/dbus-glib/trunk/checksums
===================================================================
--- csw/mgar/pkg/dbus-glib/trunk/checksums	2010-07-04 11:25:11 UTC (rev 10418)
+++ csw/mgar/pkg/dbus-glib/trunk/checksums	2010-07-04 11:26:21 UTC (rev 10419)
@@ -1 +1 @@
-69fbe31fb3ee778715dff44cdd5178bf  dbus-glib-0.84.tar.gz
+cd0ab148fb0c786fc88be49d19971f50  dbus-glib-0.86.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 Jul  4 13:37:26 2010
From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net)
Date: Sun, 04 Jul 2010 11:37:26 +0000
Subject: [csw-devel] SF.net SVN: gar:[10420]
	csw/mgar/pkg/dbus-glib/trunk/Makefile
Message-ID: <E1OVNVm-00089d-6a@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 10420
          http://gar.svn.sourceforge.net/gar/?rev=10420&view=rev
Author:   wbonnet
Date:     2010-07-04 11:37:25 +0000 (Sun, 04 Jul 2010)

Log Message:
-----------
Upgrade to 0.86

Modified Paths:
--------------
    csw/mgar/pkg/dbus-glib/trunk/Makefile

Modified: csw/mgar/pkg/dbus-glib/trunk/Makefile
===================================================================
--- csw/mgar/pkg/dbus-glib/trunk/Makefile	2010-07-04 11:26:21 UTC (rev 10419)
+++ csw/mgar/pkg/dbus-glib/trunk/Makefile	2010-07-04 11:37:25 UTC (rev 10420)
@@ -24,8 +24,7 @@
 CATALOGNAME_CSWdbusglib         = dbus_glib
 CATALOGNAME_CSWdbusglibdev      = dbus_glibdev
 
-RUNTIME_DEP_PKGS_CSWdbusglibdev	= CSWdbusglib
-RUNTIME_DEP_PKGS_CSWdbusglib    = CSWexpat CSWggettextrt CSWglib2 CSWiconv CSWsunmath CSWlibdbus
+RUNTIME_DEP_PKGS_CSWdbusglib    = CSWexpat CSWggettextrt CSWglib2 CSWlibdbus
 
 PKGFILES_CSWdbusglibdev  = $(PKGFILES_DEVEL)
 # PKGFILES_CSWdbusglibdev += $(prefix)/include/.*


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From wahwah at users.sourceforge.net  Sun Jul  4 15:51:05 2010
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Sun, 04 Jul 2010 13:51:05 +0000
Subject: [csw-devel] SF.net SVN: gar:[10421]
	csw/mgar/gar/v2/bin/checkpkg_inspect_stats.py
Message-ID: <E1OVPb7-0002M8-Lq@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 10421
          http://gar.svn.sourceforge.net/gar/?rev=10421&view=rev
Author:   wahwah
Date:     2010-07-04 13:51:05 +0000 (Sun, 04 Jul 2010)

Log Message:
-----------
mGAR v2: A helper tool for package statistics inspection.

Added Paths:
-----------
    csw/mgar/gar/v2/bin/checkpkg_inspect_stats.py

Added: csw/mgar/gar/v2/bin/checkpkg_inspect_stats.py
===================================================================
--- csw/mgar/gar/v2/bin/checkpkg_inspect_stats.py	                        (rev 0)
+++ csw/mgar/gar/v2/bin/checkpkg_inspect_stats.py	2010-07-04 13:51:05 UTC (rev 10421)
@@ -0,0 +1,37 @@
+#!/opt/csw/bin/python2.6
+# coding=utf-8
+
+import code
+import logging
+import optparse
+import os
+import pprint
+import sys
+
+# 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():
+  parser = optparse.OptionParser()
+  parser.add_option("-d", "--debug", dest="debug",
+                    default=False, action="store_true",
+                    help="Turn on debugging messages")
+  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.")
+  filenames = args
+  srv4_pkgs = [opencsw.CswSrv4File(x) for x in filenames]
+  pkgstats = [checkpkg.PackageStats(x) for x in srv4_pkgs]
+  pkgstats = [x.GetAllStats() for x in pkgstats]
+  code.interact(local=locals())
+
+if __name__ == '__main__':
+	main()


Property changes on: csw/mgar/gar/v2/bin/checkpkg_inspect_stats.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 Jul  4 15:52:34 2010
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Sun, 04 Jul 2010 13:52:34 +0000
Subject: [csw-devel] SF.net SVN: gar:[10422] csw/mgar/gar/v2
Message-ID: <E1OVPcY-0001Ji-K6@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10422
          http://gar.svn.sourceforge.net/gar/?rev=10422&view=rev
Author:   wahwah
Date:     2010-07-04 13:52:34 +0000 (Sun, 04 Jul 2010)

Log Message:
-----------
mGAR v2: Architecture vs placement check improvements, less false positives.

Modified Paths:
--------------
    csw/mgar/gar/v2/bin/checkpkg_collect_stats.py
    csw/mgar/gar/v2/lib/python/checkpkg.py
    csw/mgar/gar/v2/lib/python/opencsw.py
    csw/mgar/gar/v2/lib/python/package_checks.py
    csw/mgar/gar/v2/lib/python/package_checks_test.py

Modified: csw/mgar/gar/v2/bin/checkpkg_collect_stats.py
===================================================================
--- csw/mgar/gar/v2/bin/checkpkg_collect_stats.py	2010-07-04 13:51:05 UTC (rev 10421)
+++ csw/mgar/gar/v2/bin/checkpkg_collect_stats.py	2010-07-04 13:52:34 UTC (rev 10422)
@@ -12,6 +12,7 @@
 import os.path
 import subprocess
 import sys
+import progressbar
 
 # The following bit of code sets the correct path to Python libraries
 # distributed with GAR.
@@ -58,13 +59,18 @@
   stats_list.reverse()
   total_packages = len(stats_list)
   counter = itertools.count(1)
+  bar = progressbar.ProgressBar()
+  bar.maxval = total_packages
+  bar.start()
+  logging.debug("Making sure package statistics are collected.")
   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()
-    logging.debug("Collected stats %s of %s.", counter.next(), total_packages)
+    bar.update(counter.next())
+  bar.finish()
 
 if __name__ == '__main__':
   main()

Modified: csw/mgar/gar/v2/lib/python/checkpkg.py
===================================================================
--- csw/mgar/gar/v2/lib/python/checkpkg.py	2010-07-04 13:51:05 UTC (rev 10421)
+++ csw/mgar/gar/v2/lib/python/checkpkg.py	2010-07-04 13:52:34 UTC (rev 10422)
@@ -731,6 +731,8 @@
 
   def GetOptimizedAllStats(self, stats_obj_list):
     pkgs_data = []
+    counter = itertools.count()
+    length = len(stats_obj_list)
     for stats_obj in stats_obj_list:
       # pkg_data = {}
       # This bit is tightly tied to the data structures returned by
@@ -738,7 +740,9 @@
       #
       # Python strings are already implementing the flyweight pattern. What's
       # left is lists and dictionaries.
-      logging.debug("Loading stats for %s", stats_obj.md5sum)
+      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)

Modified: csw/mgar/gar/v2/lib/python/opencsw.py
===================================================================
--- csw/mgar/gar/v2/lib/python/opencsw.py	2010-07-04 13:51:05 UTC (rev 10421)
+++ csw/mgar/gar/v2/lib/python/opencsw.py	2010-07-04 13:52:34 UTC (rev 10422)
@@ -30,7 +30,10 @@
 import checkpkg
 from Cheetah import Template
 
-ARCHITECTURES = ["i386", "sparc", "all"]
+ARCH_SPARC = "sparc"
+ARCH_i386 = "i386"
+ARCH_ALL = "all"
+ARCHITECTURES = [ARCH_SPARC, ARCH_i386, ARCH_ALL]
 MAJOR_VERSION = "major version"
 MINOR_VERSION = "minor version"
 PATCHLEVEL = "patchlevel"

Modified: csw/mgar/gar/v2/lib/python/package_checks.py
===================================================================
--- csw/mgar/gar/v2/lib/python/package_checks.py	2010-07-04 13:51:05 UTC (rev 10421)
+++ csw/mgar/gar/v2/lib/python/package_checks.py	2010-07-04 13:52:34 UTC (rev 10422)
@@ -50,7 +50,7 @@
 ARCH_RE = re.compile(r"(sparcv(8|9)|i386|amd64)")
 MAX_CATALOGNAME_LENGTH = 20
 MAX_PKGNAME_LENGTH = 20
-ARCH_LIST = ["sparc", "i386", "all"]
+ARCH_LIST = opencsw.ARCHITECTURES
 VERSION_RE = r".*,REV=(20[01][0-9]\.[0-9][0-9]\.[0-9][0-9]).*"
 # Pkgnames matching these regexes must not be ARCHALL = 1
 ARCH_SPECIFIC_PKGNAMES_RE_LIST = [
@@ -90,24 +90,50 @@
 # Valid URLs in the VENDOR field in pkginfo
 VENDORURL_RE = r"^(http|ftp)s?\://.+\..+$"
 
-BASE_BINARY_PATHS = ('bin', 'lib', 'libexec')
-SPARCV8_PATHS = BASE_BINARY_PATHS + ('sparcv8', 'sparcv8-fsmuld',
-                                     'sparcv7', 'sparc')
+BASE_BINARY_PATHS = ('bin', 'sbin', 'lib', 'libexec', 'cgi-bin')
+SPARCV8_PATHS = ('sparcv8', 'sparcv8-fsmuld',
+                 'sparcv7', 'sparc')
 SPARCV8PLUS_PATHS = ('sparcv8plus+vis2', 'sparcv8plus+vis', 'sparcv8plus')
 SPARCV9_PATHS = ('sparcv9+vis2', 'sparcv9+vis', 'sparcv9')
-INTEL_386_PATHS = BASE_BINARY_PATHS + ('pentium_pro+mmx', 'pentium_pro',
-                                       'pentium+mmx', 'pentium',
-                                       'i486', 'i386', 'i86')
+INTEL_386_PATHS = ('pentium_pro+mmx', 'pentium_pro',
+                   'pentium+mmx', 'pentium',
+                   'i486', 'i386', 'i86')
 AMD64_PATHS = ('amd64',)
 HACHOIR_MACHINES = {
-    # id: (name, allowed_paths)
-    -1: ("Unknown",   ()),
-     2: ("sparcv8",   SPARCV8_PATHS),
-     3: ("i386",      INTEL_386_PATHS),
-     6: ("i486",      INTEL_386_PATHS),
-    18: ("sparcv8+",  SPARCV8PLUS_PATHS),
-    43: ("sparcv9",   SPARCV9_PATHS),
-    62: ("amd64",     AMD64_PATHS),
+    # id: (name, allowed_paths, disallowed_paths)
+    -1: {"name": "Unknown",
+         "allowed": (), "disallowed": (),
+         "type": "unknown"},
+     2: {"name": "sparcv8",
+         "type": opencsw.ARCH_SPARC,
+         "allowed": BASE_BINARY_PATHS + SPARCV8_PATHS,
+         "disallowed": SPARCV9_PATHS + INTEL_386_PATHS + AMD64_PATHS,
+        },
+     3: {"name": "i386",
+         "type": opencsw.ARCH_i386,
+         "allowed": INTEL_386_PATHS,
+         "disallowed": (),
+        },
+     6: {"name": "i486",
+         "type": opencsw.ARCH_i386,
+         "allowed": INTEL_386_PATHS,
+         "disallowed": (),
+         },
+    18: {"name": "sparcv8+",
+         "type": opencsw.ARCH_SPARC,
+         "allowed": SPARCV8PLUS_PATHS,
+         "disallowed": (),
+        },
+    43: {"name": "sparcv9",
+         "type": opencsw.ARCH_SPARC,
+         "allowed": SPARCV9_PATHS,
+         "disallowed": (),
+        },
+    62: {"name": "amd64",
+         "type": opencsw.ARCH_i386,
+         "allowed": AMD64_PATHS,
+         "disallowed": (),
+        },
 }
 
 def RemovePackagesUnderInstallation(paths_and_pkgs_by_soname,
@@ -434,6 +460,12 @@
                       % (pkgname, arch))
     messenger.SuggestGarLine("ARCHALL_%s = 1" % pkgname)
 
+
+# TODO: Verify that architecture type of binaries matches the actual binaries.
+# Correlate architecture type from files_metadata and HACHOIR_MACHINES with
+# pkginfo.
+
+
 def CheckFileNameSanity(pkg_data, error_mgr, logger, messenger):
   basic_stats = pkg_data["basic_stats"]
   revision_info = basic_stats["parsed_basename"]["revision_info"]
@@ -820,20 +852,41 @@
     if "machine_id" not in metadata:
       continue
     logger.debug("CheckArchitecture(): %s", metadata)
-    cpu_type, allowed_paths = HACHOIR_MACHINES[metadata["machine_id"]]
-    binary_path, unused_binary_name = os.path.split(metadata["path"])
-    unused_dir, binary_subdir = os.path.split(binary_path)
-    if binary_subdir not in allowed_paths:
+    machine_data = HACHOIR_MACHINES[metadata["machine_id"]]
+    cpu_type = machine_data["name"]
+    allowed_paths = set(machine_data["allowed"])
+    disallowed_paths = set(machine_data["disallowed"])
+    path_parts = set(metadata["path"].split(os.path.sep))
+    if not path_parts.intersection(allowed_paths):
       error_mgr.ReportError(
-          "binary-wrong-architecture",
-          "id=%s name=%s subdir=%s" % (
+          "binary-architecture-does-not-match-placement",
+          "file=%s arch_id=%s arch_name=%s" % (
+            metadata["path"],
             metadata["machine_id"],
-            cpu_type,
-            binary_subdir))
+            cpu_type))
       messenger.Message(
           "Files compiled for specific architectures must be placed in "
-          "subdirectories that match the architecture.  For more "
-          "information, visit "
+          "subdirectories that match the architecture.  "
+          "For example, a sparcv8+ binary must not be placed under "
+          "/opt/csw/lib, but under /opt/csw/lib/sparcv8plus.  "
+          "For more information, visit "
           "http://www.opencsw.org/extend-it/contribute-packages/"
           "build-standards/"
           "architecture-optimization-using-isaexec-and-isalist/")
+    else:
+      for bad_path in path_parts.intersection(disallowed_paths):
+        error_mgr.ReportError(
+          "binary-disallowed-placement",
+          "file=%s arch_id=%s arch_name=%s bad_path=%s" % (
+            metadata["path"],
+            metadata["machine_id"],
+            cpu_type,
+            bad_path))
+        messenger.Message(
+            "The %s binary is placed in a disallowed path.  "
+            "For example, a sparcv8+ binary must not be placed "
+            "under a directory named sparcv9.  "
+            "For more information, visit "
+            "http://www.opencsw.org/extend-it/contribute-packages/"
+            "build-standards/"
+            "architecture-optimization-using-isaexec-and-isalist/")

Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py
===================================================================
--- csw/mgar/gar/v2/lib/python/package_checks_test.py	2010-07-04 13:51:05 UTC (rev 10421)
+++ csw/mgar/gar/v2/lib/python/package_checks_test.py	2010-07-04 13:52:34 UTC (rev 10422)
@@ -698,6 +698,32 @@
         'path': 'opt/csw/bin/tree'}]
 
 
+class TestCheckArchitecture_LibSubdir(CheckpkgUnitTestHelper,
+                                      unittest.TestCase):
+  FUNCTION_NAME = "CheckArchitecture"
+  def CheckpkgTest(self):
+    self.pkg_data["files_metadata"] = [
+       {'endian': 'Big endian',
+        'machine_id': 2,
+        'mime_type': 'application/x-sharedlib; charset=binary',
+        'path': 'opt/csw/lib/foo/subdir/libfoo.so.1'}]
+
+
+class TestCheckArchitecture_LibSubdirWrong(CheckpkgUnitTestHelper,
+                                      unittest.TestCase):
+  FUNCTION_NAME = "CheckArchitecture"
+  def CheckpkgTest(self):
+    self.pkg_data["files_metadata"] = [
+       {'endian': 'Big endian',
+        'machine_id': 2,
+        'mime_type': 'application/x-sharedlib; charset=binary',
+        'path': 'opt/csw/lib/sparcv9/foo/subdir/libfoo.so.1'}]
+    self.error_mgr_mock.ReportError(
+        'binary-wrong-wrong-placement',
+        'file=opt/csw/lib/sparcv9/foo/subdir/libfoo.so.1 '
+        'arch_id=2 arch_name=sparcv8 bad_path=sparcv9')
+
+
 class TestConflictingFiles(CheckpkgUnitTestHelper,
                            unittest.TestCase):
   """Throw an error if there's a conflicting file in the package set."""


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 Jul  4 18:16:51 2010
From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net)
Date: Sun, 04 Jul 2010 16:16:51 +0000
Subject: [csw-devel] SF.net SVN: gar:[10423]
 csw/mgar/pkg/dbus/trunk/files/dbus-sysdeps-unix.c. diff
Message-ID: <E1OVRsB-0001Mv-AB@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 10423
          http://gar.svn.sourceforge.net/gar/?rev=10423&view=rev
Author:   wbonnet
Date:     2010-07-04 16:16:51 +0000 (Sun, 04 Jul 2010)

Log Message:
-----------
Patching XDG_DATA_DIRS

Modified Paths:
--------------
    csw/mgar/pkg/dbus/trunk/files/dbus-sysdeps-unix.c.diff

Modified: csw/mgar/pkg/dbus/trunk/files/dbus-sysdeps-unix.c.diff
===================================================================
--- csw/mgar/pkg/dbus/trunk/files/dbus-sysdeps-unix.c.diff	2010-07-04 13:52:34 UTC (rev 10422)
+++ csw/mgar/pkg/dbus/trunk/files/dbus-sysdeps-unix.c.diff	2010-07-04 16:16:51 UTC (rev 10423)
@@ -15,7 +15,7 @@
    else
      {
 -      if (!_dbus_string_append (&servicedir_path, "/usr/local/share:/usr/share:"))
-+      if (!_dbus_string_append (&servicedir_path, "/opt/csw/share:"))
++      if (!_dbus_string_append (&servicedir_path, "/opt/csw/share:/usr/local/share:/usr/share:"))
          goto oom;
      }
 
@@ -24,7 +24,7 @@
    else
      {
 -      if (!_dbus_string_append (&servicedir_path, "/usr/local/share:/usr/share:"))
-+      if (!_dbus_string_append (&servicedir_path, "/opt/csw/share:"))
++      if (!_dbus_string_append (&servicedir_path, "/opt/csw/share:/usr/local/share:/usr/share:"))
          goto oom;
      }
 


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 Jul  4 18:17:40 2010
From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net)
Date: Sun, 04 Jul 2010 16:17:40 +0000
Subject: [csw-devel] SF.net SVN: gar:[10424]
	csw/mgar/pkg/dbus/trunk/checksums
Message-ID: <E1OVRsy-0001PX-Qe@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 10424
          http://gar.svn.sourceforge.net/gar/?rev=10424&view=rev
Author:   wbonnet
Date:     2010-07-04 16:17:40 +0000 (Sun, 04 Jul 2010)

Log Message:
-----------
Patching XDG_DATA_DIRS

Modified Paths:
--------------
    csw/mgar/pkg/dbus/trunk/checksums

Modified: csw/mgar/pkg/dbus/trunk/checksums
===================================================================
--- csw/mgar/pkg/dbus/trunk/checksums	2010-07-04 16:16:51 UTC (rev 10423)
+++ csw/mgar/pkg/dbus/trunk/checksums	2010-07-04 16:17:40 UTC (rev 10424)
@@ -1,5 +1,5 @@
 6e26e51243c4551ac222112edf67b5db  CSWdbus.preinstall
 9222a44088c837eba62822e330de713f  cswdbus
 1aab02bdcac4d662d3760896790f0ede  dbus-1.3.1.tar.gz
-6856e34f9fb52f9fd569a80576556543  dbus-sysdeps-unix.c.diff
+862baa44c7b80476643ad76065607d92  dbus-sysdeps-unix.c.diff
 5d584064f7e6a50bf54750ae56d7e29e  dbus-sysdeps.h.diff


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 Jul  4 20:01:08 2010
From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net)
Date: Sun, 04 Jul 2010 18:01:08 +0000
Subject: [csw-devel] SF.net SVN: gar:[10425] csw/mgar/pkg/MailScanner/trunk
Message-ID: <E1OVTV6-0000V7-Jt@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 10425
          http://gar.svn.sourceforge.net/gar/?rev=10425&view=rev
Author:   bonivart
Date:     2010-07-04 18:01:08 +0000 (Sun, 04 Jul 2010)

Log Message:
-----------
MailScanner: check in build script

Added Paths:
-----------
    csw/mgar/pkg/MailScanner/trunk/legacy/
    csw/mgar/pkg/MailScanner/trunk/legacy/LICENSE
    csw/mgar/pkg/MailScanner/trunk/legacy/MailScanner
    csw/mgar/pkg/MailScanner/trunk/legacy/README.CSW
    csw/mgar/pkg/MailScanner/trunk/legacy/SA.pm.patch
    csw/mgar/pkg/MailScanner/trunk/legacy/_installhelper
    csw/mgar/pkg/MailScanner/trunk/legacy/bugs
    csw/mgar/pkg/MailScanner/trunk/legacy/buildms.sh
    csw/mgar/pkg/MailScanner/trunk/legacy/check_mailscanner.patch
    csw/mgar/pkg/MailScanner/trunk/legacy/checkinstall
    csw/mgar/pkg/MailScanner/trunk/legacy/copyright
    csw/mgar/pkg/MailScanner/trunk/legacy/cswmailscanner
    csw/mgar/pkg/MailScanner/trunk/legacy/cswmailscanner.sendmail
    csw/mgar/pkg/MailScanner/trunk/legacy/depend
    csw/mgar/pkg/MailScanner/trunk/legacy/history
    csw/mgar/pkg/MailScanner/trunk/legacy/history.csw
    csw/mgar/pkg/MailScanner/trunk/legacy/i.smfno
    csw/mgar/pkg/MailScanner/trunk/legacy/i.smfyes
    csw/mgar/pkg/MailScanner/trunk/legacy/mailscanner.sendmail.xml
    csw/mgar/pkg/MailScanner/trunk/legacy/mailscanner.xml
    csw/mgar/pkg/MailScanner/trunk/legacy/pkginfo.stub
    csw/mgar/pkg/MailScanner/trunk/legacy/postinstall
    csw/mgar/pkg/MailScanner/trunk/legacy/preremove
    csw/mgar/pkg/MailScanner/trunk/legacy/prototype.stub
    csw/mgar/pkg/MailScanner/trunk/legacy/readme
    csw/mgar/pkg/MailScanner/trunk/legacy/space
    csw/mgar/pkg/MailScanner/trunk/legacy/svc-mailscanner
    csw/mgar/pkg/MailScanner/trunk/legacy/svc-mailscanner.sendmail

Added: csw/mgar/pkg/MailScanner/trunk/legacy/LICENSE
===================================================================
--- csw/mgar/pkg/MailScanner/trunk/legacy/LICENSE	                        (rev 0)
+++ csw/mgar/pkg/MailScanner/trunk/legacy/LICENSE	2010-07-04 18:01:08 UTC (rev 10425)
@@ -0,0 +1 @@
+link copyright
\ No newline at end of file


Property changes on: csw/mgar/pkg/MailScanner/trunk/legacy/LICENSE
___________________________________________________________________
Added: svn:special
   + *

Added: csw/mgar/pkg/MailScanner/trunk/legacy/MailScanner
===================================================================
--- csw/mgar/pkg/MailScanner/trunk/legacy/MailScanner	                        (rev 0)
+++ csw/mgar/pkg/MailScanner/trunk/legacy/MailScanner	2010-07-04 18:01:08 UTC (rev 10425)
@@ -0,0 +1,13 @@
+# This is where you customize some settings of your MailScanner installation so
+# you don't have to edit the scripts themselves as they will be replaced during
+# upgrades.
+#
+# Peter Bonivart, OpenCSW
+
+# Proxy settings
+#http_proxy=http://proxy.foo.bar
+#export http_proxy
+
+# Used by the update_spamassassin script
+# Example: "--channelfile /opt/csw/etc/spamassassin/sa.update.txt --gpgkey 123456"
+#SAUPDATEARGS=""

Added: csw/mgar/pkg/MailScanner/trunk/legacy/README.CSW
===================================================================
--- csw/mgar/pkg/MailScanner/trunk/legacy/README.CSW	                        (rev 0)
+++ csw/mgar/pkg/MailScanner/trunk/legacy/README.CSW	2010-07-04 18:01:08 UTC (rev 10425)
@@ -0,0 +1,56 @@
+README.CSW
+==========
+
+Quick Start
+-----------
+- Stop and disable Sendmail from Sun and CSW.
+- Start Sendmail with /etc/init.d/cswmailscanner.sendmail
+  (or svcadm enable cswmailscannersendmail).
+- Start MailScanner with /etc/init.d/cswmailscanner
+  (or svcadm enable cswmailscanner).
+
+Not So Quick Start
+------------------
+- Look through all configuration files in /opt/csw/mailscanner/etc and modify
+  as needed.
+- Use the cron scripts in /opt/csw/mailscanner/bin/cron to automate restart, 
+  quarantine cleaning, virus signature updates and so on.
+- Typical entries in crontab for root:
+-- 0,30 * * * * /opt/csw/mailscanner/bin/cron/check_MailScanner.cron
+--- Note: the above is not needed if you use SMF
+-- 0 * * * * /opt/csw/mailscanner/bin/cron/update_virus_scanners.cron
+-- 0 4 * * * /opt/csw/mailscanner/bin/cron/update_spamassassin.cron
+-- 0 4 * * * /opt/csw/mailscanner/bin/cron/clean.quarantine.cron
+- Mount MailScanner work folder as tmpfs, totally safe since Sendmail is
+  responsible for the message at all times. In /etc/vfstab add:
+-- swap - /var/spool/MailScanner/incoming tmpfs - yes -
+
+After Each Upgrade (IMPORTANT)
+------------------
+- Update your configuration files as necessary. Use tools like 
+  upgrade_MailScanner_conf and upgrade_languages_conf.
+- Typical use of upgrade_MailScanner_conf:
+-- # cd /opt/csw/mailscanner/etc
+-- # ../bin/upgrade_MailScanner_conf MailScanner.conf MailScanner.conf.CSW > MailScanner.new
+-- look through MailScanner.new before using it as MailScanner.conf.
+ 
+MailScanner with Clam AntiVirus and SpamAssassin
+------------------------------------------------
+- MailScanner comes configured to use Clam and SA if present.
+- You may need to configure Clam and SA to use web proxies, plugins, etc.
+-- IMPORTANT: make sure Clam can fetch updated virus signatures, test with "freshclam -v".
+- Run "MailScanner --lint" to see what MS thinks of Clam and SA.
+
+Notes
+-----
+- Both Sun and CSW Sendmail must be disabled.
+- Sendmail is controlled by rc-script (or SMF) included with this package.
+- MailScanner itself is controlled by another rc-script (or SMF).
+- For MailScanner info: http://www.mailscanner.info.
+
+Todo
+----
+- Control both Sendmail and MailScanner from the same rc-script.
+- Help with updating configuration files after upgrades.
+
+bonivart/100702

Added: csw/mgar/pkg/MailScanner/trunk/legacy/SA.pm.patch
===================================================================
--- csw/mgar/pkg/MailScanner/trunk/legacy/SA.pm.patch	                        (rev 0)
+++ csw/mgar/pkg/MailScanner/trunk/legacy/SA.pm.patch	2010-07-04 18:01:08 UTC (rev 10425)
@@ -0,0 +1,20 @@
+--- SA.pm.orig	Wed Apr  9 13:13:37 2008
++++ SA.pm	Wed Apr  9 13:14:18 2008
+@@ -85,7 +85,7 @@
+     my $result;
+     # Do a trial run of awk to see if it is going to work on this system.
+     eval {
+-      $result = `echo 'Hello,World' | awk '{printf \"%s %s\\n\", strftime(\"%T\"), \$0}' 2>&1`;
++      $result = `echo 'Hello,World' | /opt/csw/bin/gawk '{printf \"%s %s\\n\", strftime(\"%T\"), \$0}' 2>&1`;
+       #print "Result is \"$result\"\n";
+     };
+     #print "Eval result = \"$@\"\n";
+@@ -96,7 +96,7 @@
+       #select STDERR; $| = 1;
+       # Re-open STDERR with the current time stuck on the front of each line.
+       # It should work okay as we have just tried it out.
+-      open STDERR, "| awk '{printf \"%s %s\\n\", strftime(\"%T\"), \$0}'";
++      open STDERR, "| /opt/csw/bin/gawk '{printf \"%s %s\\n\", strftime(\"%T\"), \$0}'";
+       select STDOUT;
+     } else {
+       print STDERR "\n\n*****\n";

Added: csw/mgar/pkg/MailScanner/trunk/legacy/_installhelper
===================================================================
--- csw/mgar/pkg/MailScanner/trunk/legacy/_installhelper	                        (rev 0)
+++ csw/mgar/pkg/MailScanner/trunk/legacy/_installhelper	2010-07-04 18:01:08 UTC (rev 10425)
@@ -0,0 +1,40 @@
+#!/bin/sh
+
+# postinstall for MailScanner
+# 2006-05-12 Peter Bonivart
+
+ECHO=/usr/bin/echo
+READ=/usr/bin/read
+SYM=/opt/csw/MailScanner
+
+$ECHO "Creating symlink from /opt to /opt/csw"
+if [ -h "$SYM" -o -f "$SYM" -o -d "$SYM" ]; then
+  $ECHO "$SYM already exists. Can not create symlink."
+else
+  /usr/bin/ln -s /opt/csw/mailscanner /opt/mailscanner
+fi
+
+#$ECHO "Installing start script"
+
+#$ECHO "MailScanner handles Sendmail, do you want to disable"
+#$ECHO "the Sendmail start script? [y] \c"
+#$READ a
+#if [ "$a" = "n" -o "$a" = "N" ]; then
+#  $ECHO "You need to modify the operation of Sendmail yourself"
+#else
+#  $ECHO "Disabled Sendmail start script by renaming /etc/init.d/cswsendmail"
+#  $ECHO "to cswsendmail.disabled"
+#fi
+
+#$ECHO "Queue directories prefix? [/var/spool] \c"
+#$READ a
+
+#$ECHO "Creating incoming queue directory"
+
+#$ECHO "Creating MailScanner work directory"
+
+#$ECHO "Setting ownership and permission on queue directories"
+
+$ECHO "Copying CSW-configuration files to default files"
+
+exit 0


Property changes on: csw/mgar/pkg/MailScanner/trunk/legacy/_installhelper
___________________________________________________________________
Added: svn:executable
   + *

Added: csw/mgar/pkg/MailScanner/trunk/legacy/bugs
===================================================================
--- csw/mgar/pkg/MailScanner/trunk/legacy/bugs	                        (rev 0)
+++ csw/mgar/pkg/MailScanner/trunk/legacy/bugs	2010-07-04 18:01:08 UTC (rev 10425)
@@ -0,0 +1,20 @@
+New
+===
+070713. DBI is required (for SA cache?), but is listed as optional.
+070711. What is clamd looking for in virus.scanners.conf? /bin/false for path?
+070711. Syslogging shows localhost instead of actual hostname.
+
+Fixed
+=====
+080409. Bug in update_bad_phishing_sites, logs as update.phishing.sites. FIX:
+        rewritten in Perl in 4.68.
+070815. Date::Parse (TimeDate) is required. Not listed with -v. FIX: fixed in
+        4.64.3.
+070816. check_mailscanner should use pgrep instead of complicated 4-line
+        grep that fails if path does not contain MailScanner. FIX: fixed in
+        4.63.8.
+070711. Why is a new incoming pid-dir created for a --lint? Or more importantly,
+        why is it not removed after the lint is finished? FIX: seems OK in 4.62.
+070711. MailScanner.pid left in /opt/csw/mailscanner, should be written to
+        /opt/csw/mailscanner/var. FIX: path in cswmailscanner (start script in
+        init.d) fixed.

Added: csw/mgar/pkg/MailScanner/trunk/legacy/buildms.sh
===================================================================
--- csw/mgar/pkg/MailScanner/trunk/legacy/buildms.sh	                        (rev 0)
+++ csw/mgar/pkg/MailScanner/trunk/legacy/buildms.sh	2010-07-04 18:01:08 UTC (rev 10425)
@@ -0,0 +1,440 @@
+#!/bin/sh
+
+# buildms.sh - script for easier build of MailScanner
+# usage: buildms.sh [ source file ]
+# 2006-05-12 Peter Bonivart
+# 2006-05-15 First working version
+# 2007-07-09 Lots added
+# 2007-07-10 Added .CSW and lots more
+# 2007-07-11 Added mods to MailScanner.conf, spam.assassin.prefs.conf and
+#            virus.scanners.conf. Support REV=YYYY.MM.DD
+# 2007-07-12 Added mods to check_mailscanner, syslog type
+# 2007-07-16 Added mods to MailScanner.conf: clamd settings
+# 2007-08-14 Added mod so symlink from /opt is not needed. Fixed so 4.62+ tar
+#	     filename (includes build rev) is handled
+# 2007-08-15 Added path mod to check_MailScanner.cron. Patch check_mailscanner
+# 2007-08-21 Remove unnecessary files (other OS and so on). Added history file
+#	     to package
+# 2007-09-03 Remove snv-commit files that are left over
+# 2007-09-13 Add changelog to package, removed patching of check_mailscanner
+#            (not needed with 4.63.8)
+# 2007-10-01 Changelog included in 4.64, moved README and COPYING to CSW doc
+# 2008-01-03 Added wrapper script to /opt/csw/bin/MailScanner instead of
+#            symlink so lint etc works. PERLIB added to rc-script. Dependency
+#            to CSWpmio added
+# 2008-01-09 Backed out changes from 2008-01-03. Fixed path to tnef-binary in
+#            MailScanner.conf and added unrar and mailtools as dependencies
+# 2008-04-09 Changed awk to CSW gawk in SA.pm. Always add REV=YYYY.MM.DD.
+# 2008-06-19 Changed gtar path to /usr/sfw/bin (login changed to loginz),
+#            added pm_converttnef, pm_podescapes, pm_podsimple and pm_testpod
+#            as dependencies
+# 2008-06-27 Removed displaying full license during install, instead show just a
+#            short message referring to the license file
+# 2008-07-03 Added SMF support
+# 2008-09-04 Fixed path to sendmail in MailScanner.conf, symlink cswmailscanner
+#            works regardless of SMF or not
+# 2008-11-18 Fixed SA Install Prefix and Local State Dir in MailScanner.conf
+# 2008-12-18 Changed copyright filename to LICENSE, gtar path
+# 2009-01-13 Fixed path for ClamAV update monitoring
+# 2009-01-21 Fixed path for SpamAssassin Site Rules Dir, fixed
+#            update_spamassassin
+# 2009-01-23 Fixed Sendmail service script
+# 2009-01-24 Added etc/MailScanner file
+# 2009-10-01 Run only on build servers, not on login server
+# 2010-02-22 Copy package to experimental instead of testing, changed SA path
+#            from /opt/csw/etc/spamassassin to /etc/opt/csw/spamassassin
+# 2010-07-02 Lowercase license filename. Make conffiles 0400 to protect it
+# 2010-07-03 Use /tmp/clamd.socket for ClamAV socket
+
+# todo: 
+
+# abort execution in case of error
+
+set -e
+
+BSVER=2.10
+SLTYPE=udp
+
+PATHPREFIX1=/home/bonivart
+PATHPREFIX2=/home
+PKGDIR=$PATHPREFIX1/pkgs/mailscanner
+BUILDDIR=$PATHPREFIX1/build/mailscanner
+SRCDIR=$PATHPREFIX2/src/mailscanner
+TESTDIR=$PATHPREFIX2/experimental/bonivart
+GTAR=/opt/csw/bin/gtar
+
+# abort if not on build server
+
+if [ `uname -n` = "login" ]; then
+  echo "Run on build server. Exiting."
+  exit 1
+fi
+ 
+# select source file
+
+if [ "$1" ]; then
+  if [ ! -s "$SRCDIR/$1" ]; then
+    echo "-err-> No such source file: $1. Exiting."
+    exit 1
+  else
+    src=$1
+  fi
+else
+  echo "-> No source file given on command line. Select from:"
+  echo
+  ls -t $SRCDIR | grep '^MailScanner'
+  echo
+  echo "Enter source file: \c"
+  read src
+  if [ ! -s "$SRCDIR/$src" -o ! "$src" ]; then
+    echo "-err-> No such source file: $src. Exiting."
+    exit 1
+  fi
+fi
+
+# log stuff
+
+version=`echo $src | awk -F'-' '{print $3}'`
+rev=`echo $src | awk -F'-' '{print $4}' | awk -F'.' '{print $1}'`
+cswrev=`date +%Y.%m.%d`
+timestamp=`date +%y%m%d-%H%M`
+LOGDIR=$PKGDIR/$version-$timestamp
+TARLOG1=$LOGDIR/tarlog1
+TARLOG2=$LOGDIR/tarlog2
+LOG=$LOGDIR/buildms.log
+mkdir $LOGDIR
+
+# copy current build script and misc other files to log dir
+
+cp $PKGDIR/$0 $LOGDIR
+cp $PKGDIR/depend $LOGDIR
+cp $PKGDIR/pkginfo.stub $LOGDIR
+cp $PKGDIR/postinstall $LOGDIR
+#cp $PKGDIR/postremove $LOGDIR	# not used at the moment
+#cp $PKGDIR/preinstall $LOGDIR	# not used at the moment
+cp $PKGDIR/preremove $LOGDIR
+cp $PKGDIR/prototype.stub $LOGDIR
+cp $PKGDIR/README.CSW $LOGDIR
+cp $PKGDIR/cswmailscanner $LOGDIR
+cp $PKGDIR/cswmailscanner.sendmail $LOGDIR
+cp $PKGDIR/history $LOGDIR
+cp $PKGDIR/SA.pm.patch $LOGDIR
+cp $PKGDIR/checkinstall $LOGDIR
+cp $PKGDIR/i.smfno $LOGDIR
+cp $PKGDIR/i.smfyes $LOGDIR
+cp $PKGDIR/space $LOGDIR
+cp $PKGDIR/mailscanner.xml $LOGDIR
+cp $PKGDIR/mailscanner.sendmail.xml $LOGDIR
+cp $PKGDIR/MailScanner $LOGDIR
+echo "-> Build script version: $BSVER" | tee $LOG
+echo "-> Builder: `/usr/ucb/whoami`" | tee $LOG
+echo "-> Build host: `uname -n`" | tee -a $LOG
+echo "-> Build time: `date +'%Y-%m-%d %H:%M'`" | tee -a $LOG
+echo "-> Source file: $src" | tee -a $LOG
+echo "-> Version: $version" | tee -a $LOG
+echo "-> Revision: $rev" | tee -a $LOG
+if [ "$cswrev" ]; then
+  echo "-> CSW Revision: $cswrev" | tee -a $LOG
+  cswrev=",REV=$cswrev"
+fi
+echo "-> Log directory: $LOGDIR" | tee -a $LOG
+
+# unpack source file in build dir
+
+cd $BUILDDIR
+echo "-> Unpacking source file ..." | tee -a $LOG
+if [ -d "$BUILDDIR/MailScanner-install-$version" ]; then
+  echo "-err-> Directory already exists. Exiting." | tee -a $LOG
+  exit 1
+fi
+$GTAR xvzf "$SRCDIR/$src" > $TARLOG1
+echo "-> Unpacking MailScanner into MailScanner-install-$version/mailscanner ..." | tee -a $LOG
+cd $BUILDDIR/MailScanner-install-$version
+$GTAR xvzf $BUILDDIR/MailScanner-install-$version/perl-tar/MailScanner-$version-$rev.tar.gz > $TARLOG2
+mv MailScanner-$version-$rev mailscanner
+
+# replace /usr/bin/perl with /opt/csw/bin/perl
+
+cd mailscanner
+find . -type f | xargs grep -n '#!/usr/bin/perl' | grep :1: | awk -F':' '{print $1}' > $LOGDIR/perlpathfix
+echo "-> Fixing perl path in `wc -l $LOGDIR/perlpathfix | awk '{print $1}'` files ..." | tee -a $LOG
+for i in `cat $LOGDIR/perlpathfix`
+do
+  echo "---> Fixing perl path in $i ..." >> $LOG
+  sed 's/^#!\/usr\/bin\/perl/#!\/opt\/csw\/bin\/perl/' $i > $i.tmp
+  mv $i.tmp $i
+done
+cd ..
+
+# fix MailScanner.conf
+
+cd mailscanner/etc
+
+echo "-> Modifying MailScanner.conf for use with CSW ..." | tee -a $LOG
+sed 's/\/opt\/MailScanner/\/opt\/csw\/mailscanner/' MailScanner.conf > MailScanner.conf.tmp
+mv MailScanner.conf.tmp MailScanner.conf
+
+sed 's/^TNEF Expander = \/opt\/csw\/mailscanner\/bin\/tnef/TNEF Expander = \/opt\/csw\/bin\/tnef/' MailScanner.conf > MailScanner.conf.tmp
+mv MailScanner.conf.tmp MailScanner.conf
+
+sed 's/^Incoming Work User =/Incoming Work User = clamav/' MailScanner.conf > MailScanner.conf.tmp
+mv MailScanner.conf.tmp MailScanner.conf
+
+sed 's/^Incoming Work Permissions = 0600/Incoming Work Permissions = 0640/' MailScanner.conf > MailScanner.conf.tmp
+mv MailScanner.conf.tmp MailScanner.conf
+
+#sed 's/^Clamd Socket = \/tmp\/clamd/Clamd Socket = \/tmp\/clamd.socket/' MailScanner.conf > MailScanner.conf.tmp
+#mv MailScanner.conf.tmp MailScanner.conf
+
+sed 's/^Monitors for ClamAV Updates = \/usr\/local\/share\/clamav\/\*\.cld \/usr\/local\/share\/clamav\/\*\.cvd/Monitors for ClamAV Updates = \/var\/opt\/csw\/clamav\/db\/\*\.cld \/var\/opt\/csw\/clamav\/db\/\*\.cvd/' MailScanner.conf > MailScanner.conf.tmp
+mv MailScanner.conf.tmp MailScanner.conf
+
+sed 's/^Unrar Command = \/usr\/bin\/unrar/Unrar Command = \/opt\/csw\/bin\/unrar/' MailScanner.conf > MailScanner.conf.tmp
+mv MailScanner.conf.tmp MailScanner.conf
+
+sed 's/^Sendmail = \/usr\/lib\/sendmail/Sendmail = \/opt\/csw\/lib\/sendmail/' MailScanner.conf > MailScanner.conf.tmp
+mv MailScanner.conf.tmp MailScanner.conf
+
+sed 's/^Sendmail2 = \/usr\/lib\/sendmail/Sendmail2 = \/opt\/csw\/lib\/sendmail/' MailScanner.conf > MailScanner.conf.tmp
+mv MailScanner.conf.tmp MailScanner.conf
+
+sed 's/^SpamAssassin Install Prefix =/SpamAssassin Install Prefix = \/opt\/csw/' MailScanner.conf > MailScanner.conf.tmp
+mv MailScanner.conf.tmp MailScanner.conf
+
+sed 's/^SpamAssassin Local State Dir = # \/var\/lib\/spamassassin/SpamAssassin Local State Dir = # \/var\/opt\/csw\/spamassassin/' MailScanner.conf > MailScanner.conf.tmp
+mv MailScanner.conf.tmp MailScanner.conf
+
+sed 's/^SpamAssassin Site Rules Dir = \/etc\/mail\/spamassassin/SpamAssassin Site Rules Dir = \/etc\/opt\/csw\/spamassassin/' MailScanner.conf > MailScanner.conf.tmp
+mv MailScanner.conf.tmp MailScanner.conf
+
+cd ../..
+
+# fix spam.assassin.prefs.conf
+
+cd mailscanner/etc
+echo "-> Modifying spam.assassin.prefs.conf for use with CSW ..." | tee -a $LOG
+sed 's/^dcc_path \/usr\/local\/bin\/dccproc$/dcc_path \/opt\/csw\/bin\/dccproc/' spam.assassin.prefs.conf > spam.assassin.prefs.conf.tmp
+mv spam.assassin.prefs.conf.tmp spam.assassin.prefs.conf
+cd ../..
+
+# fix virus.scanners.conf
+
+cd mailscanner/etc
+echo "-> Modifying virus.scanners.conf for use with CSW ..." | tee -a $LOG
+sed '/^clamav/s/\/usr\/local/\/opt\/csw/;/^clamd/s/\/usr\/local/\/opt\/csw/' virus.scanners.conf > virus.scanners.conf.tmp
+mv virus.scanners.conf.tmp virus.scanners.conf
+cd ../..
+
+# fix check_mailscanner
+
+cd mailscanner/bin
+echo "-> Modifying check_mailscanner for use with CSW ..." | tee -a $LOG
+sed "s/^  echo -n \'Starting MailScanner...\'/  echo \'Starting MailScanner...\\\c\'/" check_mailscanner > check_mailscanner.tmp
+mv check_mailscanner.tmp check_mailscanner
+cd ../..
+
+# fix update_spamassassin
+
+cd mailscanner/bin
+echo "-> Modifying update_spamassassin for use with CSW ..." | tee -a $LOG
+# set replace /usr with /opt/csw, replace /etc/init.d with /opt/csw/bin, replace /etc/mail with /opt/csw/etc, replace /etc/sysconfig with /opt/csw/mailscanner/etc, insert PATH
+sed 's/\/usr/\/opt\/csw/;s/^\/etc\/init.d\/MailScanner/\/opt\/csw\/bin\/cswmailscanner/;s/\/etc\/mail/\/opt\/csw\/etc/;s/\/etc\/sysconfig/\/opt\/csw\/mailscanner\/etc/;s/^SAUPDATEARGS/PATH=\/opt\/csw\/bin:\/usr\/bin ; export PATH ; SAUPDATEARGS/' update_spamassassin > update_spamassassin.tmp
+mv update_spamassassin.tmp update_spamassassin
+cd ../..
+
+# fix check_MailScanner.cron
+
+cd mailscanner/bin/cron
+echo "-> Modifying check_MailScanner.cron for use with CSW ..." | tee -a $LOG
+sed 's/^LOCKFILE=\/var\/lock\/check_Mailscanner.lock/LOCKFILE=\/opt\/csw\/mailscanner\/var\/check_MailScanner.lock/;s/^MS_LOCKFILE=\/var\/lock\/subsys\/MailScanner.off/MS_LOCKFILE=\/opt\/csw\/mailscanner\/var\/MailScanner.off/' check_MailScanner.cron > check_MailScanner.cron.tmp
+mv check_MailScanner.cron.tmp check_MailScanner.cron
+cd ../../..
+
+# fix clamav-wrapper
+
+cd mailscanner/lib
+echo "-> Modifying clamav-wrapper for use with CSW ..." | tee -a $LOG
+# disable tgz and deb, enable unrar
+sed 's/^ExtraScanOptions=\"\$ExtraScanOptions --tgz/#ExtraScanOptions=\"\$ExtraScanOptions --tgz/;s/^ExtraScanOptions=\"\$ExtraScanOptions --deb/#ExtraScanOptions=\"\$ExtraScanOptions --deb/;s/^#ExtraScanOptions=\"\$ExtraScanOptions --unrar=\/path\/to\/unrar\"/ExtraScanOptions=\"\$ExtraScanOptions --unrar=\/opt\/csw\/bin\/unrar"/' clamav-wrapper > clamav-wrapper.tmp
+mv clamav-wrapper.tmp clamav-wrapper
+cd ../..
+
+# change syslog socket
+
+cd mailscanner/lib
+find . -type f | xargs grep "setlogsock('unix')" | awk -F':' '{print $1}' | sort | uniq > $LOGDIR/syslogsocketfix
+echo "-> Fixing syslog socket type in `wc -l $LOGDIR/syslogsocketfix | awk '{print $1}'` files ..." | tee -a $LOG
+for i in `cat $LOGDIR/syslogsocketfix`
+do
+  echo "---> Fixing syslog socket type in $i ..." >> $LOG
+  sed "/Sys::Syslog::setlogsock/s/unix/$SLTYPE/" $i > $i.tmp
+  mv $i.tmp $i
+done
+cd ../..
+
+# change awk to gawk in SA.pm
+
+cd mailscanner/lib/MailScanner
+echo "-> Changing awk to gawk in SA.pm ..." | tee -a $LOG
+patch SA.pm < $LOGDIR/SA.pm.patch > /dev/null 2>&1
+cd ../../..
+
+# change MailScanner path (/opt/MailScanner to /opt/csw/mailscanner)
+
+cd mailscanner
+find . -type f | egrep -v 'INSTALL.FreeBSD|INSTALL.OpenBSD' | xargs grep "/opt/MailScanner" | awk -F':' '{print $1}' | sort | uniq > $LOGDIR/mspathfix
+echo "-> Fixing MailScanner path in `wc -l $LOGDIR/mspathfix | awk '{print $1}'` files ..." | tee -a $LOG
+for i in `cat $LOGDIR/mspathfix`
+do
+  echo "---> Fixing MailScanner path in $i ..." >> $LOG
+  sed 's/\/opt\/MailScanner/\/opt\/csw\/mailscanner/g' $i > $i.tmp
+  mv $i.tmp $i
+done
+cd ..
+
+# fix ownership/permissions
+
+cd mailscanner
+echo "-> Fixing permissions ..." | tee -a $LOG
+chmod 644 COPYING INSTALL.FreeBSD INSTALL.OpenBSD MailScanner.conf.index.html README
+find bin | xargs chmod 755
+find etc -type f |xargs chmod 644
+find lib/MailScanner -type f |xargs chmod 644
+find var -type f |xargs chmod 644
+find www -type f |xargs chmod 644
+chmod 755 bin bin/cron etc etc/mcp etc/reports etc/reports/* etc/rules lib lib/* lib/MailScanner/CustomFunctions var www
+cd ..
+
+# remove bak files in reports
+
+cd mailscanner/etc/reports
+find . -type f -name "*.bak" > $LOGDIR/bakfiles
+echo "-> Removing `wc -l $LOGDIR/bakfiles | awk '{print $1}'` .bak files in reports ..." | tee -a $LOG
+for i in `cat $LOGDIR/bakfiles`
+do
+  echo "---> Removing $i ..." >> $LOG
+  rm $i
+done
+cd ../../..
+
+# remove unnecessary files
+
+cd mailscanner
+echo "-> Removing unnecessary files ..." | tee -a $LOG
+for i in INSTALL.FreeBSD INSTALL.OpenBSD MailScanner.conf.index.html svn-commit.tmp bin/Sophos.install bin/Sophos.install.linux bin/tnef.solaris.x86 bin/check_mailscanner.tru64
+do
+  echo "---> Removing $i ..." >> $LOG
+  rm -f $i
+done
+cd ..
+
+# add files to etc dir
+
+echo "-> Adding files to etc dir ..." | tee -a $LOG
+cd mailscanner/etc
+cp $LOGDIR/MailScanner .
+cd ../..
+
+# fix conf files, add .CSW
+
+cd mailscanner/etc
+find . -type f | egrep -v -i 'example|readme|.CSW$' > $LOGDIR/conffiles
+echo "-> Adding .CSW to `wc -l $LOGDIR/conffiles | awk '{print $1}'` configurable files ..." | tee -a $LOG
+for i in `cat $LOGDIR/conffiles`
+do
+  echo "---> Adding .CSW to $i ..." >> $LOG
+  mv $i ${i}.CSW
+done
+cd ../..
+
+# add CSW files to doc dir, also move MS doc files there
+
+echo "-> Adding files to doc dir ..." | tee -a $LOG
+mkdir -p share/doc/mailscanner
+cd share/doc/mailscanner
+cp $LOGDIR/conffiles .
+cp $LOGDIR/README.CSW .
+cp $LOGDIR/history .
+cp $LOGDIR/cswmailscanner .
+cp $LOGDIR/cswmailscanner.sendmail .
+cp $LOGDIR/mailscanner.xml .
+cp $LOGDIR/mailscanner.sendmail.xml .
+mv ../../../mailscanner/README .
+mv ../../../mailscanner/ChangeLog .
+mv ../../../mailscanner/COPYING license
+cd ../../..
+
+# create prototype
+
+echo "-> Creating prototype ..." | tee -a $LOG
+find mailscanner | pkgproto | grep -v prototype.find > prototype.find
+cat $LOGDIR/prototype.stub prototype.find > prototype.combined
+sed 's/bonivart csw/root bin/' prototype.combined > prototype
+rm prototype.find prototype.combined
+
+# add pstamp
+
+pstamp=`uname -n``date +%Y%m%d%H%M%S`
+
+# fix pkginfo
+
+echo "-> Creating pkginfo ..." | tee -a $LOG
+cp $LOGDIR/pkginfo.stub pkginfo
+echo "VERSION=$version.$rev$cswrev" >> pkginfo
+echo "PSTAMP=$pstamp" >> pkginfo
+
+# add symlinks to pkg build files
+
+echo "-> Adding symlinks to package build files ..." | tee -a $LOG
+cp $PKGDIR/copyright .
+ln -s $LOGDIR/depend depend
+ln -s $LOGDIR/postinstall postinstall
+#ln -s $LOGDIR/postremove postremove	# not used at the moment
+#ln -s $LOGDIR/preinstall preinstall	# not used at the moment
+ln -s $LOGDIR/preremove preremove
+ln -s $LOGDIR/checkinstall checkinstall
+ln -s $LOGDIR/i.smfyes i.smfyes
+ln -s $LOGDIR/i.smfno i.smfno
+ln -s $LOGDIR/space space
+
+# pkgmk
+
+echo "-> Making package ..." | tee -a $LOG
+pkgmk -r `pwd` 2>> $LOG
+
+# pkgtrans
+
+echo "-> Translating package ..." | tee -a $LOG
+cd /var/spool/pkg
+pkg=mailscanner-$version.$rev$cswrev-SunOS5.8-all-CSW.pkg
+pkgtrans -s `pwd` $LOGDIR/$pkg CSWmailscanner 2>> $LOG
+
+# gzip
+
+echo "-> Compressing package ..." | tee -a $LOG
+cd $LOGDIR
+gzip $pkg
+
+# copy to experimental/bonivart
+
+echo "-> Copying package to /experimental/bonivart ..." | tee -a $LOG
+cp $pkg.gz $TESTDIR/
+
+# cleaning up
+
+echo "-> Cleaning up spool dir ..." | tee -a $LOG
+rm -rf /var/spool/pkg/CSWmailscanner
+echo "-> Cleaning up build dir ..." | tee -a $LOG
+cd $BUILDDIR/MailScanner-install-$version
+rm -rf perl-tar CheckModuleVersion install.*
+
+# copy pkginfo and prototype to pkg dir
+
+echo "-> Copying pkginfo and prototype to log dir ..." | tee -a $LOG
+cp $BUILDDIR/MailScanner-install-$version/pkginfo $LOGDIR
+cp $BUILDDIR/MailScanner-install-$version/prototype $LOGDIR
+
+# exiting
+
+echo "-> Exiting build script ..." | tee -a $LOG
+exit 0


Property changes on: csw/mgar/pkg/MailScanner/trunk/legacy/buildms.sh
___________________________________________________________________
Added: svn:executable
   + *

Added: csw/mgar/pkg/MailScanner/trunk/legacy/check_mailscanner.patch
===================================================================
--- csw/mgar/pkg/MailScanner/trunk/legacy/check_mailscanner.patch	                        (rev 0)
+++ csw/mgar/pkg/MailScanner/trunk/legacy/check_mailscanner.patch	2010-07-04 18:01:08 UTC (rev 10425)
@@ -0,0 +1,18 @@
+--- check_mailscanner.orig	Wed Aug 15 11:09:25 2007
++++ check_mailscanner	Wed Aug 15 11:20:29 2007
+@@ -54,4 +54,5 @@
+ FGREP=fgrep
+ EGREP=egrep
++PGREP=pgrep
+ PS=ps
+ UNAME='uname -a'
+@@ -71,8 +72,5 @@
+ if $UNAME | $FGREP "SunOS" >/dev/null ; then
+     # Version for Solaris/SysV systems:
+-    pid=`/usr/ucb/ps auxww |
+-         egrep $msbindir/$process'|'$process'[:]' |
+-         grep -v grep |
+-         awk '{print $2}'`
++    pid=`$PGREP $process`
+ elif $UNAME | $FGREP "HP" >/dev/null ; then
+     # Version for HP-UX

Added: csw/mgar/pkg/MailScanner/trunk/legacy/checkinstall
===================================================================
--- csw/mgar/pkg/MailScanner/trunk/legacy/checkinstall	                        (rev 0)
+++ csw/mgar/pkg/MailScanner/trunk/legacy/checkinstall	2010-07-04 18:01:08 UTC (rev 10425)
@@ -0,0 +1,35 @@
+# checkinstall script
+
+# 2008-07-03 Peter Bonivart
+
+trap `exit 3` 15
+
+# check csw.conf
+if [ -f $PKG_INSTALL_ROOT/opt/csw/etc/csw.conf ] ; then
+  . $PKG_INSTALL_ROOT/opt/csw/etc/csw.conf
+fi
+if [ -f $PKG_INSTALL_ROOT/etc/opt/csw/csw.conf ] ; then
+  . $PKG_INSTALL_ROOT/etc/opt/csw/csw.conf
+fi
+
+# Assign Solaris release class to install release specific files
+smf=no
+if [ -f $PKG_INSTALL_ROOT/usr/sbin/svccfg -a -f $PKG_INSTALL_ROOT/usr/sbin/svcadm ]; then
+  if [ "$use_smf" != "no" ]; then
+    smf=yes
+  fi
+fi
+
+if [ $smf = yes ]; then
+  CLASSES='none smfyes'
+else
+  CLASSES='none smfno'
+fi
+
+# Make env variables available to other packaging scripts
+
+cat >$1 <<!
+CLASSES='$CLASSES'
+!
+
+exit 0

Added: csw/mgar/pkg/MailScanner/trunk/legacy/copyright
===================================================================
--- csw/mgar/pkg/MailScanner/trunk/legacy/copyright	                        (rev 0)
+++ csw/mgar/pkg/MailScanner/trunk/legacy/copyright	2010-07-04 18:01:08 UTC (rev 10425)
@@ -0,0 +1,3 @@
+
+Please see /opt/csw/share/doc/mailscanner/LICENSE for license information.
+

Added: csw/mgar/pkg/MailScanner/trunk/legacy/cswmailscanner
===================================================================
--- csw/mgar/pkg/MailScanner/trunk/legacy/cswmailscanner	                        (rev 0)
+++ csw/mgar/pkg/MailScanner/trunk/legacy/cswmailscanner	2010-07-04 18:01:08 UTC (rev 10425)
@@ -0,0 +1,70 @@
+#!/sbin/sh
+
+# cswmailscanner - controls MailScanner
+# 2007-08-15 Peter Bonivart
+
+DIR=/opt/csw/mailscanner
+MSCONF=$DIR/etc/MailScanner.conf
+MS_LOCKFILE=$DIR/var/MailScanner.off
+PPID=$DIR/var/MailScanner.pid
+HOSTNAME=`hostname`
+export HOSTNAME
+
+case "$1" in
+  start)
+    [ -f "$MSCONF" ] || exit
+    msin=`grep '^Incoming Work Dir' /opt/csw/mailscanner/etc/MailScanner.conf | awk '{print $5}'`
+    msquar=`grep '^Quarantine Dir' /opt/csw/mailscanner/etc/MailScanner.conf | awk '{print $4}'`
+    if [ ! -d "$msin" ]; then
+      /usr/bin/mkdir -m 0755 "$msin"
+      /usr/bin/chown root:bin "$msin"
+    fi
+    if [ ! -d "$msquar" ]; then
+      /usr/bin/mkdir -m 0750 "$msquar"
+      /usr/bin/chown root:bin "$msquar"
+    fi
+    $DIR/bin/check_mailscanner
+    rm -f $MS_LOCKFILE
+    ;;
+  stop)
+    echo Shutting down MailScanner...
+    if [ -s "$PPID" ]; then
+      kill `cat $PPID`
+      > $PPID
+      touch $MS_LOCKFILE
+    else
+      echo MailScanner is not running
+    fi
+    ;;
+  restart)
+    echo Restarting MailScanner...
+    $0 stop
+    echo "Waiting for MailScanner to stop.\c"
+    while ( pgrep MailScanner > /dev/null )
+    do
+      echo ".\c"
+      sleep 1
+    done
+    echo
+    sleep 1
+    $0 start
+    ;;
+  reload)
+    echo Reloading MailScanner...
+    pkill -HUP -x MailScanner
+    ;;
+  status)
+    PID=`pgrep MailScanner`
+    if [ "$PID" ]; then
+      echo MailScanner running with pid $PID
+    else
+      echo MailScanner not running
+    fi
+    ;;
+  *)
+    echo "Usage: $0 { start | stop | restart | reload | status }"
+    exit 1
+    ;;
+esac
+
+exit 0

Added: csw/mgar/pkg/MailScanner/trunk/legacy/cswmailscanner.sendmail
===================================================================
--- csw/mgar/pkg/MailScanner/trunk/legacy/cswmailscanner.sendmail	                        (rev 0)
+++ csw/mgar/pkg/MailScanner/trunk/legacy/cswmailscanner.sendmail	2010-07-04 18:01:08 UTC (rev 10425)
@@ -0,0 +1,126 @@
+#!/sbin/sh
+#
+# Copyright (c) 1992 - 2001 by Sun Microsystems, Inc.
+# All rights reserved.
+#
+#ident  "@(#)sendmail   1.19    01/12/05 SMI"
+# Modified for CSW by Alex Moore 01/01/2004
+# Modified for MailScanner by Peter Bonivart 2007-07-10
+
+ERRMSG1='WARNING: /var/mail is NFS-mounted without setting actimeo=0,'
+ERRMSG2='this can cause mailbox locking and access problems.'
+SERVER_PID_FILE="/var/run/sendmail.pid"
+CLIENT_PID_FILE="/opt/csw/var/spool/clientmqueue/sm-client.pid"
+DEFAULT_FILE="/opt/csw/etc/default/sendmail"
+ALIASES_FILE="/opt/csw/etc/mail/aliases"
+CSW_DIR="/opt/csw"
+MSCONF="$CSW_DIR/mailscanner/etc/MailScanner.conf"
+
+check_queue_interval_syntax()
+{
+        default="15m"
+        if [ $# -lt 1 ]; then
+                answer=$default
+                return
+        fi
+        if echo $1 | egrep '^([0-9]*[1-9][0-9]*[smhdw])+$' >/dev/null 2>&1; then
+                answer=$1
+        else
+                answer=$default
+        fi
+}
+
+case "$1" in
+'restart')
+#       [ -f $SERVER_PID_FILE ] && kill -1 `head -1 $SERVER_PID_FILE`
+#       [ -f $CLIENT_PID_FILE ] && kill -1 `head -1 $CLIENT_PID_FILE`
+        $0 stop
+        sleep 2
+        $0 start
+        ;;
+
+'start')
+	[ -f "$MSCONF" ] || exit
+        echo Starting Sendmail
+        if [ -f $CSW_DIR/lib/sendmail -a -f $CSW_DIR/etc/mail/sendmail.cf ]; then
+		INDIR=`grep '^Incoming Queue Dir' $MSCONF | awk -F'=' '{print $2}' | awk '{print $1}'`
+		OUTDIR=`grep '^Outgoing Queue Dir' $MSCONF | awk -F'=' '{print $2}' | awk '{print $1}'`
+		if [ ! -d $INDIR ]; then
+			/usr/bin/mkdir -m 0750 $INDIR
+			/usr/bin/chown root:bin $INDIR
+		fi
+		if [ ! -d $OUTDIR ]; then
+			/usr/bin/mkdir -m 0750 $OUTDIR
+			/usr/bin/chown root:bin $OUTDIR
+		fi
+                if [ ! -f $ALIASES_FILE.db ] && [ ! -f $ALIASES_FILE.dir ] \
+                    && [ ! -f $ALIASES_FILE.pag ]; then
+                        $CSW_DIR/bin/newaliases
+                fi
+                MODE="-bd"
+                [ -f $DEFAULT_FILE ] && . $DEFAULT_FILE
+                #
+                # * MODE should be "-bd" or null (MODE= or MODE="") or
+                #   left alone.  Anything else and you're on your own.
+                # * QUEUEOPTION should be "p" or null (as above).
+                # * [CLIENT]QUEUEINTERVAL should be set to some legal value;
+                #   sanity checks are done below.
+                # * [CLIENT]OPTIONS are catch-alls; set with care.
+                #
+                if [ -n "$QUEUEOPTION" -a "$QUEUEOPTION" != "p" ]; then
+                        QUEUEOPTION=""
+                fi
+                if [ -z "$QUEUEOPTION" -o -n "$QUEUEINTERVAL" ]; then
+                        check_queue_interval_syntax $QUEUEINTERVAL
+                        QUEUEINTERVAL=$answer
+                fi
+                check_queue_interval_syntax $CLIENTQUEUEINTERVAL
+                CLIENTQUEUEINTERVAL=$answer
+                $CSW_DIR/lib/sendmail -L sm-mta -bd -OPrivacyOptions=noetrn -ODeliveryMode=queueonly -OQueueDirectory=$INDIR &
+                $CSW_DIR/lib/sendmail -L sm-mta -q$CLIENTQUEUEINTERVAL -OQueueDirectory=$OUTDIR
+                $CSW_DIR/lib/sendmail -L sm-msp -Ac -q$CLIENTQUEUEINTERVAL $CLIENTOPTIONS &
+                #
+                # ETRN_HOSTS should be of the form
+                # "s1:c1.1,c1.2        s2:c2.1 s3:c3.1,c3.2,c3.3"
+                # i.e., white-space separated groups of server:client where
+                # client can be one or more comma-separated names; N.B. that
+                # the :client part is optional; see etrn(1M) for details.
+                # server is the name of the server to prod; a mail queue run
+                # is requested for each client name.  This is comparable to
+                # running "/usr/lib/sendmail -qRclient" on the host server.
+                #
+                # See RFC 1985 for more information.
+                #
+                for i in $ETRN_HOSTS; do
+                        SERVER=`echo $i | /usr/bin/sed -e 's/:.*$//'`
+                        CLIENTS=`echo $i | /usr/bin/sed -n -e 's/,/ /g' \
+                            -e '/:/s/^.*://p'`
+                        /usr/sbin/etrn $SERVER $CLIENTS >/dev/null 2>&1 &
+                done
+        fi
+
+        if /usr/bin/nawk 'BEGIN{s = 1}
+            $2 == "/var/mail" && $3 == "nfs" && $4 !~ /actimeo=0/ &&
+            $4 !~ /noac/{s = 0} END{exit s}' /etc/mnttab; then
+
+                /usr/bin/logger -p mail.crit "$ERRMSG1"
+                /usr/bin/logger -p mail.crit "$ERRMSG2"
+        fi
+        ;;
+
+'stop')
+        echo Stopping Sendmail
+        [ -f $SERVER_PID_FILE ] && kill `head -1 $SERVER_PID_FILE`
+        if [ -f $CLIENT_PID_FILE ]; then
+                kill `head -1 $CLIENT_PID_FILE`
+                rm -f $CLIENT_PID_FILE
+        fi
+        /usr/bin/pkill -x -u 0 sendmail
+        ;;
+
+*)
+        echo "Usage: $0 { start | stop | restart }"
+        exit 1
+        ;;
+esac
+exit 0

Added: csw/mgar/pkg/MailScanner/trunk/legacy/depend
===================================================================
--- csw/mgar/pkg/MailScanner/trunk/legacy/depend	                        (rev 0)
+++ csw/mgar/pkg/MailScanner/trunk/legacy/depend	2010-07-04 18:01:08 UTC (rev 10425)
@@ -0,0 +1,22 @@
+P CSWantiword
+P CSWcommon
+P CSWgawk
+P CSWperl
+P CSWpmarchivezip
+P CSWpmconvertbinhex
+P CSWpmconverttnef
+P CSWpmdbdsqlite
+P CSWpmdbi
+P CSWpmfilesysdf
+P CSWpmhtmlparser
+P CSWpmmailtools
+P CSWpmmimetools
+P CSWpmnetcidr
+P CSWpmolestoragelite
+P CSWpmpodescapes
+P CSWpmpodsimple
+P CSWpmsyshostnamelong
+P CSWpmtestpod
+P CSWpmtimedate
+P CSWtnef
+P CSWunrar

Added: csw/mgar/pkg/MailScanner/trunk/legacy/history
===================================================================
--- csw/mgar/pkg/MailScanner/trunk/legacy/history	                        (rev 0)
+++ csw/mgar/pkg/MailScanner/trunk/legacy/history	2010-07-04 18:01:08 UTC (rev 10425)
@@ -0,0 +1,102 @@
+2010-07-03 4.79.11-1,REV=2010.07.03
+----------
+- changed SA path from /opt/csw/etc/spamassassin to
+  /etc/opt/csw/spamassassin.
+- moved mailscanner.cf symlink to new SA location.
+- use /tmp for clamd socket.
+
+2009-10-01 4.78.17-1,REV=2009.10.01
+----------
+- no news related to the package itself.
+
+2009-06-01 4.77.8-1,REV=2009.06.01
+----------
+- no news related to the package itself.
+
+2009-05-12 4.76.25-1,REV=2009.05.12
+----------
+- no news related to the package itself.
+
+2009-05-04 4.76.24-3,REV=2009.05.04
+----------
+- no news related to the package itself.
+
+2009-04-22 4.75.11-1,REV=2009.04.22
+----------
+- no news related to the package itself.
+
+2009-01-21 4.74.16-1,REV=2009.01.21
+----------
+- added dir creation to postinstall script.
+- fixed path for ClamAV update monitoring.
+- fixed path for SpamAssassin Site Rules Dir.
+- fixed update_spamassassin script.
+- fixed svc-mailscanner.sendmail.
+
+2008-12-18 4.73.4-2,REV=2008.12.18
+----------
+- no news related to the package itself.
+
+2008-09-03 4.71.10-1,REV=2008.11.18
+----------
+- added dependency antiword.
+
+2008-08-06 4.70.7-1,REV=2008.08.06
+----------
+- added support for SMF.
+- added dependencies to pm_converttnef, pm_podescapes, pm_podsimple and
+  pm_testpod.
+- never released.
+
+2008-05-05 4.69.9-2,REV=2008.05.05
+----------
+- added dependency pm_olestoragelite.
+
+2008-04-14 4.68.8-1,REV=2008.04.14
+----------
+- changed paths to (g)awk in SA.pm to support timestamp feature when --debug-sa is used.
+- added dependencies to pm_mailtools, unrar and gawk.
+- removed dependency to pm_io since main Perl package is upgraded with new IO.
+- PERLLIB removed from rc-script.
+- wrapper /opt/csw/bin/MailScanner replaced with the old symlink.
+
+2008-01-04 4.66.5-2 (not officially released, only in testing)
+----------
+- new dependency pm_io, IO is included in core Perl but is too old.
+- PERLLIB added to rc-script to use new IO.
+- wrapper added to /opt/csw/bin/MailScanner to use new IO.
+
+2008-01-04 4.65.3-1,REV=2008.01.04
+----------
+- replace test -L with -h in preremove/postinstall scripts, caused error in
+  Solaris 8.
+
+2007-11-01 4.65.3-1
+----------
+- no news related to the package itself.
+
+2007-10-01 4.64.3-1
+----------
+- moved documentation to share/doc/mailscanner.
+
+2007-09-17 4.63.8-1,REV=2007.09.17
+----------
+- added dependency pm_syshostnamelong.
+
+2007-09-13 4.63.8-1
+----------
+- added official changelog.
+
+2007-09-03 4.63.7-2
+----------
+- add/remove symlink mailscanner.cf -> spam.assassin.prefs.conf.
+- removed unnecessary files (install guides for other OS:es and so on).
+- added history file to package.
+
+2007-08-16 4.62.9-3,REV=2007.08.16
+----------
+- Fixed init and cron scripts to better fit Solaris/CSW.
+
+2007-08-14 4.62.9-3
+----------
+- First CSW release.

Added: csw/mgar/pkg/MailScanner/trunk/legacy/history.csw
===================================================================
--- csw/mgar/pkg/MailScanner/trunk/legacy/history.csw	                        (rev 0)
+++ csw/mgar/pkg/MailScanner/trunk/legacy/history.csw	2010-07-04 18:01:08 UTC (rev 10425)
@@ -0,0 +1,122 @@
+2010-07-03 4.79.11-1,REV=2010.07.03
+----------
+- changed SA path from /opt/csw/etc/spamassassin to
+  /etc/opt/csw/spamassassin.
+- moved mailscanner.cf symlink to new SA location.
+- use /tmp for clamd socket.
+
+2009-10-01 4.78.17-1,REV=2009.10.01
+----------
+- no news related to the package itself.
+
+2009-06-01 4.77.8-1,REV=2009.06.01
+----------
+- no news related to the package itself.
+
+2009-05-12 4.76.25-1,REV=2009.05.12
+----------
+- no news related to the package itself.
+
+2009-05-04 4.76.24-3,REV=2009.05.04
+----------
+- no news related to the package itself.
+
+2009-04-22 4.75.11-1,REV=2009.04.22
+----------
+- no news related to the package itself.
+
+2009-01-21 4.74.16-1,REV=2009.01.21
+----------
+- added dir creation to postinstall script.
+- fixed path for ClamAV update monitoring.
+- fixed path for SpamAssassin Site Rules Dir.
+- fixed update_spamassassin script.
+- fixed svc-mailscanner.sendmail.
+
+2008-12-18 4.73.4-2,REV=2008.12.18
+----------
+- no news related to the package itself.
+
+2008-09-03 4.71.10-1,REV=2008.11.18
+----------
+- added dependency antiword.
+
+2008-08-06 4.70.7-1,REV=2008.08.06
+----------
+- added support for SMF.
+- added dependencies to pm_converttnef, pm_podescapes, pm_podsimple and
+  pm_testpod.
+- never released.
+
+2008-05-05 4.69.9-2,REV=2008.05.05
+----------
+- added dependency pm_olestoragelite.
+
+2008-04-14 4.68.8-1,REV=2008.04.14
+----------
+- changed paths to (g)awk in SA.pm to support timestamp feature when --debug-sa is used.
+- added dependencies to pm_mailtools, unrar and gawk.
+- removed dependency to pm_io since main Perl package is upgraded with new IO.
+- PERLLIB removed from rc-script.
+- wrapper /opt/csw/bin/MailScanner replaced with the old symlink.
+
+2008-01-04 4.66.5-2 (not officially released, only in testing)
+----------
+- new dependency pm_io, IO is included in core Perl but is too old.
+- PERLLIB added to rc-script to use new IO.
+- wrapper added to /opt/csw/bin/MailScanner to use new IO.
+
+2008-01-04 4.65.3-1,REV=2008.01.04
+----------
+- replace test -L with -h in preremove/postinstall scripts, caused error in
+  Solaris 8.
+
+2007-11-01 4.65.3-1
+----------
+- no news related to the package itself.
+
+2007-10-01 4.64.3-1
+----------
+- moved documentation to share/doc/mailscanner.
+
+2007-09-17 4.63.8-1,REV=2007.09.17
+----------
+- added dependency pm_syshostnamelong.
+
+2007-09-13 4.63.8-1
+----------
+- added official changelog.
+
+2007-09-03 4.63.7-2
+----------
+- add/remove symlink mailscanner.cf -> spam.assassin.prefs.conf.
+- removed unnecessary files (install guides for other OS:es and so on).
+- added history file to package.
+
+2007-08-16 4.62.9-3,REV=2007.08.16
+----------
+- Fixed init and cron scripts to better fit Solaris/CSW.
+
+2007-08-14 4.62.9-3
+----------
+- Modified to not need symlink from /opt. Changes to build script and prototype
+  stub. Updated README.CSW with upgrade info. Added CSWpmtimedate as dep.
+
+2007-07-11 4.61.7-2
+----------
+- Build script now fixes everything.
+
+2006-05-15 4.52.2-1,REV=2006.05.15
+----------
+- Added Sendmail as a dependency. Preinst and prerem scripts now removed and
+  postinst and postremo scripts are somewhat meaningful. First version built
+  with the build script.
+
+2006-05-12 4.52.2-1,REV=2006.05.12
+----------
+- Fixed dependency error (CSWpmtimedate incorrectly named).
+
+2006-05-11 4.52.2-1
+----------
+- First release. All scripts (preinst, postint, prerem, postrem) are just
+  dummies. Built on login since nothing needs to be compiled.

Added: csw/mgar/pkg/MailScanner/trunk/legacy/i.smfno
===================================================================
--- csw/mgar/pkg/MailScanner/trunk/legacy/i.smfno	                        (rev 0)
+++ csw/mgar/pkg/MailScanner/trunk/legacy/i.smfno	2010-07-04 18:01:08 UTC (rev 10425)
@@ -0,0 +1,13 @@
+# i.smfno script
+
+# Copy the non-SMF specific files to the base directory.
+
+echo "Installing class <smfno>."
+
+while read src dest
+do
+  /usr/bin/cp $src $dest || exit 2
+  echo $dest
+done
+
+exit 0

Added: csw/mgar/pkg/MailScanner/trunk/legacy/i.smfyes
===================================================================
--- csw/mgar/pkg/MailScanner/trunk/legacy/i.smfyes	                        (rev 0)
+++ csw/mgar/pkg/MailScanner/trunk/legacy/i.smfyes	2010-07-04 18:01:08 UTC (rev 10425)
@@ -0,0 +1,13 @@
+# i.smfyes script
+
+# Copy the SMF specific files to the base directory.
+
+echo "Installing class <smfyes>."
+
+while read src dest
+do
+  /usr/bin/cp $src $dest || exit 2
+  echo $dest
+done
+
+exit 0

Added: csw/mgar/pkg/MailScanner/trunk/legacy/mailscanner.sendmail.xml
===================================================================
--- csw/mgar/pkg/MailScanner/trunk/legacy/mailscanner.sendmail.xml	                        (rev 0)
+++ csw/mgar/pkg/MailScanner/trunk/legacy/mailscanner.sendmail.xml	2010-07-04 18:01:08 UTC (rev 10425)
@@ -0,0 +1,150 @@
+<?xml version="1.0"?>
+<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
+<!--
+        Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+        Use is subject to license terms.
+
+        ident   "@(#)cswmailscanner.sendmail.xml       1.11    04/12/16 SMI"
+
+        NOTE:  This service manifest is for CSWsendmail and is 
+        not editable; its contents will be overwritten by pkg-get 
+        upgrade.  Make customizations in a different file.
+
+	2008-07-03. Based on the manifest for CSWsendmail. /bonivart
+-->
+
+<service_bundle type='manifest' name='mailscannersendmail:mailscannersendmail'>
+
+<service
+        name='network/smtp/cswmailscannersendmail'
+        type='service'
+        version='1'>
+
+        <single_instance />
+
+        <dependency
+            name='fs-local'
+            grouping='require_all'
+            restart_on='none'
+            type='service'>
+                <service_fmri value='svc:/system/filesystem/local' />
+        </dependency>
+
+        <dependency
+            name='network-service'
+            grouping='require_all'
+            restart_on='none'
+            type='service'>
+                <service_fmri value='svc:/network/service' />
+        </dependency>
+
+        <dependency
+            name='name-services'
+            grouping='require_all'
+            restart_on='refresh'
+            type='service'>
+                <service_fmri value='svc:/milestone/name-services' />
+        </dependency>
+
+        <dependency
+            name='identity'
+            grouping='optional_all'
+            restart_on='refresh'
+            type='service'>
+                <service_fmri value='svc:/system/identity:domain' />
+        </dependency>
+
+        <dependency
+            name='system-log'
+            grouping='optional_all'
+            restart_on='none'
+            type='service'>
+                <service_fmri value='svc:/system/system-log' />
+        </dependency>
+
+        <instance name='default' enabled='false'>
+
+                <dependency
+                    name='config-file'
+                    grouping='require_all'
+                    restart_on='refresh'
+                    type='path'>
+                        <service_fmri
+                            value='file://localhost/opt/csw/etc/mail/sendmail.cf' />
+                </dependency>
+
+                <dependency
+                    name='nsswitch'
+                    grouping='require_all'
+                    restart_on='refresh'
+                    type='path'>
+                        <service_fmri
+                            value='file://localhost/etc/nsswitch.conf' />
+                </dependency>
+
+                <!--
+                If autofs is enabled, wait for it to get users' home
+                directories.
+                -->
+                <dependency
+                    name='autofs'
+                    grouping='optional_all'
+                    restart_on='none'
+                    type='service'>
+                        <service_fmri value='svc:/system/filesystem/autofs' />
+                </dependency>
+
+                <!--
+                Sendmail is hard-coded to sleep for 60 seconds if it cannot
+                determine the FQHN, so the timeout for start must be longer
+                than that.  For details, see
+                http://www.sendmail.org/vendor/sun/differences.html#3.2
+                -->
+
+                <exec_method
+                        type='method'
+                        name='start'
+                        exec='/var/opt/csw/svc/method/svc-mailscanner.sendmail start'
+                        timeout_seconds='120' />
+
+                <exec_method
+                        type='method'
+                        name='stop'
+                        exec='/var/opt/csw/svc/method/svc-mailscanner.sendmail stop %{restarter/contract}'
+                        timeout_seconds='60' />
+
+                <exec_method
+                        type='method'
+                        name='refresh'
+                        exec='/var/opt/csw/svc/method/svc-mailscanner.sendmail refresh'
+                        timeout_seconds='60' />
+
+                <property_group name='startd' type='framework'>
+                        <propval name='ignore_error' type='astring'
+                            value='core,signal' />
+                </property_group>
+
+                <property_group name='general' type='framework'>
+                        <propval name='action_authorization' type='astring'
+                                value='solaris.smf.manage.sendmail' />
+                </property_group>
+
+                <template>
+                        <common_name>
+                                <loctext xml:lang='C'>
+                                sendmail SMTP mail transfer agent
+                                </loctext>
+                        </common_name>
+                        <documentation>
+                                <manpage title='sendmail' section='1M'
+                                    manpath='/opt/csw/share/man' />
+                        </documentation>
+                </template>
+
+        </instance>
+
+        <stability value='Unstable' />
+
+</service>
+
+</service_bundle>

Added: csw/mgar/pkg/MailScanner/trunk/legacy/mailscanner.xml
===================================================================
--- csw/mgar/pkg/MailScanner/trunk/legacy/mailscanner.xml	                        (rev 0)
+++ csw/mgar/pkg/MailScanner/trunk/legacy/mailscanner.xml	2010-07-04 18:01:08 UTC (rev 10425)
@@ -0,0 +1,61 @@
+<?xml version='1.0'?>
+<!DOCTYPE service_bundle SYSTEM '/usr/share/lib/xml/dtd/service_bundle.dtd.1'>
+<!--
+Service manifest for MailScanner
+2008-09-03 Peter Bonivart
+-->
+
+<service_bundle type='manifest' name='mailscanner:mailscanner'>
+
+<service
+  name='network/smtp/cswmailscanner'
+  type='service'
+  version='1'>
+  <create_default_instance enabled='false' />
+  <single_instance />
+
+  <dependency name='fs'
+    grouping='require_all'
+    restart_on='none'
+    type='service'>
+    <service_fmri value='svc:/system/filesystem/local' />
+  </dependency>
+
+  <dependency name='net'
+    grouping='require_all'
+    restart_on='none'
+    type='service'>
+    <service_fmri value='svc:/network/loopback' />
+  </dependency>
+
+  <exec_method
+    type='method'
+    name='start'
+    exec='/var/opt/csw/svc/method/svc-mailscanner start'
+    timeout_seconds='-1'>
+  </exec_method>
+
+  <exec_method
+    type='method'
+    name='stop'
+    exec='/var/opt/csw/svc/method/svc-mailscanner stop'
+    timeout_seconds='-1'>
+  </exec_method>
+
+  <exec_method
+    type='method'
+    name='restart'
+    exec='/opt/csw/svc/method/svc-mailscanner restart'
+    timeout_seconds='-1'>
+  </exec_method>
+
+  <exec_method
+    type='method'
+    name='refresh'
+    exec='/var/opt/csw/svc/method/svc-mailscanner reload'
+    timeout_seconds='-1'>
+  </exec_method>
+
+</service>
+
+</service_bundle>

Added: csw/mgar/pkg/MailScanner/trunk/legacy/pkginfo.stub
===================================================================
--- csw/mgar/pkg/MailScanner/trunk/legacy/pkginfo.stub	                        (rev 0)
+++ csw/mgar/pkg/MailScanner/trunk/legacy/pkginfo.stub	2010-07-04 18:01:08 UTC (rev 10425)
@@ -0,0 +1,10 @@
+PKG=CSWmailscanner
+NAME=mailscanner - A Free Anti-Virus and Anti-Spam Filter
+CATEGORY=application
+VENDOR=http://www.mailscanner.info packaged for CSW by Peter Bonivart
+HOTLINE=http://www.opencsw.org/bugtrack/
+EMAIL=bonivart at opencsw.org
+ARCH=all
+BASEDIR=/opt/csw
+CSW_CATEGORY=mailsys,security
+CLASSES=none

Added: csw/mgar/pkg/MailScanner/trunk/legacy/postinstall
===================================================================
--- csw/mgar/pkg/MailScanner/trunk/legacy/postinstall	                        (rev 0)
+++ csw/mgar/pkg/MailScanner/trunk/legacy/postinstall	2010-07-04 18:01:08 UTC (rev 10425)
@@ -0,0 +1,113 @@
+#!/bin/sh
+
+# postinstall with SMF support for MailScanner
+# 2009-01-13 Peter Bonivart
+
+CHMOD=/usr/bin/chmod
+CHOWN=/usr/bin/chown
+CHROOT=/usr/sbin/chroot
+CP=/usr/bin/cp
+ECHO=/usr/bin/echo
+LN=/usr/bin/ln
+MKDIR=/usr/bin/mkdir
+SVCADM=/usr/sbin/svcadm
+SVCCFG=/usr/sbin/svccfg
+
+CONFFILES=$BASEDIR/share/doc/mailscanner/conffiles
+INSTALLDIR=$BASEDIR/mailscanner
+ETC=$INSTALLDIR/etc
+MSCONF=$ETC/MailScanner.conf
+SADIR=$PKG_INSTALL_ROOT/etc/opt/csw/spamassassin
+
+# check csw.conf
+if [ -f $PKG_INSTALL_ROOT/opt/csw/etc/csw.conf ] ; then
+  . $PKG_INSTALL_ROOT/opt/csw/etc/csw.conf
+fi
+if [ -f $PKG_INSTALL_ROOT/etc/opt/csw/csw.conf ] ; then
+  . $PKG_INSTALL_ROOT/etc/opt/csw/csw.conf
+fi
+
+# create symlink to spam.assassin.prefs.conf
+if [ -d "$SADIR" -a ! -h "$SADIR/mailscanner.cf" ]; then
+  $ECHO "Creating symlink to spam.assassin.prefs.conf."
+  $LN -s $ETC/spam.assassin.prefs.conf $SADIR/mailscanner.cf
+fi
+
+# create symlink cswmailscanner
+$ECHO "Creating symlink cswmailscanner."
+if [ -f "$PKG_INSTALL_ROOT/etc/init.d/cswmailscanner" ]; then
+  $LN -s $PKG_INSTALL_ROOT/etc/init.d/cswmailscanner $BASEDIR/bin/cswmailscanner
+else
+  $LN -s $PKG_INSTALL_ROOT/var/opt/csw/svc/method/svc-mailscanner $BASEDIR/bin/cswmailscanner
+fi
+
+# copying x.CSW to x
+$ECHO "Copying `wc -l $CONFFILES | awk '{print $1}'` CSW-configuration files to default files."
+for i in `cat $CONFFILES`
+do
+  if [ ! -f "$ETC/$i" ]; then
+    if [ "$i" = "./MailScanner.conf" -a "$autoenable_daemons" = "no" ]; then
+      $ECHO "\nMailScanner.conf not created due to csw.conf setting."
+    else
+      $CP $ETC/${i}.CSW $ETC/$i
+      $CHOWN root:bin $ETC/$i
+      $CHMOD 644 $ETC/$i
+      $ECHO ".\c"
+    fi
+  else
+    $ECHO "\n$i already present. Not copied."
+  fi
+done
+$ECHO
+
+# create mailscanner dirs
+WD=`grep '^Incoming Work Dir' $MSCONF | awk -F'=' '{print $2}'`
+IQ=`grep '^Incoming Queue Dir' $MSCONF | awk -F'=' '{print $2}'`
+OQ=`grep '^Outgoing Queue Dir' $MSCONF | awk -F'=' '{print $2}'`
+LD=`grep '^Lockfile Dir' $MSCONF | awk -F'=' '{print $2}'`
+QD=`grep '^Quarantine Dir' $MSCONF | awk -F'=' '{print $2}'`
+for i in $WD $LD $QD $IQ $OQ
+do
+  $ECHO "Creating $i directory."
+  if [ -h "$i" -o -f "$i" -o -d "$i" ]; then
+    $ECHO "! $i already exists. Could not create directory."
+  else
+    $MKDIR -p -m 755 $i
+    $CHOWN root:bin $i
+  fi
+done
+$CHMOD 750 $IQ
+
+# SMF
+smf=no
+if [ -f $PKG_INSTALL_ROOT/usr/sbin/svccfg -a -f $PKG_INSTALL_ROOT/usr/sbin/svcadm ]; then
+  if [ "$use_smf" != "no" ]; then
+    smf=yes
+  fi
+fi
+
+if [ "$smf" = "yes" ]; then
+  $ECHO "Configuring service in SMF."
+  $SVCCFG import /var/opt/csw/svc/manifest/network/smtp/mailscanner.xml > /dev/null 2>&1
+  $SVCADM disable svc:/network/smtp/cswmailscanner > /dev/null 2>&1
+  $SVCCFG import /var/opt/csw/svc/manifest/network/smtp/mailscanner.sendmail.xml > /dev/null 2>&1
+  $SVCADM disable svc:/network/smtp/cswmailscannersendmail > /dev/null 2>&1
+  $ECHO "MailScanner is using SMF. The FMRI is: svc:/network/smtp/cswmailscanner, svc:/network/smtp/cswmailscanner.sendmail"
+fi
+
+# If enabled, start the daemon
+#if [ "$enable_daemon" = "yes" -a x"$PKG_INSTALL_ROOT" = x"" ]; then
+#  $ECHO "Starting MailScanner."
+#  if [ "$smf" = "no" ]; then
+#    /etc/init.d/cswmailscanner start
+#  else
+#    $SVCADM enable svc:/network/smtp/cswmailscanner
+#  fi
+#fi
+
+# info
+$ECHO
+$ECHO ">>> Please read /opt/csw/share/doc/mailscanner/README.CSW <<<"
+$ECHO
+
+exit 0


Property changes on: csw/mgar/pkg/MailScanner/trunk/legacy/postinstall
___________________________________________________________________
Added: svn:executable
   + *

Added: csw/mgar/pkg/MailScanner/trunk/legacy/preremove
===================================================================
--- csw/mgar/pkg/MailScanner/trunk/legacy/preremove	                        (rev 0)
+++ csw/mgar/pkg/MailScanner/trunk/legacy/preremove	2010-07-04 18:01:08 UTC (rev 10425)
@@ -0,0 +1,96 @@
+#!/bin/sh
+
+# preremove with SMF support for MailScanner
+# 2008-09-04 Peter Bonivart
+
+CHROOT=/usr/sbin/chroot
+ECHO=/usr/bin/echo
+RM=/usr/bin/rm
+RMDIR=/usr/bin/rmdir
+SVCADM=/usr/sbin/svcadm
+SVCCFG=/usr/sbin/svccfg
+
+CONFFILES=$BASEDIR/share/doc/mailscanner/conffiles
+ETC=$BASEDIR/mailscanner/etc
+MSDIR=$PKG_INSTALL_ROOT/var/spool/MailScanner
+SADIR=$PKG_INSTALL_ROOT/etc/opt/csw/spamassassin
+
+# If removing from a filesystem that is not running the OS, exit this script.
+if [ ! x"$PKG_INSTALL_ROOT" = x"" ]; then
+  exit 0
+fi
+
+# check csw.conf
+if [ -f $PKG_INSTALL_ROOT/opt/csw/etc/csw.conf ] ; then
+  . $PKG_INSTALL_ROOT/opt/csw/etc/csw.conf
+fi
+if [ -f $PKG_INSTALL_ROOT/etc/opt/csw/csw.conf ] ; then
+  . $PKG_INSTALL_ROOT/etc/opt/csw/csw.conf
+fi
+
+# SMF
+smf=no
+if [ -f $PKG_INSTALL_ROOT/usr/sbin/svccfg -a -f $PKG_INSTALL_ROOT/usr/sbin/svcadm ]; then
+  if [ "$use_smf" != "no" ]; then
+    smf=yes
+  fi
+fi
+
+# killing mailscanner
+$ECHO "Stopping MailScanner."
+if [ "$smf" = "yes" ]; then
+  $SVCADM disable -s svc:network/smtp/cswmailscanner > /dev/null 2>&1
+  $SVCADM disable -s svc:network/smtp/cswmailscannersendmail > /dev/null 2>&1
+else
+  /etc/init.d/cswmailscanner stop >/dev/null 2>&1
+  /etc/init.d/cswmailscanner.sendmail stop >/dev/null 2>&1
+fi
+
+if [ "$smf" = "yes" ]; then
+  # Unregister with SMF
+  $ECHO "Unregister with SMF."
+  $SVCCFG delete svc:network/smtp/cswmailscanner > /dev/null 2>&1
+  $SVCCFG delete svc:network/smtp/cswmailscannersendmail > /dev/null 2>&1
+fi
+
+# remove mailscanner dir
+$ECHO "Removing $MSDIR directory."
+if [ -d "$MSDIR" ]; then
+  dirs=`find $MSDIR -type d | wc -l | awk '{print $1}'` 
+  test -f "$MSDIR/incoming/SpamAssassin.cache.db"
+  sacache=$?
+  if [ "$dirs" -le "3" -a "$sacache" -ne "0" ]; then
+    $RM -rf $MSDIR
+  else
+    $ECHO "! $MSDIR does not seem empty. Not removing."
+  fi
+else
+  $ECHO "! No directory found."
+fi
+
+# remove symlink to spam.assassin.prefs.conf
+if [ -h "$SADIR/mailscanner.cf" ]; then
+  $ECHO "Removing symlink to spam.assassin.prefs.conf."
+  $RM $SADIR/mailscanner.cf
+fi
+
+# remove symlink cswmailscanner
+$ECHO "Removing symlink cswmailscanner."
+$RM -f $BASEDIR/bin/cswmailscanner
+
+# remove x conf file if same as x.CSW
+$ECHO "Removing configuration files that have not been modified."
+for i in `cat $CONFFILES`
+do
+  cmp -s "$ETC/$i" "$ETC/${i}.CSW"
+  if [ "x$?" = "x1" ]; then
+    $ECHO
+    echo "! $i modified, will not remove it."
+  else
+    $ECHO ".\c"
+    $RM -f $ETC/$i
+  fi
+done
+$ECHO
+
+exit 0


Property changes on: csw/mgar/pkg/MailScanner/trunk/legacy/preremove
___________________________________________________________________
Added: svn:executable
   + *

Added: csw/mgar/pkg/MailScanner/trunk/legacy/prototype.stub
===================================================================
--- csw/mgar/pkg/MailScanner/trunk/legacy/prototype.stub	                        (rev 0)
+++ csw/mgar/pkg/MailScanner/trunk/legacy/prototype.stub	2010-07-04 18:01:08 UTC (rev 10425)
@@ -0,0 +1,38 @@
+i pkginfo
+i depend
+i copyright
+i checkinstall
+i postinstall=./postinstall
+i preremove=./preremove
+i i.smfno
+i i.smfyes
+i space
+d none share 0755 root bin
+d none share/doc 0755 root bin
+d none share/doc/mailscanner 0755 root bin
+f none share/doc/mailscanner/ChangeLog 0644 root bin
+f none share/doc/mailscanner/README.CSW 0644 root bin
+f none share/doc/mailscanner/README 0644 root bin
+f none share/doc/mailscanner/conffiles 0400 root bin
+f none share/doc/mailscanner/license 0644 root bin
+f none share/doc/mailscanner/history 0644 root bin
+f smfno /etc/init.d/cswmailscanner=share/doc/mailscanner/cswmailscanner 0744 root bin
+f smfno /etc/init.d/cswmailscanner.sendmail=share/doc/mailscanner/cswmailscanner.sendmail 0744 root bin
+s smfno /etc/rc2.d/K28cswmailscanner=/etc/init.d/cswmailscanner
+s smfno /etc/rc3.d/S28cswmailscanner=/etc/init.d/cswmailscanner
+s smfno /etc/rc2.d/K78cswmailscanner.sendmail=/etc/init.d/cswmailscanner.sendmail
+s smfno /etc/rc3.d/S78cswmailscanner.sendmail=/etc/init.d/cswmailscanner.sendmail
+d smfyes /var/opt/csw/svc 0755 root bin
+d smfyes /var/opt/csw/svc/manifest 0755 root bin
+d smfyes /var/opt/csw/svc/manifest/network 0755 root bin
+d smfyes /var/opt/csw/svc/manifest/network/smtp 0755 root bin
+f smfyes /var/opt/csw/svc/manifest/network/smtp/mailscanner.xml=share/doc/mailscanner/mailscanner.xml 0644 root bin
+f smfyes /var/opt/csw/svc/manifest/network/smtp/mailscanner.sendmail.xml=share/doc/mailscanner/mailscanner.sendmail.xml 0644 root bin
+d smfyes /var/opt/csw/svc 0755 root bin
+d smfyes /var/opt/csw/svc/method 0755 root bin
+f smfyes /var/opt/csw/svc/method/svc-mailscanner=share/doc/mailscanner/cswmailscanner 0755 root bin
+f smfyes /var/opt/csw/svc/method/svc-mailscanner.sendmail=share/doc/mailscanner/cswmailscanner.sendmail 0755 root bin
+s none bin/MailScanner=../mailscanner/bin/MailScanner
+s none bin/analyze_SpamAssassin_cache=../mailscanner/bin/analyze_SpamAssassin_cache
+s none bin/upgrade_MailScanner_conf=../mailscanner/bin/upgrade_MailScanner_conf
+s none bin/upgrade_languages_conf=../mailscanner/bin/upgrade_languages_conf

Added: csw/mgar/pkg/MailScanner/trunk/legacy/readme
===================================================================
--- csw/mgar/pkg/MailScanner/trunk/legacy/readme	                        (rev 0)
+++ csw/mgar/pkg/MailScanner/trunk/legacy/readme	2010-07-04 18:01:08 UTC (rev 10425)
@@ -0,0 +1,91 @@
+Edited 060424, 060425, 060512, 060515, 060516, 070705, 070711, 070717, 070721,
+       081218
+
+Todo
+----
+# if csw.conf is enabled, try to get up and running immediately
+# - stop/disable sun sendmail and csw sendmail (note: smf on sol10)
+# - start cswmailscanner.sendmail and cswmailscanner
+# -- maybe not such a good idea after upgrades?
+# -- stop/disable can be done but start?
+
+Build script
+------------
+- menu based
++ fix ownership/permissions
++ add csw-directory
++ ask for version
++ add pstamp
++ create prototype
++ pkgmk
++ pkgtrans
++ gzip
++ copy to testing
+
+Misc
+----
++ Add CSW specific things (start scripts...) in csw-directory
++ Add CSW readme, history and so on in csw-directory
++ SMF support
+
+Postinstall
+----------
++ symlink /opt/MailScanner to /opt/csw/mailscanner
+++ detect if link already present
+- ask if to disable CSWsendmail/SUNWsendmail (rename init.d file or remove K/S
+  symlinks?)
++ install start script (cswmailscanner) with K/S symlinks
+- start script should support general MTA operation (start/stop)
++ start script should support Sendmail
+- ask for queue folders (default: /var/spool)
++ create queue folders and MailScanner folder
++ support S10 svc feature
++ copy .CSW config files to non .CSW
+
+Postremove
+----------
++ remove symlink /opt/MailScanner
++ diff config files against originals, if modified copy to other name
+++ should package only contain config files named x.CSW to avoid above issue?
++++ yes!
+
+Modifications
+-------------
++ #!/usr/bin/perl -> #!/opt/csw/bin/perl
+- /opt in bin/MailScanner
+- /var in bin/update_virus_scanners
+- /etc in bin/cron/check_MailScanner.cron
+          bin/cron/update_phishing_sites.cron
+          bin/cron/update_virus_scanners.cron
+          bin/check_mailscanner
+          bin/update_phishing_sites
+          lib/ConfigDefs.pl
+          lib/CustomConfig.pm
+          etc/MailScanner.conf
+          etc/virus.scanners.conf
+
+New pkgs
+--------
+
+- Net::IP (needed for Net::DNS 0.60)
+
+MTA
+---
+Support only Sendmail and how? Replace/disable CSWsendmail's start script?
+
+Dependencies
+------------
+common
+perl
+pm_archivezip
+pm_convertbinhex
+pm_dbdsqlite
+pm_dbi
+pm_filesysdf
+pm_htmlparser
+pm_mimebase64 (probably not needed, seems included in perl 5.8.8)
+pm_mimetools
+pm_netcidr
+tnef
+
+:EOF

Added: csw/mgar/pkg/MailScanner/trunk/legacy/space
===================================================================
Added: csw/mgar/pkg/MailScanner/trunk/legacy/svc-mailscanner
===================================================================
--- csw/mgar/pkg/MailScanner/trunk/legacy/svc-mailscanner	                        (rev 0)
+++ csw/mgar/pkg/MailScanner/trunk/legacy/svc-mailscanner	2010-07-04 18:01:08 UTC (rev 10425)
@@ -0,0 +1,70 @@
+#!/sbin/sh
+
+# cswmailscanner - controls MailScanner
+# 2007-08-15 Peter Bonivart
+
+DIR=/opt/csw/mailscanner
+MSCONF=$DIR/etc/MailScanner.conf
+MS_LOCKFILE=$DIR/var/MailScanner.off
+PPID=$DIR/var/MailScanner.pid
+HOSTNAME=`hostname`
+export HOSTNAME
+
+case "$1" in
+  start)
+    [ -f "$MSCONF" ] || exit
+    msin=`grep '^Incoming Work Dir' /opt/csw/mailscanner/etc/MailScanner.conf | awk '{print $5}'`
+    msquar=`grep '^Quarantine Dir' /opt/csw/mailscanner/etc/MailScanner.conf | awk '{print $4}'`
+    if [ ! -d "$msin" ]; then
+      /usr/bin/mkdir -m 0755 "$msin"
+      /usr/bin/chown root:bin "$msin"
+    fi
+    if [ ! -d "$msquar" ]; then
+      /usr/bin/mkdir -m 0750 "$msquar"
+      /usr/bin/chown root:bin "$msquar"
+    fi
+    $DIR/bin/check_mailscanner
+    rm -f $MS_LOCKFILE
+    ;;
+  stop)
+    echo Shutting down MailScanner...
+    if [ -s "$PPID" ]; then
+      kill `cat $PPID`
+      > $PPID
+      touch $MS_LOCKFILE
+    else
+      echo MailScanner is not running
+    fi
+    ;;
+  restart)
+    echo Restarting MailScanner...
+    $0 stop
+    echo "Waiting for MailScanner to stop.\c"
+    while ( pgrep MailScanner > /dev/null )
+    do
+      echo ".\c"
+      sleep 1
+    done
+    echo
+    sleep 1
+    $0 start
+    ;;
+  reload)
+    echo Reloading MailScanner...
+    pkill -HUP -x MailScanner
+    ;;
+  status)
+    PID=`pgrep MailScanner`
+    if [ "$PID" ]; then
+      echo MailScanner running with pid $PID
+    else
+      echo MailScanner not running
+    fi
+    ;;
+  *)
+    echo "Usage: $0 { start | stop | restart | reload | status }"
+    exit 1
+    ;;
+esac
+
+exit 0

Added: csw/mgar/pkg/MailScanner/trunk/legacy/svc-mailscanner.sendmail
===================================================================
--- csw/mgar/pkg/MailScanner/trunk/legacy/svc-mailscanner.sendmail	                        (rev 0)
+++ csw/mgar/pkg/MailScanner/trunk/legacy/svc-mailscanner.sendmail	2010-07-04 18:01:08 UTC (rev 10425)
@@ -0,0 +1,126 @@
+#!/sbin/sh
+#
+# Copyright (c) 1992 - 2001 by Sun Microsystems, Inc.
+# All rights reserved.
+#
+#ident  "@(#)sendmail   1.19    01/12/05 SMI"
+# Modified for CSW by Alex Moore 01/01/2004
+# Modified for MailScanner by Peter Bonivart 2007-07-10
+
+ERRMSG1='WARNING: /var/mail is NFS-mounted without setting actimeo=0,'
+ERRMSG2='this can cause mailbox locking and access problems.'
+SERVER_PID_FILE="/var/run/sendmail.pid"
+CLIENT_PID_FILE="/opt/csw/var/spool/clientmqueue/sm-client.pid"
+DEFAULT_FILE="/opt/csw/etc/default/sendmail"
+ALIASES_FILE="/opt/csw/etc/mail/aliases"
+CSW_DIR="/opt/csw"
+MSCONF="$CSW_DIR/mailscanner/etc/MailScanner.conf"
+
+check_queue_interval_syntax()
+{
+        default="15m"
+        if [ $# -lt 1 ]; then
+                answer=$default
+                return
+        fi
+        if echo $1 | egrep '^([0-9]*[1-9][0-9]*[smhdw])+$' >/dev/null 2>&1; then
+                answer=$1
+        else
+                answer=$default
+        fi
+}
+
+case "$1" in
+'restart')
+#       [ -f $SERVER_PID_FILE ] && kill -1 `head -1 $SERVER_PID_FILE`
+#       [ -f $CLIENT_PID_FILE ] && kill -1 `head -1 $CLIENT_PID_FILE`
+        $0 stop
+        sleep 2
+        $0 start
+        ;;
+
+'start')
+	[ -f "$MSCONF" ] || exit
+        echo Starting Sendmail
+        if [ -f $CSW_DIR/lib/sendmail -a -f $CSW_DIR/etc/mail/sendmail.cf ]; then
+		INDIR=`grep '^Incoming Queue Dir' $MSCONF | awk -F'=' '{print $2}' | awk '{print $1}'`
+		OUTDIR=`grep '^Outgoing Queue Dir' $MSCONF | awk -F'=' '{print $2}' | awk '{print $1}'`
+		if [ ! -d $INDIR ]; then
+			/usr/bin/mkdir -m 0750 $INDIR
+			/usr/bin/chown root:bin $INDIR
+		fi
+		if [ ! -d $OUTDIR ]; then
+			/usr/bin/mkdir -m 0750 $OUTDIR
+			/usr/bin/chown root:bin $OUTDIR
+		fi
+                if [ ! -f $ALIASES_FILE.db ] && [ ! -f $ALIASES_FILE.dir ] \
+                    && [ ! -f $ALIASES_FILE.pag ]; then
+                        $CSW_DIR/bin/newaliases
+                fi
+                MODE="-bd"
+                [ -f $DEFAULT_FILE ] && . $DEFAULT_FILE
+                #
+                # * MODE should be "-bd" or null (MODE= or MODE="") or
+                #   left alone.  Anything else and you're on your own.
+                # * QUEUEOPTION should be "p" or null (as above).
+                # * [CLIENT]QUEUEINTERVAL should be set to some legal value;
+                #   sanity checks are done below.
+                # * [CLIENT]OPTIONS are catch-alls; set with care.
+                #
+                if [ -n "$QUEUEOPTION" -a "$QUEUEOPTION" != "p" ]; then
+                        QUEUEOPTION=""
+                fi
+                if [ -z "$QUEUEOPTION" -o -n "$QUEUEINTERVAL" ]; then
+                        check_queue_interval_syntax $QUEUEINTERVAL
+                        QUEUEINTERVAL=$answer
+                fi
+                check_queue_interval_syntax $CLIENTQUEUEINTERVAL
+                CLIENTQUEUEINTERVAL=$answer
+                $CSW_DIR/lib/sendmail -L sm-mta -bd -OPrivacyOptions=noetrn -ODeliveryMode=queueonly -OQueueDirectory=$INDIR &
+                $CSW_DIR/lib/sendmail -L sm-mta -q$CLIENTQUEUEINTERVAL -OQueueDirectory=$OUTDIR
+                $CSW_DIR/lib/sendmail -L sm-msp -Ac -q$CLIENTQUEUEINTERVAL $CLIENTOPTIONS &
+                #
+                # ETRN_HOSTS should be of the form
+                # "s1:c1.1,c1.2        s2:c2.1 s3:c3.1,c3.2,c3.3"
+                # i.e., white-space separated groups of server:client where
+                # client can be one or more comma-separated names; N.B. that
+                # the :client part is optional; see etrn(1M) for details.
+                # server is the name of the server to prod; a mail queue run
+                # is requested for each client name.  This is comparable to
+                # running "/usr/lib/sendmail -qRclient" on the host server.
+                #
+                # See RFC 1985 for more information.
+                #
+                for i in $ETRN_HOSTS; do
+                        SERVER=`echo $i | /usr/bin/sed -e 's/:.*$//'`
+                        CLIENTS=`echo $i | /usr/bin/sed -n -e 's/,/ /g' \
+                            -e '/:/s/^.*://p'`
+                        /usr/sbin/etrn $SERVER $CLIENTS >/dev/null 2>&1 &
+                done
+        fi
+
+        if /usr/bin/nawk 'BEGIN{s = 1}
+            $2 == "/var/mail" && $3 == "nfs" && $4 !~ /actimeo=0/ &&
+            $4 !~ /noac/{s = 0} END{exit s}' /etc/mnttab; then
+
+                /usr/bin/logger -p mail.crit "$ERRMSG1"
+                /usr/bin/logger -p mail.crit "$ERRMSG2"
+        fi
+        ;;
+
+'stop')
+        echo Stopping Sendmail
+        [ -f $SERVER_PID_FILE ] && kill `head -1 $SERVER_PID_FILE`
+        if [ -f $CLIENT_PID_FILE ]; then
+                kill `head -1 $CLIENT_PID_FILE`
+                rm -f $CLIENT_PID_FILE
+        fi
+        /usr/bin/pkill -x -u 0 sendmail
+        ;;
+
+*)
+        echo "Usage: $0 { start | stop | restart }"
+        exit 1
+        ;;
+esac
+exit 0


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From wahwah at users.sourceforge.net  Mon Jul  5 00:49:05 2010
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Sun, 04 Jul 2010 22:49:05 +0000
Subject: [csw-devel] SF.net SVN: gar:[10426] csw/mgar/pkg/tree/trunk
Message-ID: <E1OVXzl-0004cD-Eu@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 10426
          http://gar.svn.sourceforge.net/gar/?rev=10426&view=rev
Author:   wahwah
Date:     2010-07-04 22:49:05 +0000 (Sun, 04 Jul 2010)

Log Message:
-----------
tree: Using CFLAGS from GAR

Modified Paths:
--------------
    csw/mgar/pkg/tree/trunk/Makefile
    csw/mgar/pkg/tree/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/tree/trunk/files/0002-Allowing-CFLAGS-from-GAR.patch

Modified: csw/mgar/pkg/tree/trunk/Makefile
===================================================================
--- csw/mgar/pkg/tree/trunk/Makefile	2010-07-04 18:01:08 UTC (rev 10425)
+++ csw/mgar/pkg/tree/trunk/Makefile	2010-07-04 22:49:05 UTC (rev 10426)
@@ -14,7 +14,8 @@
 SPKG_SOURCEURL = http://mama.indstate.edu/users/ice/tree/
 MASTER_SITES  = ftp://mama.indstate.edu/linux/tree/
 MASTER_SITES += http://www.sfr-fresh.com/linux/misc/
-PATCHFILES = solaris.patch
+PATCHFILES += solaris.patch
+PATCHFILES += 0002-Allowing-CFLAGS-from-GAR.patch
 DISTFILES  = $(GARNAME)-$(GARVERSION).tgz
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tgz
 CONFIGURE_SCRIPTS =

Modified: csw/mgar/pkg/tree/trunk/checksums
===================================================================
--- csw/mgar/pkg/tree/trunk/checksums	2010-07-04 18:01:08 UTC (rev 10425)
+++ csw/mgar/pkg/tree/trunk/checksums	2010-07-04 22:49:05 UTC (rev 10426)
@@ -1,2 +1,3 @@
+05bd12b988fe004f1e82a0528b097100  0002-Allowing-CFLAGS-from-GAR.patch
 2e286acfa044c3bf9b75f31a97fa7540  solaris.patch
 c07ce9065667a23f27aca4de8ecccb10  tree-1.5.3.tgz

Added: csw/mgar/pkg/tree/trunk/files/0002-Allowing-CFLAGS-from-GAR.patch
===================================================================
--- csw/mgar/pkg/tree/trunk/files/0002-Allowing-CFLAGS-from-GAR.patch	                        (rev 0)
+++ csw/mgar/pkg/tree/trunk/files/0002-Allowing-CFLAGS-from-GAR.patch	2010-07-04 22:49:05 UTC (rev 10426)
@@ -0,0 +1,26 @@
+From ac6973fc238837f1618bef33603b82118a0f963d Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Mon, 5 Jul 2010 00:43:50 +0200
+Subject: [PATCH] Allowing CFLAGS from GAR.
+
+---
+ Makefile |    3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 3324dd3..ac03ef9 100644
+--- a/Makefile
++++ b/Makefile
+@@ -30,8 +30,7 @@ MANDIR=${prefix}/man/man1
+ 
+ # Uncomment for Solaris:
+ #CC=cc
+-CFLAGS=-xO0 -v
+-LDFLAGS=
++CFLAGS ?= -xO0 -v
+ XOBJS=strverscmp.o
+ MANDIR=${prefix}/share/man/man1
+ INSTALL=ginstall
+-- 
+1.7.1
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From wahwah at users.sourceforge.net  Mon Jul  5 00:57:55 2010
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Sun, 04 Jul 2010 22:57:55 +0000
Subject: [csw-devel] SF.net SVN: gar:[10427]
	csw/mgar/gar/v2/lib/python/package_checks.py
Message-ID: <E1OVY8J-0001VW-05@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 10427
          http://gar.svn.sourceforge.net/gar/?rev=10427&view=rev
Author:   wahwah
Date:     2010-07-04 22:57:54 +0000 (Sun, 04 Jul 2010)

Log Message:
-----------
Updating machine type data to support i386 binary checks and improve others.

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	2010-07-04 22:49:05 UTC (rev 10426)
+++ csw/mgar/gar/v2/lib/python/package_checks.py	2010-07-04 22:57:54 UTC (rev 10427)
@@ -111,28 +111,28 @@
         },
      3: {"name": "i386",
          "type": opencsw.ARCH_i386,
-         "allowed": INTEL_386_PATHS,
-         "disallowed": (),
+         "allowed": BASE_BINARY_PATHS + INTEL_386_PATHS,
+         "disallowed": SPARCV8_PATHS + SPARCV8PLUS_PATHS + SPARCV9_PATHS + AMD64_PATHS,
         },
      6: {"name": "i486",
          "type": opencsw.ARCH_i386,
          "allowed": INTEL_386_PATHS,
-         "disallowed": (),
+         "disallowed": SPARCV8_PATHS + SPARCV8PLUS_PATHS + SPARCV9_PATHS + AMD64_PATHS,
          },
     18: {"name": "sparcv8+",
          "type": opencsw.ARCH_SPARC,
          "allowed": SPARCV8PLUS_PATHS,
-         "disallowed": (),
+         "disallowed": SPARCV8_PATHS + SPARCV9_PATHS + AMD64_PATHS + INTEL_386_PATHS,
         },
     43: {"name": "sparcv9",
          "type": opencsw.ARCH_SPARC,
          "allowed": SPARCV9_PATHS,
-         "disallowed": (),
+         "disallowed": INTEL_386_PATHS + AMD64_PATHS,
         },
     62: {"name": "amd64",
          "type": opencsw.ARCH_i386,
          "allowed": AMD64_PATHS,
-         "disallowed": (),
+         "disallowed": SPARCV8_PATHS + SPARCV8PLUS_PATHS + SPARCV9_PATHS,
         },
 }
 


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 Jul  5 01:55:16 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Sun, 04 Jul 2010 23:55:16 +0000
Subject: [csw-devel] SF.net SVN: gar:[10428]
	csw/mgar/pkg/cswutils/trunk/Makefile
Message-ID: <E1OVZ1o-0005P3-DV@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 10428
          http://gar.svn.sourceforge.net/gar/?rev=10428&view=rev
Author:   bdwalton
Date:     2010-07-04 23:55:15 +0000 (Sun, 04 Jul 2010)

Log Message:
-----------
cswutils: add new dep on CSWpy-hachoir-parser

Modified Paths:
--------------
    csw/mgar/pkg/cswutils/trunk/Makefile

Modified: csw/mgar/pkg/cswutils/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cswutils/trunk/Makefile	2010-07-04 22:57:54 UTC (rev 10427)
+++ csw/mgar/pkg/cswutils/trunk/Makefile	2010-07-04 23:55:15 UTC (rev 10428)
@@ -34,6 +34,7 @@
 RUNTIME_DEP_PKGS += CSWpmlibwww
 RUNTIME_DEP_PKGS += CSWpmyaml
 RUNTIME_DEP_PKGS += CSWpy-libmagic
+RUNTIME_DEP_PKGS += CSWpy-hachoir-parser
 RUNTIME_DEP_PKGS += CSWpython
 
 WORKSRC = $(WORKDIR)


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 Jul  5 02:11:08 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Mon, 05 Jul 2010 00:11:08 +0000
Subject: [csw-devel] SF.net SVN: gar:[10429]
	csw/mgar/pkg/cswutils/trunk/Makefile
Message-ID: <E1OVZHA-0005Ap-F7@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 10429
          http://gar.svn.sourceforge.net/gar/?rev=10429&view=rev
Author:   bdwalton
Date:     2010-07-05 00:11:08 +0000 (Mon, 05 Jul 2010)

Log Message:
-----------
cswutils: new override

Modified Paths:
--------------
    csw/mgar/pkg/cswutils/trunk/Makefile

Modified: csw/mgar/pkg/cswutils/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cswutils/trunk/Makefile	2010-07-04 23:55:15 UTC (rev 10428)
+++ csw/mgar/pkg/cswutils/trunk/Makefile	2010-07-05 00:11:08 UTC (rev 10429)
@@ -55,6 +55,7 @@
 CHECKPKG_OVERRIDES_CSWcswutils += surplus-dependency|CSWpmlibwww
 CHECKPKG_OVERRIDES_CSWcswutils += surplus-dependency|CSWpmyaml
 CHECKPKG_OVERRIDES_CSWcswutils += surplus-dependency|CSWpy-libmagic
+CHECKPKG_OVERRIDES_CSWcswutils += surplus-dependency|CSWpy-hachoir-parser
 CHECKPKG_OVERRIDES_CSWcswutils += pkgname-does-not-start-with-CSWpy-
 CHECKPKG_OVERRIDES_CSWcswutils += catalogname-does-not-start-with-py_
 


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 Jul  5 02:13:00 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Mon, 05 Jul 2010 00:13:00 +0000
Subject: [csw-devel] SF.net SVN: gar:[10430]
	csw/mgar/pkg/cswutils/trunk/Makefile
Message-ID: <E1OVZIy-0005nY-Hl@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 10430
          http://gar.svn.sourceforge.net/gar/?rev=10430&view=rev
Author:   bdwalton
Date:     2010-07-05 00:13:00 +0000 (Mon, 05 Jul 2010)

Log Message:
-----------
cswutils: version bump

Modified Paths:
--------------
    csw/mgar/pkg/cswutils/trunk/Makefile

Modified: csw/mgar/pkg/cswutils/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cswutils/trunk/Makefile	2010-07-05 00:11:08 UTC (rev 10429)
+++ csw/mgar/pkg/cswutils/trunk/Makefile	2010-07-05 00:13:00 UTC (rev 10430)
@@ -1,7 +1,7 @@
 # $Id$
 
 GARNAME = cswutils
-GARVERSION = 1.14.6
+GARVERSION = 1.14.7
 CATEGORIES = utils
 
 DESCRIPTION = Utilities for CSW maintainers


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From wbonnet at users.sourceforge.net  Mon Jul  5 11:28:31 2010
From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net)
Date: Mon, 05 Jul 2010 09:28:31 +0000
Subject: [csw-devel] SF.net SVN: gar:[10431]
	csw/mgar/pkg/dbus/tags/dbus-1.3.1, REV=2010.07.04/
Message-ID: <E1OVhyZ-0008Ki-Cu@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 10431
          http://gar.svn.sourceforge.net/gar/?rev=10431&view=rev
Author:   wbonnet
Date:     2010-07-05 09:28:31 +0000 (Mon, 05 Jul 2010)

Log Message:
-----------
Fix tag

Removed Paths:
-------------
    csw/mgar/pkg/dbus/tags/dbus-1.3.1,REV=2010.07.04/


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From wbonnet at users.sourceforge.net  Mon Jul  5 11:29:13 2010
From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net)
Date: Mon, 05 Jul 2010 09:29:13 +0000
Subject: [csw-devel] SF.net SVN: gar:[10432]
	csw/mgar/pkg/dbus/tags/dbus-1.3.1, REV=2010.07.05/
Message-ID: <E1OVhzF-0008La-FE@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 10432
          http://gar.svn.sourceforge.net/gar/?rev=10432&view=rev
Author:   wbonnet
Date:     2010-07-05 09:29:13 +0000 (Mon, 05 Jul 2010)

Log Message:
-----------
dbus: Tag as release 1.3.1,REV=2010.07.05

Added Paths:
-----------
    csw/mgar/pkg/dbus/tags/dbus-1.3.1,REV=2010.07.05/


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 Jul  5 12:13:27 2010
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Mon, 05 Jul 2010 10:13:27 +0000
Subject: [csw-devel] SF.net SVN: gar:[10433] csw/mgar/gar/v2
Message-ID: <E1OVig3-0000fl-Np@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 10433
          http://gar.svn.sourceforge.net/gar/?rev=10433&view=rev
Author:   wahwah
Date:     2010-07-05 10:13:27 +0000 (Mon, 05 Jul 2010)

Log Message:
-----------
mGAR v2: Refactoring, removing circular dependencies between opencsw.py and checkpkg.py

Modified Paths:
--------------
    csw/mgar/gar/v2/bin/analyze_module_results.py
    csw/mgar/gar/v2/lib/python/checkpkg.py
    csw/mgar/gar/v2/lib/python/checkpkg_test.py
    csw/mgar/gar/v2/lib/python/opencsw.py
    csw/mgar/gar/v2/lib/python/package_checks.py
    csw/mgar/gar/v2/lib/python/package_checks_test.py
    csw/mgar/gar/v2/tests/run_tests.py

Added Paths:
-----------
    csw/mgar/gar/v2/lib/python/configuration.py
    csw/mgar/gar/v2/lib/python/overrides.py
    csw/mgar/gar/v2/lib/python/overrides_test.py
    csw/mgar/gar/v2/lib/python/tag.py
    csw/mgar/gar/v2/lib/python/tag_test.py

Modified: csw/mgar/gar/v2/bin/analyze_module_results.py
===================================================================
--- csw/mgar/gar/v2/bin/analyze_module_results.py	2010-07-05 09:29:13 UTC (rev 10432)
+++ csw/mgar/gar/v2/bin/analyze_module_results.py	2010-07-05 10:13:27 UTC (rev 10433)
@@ -13,6 +13,7 @@
 sys.path.append(os.path.join(*path_list))
 import checkpkg
 import opencsw
+import overrides
 
 def main():
   parser = optparse.OptionParser()
@@ -29,15 +30,15 @@
   for file_name in files:
     full_path = os.path.join(options.extractdir, file_name)
     error_tags.extend(checkpkg.ErrorTagsFromFile(full_path))
-  overrides = reduce(operator.add, overrides_list)
+  override_list = reduce(operator.add, overrides_list)
   (tags_after_overrides,
-   unapplied_overrides) = checkpkg.ApplyOverrides(error_tags, overrides)
+   unapplied_overrides) = overrides.ApplyOverrides(error_tags, override_list)
   exit_code = bool(tags_after_overrides)
   if tags_after_overrides:
     print "If any of the reported errors were false positives, you can"
     print "override them pasting the lines below to the GAR recipe."
-    for tag in tags_after_overrides:
-      print tag.ToGarSyntax()
+    for checkpkg_tag in tags_after_overrides:
+      print checkpkg_tag.ToGarSyntax()
     print "Please note that checkpkg isn't suggesting you should "
     print "use these overrides.  It only informs what the overrides could "
     print "look like.  You need to understand what are the reported issues about"

Modified: csw/mgar/gar/v2/lib/python/checkpkg.py
===================================================================
--- csw/mgar/gar/v2/lib/python/checkpkg.py	2010-07-05 09:29:13 UTC (rev 10432)
+++ csw/mgar/gar/v2/lib/python/checkpkg.py	2010-07-05 10:13:27 UTC (rev 10433)
@@ -26,12 +26,13 @@
 import opencsw
 import package_checks
 import models as m
+import configuration as c
+import tag
 
 DEBUG_BREAK_PKGMAP_AFTER = False
 DB_SCHEMA_VERSION = 3L
 PACKAGE_STATS_VERSION = 6L
 SYSTEM_PKGMAP = "/var/sadm/install/contents"
-WS_RE = re.compile(r"\s+")
 NEEDED_SONAMES = "needed sonames"
 RUNPATH = "runpath"
 SONAME = "soname"
@@ -347,7 +348,7 @@
         continue
       if line.startswith("#"):
         continue
-      fields = re.split(WS_RE, line)
+      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
@@ -373,7 +374,7 @@
     logging.info("All lines of %s were processed.", pkgmap_path)
 
   def _ParsePkginfoLine(self, line):
-    fields = re.split(WS_RE, line)
+    fields = re.split(c.WS_RE, line)
     pkgname = fields[1]
     pkg_desc = u" ".join(fields[2:])
     return pkgname, pkg_desc
@@ -451,7 +452,7 @@
   def _InferPackagesFromPkgmapLine(self, line):
     """A stub of a function, to be enhanced."""
     line = line.strip()
-    parts = re.split(WS_RE, line)
+    parts = re.split(c.WS_RE, line)
     return [parts[-1]]
 
   def GetPathsAndPkgnamesByBasename(self, filename):
@@ -625,7 +626,7 @@
   runpath = []
   rpath = []
   for line in dump_output.splitlines():
-    fields = re.split(WS_RE, line)
+    fields = re.split(c.WS_RE, line)
     # TODO: Make it a unit test
     # logging.debug("%s says: %s", DUMP_BIN, fields)
     if len(fields) < 3:
@@ -648,38 +649,6 @@
   return binary_data
 
 
-class CheckpkgTag(object):
-  """Represents a tag to be written to the checkpkg tag file."""
-
-  def __init__(self, pkgname, tag_name, tag_info=None, severity=None, msg=None):
-    self.pkgname = pkgname
-    self.tag_name = tag_name
-    self.tag_info = tag_info
-    self.severity = severity
-    self.msg = msg
-
-  def __repr__(self):
-    return (u"CheckpkgTag(%s, %s, %s)"
-            % (repr(self.pkgname),
-               repr(self.tag_name),
-               repr(self.tag_info)))
-
-  def ToGarSyntax(self):
-    """Presents the error tag using GAR syntax."""
-    msg_lines = []
-    if self.msg:
-      msg_lines.extend(textwrap(self.msg, 70,
-                                initial_indent="# ",
-                                subsequent_indent="# "))
-    if self.tag_info:
-      tag_postfix = "|%s" % self.tag_info.replace(" ", "|")
-    else:
-      tag_postfix = ""
-    msg_lines.append(u"CHECKPKG_OVERRIDES_%s += %s%s"
-                     % (self.pkgname, self.tag_name, tag_postfix))
-    return "\n".join(msg_lines)
-
-
 class CheckpkgManagerBase(object):
   """Common functions between the older and newer calling functions."""
 
@@ -816,7 +785,7 @@
 class IndividualCheckInterface(CheckInterfaceBase):
   """To be passed to the checking functions.
 
-  Wraps the creation of CheckpkgTag objects.
+  Wraps the creation of tag.CheckpkgTag objects.
   """
 
   def __init__(self, pkgname, system_pkgmap=None):
@@ -825,8 +794,8 @@
     self.errors = []
 
   def ReportError(self, tag_name, tag_info=None, msg=None):
-    tag = CheckpkgTag(self.pkgname, tag_name, tag_info, msg=msg)
-    self.errors.append(tag)
+    checkpkg_tag = tag.CheckpkgTag(self.pkgname, tag_name, tag_info, msg=msg)
+    self.errors.append(checkpkg_tag)
 
 
 class SetCheckInterface(CheckInterfaceBase):
@@ -837,8 +806,8 @@
     self.errors = []
 
   def ReportError(self, pkgname, tag_name, tag_info=None, msg=None):
-    tag = CheckpkgTag(pkgname, tag_name, tag_info, msg=msg)
-    self.errors.append(tag)
+    checkpkg_tag = tag.CheckpkgTag(pkgname, tag_name, tag_info, msg=msg)
+    self.errors.append(checkpkg_tag)
 
 
 class CheckpkgMessenger(object):
@@ -916,95 +885,6 @@
     return super(CheckpkgManager2, self).Run()
 
 
-def ParseTagLine(line):
-  """Parses a line from the tag.${module} file.
-
-  Returns a triplet of pkgname, tagname, tag_info.
-  """
-  level_1 = line.strip().split(":")
-  if len(level_1) > 1:
-    data_1 = ":".join(level_1[1:])
-    pkgname = level_1[0]
-  else:
-    data_1 = level_1[0]
-    pkgname = None
-  level_2 = re.split(WS_RE, data_1.strip())
-  tag_name = level_2[0]
-  if len(level_2) > 1:
-    tag_info = " ".join(level_2[1:])
-  else:
-    tag_info = None
-  return (pkgname, tag_name, tag_info)
-
-
-class Override(object):
-  """Represents an override of a certain checkpkg tag.
-
-  It's similar to checkpkg.CheckpkgTag, but serves a different purpose.
-  """
-
-  def __init__(self, pkgname, tag_name, tag_info):
-    self.pkgname = pkgname
-    self.tag_name = tag_name
-    self.tag_info = tag_info
-
-  def __repr__(self):
-    return (u"Override(%s, %s, %s)"
-            % (repr(self.pkgname), repr(self.tag_name), repr(self.tag_info)))
-
-  def DoesApply(self, tag):
-    """Figures out if this override applies to the given tag."""
-    basket_a = {}
-    basket_b = {}
-    if self.pkgname:
-      basket_a["pkgname"] = self.pkgname
-      basket_b["pkgname"] = tag.pkgname
-    if self.tag_info:
-      basket_a["tag_info"] = self.tag_info
-      basket_b["tag_info"] = tag.tag_info
-    basket_a["tag_name"] = self.tag_name
-    basket_b["tag_name"] = tag.tag_name
-    return basket_a == basket_b
-
-
-def ParseOverrideLine(line):
-  level_1 = line.split(":")
-  if len(level_1) > 1:
-    pkgname = level_1[0]
-    data_1 = ":".join(level_1[1:])
-  else:
-    pkgname = None
-    data_1 = level_1[0]
-  level_2 = re.split(WS_RE, data_1.strip())
-  if len(level_2) > 1:
-    tag_name = level_2[0]
-    tag_info = " ".join(level_2[1:])
-  else:
-    tag_name = level_2[0]
-    tag_info = None
-  return Override(pkgname, tag_name, tag_info)
-
-
-def ApplyOverrides(error_tags, overrides):
-  """Filters out all the error tags that overrides apply to.
-
-  O(N * M), but N and M are always small.
-  """
-  tags_after_overrides = []
-  applied_overrides = set([])
-  provided_overrides = set(copy.copy(overrides))
-  for tag in error_tags:
-    override_applies = False
-    for override in overrides:
-      if override.DoesApply(tag):
-        override_applies = True
-        applied_overrides.add(override)
-    if not override_applies:
-      tags_after_overrides.append(tag)
-  unapplied_overrides = provided_overrides.difference(applied_overrides)
-  return tags_after_overrides, unapplied_overrides
-
-
 def GetIsalist():
   args = ["isalist"]
   isalist_proc = subprocess.Popen(args, stdout=subprocess.PIPE)
@@ -1417,6 +1297,6 @@
   for line in fd:
     if line.startswith("#"):
       continue
-    pkgname, tag_name, tag_info = ParseTagLine(line)
-    error_tags.append(CheckpkgTag(pkgname, tag_name, tag_info))
+    pkgname, tag_name, tag_info = tag.ParseTagLine(line)
+    error_tags.append(tag.CheckpkgTag(pkgname, tag_name, tag_info))
   return error_tags

Modified: csw/mgar/gar/v2/lib/python/checkpkg_test.py
===================================================================
--- csw/mgar/gar/v2/lib/python/checkpkg_test.py	2010-07-05 09:29:13 UTC (rev 10432)
+++ csw/mgar/gar/v2/lib/python/checkpkg_test.py	2010-07-05 10:13:27 UTC (rev 10433)
@@ -6,7 +6,7 @@
 import mox
 import difflib
 import checkpkg
-import opencsw
+import tag
 import testdata.dump_output_1 as dump_1
 import testdata.dump_output_2 as dump_2
 import testdata.dump_output_3 as dump_3
@@ -178,162 +178,6 @@
         checkpkg.ParseDumpOutput(dump_3.DATA_DUMP_OUTPUT))
 
 
-class CheckpkgTagsUnitTest(unittest.TestCase):
-
-  def test_1(self):
-    m = checkpkg.CheckpkgManager2("testname", "/tmp", ["CSWfoo"])
-    tags = {
-        "CSWfoo": [
-          checkpkg.CheckpkgTag("CSWfoo", "foo-tag", "foo-info"),
-        ],
-    }
-    screen_report, tags_report = m.FormatReports(tags, [], [])
-    expected = u'# Tags reported by testname module\nCSWfoo: foo-tag foo-info\n'
-    self.assertEqual(expected, tags_report)
-
-  def test_2(self):
-    m = checkpkg.CheckpkgManager2("testname", "/tmp", ["CSWfoo"])
-    tags = {
-        "CSWfoo": [
-          checkpkg.CheckpkgTag("CSWfoo", "foo-tag", "foo-info"),
-          checkpkg.CheckpkgTag("CSWfoo", "bar-tag", "bar-info"),
-          checkpkg.CheckpkgTag("CSWfoo", "baz-tag"),
-        ],
-    }
-    screen_report, tags_report = m.FormatReports(tags, [], [])
-    expected = (u'# Tags reported by testname module\n'
-                u'CSWfoo: foo-tag foo-info\n'
-                u'CSWfoo: bar-tag bar-info\n'
-                u'CSWfoo: baz-tag\n')
-    self.assertEqual(expected, tags_report)
-
-  def testParseTagLine1(self):
-    line = "foo-tag"
-    self.assertEquals((None, "foo-tag", None), checkpkg.ParseTagLine(line))
-
-  def testParseTagLine2(self):
-    line = "CSWfoo: foo-tag"
-    self.assertEquals(("CSWfoo", "foo-tag", None), checkpkg.ParseTagLine(line))
-
-  def testParseTagLine3(self):
-    line = "CSWfoo: foo-tag foo-info"
-    self.assertEquals(("CSWfoo", "foo-tag", "foo-info"),
-                      checkpkg.ParseTagLine(line))
-
-  def testParseTagLine4(self):
-    line = "CSWfoo: foo-tag foo-info1 foo-info2"
-    self.assertEquals(("CSWfoo", "foo-tag", "foo-info1 foo-info2"),
-                      checkpkg.ParseTagLine(line))
-
-  def testParseTagLine_WithUrl(self):
-    line = "CSWfoo: tag-with-an-url http://www.example.com/"
-    self.assertEquals(("CSWfoo", "tag-with-an-url", "http://www.example.com/"),
-                      checkpkg.ParseTagLine(line))
-
-
-class ParseOverrideLineUnitTest(unittest.TestCase):
-  
-  def setUp(self):
-    line1 = "CSWfoo: foo-override"
-    line2 = "CSWfoo: foo-override foo-info"
-    line3 = "CSWfoo: foo-override foo-info-1 foo-info-2"
-    line4 = ("CSWpmcommonsense: "
-             "pkginfo-description-not-starting-with-uppercase "
-             "common-sense: Some sane defaults for Perl programs")
-    self.o1 = checkpkg.ParseOverrideLine(line1)
-    self.o2 = checkpkg.ParseOverrideLine(line2)
-    self.o3 = checkpkg.ParseOverrideLine(line3)
-    self.o4 = checkpkg.ParseOverrideLine(line4)
-
-  def test_ParseOverridesLine1(self):
-    self.assertEqual("CSWfoo", self.o1.pkgname)
-
-  def test_ParseOverridesLine2(self):
-    self.assertEqual("foo-override", self.o1.tag_name)
-
-  def test_ParseOverridesLine3(self):
-    self.assertEqual(None, self.o1.tag_info)
-
-  def test_ParseOverridesLine4(self):
-    self.assertEqual("foo-info", self.o2.tag_info)
-
-  def test_ParseOverridesLine5(self):
-    self.assertEqual("CSWfoo", self.o3.pkgname)
-
-  def test_ParseOverridesLine6(self):
-    self.assertEqual("foo-override", self.o3.tag_name)
-
-  def test_ParseOverridesLine7(self):
-    self.assertEqual("foo-info-1 foo-info-2", self.o3.tag_info)
-
-  def test_ParseOverridesLine_4_1(self):
-    self.assertEqual("CSWpmcommonsense", self.o4.pkgname)
-
-  def test_ParseOverridesLine_4_2(self):
-    self.assertEqual(
-        "pkginfo-description-not-starting-with-uppercase",
-        self.o4.tag_name)
-
-  def test_ParseOverridesLine_4_3(self):
-    self.assertEqual(
-        "common-sense: Some sane defaults for Perl programs",
-        self.o4.tag_info)
-
-
-class ApplyOverridesUnitTest(unittest.TestCase):
-
-  # This would be better, more terse. But requires metaclasses.
-  DATA_1 = (
-      (None, 'tag1', 'info1', None, 'tag1', 'info1', None),
-  )
-
-  def test_1a(self):
-    """One tag, no overrides."""
-    tags = [checkpkg.CheckpkgTag("CSWfoo", "foo-tag")]
-    overrides = []
-    self.assertEqual((tags, set([])), checkpkg.ApplyOverrides(tags, overrides))
-
-  def test_1b(self):
-    """One override, matching by tag name only."""
-    tags = [checkpkg.CheckpkgTag("CSWfoo", "foo-tag")]
-    overrides = [checkpkg.Override(None, "foo-tag", None)]
-    self.assertEqual(([], set([])), checkpkg.ApplyOverrides(tags, overrides))
-
-  def test_1c(self):
-    """One override, matching by tag name only, no pkgname."""
-    tags = [checkpkg.CheckpkgTag("CSWfoo", "foo-tag")]
-    overrides = [checkpkg.Override(None, "foo-tag", None)]
-    self.assertEqual(([], set([])), checkpkg.ApplyOverrides(tags, overrides))
-
-  def test_2(self):
-    """One override, matching by tag name and tag info, no pkgname."""
-    tags = [checkpkg.CheckpkgTag("CSWfoo", "foo-tag")]
-    overrides = [checkpkg.Override(None, "foo-tag", None)]
-    self.assertEqual(([], set([])), checkpkg.ApplyOverrides(tags, overrides))
-
-  def test_3(self):
-    """One override, matching by tag name, mismatching tag info, no pkgname."""
-    tags = [checkpkg.CheckpkgTag("CSWfoo", "foo-tag", "tag-info-1")]
-    overrides = [checkpkg.Override(None, "foo-tag", "tag-info-2")]
-    self.assertEqual((tags, set(overrides)), checkpkg.ApplyOverrides(tags, overrides))
-
-  def test_4(self):
-    tags = [checkpkg.CheckpkgTag("CSWfoo", "foo-tag", "tag-info-1")]
-    overrides = [checkpkg.Override(None, "foo-tag", "tag-info-1")]
-    self.assertEqual(([], set([])), checkpkg.ApplyOverrides(tags, overrides))
-
-  def test_5(self):
-    tags = [checkpkg.CheckpkgTag("CSWfoo", "foo-tag", "tag-info-1")]
-    overrides = [checkpkg.Override("CSWfoo", "foo-tag", "tag-info-1")]
-    self.assertEqual(([], set([])), checkpkg.ApplyOverrides(tags, overrides))
-
-  def test_6(self):
-    """Pkgname mismatch."""
-    tags = [checkpkg.CheckpkgTag("CSWfoo", "foo-tag", "tag-info-1")]
-    overrides = [checkpkg.Override("CSWbar", "foo-tag", "tag-info-1")]
-    self.assertEqual((tags, set(overrides)), checkpkg.ApplyOverrides(tags, overrides))
-
-
 class SystemPkgmapUnitTest(unittest.TestCase):
 
   def testParsePkginfoLine(self):
@@ -484,5 +328,36 @@
     self.assertEqual(expected, re.match(checkpkg.PSTAMP_RE, pstamp).groupdict())
 
 
+class CheckpkgManager2UnitTest(unittest.TestCase):
+
+  def test_1(self):
+    m = checkpkg.CheckpkgManager2("testname", "/tmp", ["CSWfoo"])
+    tags = {
+        "CSWfoo": [
+          tag.CheckpkgTag("CSWfoo", "foo-tag", "foo-info"),
+        ],
+    }
+    screen_report, tags_report = m.FormatReports(tags, [], [])
+    expected = u'# Tags reported by testname module\nCSWfoo: foo-tag foo-info\n'
+    self.assertEqual(expected, tags_report)
+
+  def test_2(self):
+    m = checkpkg.CheckpkgManager2("testname", "/tmp", ["CSWfoo"])
+    tags = {
+        "CSWfoo": [
+          tag.CheckpkgTag("CSWfoo", "foo-tag", "foo-info"),
+          tag.CheckpkgTag("CSWfoo", "bar-tag", "bar-info"),
+          tag.CheckpkgTag("CSWfoo", "baz-tag"),
+        ],
+    }
+    screen_report, tags_report = m.FormatReports(tags, [], [])
+    expected = (u'# Tags reported by testname module\n'
+                u'CSWfoo: foo-tag foo-info\n'
+                u'CSWfoo: bar-tag bar-info\n'
+                u'CSWfoo: baz-tag\n')
+    self.assertEqual(expected, tags_report)
+
+
+
 if __name__ == '__main__':
   unittest.main()

Added: csw/mgar/gar/v2/lib/python/configuration.py
===================================================================
--- csw/mgar/gar/v2/lib/python/configuration.py	                        (rev 0)
+++ csw/mgar/gar/v2/lib/python/configuration.py	2010-07-05 10:13:27 UTC (rev 10433)
@@ -0,0 +1,7 @@
+# $Id$
+# coding=utf-8
+
+import re
+
+WS_RE = re.compile(r"\s+")
+


Property changes on: csw/mgar/gar/v2/lib/python/configuration.py
___________________________________________________________________
Added: svn:keywords
   + Id

Modified: csw/mgar/gar/v2/lib/python/opencsw.py
===================================================================
--- csw/mgar/gar/v2/lib/python/opencsw.py	2010-07-05 09:29:13 UTC (rev 10432)
+++ csw/mgar/gar/v2/lib/python/opencsw.py	2010-07-05 10:13:27 UTC (rev 10433)
@@ -27,7 +27,8 @@
 import subprocess
 import tempfile
 import urllib2
-import checkpkg
+import overrides
+import configuration as c
 from Cheetah import Template
 
 ARCH_SPARC = "sparc"
@@ -44,7 +45,6 @@
 REVISION_ADDED = "revision number added"
 PKG_URL_TMPL = "http://www.opencsw.org/packages/%s"
 CATALOG_URL = "http://mirror.opencsw.org/opencsw/current/i386/5.10/catalog"
-WS_RE = re.compile(r"\s+")
 BIN_MIMETYPES = (
     'application/x-executable',
     'application/x-sharedlib',
@@ -678,7 +678,7 @@
     A bit hacky.  Looks for the first word of the NAME field in the package.
     """
     pkginfo = self.GetParsedPkginfo()
-    words = re.split(WS_RE, pkginfo["NAME"])
+    words = re.split(c.WS_RE, pkginfo["NAME"])
     return words[0]
 
   def GetParsedPkginfo(self):
@@ -785,7 +785,7 @@
     # It needs to be a list because there might be duplicates and it's
     # necessary to carry that information.
     for line in fd:
-      fields = re.split(WS_RE, line)
+      fields = re.split(c.WS_RE, line)
       if fields[0] == "P":
         pkgname = fields[1]
         pkg_desc = " ".join(fields[1:])
@@ -897,15 +897,15 @@
       return None
 
   def _ParseOverridesStream(self, stream):
-    overrides = []
+    override_list = []
     for line in stream:
       if line.startswith("#"):
         continue
-      overrides.append(checkpkg.ParseOverrideLine(line))
-    return overrides
+      override_list.append(overrides.ParseOverrideLine(line))
+    return override_list
 
   def GetOverrides(self):
-    """Returns overrides, a list of checkpkg.Override instances."""
+    """Returns overrides, a list of overrides.Override instances."""
     stream = self._GetOverridesStream()
     if stream:
       return self._ParseOverridesStream(stream)

Added: csw/mgar/gar/v2/lib/python/overrides.py
===================================================================
--- csw/mgar/gar/v2/lib/python/overrides.py	                        (rev 0)
+++ csw/mgar/gar/v2/lib/python/overrides.py	2010-07-05 10:13:27 UTC (rev 10433)
@@ -0,0 +1,73 @@
+# $Id$
+# coding=utf-8
+
+import copy
+import re
+import configuration as c
+
+def ParseOverrideLine(line):
+  level_1 = line.split(":")
+  if len(level_1) > 1:
+    pkgname = level_1[0]
+    data_1 = ":".join(level_1[1:])
+  else:
+    pkgname = None
+    data_1 = level_1[0]
+  level_2 = re.split(c.WS_RE, data_1.strip())
+  if len(level_2) > 1:
+    tag_name = level_2[0]
+    tag_info = " ".join(level_2[1:])
+  else:
+    tag_name = level_2[0]
+    tag_info = None
+  return Override(pkgname, tag_name, tag_info)
+
+
+class Override(object):
+  """Represents an override of a certain checkpkg tag.
+
+  It's similar to checkpkg.CheckpkgTag, but serves a different purpose.
+  """
+
+  def __init__(self, pkgname, tag_name, tag_info):
+    self.pkgname = pkgname
+    self.tag_name = tag_name
+    self.tag_info = tag_info
+
+  def __repr__(self):
+    return (u"Override(%s, %s, %s)"
+            % (repr(self.pkgname), repr(self.tag_name), repr(self.tag_info)))
+
+  def DoesApply(self, tag):
+    """Figures out if this override applies to the given tag."""
+    basket_a = {}
+    basket_b = {}
+    if self.pkgname:
+      basket_a["pkgname"] = self.pkgname
+      basket_b["pkgname"] = tag.pkgname
+    if self.tag_info:
+      basket_a["tag_info"] = self.tag_info
+      basket_b["tag_info"] = tag.tag_info
+    basket_a["tag_name"] = self.tag_name
+    basket_b["tag_name"] = tag.tag_name
+    return basket_a == basket_b
+
+
+def ApplyOverrides(error_tags, overrides):
+  """Filters out all the error tags that overrides apply to.
+
+  O(N * M), but N and M are always small.
+  """
+  tags_after_overrides = []
+  applied_overrides = set([])
+  provided_overrides = set(copy.copy(overrides))
+  for tag in error_tags:
+    override_applies = False
+    for override in overrides:
+      if override.DoesApply(tag):
+        override_applies = True
+        applied_overrides.add(override)
+    if not override_applies:
+      tags_after_overrides.append(tag)
+  unapplied_overrides = provided_overrides.difference(applied_overrides)
+  return tags_after_overrides, unapplied_overrides


Property changes on: csw/mgar/gar/v2/lib/python/overrides.py
___________________________________________________________________
Added: svn:keywords
   + Id

Added: csw/mgar/gar/v2/lib/python/overrides_test.py
===================================================================
--- csw/mgar/gar/v2/lib/python/overrides_test.py	                        (rev 0)
+++ csw/mgar/gar/v2/lib/python/overrides_test.py	2010-07-05 10:13:27 UTC (rev 10433)
@@ -0,0 +1,113 @@
+# $Id$
+# coding=utf-8
+
+import unittest
+import overrides
+import re
+import tag
+
+class ParseOverrideLineUnitTest(unittest.TestCase):
+
+  def setUp(self):
+    line1 = "CSWfoo: foo-override"
+    line2 = "CSWfoo: foo-override foo-info"
+    line3 = "CSWfoo: foo-override foo-info-1 foo-info-2"
+    line4 = ("CSWpmcommonsense: "
+             "pkginfo-description-not-starting-with-uppercase "
+             "common-sense: Some sane defaults for Perl programs")
+    self.o1 = overrides.ParseOverrideLine(line1)
+    self.o2 = overrides.ParseOverrideLine(line2)
+    self.o3 = overrides.ParseOverrideLine(line3)
+    self.o4 = overrides.ParseOverrideLine(line4)
+
+  def test_ParseOverridesLine1(self):
+    self.assertEqual("CSWfoo", self.o1.pkgname)
+
+  def test_ParseOverridesLine2(self):
+    self.assertEqual("foo-override", self.o1.tag_name)
+
+  def test_ParseOverridesLine3(self):
+    self.assertEqual(None, self.o1.tag_info)
+
+  def test_ParseOverridesLine4(self):
+    self.assertEqual("foo-info", self.o2.tag_info)
+
+  def test_ParseOverridesLine5(self):
+    self.assertEqual("CSWfoo", self.o3.pkgname)
+
+  def test_ParseOverridesLine6(self):
+    self.assertEqual("foo-override", self.o3.tag_name)
+
+  def test_ParseOverridesLine7(self):
+    self.assertEqual("foo-info-1 foo-info-2", self.o3.tag_info)
+
+  def test_ParseOverridesLine_4_1(self):
+    self.assertEqual("CSWpmcommonsense", self.o4.pkgname)
+
+  def test_ParseOverridesLine_4_2(self):
+    self.assertEqual(
+        "pkginfo-description-not-starting-with-uppercase",
+        self.o4.tag_name)
+
+  def test_ParseOverridesLine_4_3(self):
+    self.assertEqual(
+        "common-sense: Some sane defaults for Perl programs",
+        self.o4.tag_info)
+
+
+class ApplyOverridesUnitTest(unittest.TestCase):
+
+  # This would be better, more terse. But requires metaclasses.
+  DATA_1 = (
+      (None, 'tag1', 'info1', None, 'tag1', 'info1', None),
+  )
+
+  def test_1a(self):
+    """One tag, no overrides."""
+    tags = [tag.CheckpkgTag("CSWfoo", "foo-tag")]
+    oo = []
+    self.assertEqual((tags, set([])), overrides.ApplyOverrides(tags, oo))
+
+  def test_1b(self):
+    """One override, matching by tag name only."""
+    tags = [tag.CheckpkgTag("CSWfoo", "foo-tag")]
+    oo = [overrides.Override(None, "foo-tag", None)]
+    self.assertEqual(([], set([])), overrides.ApplyOverrides(tags, oo))
+
+  def test_1c(self):
+    """One override, matching by tag name only, no pkgname."""
+    tags = [tag.CheckpkgTag("CSWfoo", "foo-tag")]
+    oo = [overrides.Override(None, "foo-tag", None)]
+    self.assertEqual(([], set([])), overrides.ApplyOverrides(tags, oo))
+
+  def test_2(self):
+    """One override, matching by tag name and tag info, no pkgname."""
+    tags = [tag.CheckpkgTag("CSWfoo", "foo-tag")]
+    oo = [overrides.Override(None, "foo-tag", None)]
+    self.assertEqual(([], set([])), overrides.ApplyOverrides(tags, oo))
+
+  def test_3(self):
+    """One override, matching by tag name, mismatching tag info, no pkgname."""
+    tags = [tag.CheckpkgTag("CSWfoo", "foo-tag", "tag-info-1")]
+    oo = [overrides.Override(None, "foo-tag", "tag-info-2")]
+    self.assertEqual((tags, set(oo)), overrides.ApplyOverrides(tags, oo))
+
+  def test_4(self):
+    tags = [tag.CheckpkgTag("CSWfoo", "foo-tag", "tag-info-1")]
+    oo = [overrides.Override(None, "foo-tag", "tag-info-1")]
+    self.assertEqual(([], set([])), overrides.ApplyOverrides(tags, oo))
+
+  def test_5(self):
+    tags = [tag.CheckpkgTag("CSWfoo", "foo-tag", "tag-info-1")]
+    oo = [overrides.Override("CSWfoo", "foo-tag", "tag-info-1")]
+    self.assertEqual(([], set([])), overrides.ApplyOverrides(tags, oo))
+
+  def test_6(self):
+    """Pkgname mismatch."""
+    tags = [tag.CheckpkgTag("CSWfoo", "foo-tag", "tag-info-1")]
+    oo = [overrides.Override("CSWbar", "foo-tag", "tag-info-1")]
+    self.assertEqual((tags, set(oo)), overrides.ApplyOverrides(tags, oo))
+
+
+if __name__ == '__main__':
+  unittest.main()


Property changes on: csw/mgar/gar/v2/lib/python/overrides_test.py
___________________________________________________________________
Added: svn:keywords
   + Id

Modified: csw/mgar/gar/v2/lib/python/package_checks.py
===================================================================
--- csw/mgar/gar/v2/lib/python/package_checks.py	2010-07-05 09:29:13 UTC (rev 10432)
+++ csw/mgar/gar/v2/lib/python/package_checks.py	2010-07-05 10:13:27 UTC (rev 10433)
@@ -19,6 +19,7 @@
 import pprint
 import textwrap
 import dependency_checks as depchecks
+import configuration as c
 from Cheetah import Template
 
 PATHS_ALLOWED_ONLY_IN = {
@@ -214,7 +215,7 @@
 
 
 def CheckVendorURL(pkg_data, error_mgr, logger, messenger):
-  vendorurl = opencsw.WS_RE.split(pkg_data["pkginfo"]["VENDOR"])[0]
+  vendorurl = c.WS_RE.split(pkg_data["pkginfo"]["VENDOR"])[0]
   if not re.match(VENDORURL_RE, vendorurl):
     error_mgr.ReportError("pkginfo-bad-vendorurl", vendorurl,
                           "Solution: add VENDOR_URL to GAR Recipe")
@@ -376,7 +377,7 @@
   pkgmap = pkg_data["pkgmap"]
   if "CLASSES" not in pkginfo:
     return
-  pkginfo_classes = set(re.split(opencsw.WS_RE, pkginfo["CLASSES"]))
+  pkginfo_classes = set(re.split(c.WS_RE, pkginfo["CLASSES"]))
   pkgmap_classes = set()
   for entry in pkgmap:
     if entry["class"]:  # might be None

Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py
===================================================================
--- csw/mgar/gar/v2/lib/python/package_checks_test.py	2010-07-05 09:29:13 UTC (rev 10432)
+++ csw/mgar/gar/v2/lib/python/package_checks_test.py	2010-07-05 10:13:27 UTC (rev 10433)
@@ -719,7 +719,7 @@
         'mime_type': 'application/x-sharedlib; charset=binary',
         'path': 'opt/csw/lib/sparcv9/foo/subdir/libfoo.so.1'}]
     self.error_mgr_mock.ReportError(
-        'binary-wrong-wrong-placement',
+        'binary-disallowed-placement',
         'file=opt/csw/lib/sparcv9/foo/subdir/libfoo.so.1 '
         'arch_id=2 arch_name=sparcv8 bad_path=sparcv9')
 

Added: csw/mgar/gar/v2/lib/python/tag.py
===================================================================
--- csw/mgar/gar/v2/lib/python/tag.py	                        (rev 0)
+++ csw/mgar/gar/v2/lib/python/tag.py	2010-07-05 10:13:27 UTC (rev 10433)
@@ -0,0 +1,57 @@
+# $Id$
+# coding=utf-8
+
+import re
+import configuration as c
+
+class CheckpkgTag(object):
+  """Represents a tag to be written to the checkpkg tag file."""
+
+  def __init__(self, pkgname, tag_name, tag_info=None, severity=None, msg=None):
+    self.pkgname = pkgname
+    self.tag_name = tag_name
+    self.tag_info = tag_info
+    self.severity = severity
+    self.msg = msg
+
+  def __repr__(self):
+    return (u"CheckpkgTag(%s, %s, %s)"
+            % (repr(self.pkgname),
+               repr(self.tag_name),
+               repr(self.tag_info)))
+
+  def ToGarSyntax(self):
+    """Presents the error tag using GAR syntax."""
+    msg_lines = []
+    if self.msg:
+      msg_lines.extend(textwrap(self.msg, 70,
+                                initial_indent="# ",
+                                subsequent_indent="# "))
+    if self.tag_info:
+      tag_postfix = "|%s" % self.tag_info.replace(" ", "|")
+    else:
+      tag_postfix = ""
+    msg_lines.append(u"CHECKPKG_OVERRIDES_%s += %s%s"
+                     % (self.pkgname, self.tag_name, tag_postfix))
+    return "\n".join(msg_lines)
+
+
+def ParseTagLine(line):
+  """Parses a line from the tag.${module} file.
+
+  Returns a triplet of pkgname, tagname, tag_info.
+  """
+  level_1 = line.strip().split(":")
+  if len(level_1) > 1:
+    data_1 = ":".join(level_1[1:])
+    pkgname = level_1[0]
+  else:
+    data_1 = level_1[0]
+    pkgname = None
+  level_2 = re.split(c.WS_RE, data_1.strip())
+  tag_name = level_2[0]
+  if len(level_2) > 1:
+    tag_info = " ".join(level_2[1:])
+  else:
+    tag_info = None
+  return (pkgname, tag_name, tag_info)


Property changes on: csw/mgar/gar/v2/lib/python/tag.py
___________________________________________________________________
Added: svn:keywords
   + Id

Added: csw/mgar/gar/v2/lib/python/tag_test.py
===================================================================
--- csw/mgar/gar/v2/lib/python/tag_test.py	                        (rev 0)
+++ csw/mgar/gar/v2/lib/python/tag_test.py	2010-07-05 10:13:27 UTC (rev 10433)
@@ -0,0 +1,50 @@
+# $Id$
+# coding=utf-8
+
+import unittest
+import tag
+
+
+class CheckpkgTagUnitTest(unittest.TestCase):
+
+  def testToGarSyntaxNoParam(self):
+    t = tag.CheckpkgTag("CSWfoo", "bar")
+    self.assertEquals(u'CHECKPKG_OVERRIDES_CSWfoo += bar', t.ToGarSyntax())
+
+  def testToGarSyntaxWithParam(self):
+    t = tag.CheckpkgTag("CSWfoo", "bar", "parameter")
+    self.assertEquals(u'CHECKPKG_OVERRIDES_CSWfoo += bar|parameter', t.ToGarSyntax())
+
+  def testToGarSyntaxWithParamWithSpacees(self):
+    t = tag.CheckpkgTag("CSWfoo", "bar", "a b c")
+    self.assertEquals(u'CHECKPKG_OVERRIDES_CSWfoo += bar|a|b|c', t.ToGarSyntax())
+
+
+class ParseTagLineUnitTest(unittest.TestCase):
+
+  def testParseTagLine1(self):
+    line = "foo-tag"
+    self.assertEquals((None, "foo-tag", None), tag.ParseTagLine(line))
+
+  def testParseTagLine2(self):
+    line = "CSWfoo: foo-tag"
+    self.assertEquals(("CSWfoo", "foo-tag", None), tag.ParseTagLine(line))
+
+  def testParseTagLine3(self):
+    line = "CSWfoo: foo-tag foo-info"
+    self.assertEquals(("CSWfoo", "foo-tag", "foo-info"),
+                      tag.ParseTagLine(line))
+
+  def testParseTagLine4(self):
+    line = "CSWfoo: foo-tag foo-info1 foo-info2"
+    self.assertEquals(("CSWfoo", "foo-tag", "foo-info1 foo-info2"),
+                      tag.ParseTagLine(line))
+
+  def testParseTagLine_WithUrl(self):
+    line = "CSWfoo: tag-with-an-url http://www.example.com/"
+    self.assertEquals(("CSWfoo", "tag-with-an-url", "http://www.example.com/"),
+                      tag.ParseTagLine(line))
+
+
+if __name__ == '__main__':
+  unittest.main()


Property changes on: csw/mgar/gar/v2/lib/python/tag_test.py
___________________________________________________________________
Added: svn:keywords
   + Id

Modified: csw/mgar/gar/v2/tests/run_tests.py
===================================================================
--- csw/mgar/gar/v2/tests/run_tests.py	2010-07-05 09:29:13 UTC (rev 10432)
+++ csw/mgar/gar/v2/tests/run_tests.py	2010-07-05 10:13:27 UTC (rev 10433)
@@ -14,6 +14,7 @@
 from example_test            import *
 from opencsw_test            import *
 from overrides_test          import *
+from tag_test                import *
 from package_checks_test     import *
 
 if __name__ == '__main__':


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From wahwah at users.sourceforge.net  Mon Jul  5 16:12:49 2010
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Mon, 05 Jul 2010 14:12:49 +0000
Subject: [csw-devel] SF.net SVN: gar:[10434] csw/mgar/gar/v2-sqlite/
Message-ID: <E1OVmPh-0006Ib-2D@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 10434
          http://gar.svn.sourceforge.net/gar/?rev=10434&view=rev
Author:   wahwah
Date:     2010-07-05 14:12:48 +0000 (Mon, 05 Jul 2010)

Log Message:
-----------
Starting a branch for sqlite stats storage backend.

Added Paths:
-----------
    csw/mgar/gar/v2-sqlite/


Property changes on: csw/mgar/gar/v2-sqlite
___________________________________________________________________
Added: 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-stats:8454-8649
/csw/mgar/gar/v2-collapsed-modulations:6895
/csw/mgar/gar/v2-dirpackage:8125-8180
/csw/mgar/gar/v2-migrateconf:7082-7211
/csw/mgar/gar/v2-skayser:6087-6132


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 Jul  5 16:14:07 2010
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Mon, 05 Jul 2010 14:14:07 +0000
Subject: [csw-devel] SF.net SVN: gar:[10435] csw/mgar/gar/v2-sqlite
Message-ID: <E1OVmQx-0006K9-EL@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 10435
          http://gar.svn.sourceforge.net/gar/?rev=10435&view=rev
Author:   wahwah
Date:     2010-07-05 14:14:07 +0000 (Mon, 05 Jul 2010)

Log Message:
-----------
mGAR v2-sqlite: First working version, needs more performance tweaks.

Modified Paths:
--------------
    csw/mgar/gar/v2-sqlite/bin/checkpkg_collect_stats.py
    csw/mgar/gar/v2-sqlite/lib/python/checkpkg.py
    csw/mgar/gar/v2-sqlite/lib/python/models.py
    csw/mgar/gar/v2-sqlite/lib/python/overrides.py

Modified: csw/mgar/gar/v2-sqlite/bin/checkpkg_collect_stats.py
===================================================================
--- csw/mgar/gar/v2-sqlite/bin/checkpkg_collect_stats.py	2010-07-05 14:12:48 UTC (rev 10434)
+++ csw/mgar/gar/v2-sqlite/bin/checkpkg_collect_stats.py	2010-07-05 14:14:07 UTC (rev 10435)
@@ -39,7 +39,7 @@
   args_display = args
   if len(args_display) > 5:
     args_display = args_display[:5] + ["...more..."]
-  logging.debug("Calling: %s, please be patient", args_display)
+  logging.debug("Processing: %s, please be patient", args_display)
   packages = [opencsw.CswSrv4File(x, options.debug) for x in args]
   if options.catalog_file:
     # Using cached md5sums to save time: injecting md5sums

Modified: csw/mgar/gar/v2-sqlite/lib/python/checkpkg.py
===================================================================
--- csw/mgar/gar/v2-sqlite/lib/python/checkpkg.py	2010-07-05 14:12:48 UTC (rev 10434)
+++ csw/mgar/gar/v2-sqlite/lib/python/checkpkg.py	2010-07-05 14:14:07 UTC (rev 10435)
@@ -24,13 +24,14 @@
 import yaml
 from Cheetah import Template
 import opencsw
+import overrides
 import package_checks
 import models as m
 import configuration as c
 import tag
 
 DEBUG_BREAK_PKGMAP_AFTER = False
-DB_SCHEMA_VERSION = 3L
+DB_SCHEMA_VERSION = 4L
 PACKAGE_STATS_VERSION = 6L
 SYSTEM_PKGMAP = "/var/sadm/install/contents"
 NEEDED_SONAMES = "needed sonames"
@@ -204,22 +205,48 @@
     return None
 
 
-class SystemPkgmap(object):
-  """A class to hold and manipulate the /var/sadm/install/contents file."""
+class DatabaseClient(object):
 
-  STOP_PKGS = ["SUNWbcp", "SUNWowbcp", "SUNWucb"]
   CHECKPKG_DIR = ".checkpkg"
   SQLITE3_DBNAME_TMPL = "var-sadm-install-contents-cache-%s"
+  TABLES = (m.CswConfig,
+            m.CswFile,
+            m.CswPackage,
+            m.Srv4FileStats)
 
+  def __init__(self, debug=False):
+    self.fqdn = socket.getfqdn()
+    self.checkpkg_dir = os.path.join(os.environ["HOME"], self.CHECKPKG_DIR)
+    self.db_path = os.path.join(self.checkpkg_dir,
+                                self.SQLITE3_DBNAME_TMPL % self.fqdn)
+    self.debug = debug
+
+  def InitializeSqlobject(self):
+    logging.debug("Connecting to the %s database.", self.db_path)
+    self.sqo_conn = sqlobject.connectionForURI(
+        'sqlite:%s' % self.db_path, debug=(self.debug and False))
+    sqlobject.sqlhub.processConnection = self.sqo_conn
+
+  def CreateTables(self):
+    for table in self.TABLES:
+      table.createTable(ifNotExists=True)
+
+  def IsDatabaseGoodSchema(self):
+    good_version = self.GetDatabaseSchemaVersion() >= DB_SCHEMA_VERSION
+    return good_version
+
+
+class SystemPkgmap(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.checkpkg_dir = os.path.join(os.environ["HOME"], self.CHECKPKG_DIR)
-    self.fqdn = socket.getfqdn()
-    self.db_path = os.path.join(self.checkpkg_dir,
-                                self.SQLITE3_DBNAME_TMPL % self.fqdn)
     self.file_mtime = None
     self.cache_mtime = None
     self.initialized = False
@@ -227,25 +254,11 @@
       self.system_pkgmap_files = [SYSTEM_PKGMAP]
     else:
       self.system_pkgmap_files = system_pkgmap_files
-    self.debug = debug
 
   def _LazyInitializeDatabase(self):
     if not self.initialized:
       self.InitializeDatabase()
 
-  def InitializeSqlobject(self):
-    if True:
-      logging.debug("Connecting to the %s database.", self.db_path)
-      self.sqo_conn = sqlobject.connectionForURI(
-          'sqlite:%s' % self.db_path, debug=(self.debug and False))
-    else:
-      # TODO: Use a configuration file to store the credentials
-      logging.debug("Connecting MySQL.")
-      self.sqo_conn = sqlobject.connectionForURI(
-          'mysql://checkpkg:Nid3owlOn at mysql/checkpkg',
-          debug=(self.debug and False))
-    sqlobject.sqlhub.processConnection = self.sqo_conn
-
   def InitializeRawDb(self):
     """It's necessary for low level operations."""
     if True:
@@ -277,11 +290,6 @@
       self.PopulateDatabase()
     self.initialized = True
 
-  def CreateTables(self):
-    m.CswConfig.createTable(ifNotExists=True)
-    m.CswPackage.createTable(ifNotExists=True)
-    m.CswFile.createTable(ifNotExists=True)
-
   def PopulateDatabase(self):
     """Imports data into the database.
 
@@ -496,10 +504,6 @@
       schema_on_disk = res.getOne().int_value
     return schema_on_disk
 
-  def IsDatabaseGoodSchema(self):
-    good_version = self.GetDatabaseSchemaVersion() >= DB_SCHEMA_VERSION
-    return good_version
-
   def IsDatabaseUpToDate(self):
     f_mtime = self.GetFileMtime()
     d_mtime = self.GetDatabaseMtime()
@@ -516,24 +520,14 @@
                   repr(good_version), repr(fresh))
     return fresh and good_version
 
-  def SoftDropTable(self, tablename):
-    c = self.conn.cursor()
-    try:
-      # This doesn't accept placeholders.
-      c.execute("DROP TABLE %s;" % tablename)
-    except sqlite3.OperationalError, e:
-      logging.warn("sqlite3.OperationalError: %s", e)
-
   def PurgeDatabase(self, drop_tables=False):
     if drop_tables:
-      # for table_name in ("config", "systempkgmap", "packages"):
-      #   self.SoftDropTable(table_name)
-      for table in (m.CswConfig, m.CswFile, m.CswPackage):
+      for table in self.TABLES:
         if table.tableExists():
           table.dropTable()
     else:
-      logging.info("Deleting all rows from the cache database")
-      for table in (m.CswConfig, m.CswFile, m.CswPackage):
+      logging.info("Truncating all tables")
+      for table in self.TABLES:
         table.clearTable()
 
   def GetInstalledPackages(self):
@@ -896,8 +890,13 @@
   return isalist
 
 
-class PackageStats(object):
-  """Collects stats about a package and saves it."""
+class PackageStats(DatabaseClient):
+  """Collects stats about a package and saves it.
+
+  TODO: Maintain a global database connection instead of creating one for each
+  instantiated object.
+  TODO: Store overrides in a separate table for performance.
+  """
   # This list needs to be synchronized with the CollectStats() method.
   STAT_FILES = [
       "bad_paths",
@@ -917,7 +916,8 @@
       "files_metadata",
   ]
 
-  def __init__(self, srv4_pkg, stats_basedir=None, md5sum=None):
+  def __init__(self, srv4_pkg, stats_basedir=None, md5sum=None, debug=False):
+    super(PackageStats, self).__init__(debug=debug)
     self.srv4_pkg = srv4_pkg
     self.md5sum = md5sum
     self.dir_format_pkg = None
@@ -928,6 +928,7 @@
       home = os.environ["HOME"]
       parts = [home, ".checkpkg", "stats"]
       self.stats_basedir = os.path.join(*parts)
+    self.InitializeSqlobject()
 
   def GetPkgchkData(self):
     ret, stdout, stderr = self.srv4_pkg.GetPkgchkOutput()
@@ -957,14 +958,18 @@
     Returns:
       bool
     """
-    if not self.StatsDirExists():
-      return False
     # More checks can be added in the future.
-    return True
+    md5_sum = self.GetMd5sum()
+    logging.debug("StatsExist() md5_sum=%s", md5_sum)
+    res = m.Srv4FileStats.select(m.Srv4FileStats.q.md5_sum==md5_sum)
+    if not res.count():
+      logging.debug("%s are not in the db", md5_sum)
+      return False
+    else:
+      logging.debug("%s are in the db", md5_sum)
+      pkg_stats = res.getOne()
+      return pkg_stats.stats_version == PACKAGE_STATS_VERSION
 
-  def StatsDirExists(self):
-    return os.path.isdir(self.GetStatsPath())
-
   def GetDirFormatPkg(self):
     if not self.dir_format_pkg:
       self.dir_format_pkg = self.srv4_pkg.GetDirFormatPkg()
@@ -1114,21 +1119,11 @@
 
   def CollectStats(self, force=False):
     """Lazy stats collection."""
-    if not self.StatsDirExists() or force:
-      self._CollectStats()
-      return
-    for stats_name in self.STAT_FILES + ["basic_stats"]:
-      file_name = in_file_name_pickle = os.path.join(
-          self.GetStatsPath(), "%s.pickle" % stats_name)
-      if not os.path.exists(file_name):
-        self._CollectStats()
-        return
-    f = open(file_name, "r")
-    obj = cPickle.load(f)
-    f.close()
-    saved_version = obj["stats_version"]
-    if saved_version < PACKAGE_STATS_VERSION:
-      self._CollectStats()
+    if force:
+      return self._CollectStats()
+    if not self.StatsExist():
+      return self._CollectStats()
+    return self.ReadSavedStats()
 
   def _CollectStats(self):
     """The list of variables needs to be synchronized with the one
@@ -1142,41 +1137,50 @@
     self.MakeStatsDir()
     dir_pkg = self.GetDirFormatPkg()
     logging.info("Collecting %s package statistics.", repr(dir_pkg.pkgname))
-    self.DumpObject(dir_pkg.ListBinaries(), "binaries")
-    self.DumpObject(self.GetBinaryDumpInfo(), "binaries_dump_info")
-    self.DumpObject(dir_pkg.GetDependencies(), "depends")
-    self.DumpObject(GetIsalist(), "isalist")
-    self.DumpObject(self.GetOverrides(), "overrides")
-    self.DumpObject(self.GetPkgchkData(), "pkgchk")
-    self.DumpObject(dir_pkg.GetParsedPkginfo(), "pkginfo")
-    self.DumpObject(dir_pkg.GetPkgmap().entries, "pkgmap")
+    pkg_stats = {
+        "binaries": dir_pkg.ListBinaries(),
+        "binaries_dump_info": self.GetBinaryDumpInfo(),
+        "depends": dir_pkg.GetDependencies(),
+        "isalist": GetIsalist(),
+        "overrides": self.GetOverrides(),
+        "pkgchk": self.GetPkgchkData(),
+        "pkginfo": dir_pkg.GetParsedPkginfo(),
+        "pkgmap": dir_pkg.GetPkgmap().entries,
+        "bad_paths": dir_pkg.GetFilesContaining(BAD_CONTENT_REGEXES),
+        "basic_stats": self.GetBasicStats(),
+        "files_metadata": dir_pkg.GetFilesMetadata(),
+    }
+    db_pkg_stats = m.Srv4FileStats(md5_sum=self.GetMd5sum(),
+                                   pkgname=pkg_stats["basic_stats"]["pkgname"],
+                                   stats_version=PACKAGE_STATS_VERSION,
+                                   data=cPickle.dumps(pkg_stats))
     # The ldd -r reporting breaks on bigger packages during yaml saving.
     # It might work when yaml is disabled
     # self.DumpObject(self.GetLddMinusRlines(), "ldd_dash_r")
     # This check is currently disabled, let's save time by not collecting
     # these data.
     # self.DumpObject(self.GetDefinedSymbols(), "defined_symbols")
-    self.DumpObject(dir_pkg.GetFilesContaining(BAD_CONTENT_REGEXES), "bad_paths")
     # This one should be last, so that if the collection is interrupted
     # in one of the previous runs, the basic_stats.pickle file is not there
     # or not updated, and the collection is started again.
-    self.DumpObject(self.GetBasicStats(), "basic_stats")
-    self.DumpObject(dir_pkg.GetFilesMetadata(), "files_metadata")
+
     logging.debug("Statistics of %s have been collected.", repr(dir_pkg.pkgname))
+    return pkg_stats
 
   def GetAllStats(self):
-    if self.StatsExist():
+    logging.debug("GetAllStats()")
+    if not self.all_stats and self.StatsExist():
       self.all_stats = self.ReadSavedStats()
-    else:
-      self.CollectStats()
+    elif not self.all_stats:
+      self.all_stats = self.CollectStats()
     return self.all_stats
 
   def GetSavedOverrides(self):
     if not self.StatsExist():
       raise PackageError("Package stats not ready.")
-    override_stats = self.ReadObject("overrides")
-    overrides = [Override(**x) for x in override_stats]
-    return overrides
+    override_stats = self.GetAllStats()["overrides"]
+    override_list = [overrides.Override(**x) for x in override_stats]
+    return override_list
 
   def DumpObject(self, obj, name):
     """Saves an object."""
@@ -1196,35 +1200,18 @@
     f.close()
     self.all_stats[name] = obj
 
-  def ReadObject(self, name):
-    """Reads an object."""
-    stats_path = self.GetStatsPath()
-    in_file_name = os.path.join(stats_path, "%s.yml" % name)
-    in_file_name_pickle = os.path.join(stats_path, "%s.pickle" % name)
-    if os.path.exists(in_file_name_pickle):
-      f = open(in_file_name_pickle, "r")
-      obj = cPickle.load(f)
-      f.close()
-    elif os.path.exists(in_file_name):
-      f = open(in_file_name, "r")
-      obj = yaml.safe_load(f)
-      f.close()
-    else:
-      raise PackageError("Can't read %s nor %s."
-                         % (in_file_name, in_file_name_pickle))
-    return obj
-
   def ReadSavedStats(self):
-    all_stats = {}
-    for name in self.STAT_FILES:
-      all_stats[name] = self.ReadObject(name)
-    return all_stats
+    md5_sum = self.GetMd5sum()
+    res = m.Srv4FileStats.select(m.Srv4FileStats.q.md5_sum==md5_sum)
+    return cPickle.loads(str(res.getOne().data))
 
   def _ParseLddDashRline(self, line):
     found_re = r"^\t(?P<soname>\S+)\s+=>\s+(?P<path_found>\S+)"
-    symbol_not_found_re = r"^\tsymbol not found:\s(?P<symbol>\S+)\s+\((?P<path_not_found>\S+)\)"
+    symbol_not_found_re = (r"^\tsymbol not found:\s(?P<symbol>\S+)\s+"
+                           r"\((?P<path_not_found>\S+)\)")
     only_so = r"^\t(?P<path_only>\S+)$"
-    version_so = r'^\t(?P<soname_version_not_found>\S+) \((?P<lib_name>\S+)\) =>\t \(version not found\)'
+    version_so = (r'^\t(?P<soname_version_not_found>\S+) '
+                  r'\((?P<lib_name>\S+)\) =>\t \(version not found\)')
     stv_protected = (r'^\trelocation \S+ symbol: (?P<relocation_symbol>\S+): '
                      r'file (?P<relocation_path>\S+): '
                      r'relocation bound to a symbol with STV_PROTECTED visibility$')

Modified: csw/mgar/gar/v2-sqlite/lib/python/models.py
===================================================================
--- csw/mgar/gar/v2-sqlite/lib/python/models.py	2010-07-05 14:12:48 UTC (rev 10434)
+++ csw/mgar/gar/v2-sqlite/lib/python/models.py	2010-07-05 14:14:07 UTC (rev 10435)
@@ -40,3 +40,9 @@
   path = sqlobject.UnicodeCol(notNone=True)
   line = sqlobject.UnicodeCol(notNone=True)
   basename_idx = sqlobject.DatabaseIndex('basename')
+
+class Srv4FileStats(sqlobject.SQLObject):
+  md5_sum = sqlobject.UnicodeCol(notNone=True, unique=True)
+  pkgname = sqlobject.UnicodeCol(length=255, notNone=True)
+  stats_version = sqlobject.IntCol(notNone=True)
+  data = sqlobject.UnicodeCol(notNone=True)

Modified: csw/mgar/gar/v2-sqlite/lib/python/overrides.py
===================================================================
--- csw/mgar/gar/v2-sqlite/lib/python/overrides.py	2010-07-05 14:12:48 UTC (rev 10434)
+++ csw/mgar/gar/v2-sqlite/lib/python/overrides.py	2010-07-05 14:14:07 UTC (rev 10435)
@@ -53,17 +53,17 @@
     return basket_a == basket_b
 
 
-def ApplyOverrides(error_tags, overrides):
+def ApplyOverrides(error_tags, override_list):
   """Filters out all the error tags that overrides apply to.
 
   O(N * M), but N and M are always small.
   """
   tags_after_overrides = []
   applied_overrides = set([])
-  provided_overrides = set(copy.copy(overrides))
+  provided_overrides = set(copy.copy(override_list))
   for tag in error_tags:
     override_applies = False
-    for override in overrides:
+    for override in override_list:
       if override.DoesApply(tag):
         override_applies = True
         applied_overrides.add(override)


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 Jul  5 18:11:37 2010
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Mon, 05 Jul 2010 16:11:37 +0000
Subject: [csw-devel] SF.net SVN: gar:[10436]
	csw/mgar/gar/v2/lib/python/opencsw.py
Message-ID: <E1OVoGf-0004ne-Tb@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 10436
          http://gar.svn.sourceforge.net/gar/?rev=10436&view=rev
Author:   wahwah
Date:     2010-07-05 16:11:37 +0000 (Mon, 05 Jul 2010)

Log Message:
-----------
mGAR v2: checkpkg, suppressing unhelpful hachoir warnings.

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	2010-07-05 14:14:07 UTC (rev 10435)
+++ csw/mgar/gar/v2/lib/python/opencsw.py	2010-07-05 16:11:37 UTC (rev 10436)
@@ -16,7 +16,6 @@
 import datetime
 import difflib
 import hachoir_parser as hp
-import hachoir_core as hc
 import hashlib
 import magic
 import logging
@@ -31,6 +30,11 @@
 import configuration as c
 from Cheetah import Template
 
+# Suppress unhelpful warnings
+# http://bitbucket.org/haypo/hachoir/issue/23
+import hachoir_core.config
+hachoir_core.config.quiet = True
+
 ARCH_SPARC = "sparc"
 ARCH_i386 = "i386"
 ARCH_ALL = "all"


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 Jul  5 18:33:22 2010
From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net)
Date: Mon, 05 Jul 2010 16:33:22 +0000
Subject: [csw-devel] SF.net SVN: gar:[10437]
	csw/mgar/pkg/miltergreylist/trunk
Message-ID: <E1OVobi-0006wq-Vm@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 10437
          http://gar.svn.sourceforge.net/gar/?rev=10437&view=rev
Author:   bonivart
Date:     2010-07-05 16:33:22 +0000 (Mon, 05 Jul 2010)

Log Message:
-----------
miltergreylist: patch for conf file, add post msg

Modified Paths:
--------------
    csw/mgar/pkg/miltergreylist/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/miltergreylist/trunk/files/0001-Path-and-user-changes-in-conf-file.patch

Modified: csw/mgar/pkg/miltergreylist/trunk/Makefile
===================================================================
--- csw/mgar/pkg/miltergreylist/trunk/Makefile	2010-07-05 16:11:37 UTC (rev 10436)
+++ csw/mgar/pkg/miltergreylist/trunk/Makefile	2010-07-05 16:33:22 UTC (rev 10437)
@@ -36,9 +36,10 @@
 
 TEST_SCRIPTS = 
 INSTALL_SCRIPTS = custom
-USERGROUP = /opt/csw/etc/pkg/miltergreylist/cswusergroup
+USERGROUP = /opt/csw/etc/pkg/CSWmiltergreylist/cswusergroup
 SAMPLECONF = /etc/opt/csw/greylist.conf
-INITSMF = /opt/csw/etc/init.d/cswmiltergreylist
+INITSMF = /etc/opt/csw/init.d/cswmiltergreylist
+POSTMSG = /opt/csw/share/doc/miltergreylist/README
 
 PROTOTYPE_MODIFIERS = 1
 PROTOTYPE_FILES_1 = /var/opt/csw/miltergreylist
@@ -65,10 +66,10 @@
 	@$(foreach DOC,$(DOCLIST),cp $(WORKSRC)/$(DOC) $(DESTDIR)$(docdir)/$(GARNAME);)
 	@ginstall -d -m 755 $(DESTDIR)/var/opt/csw/$(GARNAME)
 	@rmdir $(DESTDIR)/var/milter-greylist
-	@ginstall -d -m 755 $(DESTDIR)/opt/csw/etc/pkg/$(GARNAME)
-	@cp $(FILEDIR)/CSWmiltergreylist.ug $(DESTDIR)/opt/csw/etc/pkg/$(GARNAME)/cswusergroup
-	@ginstall -d -m 755 $(DESTDIR)/opt/csw/etc/init.d
-	@cp $(FILEDIR)/CSWmiltergreylist.init $(DESTDIR)/opt/csw/etc/init.d/cswmiltergreylist
-	@chmod 755 $(DESTDIR)/opt/csw/etc/init.d/cswmiltergreylist
+	@ginstall -d -m 755 $(DESTDIR)/opt/csw/etc/pkg/CSW$(GARNAME)
+	@cp $(FILEDIR)/CSWmiltergreylist.ug $(DESTDIR)/opt/csw/etc/pkg/CSW$(GARNAME)/cswusergroup
+	@ginstall -d -m 755 $(DESTDIR)/etc/opt/csw/init.d
+	@cp $(FILEDIR)/CSWmiltergreylist.init $(DESTDIR)/etc/opt/csw/init.d/cswmiltergreylist
+	@chmod 755 $(DESTDIR)/etc/opt/csw/init.d/cswmiltergreylist
 	@cp $(FILEDIR)/README.CSW $(DESTDIR)$(docdir)/$(GARNAME)
 	@$(MAKECOOKIE)

Added: csw/mgar/pkg/miltergreylist/trunk/files/0001-Path-and-user-changes-in-conf-file.patch
===================================================================
--- csw/mgar/pkg/miltergreylist/trunk/files/0001-Path-and-user-changes-in-conf-file.patch	                        (rev 0)
+++ csw/mgar/pkg/miltergreylist/trunk/files/0001-Path-and-user-changes-in-conf-file.patch	2010-07-05 16:33:22 UTC (rev 10437)
@@ -0,0 +1,32 @@
+From ac7a4154ceae818a9518fc0dd597458d2ffceb93 Mon Sep 17 00:00:00 2001
+From: Peter Bonivart <bonivart at opencsw.org>
+Date: Mon, 5 Jul 2010 18:07:02 +0200
+Subject: [PATCH] Path and user changes in conf file
+
+---
+ greylist.conf |    8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/greylist.conf b/greylist.conf
+index 04864fd..b49fd4d 100644
+--- a/greylist.conf
++++ b/greylist.conf
+@@ -5,11 +5,11 @@
+ # $Id: greylist.conf,v 1.45.2.1 2009/02/12 22:39:01 manu Exp $
+ #
+ 
+-pidfile "/var/run/milter-greylist.pid"
+-socket "/var/milter-greylist/milter-greylist.sock"
+-dumpfile "/var/milter-greylist/greylist.db" 600
++pidfile "/var/opt/csw/miltergreylist/milter-greylist.pid"
++socket "/var/opt/csw/miltergreylist/milter-greylist.sock"
++dumpfile "/var/opt/csw/miltergreylist/greylist.db" 600
+ dumpfreq 1
+-user "smmsp"
++user "greylist"
+ 
+ # Log milter-greylist activity to a file
+ #stat ">>/var/milter-greylist/greylist.log" \
+-- 
+1.7.1
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From bonivart at users.sourceforge.net  Mon Jul  5 18:40:16 2010
From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net)
Date: Mon, 05 Jul 2010 16:40:16 +0000
Subject: [csw-devel] SF.net SVN: gar:[10438]
	csw/mgar/pkg/miltergreylist/trunk
Message-ID: <E1OVoiO-0005MT-CF@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 10438
          http://gar.svn.sourceforge.net/gar/?rev=10438&view=rev
Author:   bonivart
Date:     2010-07-05 16:40:15 +0000 (Mon, 05 Jul 2010)

Log Message:
-----------
miltergreylist: add patchfiles to makefile and checksums

Modified Paths:
--------------
    csw/mgar/pkg/miltergreylist/trunk/Makefile
    csw/mgar/pkg/miltergreylist/trunk/checksums

Modified: csw/mgar/pkg/miltergreylist/trunk/Makefile
===================================================================
--- csw/mgar/pkg/miltergreylist/trunk/Makefile	2010-07-05 16:33:22 UTC (rev 10437)
+++ csw/mgar/pkg/miltergreylist/trunk/Makefile	2010-07-05 16:40:15 UTC (rev 10438)
@@ -16,6 +16,8 @@
 DISTFILES  = milter-greylist-$(DISTVERSION).tgz
 DISTFILES += COPYING
 
+PATCHFILES += 0001-Path-and-user-changes-in-conf-file.patch
+
 RUNTIME_DEP_PKGS = CSWcurlrt CSWgeoip CSWlibspf2
 
 # We define upstream file regex so we can be notifed of new upstream software release

Modified: csw/mgar/pkg/miltergreylist/trunk/checksums
===================================================================
--- csw/mgar/pkg/miltergreylist/trunk/checksums	2010-07-05 16:33:22 UTC (rev 10437)
+++ csw/mgar/pkg/miltergreylist/trunk/checksums	2010-07-05 16:40:15 UTC (rev 10438)
@@ -1,2 +1,3 @@
+608fd6143626c2dbdfc6dac0278e6fde  0001-Path-and-user-changes-in-conf-file.patch
 e61edd088404cd2a0eacb03ce70e2d5f  COPYING
 fa1e68ff0a8b759b946c09f92d40af9d  milter-greylist-4.2.5.tgz


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From bonivart at users.sourceforge.net  Mon Jul  5 19:05:12 2010
From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net)
Date: Mon, 05 Jul 2010 17:05:12 +0000
Subject: [csw-devel] SF.net SVN: gar:[10439]
	csw/mgar/pkg/miltergreylist/trunk/Makefile
Message-ID: <E1OVp6W-0005kB-IC@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 10439
          http://gar.svn.sourceforge.net/gar/?rev=10439&view=rev
Author:   bonivart
Date:     2010-07-05 17:05:12 +0000 (Mon, 05 Jul 2010)

Log Message:
-----------
miltergreylist: postmsg readme.csw

Modified Paths:
--------------
    csw/mgar/pkg/miltergreylist/trunk/Makefile

Modified: csw/mgar/pkg/miltergreylist/trunk/Makefile
===================================================================
--- csw/mgar/pkg/miltergreylist/trunk/Makefile	2010-07-05 16:40:15 UTC (rev 10438)
+++ csw/mgar/pkg/miltergreylist/trunk/Makefile	2010-07-05 17:05:12 UTC (rev 10439)
@@ -41,7 +41,7 @@
 USERGROUP = /opt/csw/etc/pkg/CSWmiltergreylist/cswusergroup
 SAMPLECONF = /etc/opt/csw/greylist.conf
 INITSMF = /etc/opt/csw/init.d/cswmiltergreylist
-POSTMSG = /opt/csw/share/doc/miltergreylist/README
+POSTMSG = /opt/csw/share/doc/miltergreylist/README.CSW
 
 PROTOTYPE_MODIFIERS = 1
 PROTOTYPE_FILES_1 = /var/opt/csw/miltergreylist


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From skayser at users.sourceforge.net  Mon Jul  5 19:06:04 2010
From: skayser at users.sourceforge.net (skayser at users.sourceforge.net)
Date: Mon, 05 Jul 2010 17:06:04 +0000
Subject: [csw-devel] SF.net SVN: gar:[10440] csw/mgar/pkg/xterm/trunk
Message-ID: <E1OVp7M-0007Zp-Qe@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 10440
          http://gar.svn.sourceforge.net/gar/?rev=10440&view=rev
Author:   skayser
Date:     2010-07-05 17:06:04 +0000 (Mon, 05 Jul 2010)

Log Message:
-----------
xterm: bump to 260

Modified Paths:
--------------
    csw/mgar/pkg/xterm/trunk/Makefile
    csw/mgar/pkg/xterm/trunk/checksums

Modified: csw/mgar/pkg/xterm/trunk/Makefile
===================================================================
--- csw/mgar/pkg/xterm/trunk/Makefile	2010-07-05 17:05:12 UTC (rev 10439)
+++ csw/mgar/pkg/xterm/trunk/Makefile	2010-07-05 17:06:04 UTC (rev 10440)
@@ -1,9 +1,6 @@
 # TODO (release-critical prefixed with !, non release-critical with *)
-# * app-defaults are currently in $(prefix)/X11/etc/X11/app-defaults
-#   because of our libXt. Once the whole X11 mess is sorted, they
-#   might go to $(prefix)/etc/X11/app-defaults instead.
 GARNAME = xterm
-GARVERSION = 258
+GARVERSION = 260
 CATEGORIES = apps
 
 DESCRIPTION = Terminal emulator for the X Window System
@@ -60,9 +57,6 @@
 
 include gar/category.mk
 
-# ./configure needs to find xft-config
-PATH := /opt/csw/X11/bin:$(PATH)
-
 post-install-modulated: DOCDEST=$(DESTDIR)$(docdir)/$(GARNAME)
 post-install-modulated: CSWDOCS=README.CSW changelog.CSW
 post-install-modulated: DOCS=xterm.log.html ctlseqs.txt

Modified: csw/mgar/pkg/xterm/trunk/checksums
===================================================================
--- csw/mgar/pkg/xterm/trunk/checksums	2010-07-05 17:05:12 UTC (rev 10439)
+++ csw/mgar/pkg/xterm/trunk/checksums	2010-07-05 17:06:04 UTC (rev 10440)
@@ -1,2 +1,2 @@
 d028c88c07ae91b8367ee76cdcb16cc8  COPYING
-bcf4f0ba51f5f58fd5bef76b3d05e40e  xterm-258.tgz
+1db28bd91f66278b836162e960ad4e22  xterm-260.tgz


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From bonivart at users.sourceforge.net  Mon Jul  5 19:29:41 2010
From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net)
Date: Mon, 05 Jul 2010 17:29:41 +0000
Subject: [csw-devel] SF.net SVN: gar:[10441]
	csw/mgar/pkg/miltergreylist/trunk/files/README.CSW
Message-ID: <E1OVpUD-0002T1-6Y@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 10441
          http://gar.svn.sourceforge.net/gar/?rev=10441&view=rev
Author:   bonivart
Date:     2010-07-05 17:29:40 +0000 (Mon, 05 Jul 2010)

Log Message:
-----------
miltergreylist: update readme file

Modified Paths:
--------------
    csw/mgar/pkg/miltergreylist/trunk/files/README.CSW

Modified: csw/mgar/pkg/miltergreylist/trunk/files/README.CSW
===================================================================
--- csw/mgar/pkg/miltergreylist/trunk/files/README.CSW	2010-07-05 17:06:04 UTC (rev 10440)
+++ csw/mgar/pkg/miltergreylist/trunk/files/README.CSW	2010-07-05 17:29:40 UTC (rev 10441)
@@ -7,8 +7,7 @@
 1. If you're adding directly to your mc-file you should use this instead of
    what's in the official README since the location of the socket isn't correct.
 
-INPUT_MAIL_FILTER(`greylist', `S=local:/var/opt/csw/milter-greylist/milter-greyl
-ist.sock')
+INPUT_MAIL_FILTER(`greylist', `S=local:/var/opt/csw/miltergreylist/milter-greylist.sock')
 define(`confMILTER_MACROS_CONNECT', `j, {if_addr}')
 define(`confMILTER_MACROS_HELO', `{verify}, {cert_subject}')
 define(`confMILTER_MACROS_ENVFROM', `i, {auth_authen}')
@@ -23,4 +22,4 @@
 
 More info: http://milter-greylist.wikidot.com.
 
-bonivart/091013
+bonivart/100705


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 Jul  5 22:25:18 2010
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Mon, 05 Jul 2010 20:25:18 +0000
Subject: [csw-devel] SF.net SVN: gar:[10442]
	csw/mgar/gar/v2/lib/python/checkpkg.py
Message-ID: <E1OVsEA-0004JW-Iu@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 10442
          http://gar.svn.sourceforge.net/gar/?rev=10442&view=rev
Author:   wahwah
Date:     2010-07-05 20:25:18 +0000 (Mon, 05 Jul 2010)

Log Message:
-----------
mGAR v2: A bugfix, adding a missing module name to Override class call.

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	2010-07-05 17:29:40 UTC (rev 10441)
+++ csw/mgar/gar/v2/lib/python/checkpkg.py	2010-07-05 20:25:18 UTC (rev 10442)
@@ -1175,8 +1175,8 @@
     if not self.StatsExist():
       raise PackageError("Package stats not ready.")
     override_stats = self.ReadObject("overrides")
-    overrides = [Override(**x) for x in override_stats]
-    return overrides
+    override_list = [overrides.Override(**x) for x in override_stats]
+    return override_list
 
   def DumpObject(self, obj, name):
     """Saves an object."""


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 Jul  5 22:34:59 2010
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Mon, 05 Jul 2010 20:34:59 +0000
Subject: [csw-devel] SF.net SVN: gar:[10443]
	csw/mgar/gar/v2/lib/python/checkpkg.py
Message-ID: <E1OVsNX-0004by-PG@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 10443
          http://gar.svn.sourceforge.net/gar/?rev=10443&view=rev
Author:   wahwah
Date:     2010-07-05 20:34:59 +0000 (Mon, 05 Jul 2010)

Log Message:
-----------
mGAR v2: checkpkg, adding a missing module import statement

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	2010-07-05 20:25:18 UTC (rev 10442)
+++ csw/mgar/gar/v2/lib/python/checkpkg.py	2010-07-05 20:34:59 UTC (rev 10443)
@@ -24,6 +24,7 @@
 import yaml
 from Cheetah import Template
 import opencsw
+import overrides
 import package_checks
 import models as m
 import configuration as c


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From dmichelsen at users.sourceforge.net  Mon Jul  5 23:15:57 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 05 Jul 2010 21:15:57 +0000
Subject: [csw-devel] SF.net SVN: gar:[10444] csw/mgar/pkg/di/tags/di-4.24,
	REV=2010.06.02/
Message-ID: <E1OVt1B-0004eJ-0W@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 10444
          http://gar.svn.sourceforge.net/gar/?rev=10444&view=rev
Author:   dmichelsen
Date:     2010-07-05 21:15:56 +0000 (Mon, 05 Jul 2010)

Log Message:
-----------
di: Tag 4.24,REV=2010.06.02

Added Paths:
-----------
    csw/mgar/pkg/di/tags/di-4.24,REV=2010.06.02/


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 Jul  5 23:31:37 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 05 Jul 2010 21:31:37 +0000
Subject: [csw-devel] SF.net SVN: gar:[10445] csw/mgar/pkg/di/trunk
Message-ID: <E1OVtGL-0002vy-F7@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10445
          http://gar.svn.sourceforge.net/gar/?rev=10445&view=rev
Author:   dmichelsen
Date:     2010-07-05 21:31:37 +0000 (Mon, 05 Jul 2010)

Log Message:
-----------
di: Update to 4.25

Modified Paths:
--------------
    csw/mgar/pkg/di/trunk/Makefile
    csw/mgar/pkg/di/trunk/checksums

Removed Paths:
-------------
    csw/mgar/pkg/di/trunk/files/0001-Fix-Solaris-detection.patch

Modified: csw/mgar/pkg/di/trunk/Makefile
===================================================================
--- csw/mgar/pkg/di/trunk/Makefile	2010-07-05 21:15:56 UTC (rev 10444)
+++ csw/mgar/pkg/di/trunk/Makefile	2010-07-05 21:31:37 UTC (rev 10445)
@@ -1,5 +1,5 @@
 GARNAME = di
-GARVERSION = 4.24
+GARVERSION = 4.25
 CATEGORIES = utils
 
 DESCRIPTION = Disk information utility
@@ -12,7 +12,6 @@
 
 MASTER_SITES = http://www.gentoo.com/di/
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
-PATCHFILES = 0001-Fix-Solaris-detection.patch
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz

Modified: csw/mgar/pkg/di/trunk/checksums
===================================================================
--- csw/mgar/pkg/di/trunk/checksums	2010-07-05 21:15:56 UTC (rev 10444)
+++ csw/mgar/pkg/di/trunk/checksums	2010-07-05 21:31:37 UTC (rev 10445)
@@ -1,2 +1 @@
-5573dc1446ef5972a4149d5d10bb0f93  0001-Fix-Solaris-detection.patch
-f16a3829a4666696d4e139cecfa9e225  di-4.24.tar.gz
+765ef603afe1d95f52f7a5f64e85eced  di-4.25.tar.gz

Deleted: csw/mgar/pkg/di/trunk/files/0001-Fix-Solaris-detection.patch
===================================================================
--- csw/mgar/pkg/di/trunk/files/0001-Fix-Solaris-detection.patch	2010-07-05 21:15:56 UTC (rev 10444)
+++ csw/mgar/pkg/di/trunk/files/0001-Fix-Solaris-detection.patch	2010-07-05 21:31:37 UTC (rev 10445)
@@ -1,25 +0,0 @@
-From 08eae7402b5bbc3dd9e3c3d1227f22c140014c00 Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Thu, 10 Jun 2010 15:23:45 +0200
-Subject: [PATCH] Fix Solaris detection
-
----
- di.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/di.c b/di.c
-index d5adef2..32c3502 100644
---- a/di.c
-+++ b/di.c
-@@ -431,7 +431,7 @@ main (argc, argv)
-         /* change default display format here */
-     diopts->dispBlockSize = DI_VAL_1024 * DI_VAL_1024;
-     diopts->flags = 0;
--#if ! SunOS /* Solaris loopback devices should be excluded */
-+#if ! __SunOS /* Solaris loopback devices should be excluded */
-     diopts->flags |= DI_F_INCLUDE_LOOPBACK;
- #endif
-     strcpy (diopts->sortType, "m"); /* default - sort by mount point */
--- 
-1.7.1
-


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From dmichelsen at users.sourceforge.net  Mon Jul  5 23:32:04 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 05 Jul 2010 21:32:04 +0000
Subject: [csw-devel] SF.net SVN: gar:[10446] csw/mgar/pkg/msmtp/trunk
Message-ID: <E1OVtGm-0002wN-Bw@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10446
          http://gar.svn.sourceforge.net/gar/?rev=10446&view=rev
Author:   dmichelsen
Date:     2010-07-05 21:32:04 +0000 (Mon, 05 Jul 2010)

Log Message:
-----------
msmtp: Update to 1.4.21 and add buildtime dependencies

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	2010-07-05 21:31:37 UTC (rev 10445)
+++ csw/mgar/pkg/msmtp/trunk/Makefile	2010-07-05 21:32:04 UTC (rev 10446)
@@ -1,5 +1,5 @@
 GARNAME = msmtp
-GARVERSION = 1.4.20
+GARVERSION = 1.4.21
 CATEGORIES = net
 
 DESCRIPTION = SMTP client
@@ -30,6 +30,7 @@
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2
 
+BUILD_DEP_PKGS = CSWgnutlsdevel CSWlibgsasldevel CSWggettext
 RUNTIME_DEP_PKGS = CSWlibidn CSWgnutls CSWlibgsasl CSWggettextrt
 
 CONFIGURE_ARGS = $(DIRPATHS)

Modified: csw/mgar/pkg/msmtp/trunk/checksums
===================================================================
--- csw/mgar/pkg/msmtp/trunk/checksums	2010-07-05 21:31:37 UTC (rev 10445)
+++ csw/mgar/pkg/msmtp/trunk/checksums	2010-07-05 21:32:04 UTC (rev 10446)
@@ -1 +1 @@
-065042eaaee40c2779cf0bcfffe72aae  msmtp-1.4.20.tar.bz2
+9d764cd9036168f49bc9d6531a7f3dba  msmtp-1.4.21.tar.bz2


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From dmichelsen at users.sourceforge.net  Mon Jul  5 23:32:14 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 05 Jul 2010 21:32:14 +0000
Subject: [csw-devel] SF.net SVN: gar:[10447] csw/mgar/pkg/autoconf/trunk
Message-ID: <E1OVtGw-0002wj-OS@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10447
          http://gar.svn.sourceforge.net/gar/?rev=10447&view=rev
Author:   dmichelsen
Date:     2010-07-05 21:32:14 +0000 (Mon, 05 Jul 2010)

Log Message:
-----------
autoconf: Update to 2.66

Modified Paths:
--------------
    csw/mgar/pkg/autoconf/trunk/Makefile
    csw/mgar/pkg/autoconf/trunk/checksums

Modified: csw/mgar/pkg/autoconf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/autoconf/trunk/Makefile	2010-07-05 21:32:04 UTC (rev 10446)
+++ csw/mgar/pkg/autoconf/trunk/Makefile	2010-07-05 21:32:14 UTC (rev 10447)
@@ -1,5 +1,5 @@
 GARNAME = autoconf
-GARVERSION = 2.65
+GARVERSION = 2.66
 CATEGORIES = devel
 
 DESCRIPTION = GNU auto-configuration tool
@@ -29,6 +29,10 @@
 
 EXTRA_MERGE_EXCLUDE_FILES = $(infodir)/standards.info
 
+CHECKPKG_OVERRIDES_CSWautoconf += missing-dependency|CSWemacscommon
+CHECKPKG_OVERRIDES_CSWautoconf += surplus-dependency|CSWgm4
+CHECKPKG_OVERRIDES_CSWautoconf += surplus-dependency|CSWgawk
+
 include gar/category.mk
 
 # Package has two bad string which should be ignored:
@@ -36,6 +40,6 @@
 #   ;;; from file /export/medusa/dam/build/csw/devel/autoconf/work/dam-ra.d/autoconf-2.61/lib/emacs/elc.15767/autotest-mode.el
 FIXCONFIG_DIRS += $(DESTDIR)$(prefix)/share/emacs/site-lisp
 
-post-install:
+post-install-modulated:
 	@echo " ==> Fixing install anomalies"
 	@rm -f $(DESTDIR)$(prefix)/share/info/standards.info

Modified: csw/mgar/pkg/autoconf/trunk/checksums
===================================================================
--- csw/mgar/pkg/autoconf/trunk/checksums	2010-07-05 21:32:04 UTC (rev 10446)
+++ csw/mgar/pkg/autoconf/trunk/checksums	2010-07-05 21:32:14 UTC (rev 10447)
@@ -1,2 +1,2 @@
 ac233d38923d5bebe91a64d68983c3c0  0001-Prefer-CSW-tools.patch
-46cfb40e0babf4c64f8325f03da81c9b  autoconf-2.65.tar.gz
+fb00d77cbc468994c55919298af1ff02  autoconf-2.66.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 Jul  5 23:34:29 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 05 Jul 2010 21:34:29 +0000
Subject: [csw-devel] SF.net SVN: gar:[10448]
	csw/mgar/pkg/rrdtool/branches/x11-reloaded/Makefile
Message-ID: <E1OVtJ7-0002ye-Ck@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10448
          http://gar.svn.sourceforge.net/gar/?rev=10448&view=rev
Author:   dmichelsen
Date:     2010-07-05 21:34:29 +0000 (Mon, 05 Jul 2010)

Log Message:
-----------
rrd/x11-reloaded: Make just one package for now

Modified Paths:
--------------
    csw/mgar/pkg/rrdtool/branches/x11-reloaded/Makefile

Modified: csw/mgar/pkg/rrdtool/branches/x11-reloaded/Makefile
===================================================================
--- csw/mgar/pkg/rrdtool/branches/x11-reloaded/Makefile	2010-07-05 21:32:14 UTC (rev 10447)
+++ csw/mgar/pkg/rrdtool/branches/x11-reloaded/Makefile	2010-07-05 21:34:29 UTC (rev 10448)
@@ -24,7 +24,8 @@
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
-PACKAGES = CSWrrd CSWrrdrt CSWpmrrd CSWpy-rrdtool CSWrbrrd
+# PACKAGES = CSWrrd CSWrrdrt CSWpmrrd CSWpy-rrdtool CSWrbrrd
+PACKAGES = CSWrrd
 
 CATALOGNAME_CSWrrd = rrdtool
 CATALOGNAME_CSWrrdrt = rrdtool_rt
@@ -38,7 +39,8 @@
 SPKG_DESC_CSWpy-rrdtool = Python egg for RRD access (part of RRDtool)
 SPKG_DESC_CSWrbrrd = Ruby binding for RRD access (part of RRDtool)
 
-RUNTIME_DEP_PKGS_CSWrrd = CSWrrdrt CSWglib2 CSWpango CSWggettextrt CSWlibxml2 CSWlibcairo
+RUNTIME_DEP_PKGS_CSWrrd = CSWglib2 CSWpango CSWggettextrt CSWlibxml2 CSWlibcairo
+# RUNTIME_DEP_PKGS_CSWrrd += CSWrrdrt
 RUNTIME_DEP_PKGS_CSWrrdrt += CSWggettextrt CSWglib2 CSWlibcairo CSWpango CSWlibxml2
 RUNTIME_DEP_PKGS_CSWpmrrd = CSWperl CSWrrdrt
 RUNTIME_DEP_PKGS_CSWpy-rrdtool = CSWpython CSWrrdrt
@@ -68,7 +70,7 @@
 
 TEST_TARGET = check
 
-MERGE_DIRS_isa-extra = $(bindir)
+MERGE_DIRS_isa-extra = $(libdir)
 MERGE_SCRIPTS_isa-extra = copy-relocated-only copy-config-only
 EXTRA_MERGE_EXCLUDE_FILES = .*~ .*perllocal\.pod .*/\.packlist
 EXTRA_PAX_ARGS += -s ',^\.$(docdir)/$(GARNAME)-$(GARVERSION),.$(BUILD_PREFIX)/share/doc/$(CATALOGNAME),'
@@ -85,6 +87,15 @@
 CHECKPKG_OVERRIDES_CSWrbrrd += bad-rpath-entry
 CHECKPKG_OVERRIDES_CSWrbrrd += bad-rpath-entry
 
+# Take these out when the package are split again
+CHECKPKG_OVERRIDES_CSWrrd += binary-architecture-does-not-match-placement|file=opt/csw/lib/ruby/site_ruby/1.8/sparc-solaris2.8/RRD.so|arch_id=18|arch_name=sparcv8+
+CHECKPKG_OVERRIDES_CSWrrd += pkgname-does-not-start-with-CSWpy-
+CHECKPKG_OVERRIDES_CSWrrd += catalogname-does-not-start-with-py_
+CHECKPKG_OVERRIDES_CSWrrd += bad-rpath-entry|/home/dam/mgar/pkg/rrdtool/branches/x11-reloaded/work/solaris9-sparc/install-isa-sparcv8/opt/csw/lib|opt/csw/lib/ruby/site_ruby/1.8/sparc-solaris2.8/RRD.so
+CHECKPKG_OVERRIDES_CSWrrd += bad-rpath-entry|/home/dam/mgar/pkg/rrdtool/branches/x11-reloaded/work/solaris9-i386/install-isa-i386/opt/csw/lib|opt/csw/lib/ruby/site_ruby/1.8/i386-solaris2.8/RRD.so
+CHECKPKG_OVERRIDES_CSWrrd += missing-dependency|CSWruby
+CHECKPKG_OVERRIDES_CSWrrd += missing-dependency|CSWpython
+
 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 wahwah at users.sourceforge.net  Tue Jul  6 00:42:25 2010
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Mon, 05 Jul 2010 22:42:25 +0000
Subject: [csw-devel] SF.net SVN: gar:[10449]
	csw/mgar/gar/v2-sqlite/lib/python
Message-ID: <E1OVuMr-0006wC-Kr@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 10449
          http://gar.svn.sourceforge.net/gar/?rev=10449&view=rev
Author:   wahwah
Date:     2010-07-05 22:42:25 +0000 (Mon, 05 Jul 2010)

Log Message:
-----------
mGAR v2-sqlite, using global database connection, saving overrides separately from the rest of stats.

Modified Paths:
--------------
    csw/mgar/gar/v2-sqlite/lib/python/checkpkg.py
    csw/mgar/gar/v2-sqlite/lib/python/models.py
    csw/mgar/gar/v2-sqlite/lib/python/package_checks_test.py

Added Paths:
-----------
    csw/mgar/gar/v2-sqlite/lib/python/testdata/rsync_pkg_stats.py

Removed Paths:
-------------
    csw/mgar/gar/v2-sqlite/lib/python/testdata/stats/

Modified: csw/mgar/gar/v2-sqlite/lib/python/checkpkg.py
===================================================================
--- csw/mgar/gar/v2-sqlite/lib/python/checkpkg.py	2010-07-05 21:34:29 UTC (rev 10448)
+++ csw/mgar/gar/v2-sqlite/lib/python/checkpkg.py	2010-07-05 22:42:25 UTC (rev 10449)
@@ -39,7 +39,6 @@
 SONAME = "soname"
 CONFIG_MTIME = "mtime"
 CONFIG_DB_SCHEMA = "db_schema_version"
-WRITE_YAML = False
 DO_NOT_REPORT_SURPLUS = set([u"CSWcommon", u"CSWcswclassutils", u"CSWisaexec"])
 DO_NOT_REPORT_MISSING = set([])
 DO_NOT_REPORT_MISSING_RE = [r"SUNW.*", r"\*SUNW.*"]
@@ -199,34 +198,46 @@
 
 def ExtractBuildUsername(pkginfo):
   m = re.match(PSTAMP_RE, pkginfo["PSTAMP"])
-  if m:
-    return m.group("username")
-  else:
-    return None
+  return m.group("username") if m else None
 
 
 class DatabaseClient(object):
 
   CHECKPKG_DIR = ".checkpkg"
-  SQLITE3_DBNAME_TMPL = "var-sadm-install-contents-cache-%s"
+  SQLITE3_DBNAME_TMPL = "checkpkg-db-%(fqdn)s"
   TABLES = (m.CswConfig,
             m.CswFile,
             m.CswPackage,
-            m.Srv4FileStats)
+            m.Srv4FileStats,
+            m.CheckpkgOverride)
+  sqo_conn = None
+  db_path = None
 
   def __init__(self, debug=False):
-    self.fqdn = socket.getfqdn()
-    self.checkpkg_dir = os.path.join(os.environ["HOME"], self.CHECKPKG_DIR)
-    self.db_path = os.path.join(self.checkpkg_dir,
-                                self.SQLITE3_DBNAME_TMPL % self.fqdn)
     self.debug = debug
 
-  def InitializeSqlobject(self):
-    logging.debug("Connecting to the %s database.", self.db_path)
-    self.sqo_conn = sqlobject.connectionForURI(
-        'sqlite:%s' % self.db_path, debug=(self.debug and False))
-    sqlobject.sqlhub.processConnection = self.sqo_conn
+  @classmethod
+  def GetDatabasePath(cls):
+    if not cls.db_path:
+      dbname_dict = {'fqdn': socket.getfqdn()}
+      db_filename = cls.SQLITE3_DBNAME_TMPL % dbname_dict
+      home_dir = os.environ["HOME"]
+      cls.db_path = os.path.join(home_dir, cls.CHECKPKG_DIR, db_filename)
+    return cls.db_path
 
+  @classmethod
+  def InitializeSqlobject(cls):
+    """Establishes a database connection and stores it as a class member.
+
+    The idea is to share the database connection between instances.  It would
+    be solved even better if the connection was passed to the class
+    constructor.
+    """
+    if not cls.sqo_conn:
+      db_path = cls.GetDatabasePath()
+      cls.sqo_conn = sqlobject.connectionForURI('sqlite:%s' % db_path)
+      sqlobject.sqlhub.processConnection = cls.sqo_conn
+
   def CreateTables(self):
     for table in self.TABLES:
       table.createTable(ifNotExists=True)
@@ -263,18 +274,23 @@
     """It's necessary for low level operations."""
     if True:
       logging.debug("Connecting to sqlite")
-      self.sqlite_conn = sqlite3.connect(self.db_path)
+      self.sqlite_conn = sqlite3.connect(self.GetDatabasePath())
 
   def InitializeDatabase(self):
-    """Refactor this class to first create CswFile with no primary key and no indexes.
+    """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
-    if not os.path.exists(self.db_path):
-      print "Building a cache of %s." % self.system_pkgmap_files
-      print "The cache will be kept in %s." % self.db_path
-      if not os.path.exists(self.checkpkg_dir):
-        logging.debug("Creating %s", self.checkpkg_dir)
-        os.mkdir(self.checkpkg_dir)
+    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()
@@ -621,8 +637,6 @@
   rpath = []
   for line in dump_output.splitlines():
     fields = re.split(c.WS_RE, line)
-    # TODO: Make it a unit test
-    # logging.debug("%s says: %s", DUMP_BIN, fields)
     if len(fields) < 3:
       continue
     if fields[1] == "NEEDED":
@@ -764,7 +778,7 @@
 
   def GetCommonPaths(self, arch):
     """Returns a list of paths for architecture, from gar/etc/commondirs*."""
-    # TODO: If this was cached, it would save a significant amount of time.
+    # TODO: If this was cached, it could save a significant amount of time.
     assert arch in ('i386', 'sparc', 'all'), "Wrong arch: %s" % repr(arch)
     if arch == 'all':
       archs = ('i386', 'sparc')
@@ -924,6 +938,7 @@
     self.stats_path = None
     self.all_stats = {}
     self.stats_basedir = stats_basedir
+    self.db_pkg_stats = None
     if not self.stats_basedir:
       home = os.environ["HOME"]
       parts = [home, ".checkpkg", "stats"]
@@ -952,23 +967,30 @@
       self.stats_path = os.path.join(*parts)
     return self.stats_path
 
+  def GetDbObject(self):
+    if not self.db_pkg_stats:
+      md5_sum = self.GetMd5sum()
+      logging.debug("GetDbObject() md5_sum=%s", md5_sum)
+      res = m.Srv4FileStats.select(m.Srv4FileStats.q.md5_sum==md5_sum)
+      if not res.count():
+        logging.debug("%s are not in the db", md5_sum)
+        return None
+      else:
+        logging.debug("%s are in the db", md5_sum)
+        self.db_pkg_stats = res.getOne()
+    return self.db_pkg_stats
+
+
   def StatsExist(self):
     """Checks if statistics of a package exist.
 
     Returns:
       bool
     """
-    # More checks can be added in the future.
-    md5_sum = self.GetMd5sum()
-    logging.debug("StatsExist() md5_sum=%s", md5_sum)
-    res = m.Srv4FileStats.select(m.Srv4FileStats.q.md5_sum==md5_sum)
-    if not res.count():
-      logging.debug("%s are not in the db", md5_sum)
+    pkg_stats = self.GetDbObject()
+    if not pkg_stats:
       return False
-    else:
-      logging.debug("%s are in the db", md5_sum)
-      pkg_stats = res.getOne()
-      return pkg_stats.stats_version == PACKAGE_STATS_VERSION
+    return pkg_stats.stats_version == PACKAGE_STATS_VERSION
 
   def GetDirFormatPkg(self):
     if not self.dir_format_pkg:
@@ -1032,14 +1054,14 @@
 
   def GetOverrides(self):
     dir_pkg = self.GetDirFormatPkg()
-    overrides = dir_pkg.GetOverrides()
+    override_list = dir_pkg.GetOverrides()
     def OverrideToDict(override):
-      d = {}
-      d["pkgname"] = override.pkgname
-      d["tag_name"] = override.tag_name
-      d["tag_info"] = override.tag_info
-      return d
-    overrides_simple = [OverrideToDict(x) for x in overrides]
+      return {
+        "pkgname":  override.pkgname,
+        "tag_name":  override.tag_name,
+        "tag_info":  override.tag_info,
+      }
+    overrides_simple = [OverrideToDict(x) for x in override_list]
     return overrides_simple
 
   def GetLddMinusRlines(self):
@@ -1128,21 +1150,18 @@
   def _CollectStats(self):
     """The list of variables needs to be synchronized with the one
     at the top of this class.
-
-    TODO:
-    - Run pkgchk against the package file.
-    - Grep all the files for bad paths.
     """
     stats_path = self.GetStatsPath()
     self.MakeStatsDir()
     dir_pkg = self.GetDirFormatPkg()
-    logging.info("Collecting %s package statistics.", repr(dir_pkg.pkgname))
+    logging.debug("Collecting %s package statistics.", repr(dir_pkg.pkgname))
+    override_dicts = self.GetOverrides()
     pkg_stats = {
         "binaries": dir_pkg.ListBinaries(),
         "binaries_dump_info": self.GetBinaryDumpInfo(),
         "depends": dir_pkg.GetDependencies(),
         "isalist": GetIsalist(),
-        "overrides": self.GetOverrides(),
+        "overrides": override_dicts,
         "pkgchk": self.GetPkgchkData(),
         "pkginfo": dir_pkg.GetParsedPkginfo(),
         "pkgmap": dir_pkg.GetPkgmap().entries,
@@ -1154,6 +1173,11 @@
                                    pkgname=pkg_stats["basic_stats"]["pkgname"],
                                    stats_version=PACKAGE_STATS_VERSION,
                                    data=cPickle.dumps(pkg_stats))
+    # Inserting overrides as rows into the database
+    for override_dict in override_dicts:
+      o = m.CheckpkgOverride(srv4_file=db_pkg_stats,
+                             **override_dict)
+
     # The ldd -r reporting breaks on bigger packages during yaml saving.
     # It might work when yaml is disabled
     # self.DumpObject(self.GetLddMinusRlines(), "ldd_dash_r")
@@ -1178,32 +1202,24 @@
   def GetSavedOverrides(self):
     if not self.StatsExist():
       raise PackageError("Package stats not ready.")
-    override_stats = self.GetAllStats()["overrides"]
-    override_list = [overrides.Override(**x) for x in override_stats]
+    pkg_stats = self.GetDbObject()
+    res = m.CheckpkgOverride.select(m.CheckpkgOverride.q.srv4_file==pkg_stats)
+    override_list = []
+    for db_override in res:
+      d = {
+          'pkgname': db_override.pkgname,
+          'tag_name': db_override.tag_name,
+          'tag_info': db_override.tag_info,
+      }
+      override_list.append(overrides.Override(**d))
     return override_list
 
-  def DumpObject(self, obj, name):
-    """Saves an object."""
-    stats_path = self.GetStatsPath()
-    # yaml
-    if WRITE_YAML:
-      out_file_name = os.path.join(stats_path, "%s.yml" % name)
-      logging.debug("DumpObject(): writing %s", repr(out_file_name))
-      f = open(out_file_name, "w")
-      f.write(yaml.safe_dump(obj))
-      f.close()
-    # pickle
-    out_file_name_pickle = os.path.join(stats_path, "%s.pickle" % name)
-    logging.debug("DumpObject(): writing %s", repr(out_file_name_pickle))
-    f = open(out_file_name_pickle, "wb")
-    cPickle.dump(obj, f)
-    f.close()
-    self.all_stats[name] = obj
-
   def ReadSavedStats(self):
-    md5_sum = self.GetMd5sum()
-    res = m.Srv4FileStats.select(m.Srv4FileStats.q.md5_sum==md5_sum)
-    return cPickle.loads(str(res.getOne().data))
+    if not self.all_stats:
+      md5_sum = self.GetMd5sum()
+      res = m.Srv4FileStats.select(m.Srv4FileStats.q.md5_sum==md5_sum)
+      self.all_stats = cPickle.loads(str(res.getOne().data))
+    return self.all_stats
 
   def _ParseLddDashRline(self, line):
     found_re = r"^\t(?P<soname>\S+)\s+=>\s+(?P<path_found>\S+)"
@@ -1214,13 +1230,14 @@
                   r'\((?P<lib_name>\S+)\) =>\t \(version not found\)')
     stv_protected = (r'^\trelocation \S+ symbol: (?P<relocation_symbol>\S+): '
                      r'file (?P<relocation_path>\S+): '
-                     r'relocation bound to a symbol with STV_PROTECTED visibility$')
-    sizes_differ = (r'^\trelocation \S+ sizes differ: (?P<sizes_differ_symbol>\S+)$')
+                     r'relocation bound to a symbol '
+                     r'with STV_PROTECTED visibility$')
+    sizes_differ = (r'^\trelocation \S+ sizes differ: '
+                    r'(?P<sizes_differ_symbol>\S+)$')
     sizes_info = (r'^\t\t\(file (?P<sizediff_file1>\S+) size=(?P<size1>0x\w+); '
                   r'file (?P<sizediff_file2>\S+) size=(?P<size2>0x\w+)\)$')
-    sizes_one_used = (
-        r'^\t\t(?P<sizediffused_file>\S+) size used; '
-        'possible insufficient data copied$')
+    sizes_one_used = (r'^\t\t(?P<sizediffused_file>\S+) size used; '
+                      r'possible insufficient data copied$')
     common_re = (r"(%s|%s|%s|%s|%s|%s|%s|%s)"
                  % (found_re, symbol_not_found_re, only_so, version_so,
                     stv_protected, sizes_differ, sizes_info, sizes_one_used))

Modified: csw/mgar/gar/v2-sqlite/lib/python/models.py
===================================================================
--- csw/mgar/gar/v2-sqlite/lib/python/models.py	2010-07-05 21:34:29 UTC (rev 10448)
+++ csw/mgar/gar/v2-sqlite/lib/python/models.py	2010-07-05 22:42:25 UTC (rev 10449)
@@ -46,3 +46,9 @@
   pkgname = sqlobject.UnicodeCol(length=255, notNone=True)
   stats_version = sqlobject.IntCol(notNone=True)
   data = sqlobject.UnicodeCol(notNone=True)
+
+class CheckpkgOverride(sqlobject.SQLObject):
+  srv4_file = sqlobject.ForeignKey('Srv4FileStats')
+  pkgname = sqlobject.UnicodeCol(default=None)
+  tag_name = sqlobject.UnicodeCol(notNone=True)
+  tag_info = sqlobject.UnicodeCol(default=None)

Modified: csw/mgar/gar/v2-sqlite/lib/python/package_checks_test.py
===================================================================
--- csw/mgar/gar/v2-sqlite/lib/python/package_checks_test.py	2010-07-05 21:34:29 UTC (rev 10448)
+++ csw/mgar/gar/v2-sqlite/lib/python/package_checks_test.py	2010-07-05 22:42:25 UTC (rev 10449)
@@ -15,13 +15,10 @@
 import testdata.checkpkg_test_data_CSWdjvulibrert as td_1
 import testdata.checkpkg_pkgs_data_minimal as td_2
 import testdata.rpaths
+from testdata.rsync_pkg_stats import pkg_stats as rsync_stats
 
-BASE_DIR = os.path.dirname(__file__)
-TESTDATA_DIR = os.path.join(BASE_DIR, "testdata")
-CHECKPKG_STATS_DIR = os.path.join(TESTDATA_DIR, "stats")
-DEFAULT_DATA_MD5 = "461a24f02dd5020b4aa014b76f3ec2cc"
-DEFAULT_PKG_STATS = checkpkg.PackageStats(None, CHECKPKG_STATS_DIR, DEFAULT_DATA_MD5)
-DEFAULT_PKG_DATA = DEFAULT_PKG_STATS.GetAllStats()
+DEFAULT_PKG_STATS = None
+DEFAULT_PKG_DATA = rsync_stats
 
 
 class CheckpkgUnitTestHelper(object):

Added: csw/mgar/gar/v2-sqlite/lib/python/testdata/rsync_pkg_stats.py
===================================================================
--- csw/mgar/gar/v2-sqlite/lib/python/testdata/rsync_pkg_stats.py	                        (rev 0)
+++ csw/mgar/gar/v2-sqlite/lib/python/testdata/rsync_pkg_stats.py	2010-07-05 22:42:25 UTC (rev 10449)
@@ -0,0 +1,185 @@
+pkg_stats = {
+ 'all_filenames': ['pkginfo',
+                   'pkgmap',
+                   'copyright',
+                   'depend',
+                   'rsyncd.conf.5',
+                   'rsync.1',
+                   'license',
+                   'rsync',
+                   'rsync'],
+ 'bad_paths': {},
+ 'basic_stats': {'catalogname': 'rsync',
+                 'parsed_basename': {'arch': 'sparc',
+                                     'catalogname': 'rsync',
+                                     'full_version_string': '3.0.7,REV=2010.02.17',
+                                     'osrel': 'SunOS5.8',
+                                     'revision_info': {'REV': '2010.02.17'},
+                                     'vendortag': 'CSW',
+                                     'version': '3.0.7',
+                                     'version_info': {'major version': '3',
+                                                      'minor version': '0',
+                                                      'patchlevel': '7'}},
+                 'pkg_basename': 'rsync-3.0.7,REV=2010.02.17-SunOS5.8-sparc-CSW.pkg.gz',
+                 'pkg_path': '/tmp/pkg_dhBeK1/rsync-3.0.7,REV=2010.02.17-SunOS5.8-sparc-CSW.pkg.gz',
+                 'pkgname': 'CSWrsync',
+                 'stats_version': 1},
+ 'binaries': ['opt/csw/bin/sparcv9/rsync', 'opt/csw/bin/sparcv8/rsync'],
+ 'binaries_dump_info': [{'base_name': 'rsync',
+                         'needed sonames': ['libpopt.so.0',
+                                            'libsec.so.1',
+                                            'libiconv.so.2',
+                                            'libsocket.so.1',
+                                            'libnsl.so.1',
+                                            'libc.so.1'],
+                         'path': 'opt/csw/bin/sparcv9/rsync',
+                         'runpath': ['/opt/csw/lib/$ISALIST',
+                                     '/opt/csw/lib/64',
+                                     '/usr/lib/$ISALIST',
+                                     '/usr/lib',
+                                     '/lib/$ISALIST',
+                                     '/lib'],
+                         'soname': 'rsync',
+                         'soname_guessed': True},
+                        {'base_name': 'rsync',
+                         'needed sonames': ['libpopt.so.0',
+                                            'libsec.so.1',
+                                            'libiconv.so.2',
+                                            'libsocket.so.1',
+                                            'libnsl.so.1',
+                                            'libc.so.1'],
+                         'path': 'opt/csw/bin/sparcv8/rsync',
+                         'runpath': ['/opt/csw/lib/$ISALIST',
+                                     '/opt/csw/lib',
+                                     '/usr/lib/$ISALIST',
+                                     '/usr/lib',
+                                     '/lib/$ISALIST',
+                                     '/lib'],
+                         'soname': 'rsync',
+                         'soname_guessed': True}],
+ 'depends': [['CSWcommon',
+              'CSWcommon common - common files and dirs for CSW packages '],
+             ['CSWisaexec',
+              'CSWisaexec isaexec - sneaky wrapper around Sun isaexec '],
+             ['CSWiconv', 'CSWiconv libiconv - GNU iconv library '],
+             ['CSWlibpopt',
+              'CSWlibpopt libpopt - Popt is a C library for parsing command line parameters ']],
+ 'files_metadata': None,
+ 'isalist': ['sparcv9+vis2',
+             'sparcv9+vis',
+             'sparcv9',
+             'sparcv8plus+vis2',
+             'sparcv8plus+vis',
+             'sparcv8plus',
+             'sparcv8',
+             'sparcv8-fsmuld',
+             'sparcv7',
+             'sparc'],
+ 'ldd_dash_r': [],
+ 'overrides': [],
+ 'pkgchk': [],
+ 'pkginfo': {'ARCH': 'sparc',
+             'CATEGORY': 'application',
+             'CLASSES': 'none',
+             'EMAIL': 'maciej at opencsw.org',
+             'HOTLINE': 'http://www.opencsw.org/bugtrack/',
+             'NAME': 'rsync - utility which provides fast incremental file transfer',
+             'OPENCSW_CATALOGNAME': 'rsync',
+             'OPENCSW_MODE64': '32/64/isaexec',
+             'OPENCSW_REPOSITORY': 'https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/pkg/rsync/trunk at 8611',
+             'PKG': 'CSWrsync',
+             'PSTAMP': 'maciej at build8s-20100217094608',
+             'VENDOR': 'http://rsync.samba.org/ packaged for CSW by Maciej Blizinski',
+             'VERSION': '3.0.7,REV=2010.02.17',
+             'WORKDIR_FIRSTMOD': '../build-isa-sparcv8'},
+ 'pkgmap': [{'class': None,
+             'group': None,
+             'line': ': 1 2912',
+             'mode': None,
+             'path': None,
+             'type': '1',
+             'user': None},
+            {'class': 'none',
+             'group': None,
+             'line': '1 l none /opt/csw/bin/rsync=/opt/csw/bin/isaexec',
+             'mode': None,
+             'path': '/opt/csw/bin/rsync',
+             'type': 'l',
+             'user': None},
+            {'class': 'none',
+             'group': 'bin',
+             'line': '1 f none /opt/csw/bin/sparcv8/rsync 0755 root bin 585864 12576 1266395028',
+             'mode': '0755',
+             'path': '/opt/csw/bin/sparcv8/rsync',
+             'type': 'f',
+             'user': 'root'},
+            {'class': 'none',
+             'group': 'bin',
+             'line': '1 f none /opt/csw/bin/sparcv9/rsync 0755 root bin 665520 60792 1266395239',
+             'mode': '0755',
+             'path': '/opt/csw/bin/sparcv9/rsync',
+             'type': 'f',
+             'user': 'root'},
+            {'class': 'none',
+             'group': 'bin',
+             'line': '1 d none /opt/csw/share/doc/rsync 0755 root bin',
+             'mode': '0755',
+             'path': '/opt/csw/share/doc/rsync',
+             'type': 'd',
+             'user': 'root'},
+            {'class': 'none',
+             'group': 'bin',
+             'line': '1 f none /opt/csw/share/doc/rsync/license 0644 root bin 35147 30328 1266396366',
+             'mode': '0644',
+             'path': '/opt/csw/share/doc/rsync/license',
+             'type': 'f',
+             'user': 'root'},
+            {'class': 'none',
+             'group': 'bin',
+             'line': '1 d none /opt/csw/share/man/man1 0755 root bin',
+             'mode': '0755',
+             'path': '/opt/csw/share/man/man1',
+             'type': 'd',
+             'user': 'root'},
+            {'class': 'none',
+             'group': 'bin',
+             'line': '1 f none /opt/csw/share/man/man1/rsync.1 0644 root bin 159739 65016 1266395027',
+             'mode': '0644',
+             'path': '/opt/csw/share/man/man1/rsync.1',
+             'type': 'f',
+             'user': 'root'},
+            {'class': 'none',
+             'group': 'bin',
+             'line': '1 d none /opt/csw/share/man/man5 0755 root bin',
+             'mode': '0755',
+             'path': '/opt/csw/share/man/man5',
+             'type': 'd',
+             'user': 'root'},
+            {'class': 'none',
+             'group': 'bin',
+             'line': '1 f none /opt/csw/share/man/man5/rsyncd.conf.5 0644 root bin 36372 24688 1266395027',
+             'mode': '0644',
+             'path': '/opt/csw/share/man/man5/rsyncd.conf.5',
+             'type': 'f',
+             'user': 'root'},
+            {'class': None,
+             'group': None,
+             'line': '1 i copyright 69 6484 1266396366',
+             'mode': None,
+             'path': None,
+             'type': 'i',
+             'user': None},
+            {'class': None,
+             'group': None,
+             'line': '1 i depend 236 21212 1266396368',
+             'mode': None,
+             'path': None,
+             'type': 'i',
+             'user': None},
+            {'class': None,
+             'group': None,
+             'line': '1 i pkginfo 511 43247 1266396371',
+             'mode': None,
+             'path': None,
+             'type': 'i',
+             'user': 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  Tue Jul  6 00:57:42 2010
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Mon, 05 Jul 2010 22:57:42 +0000
Subject: [csw-devel] SF.net SVN: gar:[10450] csw/mgar/gar/v2
Message-ID: <E1OVube-0006Ey-0H@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 10450
          http://gar.svn.sourceforge.net/gar/?rev=10450&view=rev
Author:   wahwah
Date:     2010-07-05 22:57:41 +0000 (Mon, 05 Jul 2010)

Log Message:
-----------
mGAR v2: merging in sqlite package statistics storage backend

Modified Paths:
--------------
    csw/mgar/gar/v2/bin/checkpkg_collect_stats.py
    csw/mgar/gar/v2/lib/python/checkpkg.py
    csw/mgar/gar/v2/lib/python/models.py
    csw/mgar/gar/v2/lib/python/overrides.py
    csw/mgar/gar/v2/lib/python/package_checks_test.py

Added Paths:
-----------
    csw/mgar/gar/v2/lib/python/testdata/rsync_pkg_stats.py

Removed Paths:
-------------
    csw/mgar/gar/v2/lib/python/testdata/stats/

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-stats:8454-8649
/csw/mgar/gar/v2-collapsed-modulations:6895
/csw/mgar/gar/v2-dirpackage:8125-8180
/csw/mgar/gar/v2-migrateconf:7082-7211
/csw/mgar/gar/v2-skayser:6087-6132
   + /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-stats:8454-8649
/csw/mgar/gar/v2-collapsed-modulations:6895
/csw/mgar/gar/v2-dirpackage:8125-8180
/csw/mgar/gar/v2-migrateconf:7082-7211
/csw/mgar/gar/v2-skayser:6087-6132
/csw/mgar/gar/v2-sqlite:10434-10449

Modified: csw/mgar/gar/v2/bin/checkpkg_collect_stats.py
===================================================================
--- csw/mgar/gar/v2/bin/checkpkg_collect_stats.py	2010-07-05 22:42:25 UTC (rev 10449)
+++ csw/mgar/gar/v2/bin/checkpkg_collect_stats.py	2010-07-05 22:57:41 UTC (rev 10450)
@@ -39,7 +39,7 @@
   args_display = args
   if len(args_display) > 5:
     args_display = args_display[:5] + ["...more..."]
-  logging.debug("Calling: %s, please be patient", args_display)
+  logging.debug("Processing: %s, please be patient", args_display)
   packages = [opencsw.CswSrv4File(x, options.debug) for x in args]
   if options.catalog_file:
     # Using cached md5sums to save time: injecting md5sums

Modified: csw/mgar/gar/v2/lib/python/checkpkg.py
===================================================================
--- csw/mgar/gar/v2/lib/python/checkpkg.py	2010-07-05 22:42:25 UTC (rev 10449)
+++ csw/mgar/gar/v2/lib/python/checkpkg.py	2010-07-05 22:57:41 UTC (rev 10450)
@@ -31,7 +31,7 @@
 import tag
 
 DEBUG_BREAK_PKGMAP_AFTER = False
-DB_SCHEMA_VERSION = 3L
+DB_SCHEMA_VERSION = 4L
 PACKAGE_STATS_VERSION = 6L
 SYSTEM_PKGMAP = "/var/sadm/install/contents"
 NEEDED_SONAMES = "needed sonames"
@@ -39,7 +39,6 @@
 SONAME = "soname"
 CONFIG_MTIME = "mtime"
 CONFIG_DB_SCHEMA = "db_schema_version"
-WRITE_YAML = False
 DO_NOT_REPORT_SURPLUS = set([u"CSWcommon", u"CSWcswclassutils", u"CSWisaexec"])
 DO_NOT_REPORT_MISSING = set([])
 DO_NOT_REPORT_MISSING_RE = [r"SUNW.*", r"\*SUNW.*"]
@@ -199,28 +198,66 @@
 
 def ExtractBuildUsername(pkginfo):
   m = re.match(PSTAMP_RE, pkginfo["PSTAMP"])
-  if m:
-    return m.group("username")
-  else:
-    return None
+  return m.group("username") if m else None
 
 
-class SystemPkgmap(object):
+class DatabaseClient(object):
+
+  CHECKPKG_DIR = ".checkpkg"
+  SQLITE3_DBNAME_TMPL = "checkpkg-db-%(fqdn)s"
+  TABLES = (m.CswConfig,
+            m.CswFile,
+            m.CswPackage,
+            m.Srv4FileStats,
+            m.CheckpkgOverride)
+  sqo_conn = None
+  db_path = None
+
+  def __init__(self, debug=False):
+    self.debug = debug
+
+  @classmethod
+  def GetDatabasePath(cls):
+    if not cls.db_path:
+      dbname_dict = {'fqdn': socket.getfqdn()}
+      db_filename = cls.SQLITE3_DBNAME_TMPL % dbname_dict
+      home_dir = os.environ["HOME"]
+      cls.db_path = os.path.join(home_dir, cls.CHECKPKG_DIR, db_filename)
+    return cls.db_path
+
+  @classmethod
+  def InitializeSqlobject(cls):
+    """Establishes a database connection and stores it as a class member.
+
+    The idea is to share the database connection between instances.  It would
+    be solved even better if the connection was passed to the class
+    constructor.
+    """
+    if not cls.sqo_conn:
+      db_path = cls.GetDatabasePath()
+      cls.sqo_conn = sqlobject.connectionForURI('sqlite:%s' % db_path)
+      sqlobject.sqlhub.processConnection = cls.sqo_conn
+
+  def CreateTables(self):
+    for table in self.TABLES:
+      table.createTable(ifNotExists=True)
+
+  def IsDatabaseGoodSchema(self):
+    good_version = self.GetDatabaseSchemaVersion() >= DB_SCHEMA_VERSION
+    return good_version
+
+
+class SystemPkgmap(DatabaseClient):
   """A class to hold and manipulate the /var/sadm/install/contents file."""
 
   STOP_PKGS = ["SUNWbcp", "SUNWowbcp", "SUNWucb"]
-  CHECKPKG_DIR = ".checkpkg"
-  SQLITE3_DBNAME_TMPL = "var-sadm-install-contents-cache-%s"
 
   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.checkpkg_dir = os.path.join(os.environ["HOME"], self.CHECKPKG_DIR)
-    self.fqdn = socket.getfqdn()
-    self.db_path = os.path.join(self.checkpkg_dir,
-                                self.SQLITE3_DBNAME_TMPL % self.fqdn)
     self.file_mtime = None
     self.cache_mtime = None
     self.initialized = False
@@ -228,41 +265,32 @@
       self.system_pkgmap_files = [SYSTEM_PKGMAP]
     else:
       self.system_pkgmap_files = system_pkgmap_files
-    self.debug = debug
 
   def _LazyInitializeDatabase(self):
     if not self.initialized:
       self.InitializeDatabase()
 
-  def InitializeSqlobject(self):
-    if True:
-      logging.debug("Connecting to the %s database.", self.db_path)
-      self.sqo_conn = sqlobject.connectionForURI(
-          'sqlite:%s' % self.db_path, debug=(self.debug and False))
-    else:
-      # TODO: Use a configuration file to store the credentials
-      logging.debug("Connecting MySQL.")
-      self.sqo_conn = sqlobject.connectionForURI(
-          'mysql://checkpkg:Nid3owlOn at mysql/checkpkg',
-          debug=(self.debug and False))
-    sqlobject.sqlhub.processConnection = self.sqo_conn
-
   def InitializeRawDb(self):
     """It's necessary for low level operations."""
     if True:
       logging.debug("Connecting to sqlite")
-      self.sqlite_conn = sqlite3.connect(self.db_path)
+      self.sqlite_conn = sqlite3.connect(self.GetDatabasePath())
 
   def InitializeDatabase(self):
-    """Refactor this class to first create CswFile with no primary key and no indexes.
+    """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
-    if not os.path.exists(self.db_path):
-      print "Building a cache of %s." % self.system_pkgmap_files
-      print "The cache will be kept in %s." % self.db_path
-      if not os.path.exists(self.checkpkg_dir):
-        logging.debug("Creating %s", self.checkpkg_dir)
-        os.mkdir(self.checkpkg_dir)
+    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()
@@ -278,11 +306,6 @@
       self.PopulateDatabase()
     self.initialized = True
 
-  def CreateTables(self):
-    m.CswConfig.createTable(ifNotExists=True)
-    m.CswPackage.createTable(ifNotExists=True)
-    m.CswFile.createTable(ifNotExists=True)
-
   def PopulateDatabase(self):
     """Imports data into the database.
 
@@ -497,10 +520,6 @@
       schema_on_disk = res.getOne().int_value
     return schema_on_disk
 
-  def IsDatabaseGoodSchema(self):
-    good_version = self.GetDatabaseSchemaVersion() >= DB_SCHEMA_VERSION
-    return good_version
-
   def IsDatabaseUpToDate(self):
     f_mtime = self.GetFileMtime()
     d_mtime = self.GetDatabaseMtime()
@@ -517,24 +536,14 @@
                   repr(good_version), repr(fresh))
     return fresh and good_version
 
-  def SoftDropTable(self, tablename):
-    c = self.conn.cursor()
-    try:
-      # This doesn't accept placeholders.
-      c.execute("DROP TABLE %s;" % tablename)
-    except sqlite3.OperationalError, e:
-      logging.warn("sqlite3.OperationalError: %s", e)
-
   def PurgeDatabase(self, drop_tables=False):
     if drop_tables:
-      # for table_name in ("config", "systempkgmap", "packages"):
-      #   self.SoftDropTable(table_name)
-      for table in (m.CswConfig, m.CswFile, m.CswPackage):
+      for table in self.TABLES:
         if table.tableExists():
           table.dropTable()
     else:
-      logging.info("Deleting all rows from the cache database")
-      for table in (m.CswConfig, m.CswFile, m.CswPackage):
+      logging.info("Truncating all tables")
+      for table in self.TABLES:
         table.clearTable()
 
   def GetInstalledPackages(self):
@@ -628,8 +637,6 @@
   rpath = []
   for line in dump_output.splitlines():
     fields = re.split(c.WS_RE, line)
-    # TODO: Make it a unit test
-    # logging.debug("%s says: %s", DUMP_BIN, fields)
     if len(fields) < 3:
       continue
     if fields[1] == "NEEDED":
@@ -771,7 +778,7 @@
 
   def GetCommonPaths(self, arch):
     """Returns a list of paths for architecture, from gar/etc/commondirs*."""
-    # TODO: If this was cached, it would save a significant amount of time.
+    # TODO: If this was cached, it could save a significant amount of time.
     assert arch in ('i386', 'sparc', 'all'), "Wrong arch: %s" % repr(arch)
     if arch == 'all':
       archs = ('i386', 'sparc')
@@ -897,8 +904,13 @@
   return isalist
 
 
-class PackageStats(object):
-  """Collects stats about a package and saves it."""
+class PackageStats(DatabaseClient):
+  """Collects stats about a package and saves it.
+
+  TODO: Maintain a global database connection instead of creating one for each
+  instantiated object.
+  TODO: Store overrides in a separate table for performance.
+  """
   # This list needs to be synchronized with the CollectStats() method.
   STAT_FILES = [
       "bad_paths",
@@ -918,17 +930,20 @@
       "files_metadata",
   ]
 
-  def __init__(self, srv4_pkg, stats_basedir=None, md5sum=None):
+  def __init__(self, srv4_pkg, stats_basedir=None, md5sum=None, debug=False):
+    super(PackageStats, self).__init__(debug=debug)
     self.srv4_pkg = srv4_pkg
     self.md5sum = md5sum
     self.dir_format_pkg = None
     self.stats_path = None
     self.all_stats = {}
     self.stats_basedir = stats_basedir
+    self.db_pkg_stats = None
     if not self.stats_basedir:
       home = os.environ["HOME"]
       parts = [home, ".checkpkg", "stats"]
       self.stats_basedir = os.path.join(*parts)
+    self.InitializeSqlobject()
 
   def GetPkgchkData(self):
     ret, stdout, stderr = self.srv4_pkg.GetPkgchkOutput()
@@ -952,20 +967,31 @@
       self.stats_path = os.path.join(*parts)
     return self.stats_path
 
+  def GetDbObject(self):
+    if not self.db_pkg_stats:
+      md5_sum = self.GetMd5sum()
+      logging.debug("GetDbObject() md5_sum=%s", md5_sum)
+      res = m.Srv4FileStats.select(m.Srv4FileStats.q.md5_sum==md5_sum)
+      if not res.count():
+        logging.debug("%s are not in the db", md5_sum)
+        return None
+      else:
+        logging.debug("%s are in the db", md5_sum)
+        self.db_pkg_stats = res.getOne()
+    return self.db_pkg_stats
+
+
   def StatsExist(self):
     """Checks if statistics of a package exist.
 
     Returns:
       bool
     """
-    if not self.StatsDirExists():
+    pkg_stats = self.GetDbObject()
+    if not pkg_stats:
       return False
-    # More checks can be added in the future.
-    return True
+    return pkg_stats.stats_version == PACKAGE_STATS_VERSION
 
-  def StatsDirExists(self):
-    return os.path.isdir(self.GetStatsPath())
-
   def GetDirFormatPkg(self):
     if not self.dir_format_pkg:
       self.dir_format_pkg = self.srv4_pkg.GetDirFormatPkg()
@@ -1028,14 +1054,14 @@
 
   def GetOverrides(self):
     dir_pkg = self.GetDirFormatPkg()
-    overrides = dir_pkg.GetOverrides()
+    override_list = dir_pkg.GetOverrides()
     def OverrideToDict(override):
-      d = {}
-      d["pkgname"] = override.pkgname
-      d["tag_name"] = override.tag_name
-      d["tag_info"] = override.tag_info
-      return d
-    overrides_simple = [OverrideToDict(x) for x in overrides]
+      return {
+        "pkgname":  override.pkgname,
+        "tag_name":  override.tag_name,
+        "tag_info":  override.tag_info,
+      }
+    overrides_simple = [OverrideToDict(x) for x in override_list]
     return overrides_simple
 
   def GetLddMinusRlines(self):
@@ -1115,126 +1141,103 @@
 
   def CollectStats(self, force=False):
     """Lazy stats collection."""
-    if not self.StatsDirExists() or force:
-      self._CollectStats()
-      return
-    for stats_name in self.STAT_FILES + ["basic_stats"]:
-      file_name = in_file_name_pickle = os.path.join(
-          self.GetStatsPath(), "%s.pickle" % stats_name)
-      if not os.path.exists(file_name):
-        self._CollectStats()
-        return
-    f = open(file_name, "r")
-    obj = cPickle.load(f)
-    f.close()
-    saved_version = obj["stats_version"]
-    if saved_version < PACKAGE_STATS_VERSION:
-      self._CollectStats()
+    if force:
+      return self._CollectStats()
+    if not self.StatsExist():
+      return self._CollectStats()
+    return self.ReadSavedStats()
 
   def _CollectStats(self):
     """The list of variables needs to be synchronized with the one
     at the top of this class.
-
-    TODO:
-    - Run pkgchk against the package file.
-    - Grep all the files for bad paths.
     """
     stats_path = self.GetStatsPath()
     self.MakeStatsDir()
     dir_pkg = self.GetDirFormatPkg()
-    logging.info("Collecting %s package statistics.", repr(dir_pkg.pkgname))
-    self.DumpObject(dir_pkg.ListBinaries(), "binaries")
-    self.DumpObject(self.GetBinaryDumpInfo(), "binaries_dump_info")
-    self.DumpObject(dir_pkg.GetDependencies(), "depends")
-    self.DumpObject(GetIsalist(), "isalist")
-    self.DumpObject(self.GetOverrides(), "overrides")
-    self.DumpObject(self.GetPkgchkData(), "pkgchk")
-    self.DumpObject(dir_pkg.GetParsedPkginfo(), "pkginfo")
-    self.DumpObject(dir_pkg.GetPkgmap().entries, "pkgmap")
+    logging.debug("Collecting %s package statistics.", repr(dir_pkg.pkgname))
+    override_dicts = self.GetOverrides()
+    pkg_stats = {
+        "binaries": dir_pkg.ListBinaries(),
+        "binaries_dump_info": self.GetBinaryDumpInfo(),
+        "depends": dir_pkg.GetDependencies(),
+        "isalist": GetIsalist(),
+        "overrides": override_dicts,
+        "pkgchk": self.GetPkgchkData(),
+        "pkginfo": dir_pkg.GetParsedPkginfo(),
+        "pkgmap": dir_pkg.GetPkgmap().entries,
+        "bad_paths": dir_pkg.GetFilesContaining(BAD_CONTENT_REGEXES),
+        "basic_stats": self.GetBasicStats(),
+        "files_metadata": dir_pkg.GetFilesMetadata(),
+    }
+    db_pkg_stats = m.Srv4FileStats(md5_sum=self.GetMd5sum(),
+                                   pkgname=pkg_stats["basic_stats"]["pkgname"],
+                                   stats_version=PACKAGE_STATS_VERSION,
+                                   data=cPickle.dumps(pkg_stats))
+    # Inserting overrides as rows into the database
+    for override_dict in override_dicts:
+      o = m.CheckpkgOverride(srv4_file=db_pkg_stats,
+                             **override_dict)
+
     # The ldd -r reporting breaks on bigger packages during yaml saving.
     # It might work when yaml is disabled
     # self.DumpObject(self.GetLddMinusRlines(), "ldd_dash_r")
     # This check is currently disabled, let's save time by not collecting
     # these data.
     # self.DumpObject(self.GetDefinedSymbols(), "defined_symbols")
-    self.DumpObject(dir_pkg.GetFilesContaining(BAD_CONTENT_REGEXES), "bad_paths")
     # This one should be last, so that if the collection is interrupted
     # in one of the previous runs, the basic_stats.pickle file is not there
     # or not updated, and the collection is started again.
-    self.DumpObject(self.GetBasicStats(), "basic_stats")
-    self.DumpObject(dir_pkg.GetFilesMetadata(), "files_metadata")
+
     logging.debug("Statistics of %s have been collected.", repr(dir_pkg.pkgname))
+    return pkg_stats
 
   def GetAllStats(self):
-    if self.StatsExist():
+    logging.debug("GetAllStats()")
+    if not self.all_stats and self.StatsExist():
       self.all_stats = self.ReadSavedStats()
-    else:
-      self.CollectStats()
+    elif not self.all_stats:
+      self.all_stats = self.CollectStats()
     return self.all_stats
 
   def GetSavedOverrides(self):
     if not self.StatsExist():
       raise PackageError("Package stats not ready.")
-    override_stats = self.ReadObject("overrides")
-    override_list = [overrides.Override(**x) for x in override_stats]
+    pkg_stats = self.GetDbObject()
+    res = m.CheckpkgOverride.select(m.CheckpkgOverride.q.srv4_file==pkg_stats)
+    override_list = []
+    for db_override in res:
+      d = {
+          'pkgname': db_override.pkgname,
+          'tag_name': db_override.tag_name,
+          'tag_info': db_override.tag_info,
+      }
+      override_list.append(overrides.Override(**d))
     return override_list
 
-  def DumpObject(self, obj, name):
-    """Saves an object."""
-    stats_path = self.GetStatsPath()
-    # yaml
-    if WRITE_YAML:
-      out_file_name = os.path.join(stats_path, "%s.yml" % name)
-      logging.debug("DumpObject(): writing %s", repr(out_file_name))
-      f = open(out_file_name, "w")
-      f.write(yaml.safe_dump(obj))
-      f.close()
-    # pickle
-    out_file_name_pickle = os.path.join(stats_path, "%s.pickle" % name)
-    logging.debug("DumpObject(): writing %s", repr(out_file_name_pickle))
-    f = open(out_file_name_pickle, "wb")
-    cPickle.dump(obj, f)
-    f.close()
-    self.all_stats[name] = obj
-
-  def ReadObject(self, name):
-    """Reads an object."""
-    stats_path = self.GetStatsPath()
-    in_file_name = os.path.join(stats_path, "%s.yml" % name)
-    in_file_name_pickle = os.path.join(stats_path, "%s.pickle" % name)
-    if os.path.exists(in_file_name_pickle):
-      f = open(in_file_name_pickle, "r")
-      obj = cPickle.load(f)
-      f.close()
-    elif os.path.exists(in_file_name):
-      f = open(in_file_name, "r")
-      obj = yaml.safe_load(f)
-      f.close()
-    else:
-      raise PackageError("Can't read %s nor %s."
-                         % (in_file_name, in_file_name_pickle))
-    return obj
-
   def ReadSavedStats(self):
-    all_stats = {}
-    for name in self.STAT_FILES:
-      all_stats[name] = self.ReadObject(name)
-    return all_stats
+    if not self.all_stats:
+      md5_sum = self.GetMd5sum()
+      res = m.Srv4FileStats.select(m.Srv4FileStats.q.md5_sum==md5_sum)
+      self.all_stats = cPickle.loads(str(res.getOne().data))
+    return self.all_stats
 
   def _ParseLddDashRline(self, line):
     found_re = r"^\t(?P<soname>\S+)\s+=>\s+(?P<path_found>\S+)"
-    symbol_not_found_re = r"^\tsymbol not found:\s(?P<symbol>\S+)\s+\((?P<path_not_found>\S+)\)"
+    symbol_not_found_re = (r"^\tsymbol not found:\s(?P<symbol>\S+)\s+"
+                           r"\((?P<path_not_found>\S+)\)")
     only_so = r"^\t(?P<path_only>\S+)$"
-    version_so = r'^\t(?P<soname_version_not_found>\S+) \((?P<lib_name>\S+)\) =>\t \(version not found\)'
+    version_so = (r'^\t(?P<soname_version_not_found>\S+) '
+                  r'\((?P<lib_name>\S+)\) =>\t \(version not found\)')
     stv_protected = (r'^\trelocation \S+ symbol: (?P<relocation_symbol>\S+): '
                      r'file (?P<relocation_path>\S+): '
-                     r'relocation bound to a symbol with STV_PROTECTED visibility$')
-    sizes_differ = (r'^\trelocation \S+ sizes differ: (?P<sizes_differ_symbol>\S+)$')
+                     r'relocation bound to a symbol '
+                     r'with STV_PROTECTED visibility$')
+    sizes_differ = (r'^\trelocation \S+ sizes differ: '
+                    r'(?P<sizes_differ_symbol>\S+)$')
     sizes_info = (r'^\t\t\(file (?P<sizediff_file1>\S+) size=(?P<size1>0x\w+); '
                   r'file (?P<sizediff_file2>\S+) size=(?P<size2>0x\w+)\)$')
-    sizes_one_used = (
-        r'^\t\t(?P<sizediffused_file>\S+) size used; '
-        'possible insufficient data copied$')
+    sizes_one_used = (r'^\t\t(?P<sizediffused_file>\S+) size used; '
+                      r'possible insufficient data copied$')
     common_re = (r"(%s|%s|%s|%s|%s|%s|%s|%s)"
                  % (found_re, symbol_not_found_re, only_so, version_so,
                     stv_protected, sizes_differ, sizes_info, sizes_one_used))

Modified: csw/mgar/gar/v2/lib/python/models.py
===================================================================
--- csw/mgar/gar/v2/lib/python/models.py	2010-07-05 22:42:25 UTC (rev 10449)
+++ csw/mgar/gar/v2/lib/python/models.py	2010-07-05 22:57:41 UTC (rev 10450)
@@ -40,3 +40,15 @@
   path = sqlobject.UnicodeCol(notNone=True)
   line = sqlobject.UnicodeCol(notNone=True)
   basename_idx = sqlobject.DatabaseIndex('basename')
+
+class Srv4FileStats(sqlobject.SQLObject):
+  md5_sum = sqlobject.UnicodeCol(notNone=True, unique=True)
+  pkgname = sqlobject.UnicodeCol(length=255, notNone=True)
+  stats_version = sqlobject.IntCol(notNone=True)
+  data = sqlobject.UnicodeCol(notNone=True)
+
+class CheckpkgOverride(sqlobject.SQLObject):
+  srv4_file = sqlobject.ForeignKey('Srv4FileStats')
+  pkgname = sqlobject.UnicodeCol(default=None)
+  tag_name = sqlobject.UnicodeCol(notNone=True)
+  tag_info = sqlobject.UnicodeCol(default=None)

Modified: csw/mgar/gar/v2/lib/python/overrides.py
===================================================================
--- csw/mgar/gar/v2/lib/python/overrides.py	2010-07-05 22:42:25 UTC (rev 10449)
+++ csw/mgar/gar/v2/lib/python/overrides.py	2010-07-05 22:57:41 UTC (rev 10450)
@@ -53,17 +53,17 @@
     return basket_a == basket_b
 
 
-def ApplyOverrides(error_tags, overrides):
+def ApplyOverrides(error_tags, override_list):
   """Filters out all the error tags that overrides apply to.
 
   O(N * M), but N and M are always small.
   """
   tags_after_overrides = []
   applied_overrides = set([])
-  provided_overrides = set(copy.copy(overrides))
+  provided_overrides = set(copy.copy(override_list))
   for tag in error_tags:
     override_applies = False
-    for override in overrides:
+    for override in override_list:
       if override.DoesApply(tag):
         override_applies = True
         applied_overrides.add(override)

Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py
===================================================================
--- csw/mgar/gar/v2/lib/python/package_checks_test.py	2010-07-05 22:42:25 UTC (rev 10449)
+++ csw/mgar/gar/v2/lib/python/package_checks_test.py	2010-07-05 22:57:41 UTC (rev 10450)
@@ -15,13 +15,10 @@
 import testdata.checkpkg_test_data_CSWdjvulibrert as td_1
 import testdata.checkpkg_pkgs_data_minimal as td_2
 import testdata.rpaths
+from testdata.rsync_pkg_stats import pkg_stats as rsync_stats
 
-BASE_DIR = os.path.dirname(__file__)
-TESTDATA_DIR = os.path.join(BASE_DIR, "testdata")
-CHECKPKG_STATS_DIR = os.path.join(TESTDATA_DIR, "stats")
-DEFAULT_DATA_MD5 = "461a24f02dd5020b4aa014b76f3ec2cc"
-DEFAULT_PKG_STATS = checkpkg.PackageStats(None, CHECKPKG_STATS_DIR, DEFAULT_DATA_MD5)
-DEFAULT_PKG_DATA = DEFAULT_PKG_STATS.GetAllStats()
+DEFAULT_PKG_STATS = None
+DEFAULT_PKG_DATA = rsync_stats
 
 
 class CheckpkgUnitTestHelper(object):

Copied: csw/mgar/gar/v2/lib/python/testdata/rsync_pkg_stats.py (from rev 10449, csw/mgar/gar/v2-sqlite/lib/python/testdata/rsync_pkg_stats.py)
===================================================================
--- csw/mgar/gar/v2/lib/python/testdata/rsync_pkg_stats.py	                        (rev 0)
+++ csw/mgar/gar/v2/lib/python/testdata/rsync_pkg_stats.py	2010-07-05 22:57:41 UTC (rev 10450)
@@ -0,0 +1,185 @@
+pkg_stats = {
+ 'all_filenames': ['pkginfo',
+                   'pkgmap',
+                   'copyright',
+                   'depend',
+                   'rsyncd.conf.5',
+                   'rsync.1',
+                   'license',
+                   'rsync',
+                   'rsync'],
+ 'bad_paths': {},
+ 'basic_stats': {'catalogname': 'rsync',
+                 'parsed_basename': {'arch': 'sparc',
+                                     'catalogname': 'rsync',
+                                     'full_version_string': '3.0.7,REV=2010.02.17',
+                                     'osrel': 'SunOS5.8',
+                                     'revision_info': {'REV': '2010.02.17'},
+                                     'vendortag': 'CSW',
+                                     'version': '3.0.7',
+                                     'version_info': {'major version': '3',
+                                                      'minor version': '0',
+                                                      'patchlevel': '7'}},
+                 'pkg_basename': 'rsync-3.0.7,REV=2010.02.17-SunOS5.8-sparc-CSW.pkg.gz',
+                 'pkg_path': '/tmp/pkg_dhBeK1/rsync-3.0.7,REV=2010.02.17-SunOS5.8-sparc-CSW.pkg.gz',
+                 'pkgname': 'CSWrsync',
+                 'stats_version': 1},
+ 'binaries': ['opt/csw/bin/sparcv9/rsync', 'opt/csw/bin/sparcv8/rsync'],
+ 'binaries_dump_info': [{'base_name': 'rsync',
+                         'needed sonames': ['libpopt.so.0',
+                                            'libsec.so.1',
+                                            'libiconv.so.2',
+                                            'libsocket.so.1',
+                                            'libnsl.so.1',
+                                            'libc.so.1'],
+                         'path': 'opt/csw/bin/sparcv9/rsync',
+                         'runpath': ['/opt/csw/lib/$ISALIST',
+                                     '/opt/csw/lib/64',
+                                     '/usr/lib/$ISALIST',
+                                     '/usr/lib',
+                                     '/lib/$ISALIST',
+                                     '/lib'],
+                         'soname': 'rsync',
+                         'soname_guessed': True},
+                        {'base_name': 'rsync',
+                         'needed sonames': ['libpopt.so.0',
+                                            'libsec.so.1',
+                                            'libiconv.so.2',
+                                            'libsocket.so.1',
+                                            'libnsl.so.1',
+                                            'libc.so.1'],
+                         'path': 'opt/csw/bin/sparcv8/rsync',
+                         'runpath': ['/opt/csw/lib/$ISALIST',
+                                     '/opt/csw/lib',
+                                     '/usr/lib/$ISALIST',
+                                     '/usr/lib',
+                                     '/lib/$ISALIST',
+                                     '/lib'],
+                         'soname': 'rsync',
+                         'soname_guessed': True}],
+ 'depends': [['CSWcommon',
+              'CSWcommon common - common files and dirs for CSW packages '],
+             ['CSWisaexec',
+              'CSWisaexec isaexec - sneaky wrapper around Sun isaexec '],
+             ['CSWiconv', 'CSWiconv libiconv - GNU iconv library '],
+             ['CSWlibpopt',
+              'CSWlibpopt libpopt - Popt is a C library for parsing command line parameters ']],
+ 'files_metadata': None,
+ 'isalist': ['sparcv9+vis2',
+             'sparcv9+vis',
+             'sparcv9',
+             'sparcv8plus+vis2',
+             'sparcv8plus+vis',
+             'sparcv8plus',
+             'sparcv8',
+             'sparcv8-fsmuld',
+             'sparcv7',
+             'sparc'],
+ 'ldd_dash_r': [],
+ 'overrides': [],
+ 'pkgchk': [],
+ 'pkginfo': {'ARCH': 'sparc',
+             'CATEGORY': 'application',
+             'CLASSES': 'none',
+             'EMAIL': 'maciej at opencsw.org',
+             'HOTLINE': 'http://www.opencsw.org/bugtrack/',
+             'NAME': 'rsync - utility which provides fast incremental file transfer',
+             'OPENCSW_CATALOGNAME': 'rsync',
+             'OPENCSW_MODE64': '32/64/isaexec',
+             'OPENCSW_REPOSITORY': 'https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/pkg/rsync/trunk at 8611',
+             'PKG': 'CSWrsync',
+             'PSTAMP': 'maciej at build8s-20100217094608',
+             'VENDOR': 'http://rsync.samba.org/ packaged for CSW by Maciej Blizinski',
+             'VERSION': '3.0.7,REV=2010.02.17',
+             'WORKDIR_FIRSTMOD': '../build-isa-sparcv8'},
+ 'pkgmap': [{'class': None,
+             'group': None,
+             'line': ': 1 2912',
+             'mode': None,
+             'path': None,
+             'type': '1',
+             'user': None},
+            {'class': 'none',
+             'group': None,
+             'line': '1 l none /opt/csw/bin/rsync=/opt/csw/bin/isaexec',
+             'mode': None,
+             'path': '/opt/csw/bin/rsync',
+             'type': 'l',
+             'user': None},
+            {'class': 'none',
+             'group': 'bin',
+             'line': '1 f none /opt/csw/bin/sparcv8/rsync 0755 root bin 585864 12576 1266395028',
+             'mode': '0755',
+             'path': '/opt/csw/bin/sparcv8/rsync',
+             'type': 'f',
+             'user': 'root'},
+            {'class': 'none',
+             'group': 'bin',
+             'line': '1 f none /opt/csw/bin/sparcv9/rsync 0755 root bin 665520 60792 1266395239',
+             'mode': '0755',
+             'path': '/opt/csw/bin/sparcv9/rsync',
+             'type': 'f',
+             'user': 'root'},
+            {'class': 'none',
+             'group': 'bin',
+             'line': '1 d none /opt/csw/share/doc/rsync 0755 root bin',
+             'mode': '0755',
+             'path': '/opt/csw/share/doc/rsync',
+             'type': 'd',
+             'user': 'root'},
+            {'class': 'none',
+             'group': 'bin',
+             'line': '1 f none /opt/csw/share/doc/rsync/license 0644 root bin 35147 30328 1266396366',
+             'mode': '0644',
+             'path': '/opt/csw/share/doc/rsync/license',
+             'type': 'f',
+             'user': 'root'},
+            {'class': 'none',
+             'group': 'bin',
+             'line': '1 d none /opt/csw/share/man/man1 0755 root bin',
+             'mode': '0755',
+             'path': '/opt/csw/share/man/man1',
+             'type': 'd',
+             'user': 'root'},
+            {'class': 'none',
+             'group': 'bin',
+             'line': '1 f none /opt/csw/share/man/man1/rsync.1 0644 root bin 159739 65016 1266395027',
+             'mode': '0644',
+             'path': '/opt/csw/share/man/man1/rsync.1',
+             'type': 'f',
+             'user': 'root'},
+            {'class': 'none',
+             'group': 'bin',
+             'line': '1 d none /opt/csw/share/man/man5 0755 root bin',
+             'mode': '0755',
+             'path': '/opt/csw/share/man/man5',
+             'type': 'd',
+             'user': 'root'},
+            {'class': 'none',
+             'group': 'bin',
+             'line': '1 f none /opt/csw/share/man/man5/rsyncd.conf.5 0644 root bin 36372 24688 1266395027',
+             'mode': '0644',
+             'path': '/opt/csw/share/man/man5/rsyncd.conf.5',
+             'type': 'f',
+             'user': 'root'},
+            {'class': None,
+             'group': None,
+             'line': '1 i copyright 69 6484 1266396366',
+             'mode': None,
+             'path': None,
+             'type': 'i',
+             'user': None},
+            {'class': None,
+             'group': None,
+             'line': '1 i depend 236 21212 1266396368',
+             'mode': None,
+             'path': None,
+             'type': 'i',
+             'user': None},
+            {'class': None,
+             'group': None,
+             'line': '1 i pkginfo 511 43247 1266396371',
+             'mode': None,
+             'path': None,
+             'type': 'i',
+             'user': None}]}


Property changes on: csw/mgar/gar/v2/pkglib/csw/depend
___________________________________________________________________
Modified: svn:mergeinfo
   - /csw/mgar/gar/v2/pkglib/csw/depend:4936-6678
/csw/mgar/gar/v2-bwalton/pkglib/csw/depend:9784-10011
/csw/mgar/gar/v2-checkpkg/pkglib/csw/depend:7722-7855
/csw/mgar/gar/v2-checkpkg-stats/pkglib/csw/depend:8454-8649
/csw/mgar/gar/v2-collapsed-modulations/pkglib/csw/depend:6895
/csw/mgar/gar/v2-dirpackage/pkglib/csw/depend:8125-8180
/csw/mgar/gar/v2-skayser/pkglib/csw/depend:6087-6132
   + /csw/mgar/gar/v2/pkglib/csw/depend:4936-6678
/csw/mgar/gar/v2-bwalton/pkglib/csw/depend:9784-10011
/csw/mgar/gar/v2-checkpkg/pkglib/csw/depend:7722-7855
/csw/mgar/gar/v2-checkpkg-stats/pkglib/csw/depend:8454-8649
/csw/mgar/gar/v2-collapsed-modulations/pkglib/csw/depend:6895
/csw/mgar/gar/v2-dirpackage/pkglib/csw/depend:8125-8180
/csw/mgar/gar/v2-skayser/pkglib/csw/depend:6087-6132
/csw/mgar/gar/v2-sqlite/pkglib/csw/depend:10434-10449


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 Jul  6 03:02:35 2010
From: theferret at users.sourceforge.net (theferret at users.sourceforge.net)
Date: Tue, 06 Jul 2010 01:02:35 +0000
Subject: [csw-devel] SF.net SVN: gar:[10451] csw/mgar/pkg/atspi
Message-ID: <E1OVwYV-0005zd-9G@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10451
          http://gar.svn.sourceforge.net/gar/?rev=10451&view=rev
Author:   theferret
Date:     2010-07-06 01:02:35 +0000 (Tue, 06 Jul 2010)

Log Message:
-----------
atspi: moved legacy to subdir

Added Paths:
-----------
    csw/mgar/pkg/atspi/legacy/

Removed Paths:
-------------
    csw/mgar/pkg/atspi/trunk/legacy/


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 Jul  6 03:18:22 2010
From: theferret at users.sourceforge.net (theferret at users.sourceforge.net)
Date: Tue, 06 Jul 2010 01:18:22 +0000
Subject: [csw-devel] SF.net SVN: gar:[10452] csw/mgar/pkg/atspi/trunk
Message-ID: <E1OVwnm-0007B0-Cx@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 10452
          http://gar.svn.sourceforge.net/gar/?rev=10452&view=rev
Author:   theferret
Date:     2010-07-06 01:18:22 +0000 (Tue, 06 Jul 2010)

Log Message:
-----------
atspi: Added Makefile that works, but needs newer gtk2

Added Paths:
-----------
    csw/mgar/pkg/atspi/trunk/Makefile
    csw/mgar/pkg/atspi/trunk/pkginfo

Added: csw/mgar/pkg/atspi/trunk/Makefile
===================================================================
--- csw/mgar/pkg/atspi/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/atspi/trunk/Makefile	2010-07-06 01:18:22 UTC (rev 10452)
@@ -0,0 +1,169 @@
+# This file is from TEMPLATES/createpkg/Makefile.lib32
+# You MUST build this with gnu make, unfortunately.
+# Mainly just because of the ARCH expansion, but also for "?="
+
+# Customize your prototype file(s) as needed
+
+# Organization: variable defintions up top,
+# targets in second half.
+# Note that assignments with "?=" mean "assign if not already assigned.
+
+# Where do we keep local downloads of software src files
+ARCHIVEDIR ?= /home/src
+ARCHIVENAME ?= FooSoft.1.2.3.tar.gz
+EXTRACTPROG ?= /usr/sfw/bin/gtar jfx
+
+# Only use ONE here. The name is used for compat with 'gar'.
+MASTER_SITES ?= http://xorg.freedesktop.org/releases/X11R7.5/src/lib
+
+ARCH := $(shell /bin/uname -p)
+
+LDFLAGS_COMMON :=
+
+SRCDIR= build/*
+
+# DO NOT specify the arch-64 stuff such as -m64 here.
+# the individual targets will do that.
+
+CFLAGS_COMMON   ?= -mt -xnorunpath -xO2
+CXXFLAGS_COMMON ?= -mt -norunpath  -xO2
+CFLAGS_sparc    ?= -xarch=v8
+CFLAGS_i386     ?= -xarch=386
+
+# Keep this arch-neutral if possible. add arch-specific tweaks
+# to arch-specific target
+CONFIGURE=./configure --prefix=/opt/csw --enable-static=no
+
+
+
+CREATEPKG=createpkg -r `pwd`/build/*/cswstage
+
+
+all:	$(ARCH)-32
+#all:	$(ARCH)-32 package
+
+# ARCH-XX handles configure, build, and stage for its own combo
+# 
+
+EXTRACTPROG ?= /bin/echo ERROR: need to set EXTRACTPROG ; exit 1 ;
+
+
+
+extract:	build/.extract.done
+
+build/.extract.done:
+	test -d build || mkdir build
+	@if test -f  $(ARCHIVEDIR)/$(ARCHIVENAME) ; then \
+		echo Extracting $(ARCHIVENAME) under build dir... ;\
+		( cd build && $(EXTRACTPROG) $(ARCHIVEDIR)/$(ARCHIVENAME) ) ; \
+	else echo Cannot extract - $(ARCHIVEDIR)/$(ARCHIVENAME) does not exist ;\
+		exit 1; \
+	fi
+	touch build/.extract.done
+	
+
+clean distclean:
+	@echo Calling $@ in $(SRCDIR)
+	$(MAKE) -C $(SRCDIR) $@
+
+
+reallyclean:	distclean
+	@echo Removing any milestone files in build as well...
+	@rm -f build/.??*
+	@echo '(However, leaving src tree intact, with any patches in it)'
+	@echo '(If you want, you could rm -r build, then make extract once more)'
+
+garchive:
+	@echo Call the fetch target instead: it does the same thing.
+
+
+# Downloads the source code to the common ARCHIVEDIR
+fetch:	$(ARCHIVEDIR)/$(ARCHIVENAME)
+	@echo fetch done
+
+$(ARCHIVEDIR)/$(ARCHIVENAME):
+	wget -P $(ARCHIVEDIR) $(MASTER_SITES)/$(ARCHIVENAME)
+
+patch:
+	@echo patch: patching is handled automatically as part of the configure phase.
+
+stage-preserved:
+	@if test -f preserve-$(ARCH).tar ; then \
+		echo Copying preserved arch-specific files; \
+		cat preserve-$(ARCH).tar |(cd $(SRCDIR)/cswstage && tar xvf -);\
+	fi
+	@if test -f preserve.tar ; then \
+		echo Copying preserved arch-neutral files; \
+		cat preserve.tar |(cd $(SRCDIR)/cswstage && tar xvf -);\
+	fi
+		
+package:	stage-preserved
+	$(CREATEPKG)
+
+
+# split out generic $(ARCH) sections to platform-specific sections if needed.
+# but it usually should not be neccessary
+
+
+$(ARCH)-32 ::   configure-$(ARCH)-32 build-$(ARCH)-32 stage-$(ARCH)-32
+	@echo Completed $(ARCH)-32 configure, build and stage
+	touch build/.$(ARCH)-32.done
+
+
+
+build/.$(ARCH)-32.done:	$(ARCH)-32
+
+# Since we share the same src tree, we should only need to
+# pre-configure patching one time for all.
+build/.patch-preconf.done:	build/.extract.done
+	if test -f patchfile.preconf ; then \
+	 gpatch -d $(SRCDIR) -p0  <patchfile.preconf ; fi
+	touch $@
+
+
+#Note: I WANT to use LDFLAGS=-R$$ORIGIN, but stupid libtool
+# wont allow it! so force it at build time
+build/.configure-$(ARCH)-32.done:	build/.patch-preconf.done
+	@echo handling $@ target
+	(cd $(SRCDIR) ; \
+	  CFLAGS="$(CFLAGS_COMMON) $(CFLAGS_$(ARCH))" \
+	  CXXFLAGS="$(CXXFLAGS_COMMON)" \
+	  LDFLAGS='-R/opt/csw/lib -L/opt/csw/lib' \
+	  $(CONFIGURE) )
+	if test -f patchfile.postconf ; then \
+	 gpatch -d $(SRCDIR) -p0  <patchfile.postconf ; fi
+	touch $@
+
+
+# See note about LDFLAGS and ORIGIN, higher up	
+build/.build-$(ARCH)-32.done:
+	@echo handling $@ target
+	LD_OPTIONS='-R$$ORIGIN' $(MAKE) -C $(SRCDIR) $(MFLAGS)
+	touch $@
+
+
+
+## NOTE: This is a DESTRUCTIVE target build!!
+## 'stagepkg'  will destroy any prior "cswstage" directory!!!
+## So, we remove all 64bit milestones
+build/.stage-$(ARCH)-32.done:
+	@echo Handling stage of $(ARCH)-32
+	(cd $(SRCDIR) ; MAKE=gmake stagepkg)
+	(cd $(SRCDIR); cp COPYING cswstage/.)
+	@rm -f build/.*64.done
+	touch $@
+
+
+
+#These are the easy-to-type targets. They just trigger the real ones.
+configure-$(ARCH)-32:	build/.configure-$(ARCH)-32.done
+	@echo $@ done
+build-$(ARCH)-32:	build/.build-$(ARCH)-32.done
+	@echo $@ done
+stage-$(ARCH)-32:	build/.stage-$(ARCH)-32.done
+	@echo $@ done
+
+# manual targets
+pkgproto:
+	cat $(SRCDIR)/cswstage/prototype | sed 's/root root$$/root bin/'>prototype
+	@echo Dont forget to add a COPYING line !!

Added: csw/mgar/pkg/atspi/trunk/pkginfo
===================================================================
--- csw/mgar/pkg/atspi/trunk/pkginfo	                        (rev 0)
+++ csw/mgar/pkg/atspi/trunk/pkginfo	2010-07-06 01:18:22 UTC (rev 10452)
@@ -0,0 +1,7 @@
+PKG=CSWatspi
+NAME=atspi - An Assistive Technology Service provider Interface
+VERSION=1.30.1,REV=YYYY.MM.DD
+CATEGORY=application
+VENDOR=http://www.gnome.org/ packaged for CSW by Philip Brown
+HOTLINE=http://www.opencsw.org/bugtrack/
+EMAIL=phil at opencsw.org


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 Jul  6 10:23:36 2010
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Tue, 06 Jul 2010 08:23:36 +0000
Subject: [csw-devel] SF.net SVN: gar:[10453] csw/mgar/gar/v2/bin/checkpkg
Message-ID: <E1OW3RI-0003uH-Oz@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10453
          http://gar.svn.sourceforge.net/gar/?rev=10453&view=rev
Author:   wahwah
Date:     2010-07-06 08:23:36 +0000 (Tue, 06 Jul 2010)

Log Message:
-----------
mGAR v2: checkpkg, the saving of error tag file is now independent of the debug mode.

Modified Paths:
--------------
    csw/mgar/gar/v2/bin/checkpkg

Modified: csw/mgar/gar/v2/bin/checkpkg
===================================================================
--- csw/mgar/gar/v2/bin/checkpkg	2010-07-06 01:18:22 UTC (rev 10452)
+++ csw/mgar/gar/v2/bin/checkpkg	2010-07-06 08:23:36 UTC (rev 10453)
@@ -319,7 +319,6 @@
 done
 
 # This check is special; it uses one executable for all the checks written in Python.
-print "Analyzing collected statistics..."
 ${command_basedir}/checkpkg_run_modules.py \
     ${extra_options} \
     -b "${checkpkg_stats_basedir}" \
@@ -353,6 +352,13 @@
 	done
 fi
 
+for tagfile in ${EXTRACTDIR}/tags.*; do
+  if [[ "${SAVE_TAGS}" -eq 1 ]]; then
+    echo "Saving ${tagfile} to ${SAVED_TAGS_FILE} (pwd = `pwd`)"
+    cat "${tagfile}" >> "${SAVED_TAGS_FILE}"
+  fi
+done
+
 # Collecting errors and applying the overrides.
 # This has to use the original files.
 ${command_basedir}/analyze_module_results.py \


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 Jul  6 10:25:10 2010
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Tue, 06 Jul 2010 08:25:10 +0000
Subject: [csw-devel] SF.net SVN: gar:[10454] csw/mgar/gar/v2
Message-ID: <E1OW3So-00068v-Mp@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 10454
          http://gar.svn.sourceforge.net/gar/?rev=10454&view=rev
Author:   wahwah
Date:     2010-07-06 08:25:10 +0000 (Tue, 06 Jul 2010)

Log Message:
-----------
mGAR v2: checkpkg, terminal output tweaks: removed some debug messages and added progress bars for operations that take a long time during the whole catalog run.

Modified Paths:
--------------
    csw/mgar/gar/v2/bin/analyze_module_results.py
    csw/mgar/gar/v2/lib/python/checkpkg.py
    csw/mgar/gar/v2/lib/python/opencsw.py

Modified: csw/mgar/gar/v2/bin/analyze_module_results.py
===================================================================
--- csw/mgar/gar/v2/bin/analyze_module_results.py	2010-07-06 08:23:36 UTC (rev 10453)
+++ csw/mgar/gar/v2/bin/analyze_module_results.py	2010-07-06 08:25:10 UTC (rev 10454)
@@ -1,9 +1,11 @@
 #!/opt/csw/bin/python2.6
 # $Id$
 
+import itertools
 import operator
 import optparse
 import os
+import progressbar
 import sys
 
 # The following bit of code sets the correct path to Python libraries
@@ -27,9 +29,16 @@
   overrides_list = [pkg.GetSavedOverrides() for pkg in pkgstats]
   files = os.listdir(options.extractdir)
   error_tags = []
+  no_files = len(files)
+  bar = progressbar.ProgressBar()
+  bar.maxval = no_files
+  bar.start()
+  counter = itertools.count()
   for file_name in files:
     full_path = os.path.join(options.extractdir, file_name)
     error_tags.extend(checkpkg.ErrorTagsFromFile(full_path))
+    bar.update(counter.next())
+  bar.finish()
   override_list = reduce(operator.add, overrides_list)
   (tags_after_overrides,
    unapplied_overrides) = overrides.ApplyOverrides(error_tags, override_list)

Modified: csw/mgar/gar/v2/lib/python/checkpkg.py
===================================================================
--- csw/mgar/gar/v2/lib/python/checkpkg.py	2010-07-06 08:23:36 UTC (rev 10453)
+++ csw/mgar/gar/v2/lib/python/checkpkg.py	2010-07-06 08:25:10 UTC (rev 10454)
@@ -562,6 +562,8 @@
   return expanded_list
 
 def ExpandSymlink(symlink, target, input_path):
+  # A lot of time is spent here, e.g. 13841985 calls, 206s.
+  # TODO: Optimize this.  Make it a class and add a cache?
   symlink_re = re.compile(r"%s(/|$)" % symlink)
   if re.search(symlink_re, input_path):
     result = input_path.replace(symlink, target)
@@ -707,9 +709,13 @@
     return errors
 
   def GetOptimizedAllStats(self, stats_obj_list):
+    logging.info("Loading package statistics.")
     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
@@ -718,11 +724,13 @@
       # 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)
+      # 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):
@@ -869,6 +877,11 @@
     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("Running checks.")
+    bar.start()
     for pkg_data in pkgs_data:
       pkgname = pkg_data["basic_stats"]["pkgname"]
       check_interface = IndividualCheckInterface(pkgname, pkgmap)
@@ -878,7 +891,10 @@
         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("Running set checks.")
     for function in self.set_checks:
       logger = logging.getLogger(function.__name__)
       check_interface = SetCheckInterface(pkgmap)
@@ -970,13 +986,12 @@
   def GetDbObject(self):
     if not self.db_pkg_stats:
       md5_sum = self.GetMd5sum()
-      logging.debug("GetDbObject() md5_sum=%s", md5_sum)
       res = m.Srv4FileStats.select(m.Srv4FileStats.q.md5_sum==md5_sum)
       if not res.count():
-        logging.debug("%s are not in the db", md5_sum)
+        # TODO: Change this bit to throw an exception if the object is not
+        # found.
         return None
       else:
-        logging.debug("%s are in the db", md5_sum)
         self.db_pkg_stats = res.getOne()
     return self.db_pkg_stats
 
@@ -1192,7 +1207,6 @@
     return pkg_stats
 
   def GetAllStats(self):
-    logging.debug("GetAllStats()")
     if not self.all_stats and self.StatsExist():
       self.all_stats = self.ReadSavedStats()
     elif not self.all_stats:

Modified: csw/mgar/gar/v2/lib/python/opencsw.py
===================================================================
--- csw/mgar/gar/v2/lib/python/opencsw.py	2010-07-06 08:23:36 UTC (rev 10453)
+++ csw/mgar/gar/v2/lib/python/opencsw.py	2010-07-06 08:25:10 UTC (rev 10454)
@@ -894,7 +894,6 @@
                              catalogname)
     # This might potentially cause a file descriptor leak, but I'm not going to
     # worry about that at this stage.
-    logging.debug("Trying to open %s", repr(file_path))
     if os.path.isfile(file_path):
       return open(file_path, "r")
     else:
@@ -980,7 +979,6 @@
       if strip:
         strip_re = re.compile(r"^%s" % strip)
         fields = [re.sub(strip_re, "", x) for x in fields]
-      # logging.debug(fields)
       line_to_add = None
       installed_path = None
       prototype_class = None
@@ -1173,7 +1171,7 @@
         parsed = self._ParseCatalogLine(line)
         catalog_data.append(parsed)
       except CatalogLineParseError, e:
-        logging.error("Could not parse %s, %s", repr(line), e)
+        logging.debug("Could not parse %s, %s", repr(line), e)
     return catalog_data
 
   def GetCatalogData(self):


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 Jul  6 10:36:38 2010
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Tue, 06 Jul 2010 08:36:38 +0000
Subject: [csw-devel] SF.net SVN: gar:[10455]
	csw/mgar/gar/v2/lib/python/checkpkg.py
Message-ID: <E1OW3dt-0006KV-WA@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 10455
          http://gar.svn.sourceforge.net/gar/?rev=10455&view=rev
Author:   wahwah
Date:     2010-07-06 08:36:37 +0000 (Tue, 06 Jul 2010)

Log Message:
-----------
mGAR v2: checkpkg, a bugfix for the database directory check.

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	2010-07-06 08:25:10 UTC (rev 10454)
+++ csw/mgar/gar/v2/lib/python/checkpkg.py	2010-07-06 08:36:37 UTC (rev 10455)
@@ -288,7 +288,7 @@
     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):
+      if not os.path.exists(checkpkg_dir):
         logging.debug("Creating %s", checkpkg_dir)
         os.mkdir(checkpkg_dir)
       need_to_create_tables = True


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 Jul  6 10:53:16 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Tue, 06 Jul 2010 08:53:16 +0000
Subject: [csw-devel] SF.net SVN: gar:[10456]
	csw/mgar/pkg/shared-mime-info/trunk
Message-ID: <E1OW3u0-0006YP-GX@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 10456
          http://gar.svn.sourceforge.net/gar/?rev=10456&view=rev
Author:   dmichelsen
Date:     2010-07-06 08:53:16 +0000 (Tue, 06 Jul 2010)

Log Message:
-----------
shared-mime-info: Update to 0.71

Modified Paths:
--------------
    csw/mgar/pkg/shared-mime-info/trunk/Makefile
    csw/mgar/pkg/shared-mime-info/trunk/checksums

Modified: csw/mgar/pkg/shared-mime-info/trunk/Makefile
===================================================================
--- csw/mgar/pkg/shared-mime-info/trunk/Makefile	2010-07-06 08:36:37 UTC (rev 10455)
+++ csw/mgar/pkg/shared-mime-info/trunk/Makefile	2010-07-06 08:53:16 UTC (rev 10456)
@@ -1,5 +1,5 @@
 GARNAME = shared-mime-info
-GARVERSION = 0.70
+GARVERSION = 0.71
 CATEGORIES = lib
 
 DESCRIPTION = Freedesktop.org common MIME database

Modified: csw/mgar/pkg/shared-mime-info/trunk/checksums
===================================================================
--- csw/mgar/pkg/shared-mime-info/trunk/checksums	2010-07-06 08:36:37 UTC (rev 10455)
+++ csw/mgar/pkg/shared-mime-info/trunk/checksums	2010-07-06 08:53:16 UTC (rev 10456)
@@ -1 +1 @@
-9032d98f14b8e13e0fea4bf45ca23401  shared-mime-info-0.70.tar.bz2
+0a90508234d415f761a79fbffdff74f4  shared-mime-info-0.71.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 Jul  6 14:40:26 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Tue, 06 Jul 2010 12:40:26 +0000
Subject: [csw-devel] SF.net SVN: gar:[10457] csw/mgar/pkg/glib2/trunk
Message-ID: <E1OW7Rq-0004BA-KQ@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 10457
          http://gar.svn.sourceforge.net/gar/?rev=10457&view=rev
Author:   dmichelsen
Date:     2010-07-06 12:40:26 +0000 (Tue, 06 Jul 2010)

Log Message:
-----------
glib2: Try updating to 2.25.10, some tests fail

Modified Paths:
--------------
    csw/mgar/pkg/glib2/trunk/Makefile
    csw/mgar/pkg/glib2/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/glib2/trunk/files/0001-Replace-.-not-understood-by-Sun-Studio.patch

Modified: csw/mgar/pkg/glib2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/glib2/trunk/Makefile	2010-07-06 08:53:16 UTC (rev 10456)
+++ csw/mgar/pkg/glib2/trunk/Makefile	2010-07-06 12:40:26 UTC (rev 10457)
@@ -1,5 +1,5 @@
 GARNAME = glib
-GARVERSION = 2.25.7
+GARVERSION = 2.25.10
 CATEGORIES = lib
 
 DESCRIPTION = The GLib library of C routines.
@@ -20,7 +20,7 @@
 DISTFILES = $(GARNAME)-$(GARVERSION).tar.bz2
 
 PATCHFILES  = glib-typedetect.patch
-PATCHFILES += FIXED_STR.patch
+# PATCHFILES += FIXED_STR.patch
 PATCHFILES += gsize.patch
 # PATCHFILES += gconverter.patch
 PATCHFILES += CMSG_LEN.patch
@@ -30,6 +30,7 @@
 # PATCHFILES += 0001-Use-G_STRFUNC-instead-of-explicit-gcc-only-__PRETTY_.patch
 
 PATCHFILES += 0001-Make-sure-we-have-the-include-for-major-minor.patch
+PATCHFILES += 0001-Replace-.-not-understood-by-Sun-Studio.patch
 
 # We don't need it and if defined the test breaks
 LD_OPTIONS =
@@ -44,6 +45,8 @@
 BUILD64 = 1
 NOISAEXEC = 1
 
+BUILD_DEP_PKGS = CSWggettext
+
 RUNTIME_DEP_PKGS_CSWglib2 += CSWggettextrt
 RUNTIME_DEP_PKGS_CSWglib2 += CSWiconv
 RUNTIME_DEP_PKGS_CSWglib2 += CSWzlib
@@ -65,3 +68,6 @@
 EXTRA_LDFLAGS = -lsocket
 
 include gar/category.mk
+
+# We need /opt/csw/gnu/gettext, /usr/bin/gettext bails out
+PATH := /opt/csw/gnu:$(PATH)

Modified: csw/mgar/pkg/glib2/trunk/checksums
===================================================================
--- csw/mgar/pkg/glib2/trunk/checksums	2010-07-06 08:53:16 UTC (rev 10456)
+++ csw/mgar/pkg/glib2/trunk/checksums	2010-07-06 12:40:26 UTC (rev 10457)
@@ -1,5 +1,7 @@
+39b575a4c1dd2234a88d755a13332458  0001-Make-sure-we-have-the-include-for-major-minor.patch
+77188ce430577f5db01ba9d73aed5bcd  0001-Replace-.-not-understood-by-Sun-Studio.patch
 9f66027a275eb34d80a68ec8927bf66e  CMSG_LEN.patch
 f1f3c182f64be06ab57d8b01016af074  FIXED_STR.patch
-ac4867b9450f8bf5f1075336a32a1a88  glib-2.25.7.tar.bz2
+cdbe09f15536b526e19f06893e9b64ef  glib-2.25.10.tar.bz2
 8f683820d9ecab1abd9dbe81997ab9eb  glib-typedetect.patch
 bb2fb8eef43c995fea6c08563487ace6  gsize.patch

Added: csw/mgar/pkg/glib2/trunk/files/0001-Replace-.-not-understood-by-Sun-Studio.patch
===================================================================
--- csw/mgar/pkg/glib2/trunk/files/0001-Replace-.-not-understood-by-Sun-Studio.patch	                        (rev 0)
+++ csw/mgar/pkg/glib2/trunk/files/0001-Replace-.-not-understood-by-Sun-Studio.patch	2010-07-06 12:40:26 UTC (rev 10457)
@@ -0,0 +1,42 @@
+From 4df7207a66d0160dd99ea8cd9940194bc84ed6e0 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Tue, 6 Jul 2010 11:09:13 +0200
+Subject: [PATCH] Replace ... not understood by Sun Studio
+
+---
+ glib/tests/checksum.c |   18 ++++++++++++++++--
+ 1 files changed, 16 insertions(+), 2 deletions(-)
+
+diff --git a/glib/tests/checksum.c b/glib/tests/checksum.c
+index 0e51736..26469a5 100644
+--- a/glib/tests/checksum.c
++++ b/glib/tests/checksum.c
+@@ -615,9 +615,23 @@ hexval (const gchar c)
+ {
+   switch (c)
+     {
+-     case '0' ... '9':
++     case '0':
++     case '1':
++     case '2':
++     case '3':
++     case '4':
++     case '5':
++     case '6':
++     case '7':
++     case '8':
++     case '9':
+        return c - '0';
+-     case 'a' ... 'f':
++     case 'a':
++     case 'b':
++     case 'c':
++     case 'd':
++     case 'e':
++     case 'f':
+        return 10 + c - 'a';
+      default:
+        return 0;
+-- 
+1.7.1
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From dmichelsen at users.sourceforge.net  Tue Jul  6 16:03:11 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Tue, 06 Jul 2010 14:03:11 +0000
Subject: [csw-devel] SF.net SVN: gar:[10458]
	csw/mgar/pkg/glib2/trunk/Makefile
Message-ID: <E1OW8jv-0002SU-3n@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 10458
          http://gar.svn.sourceforge.net/gar/?rev=10458&view=rev
Author:   dmichelsen
Date:     2010-07-06 14:03:10 +0000 (Tue, 06 Jul 2010)

Log Message:
-----------
glib2: Disable DTrace and change dependency from fam to gamin

Modified Paths:
--------------
    csw/mgar/pkg/glib2/trunk/Makefile

Modified: csw/mgar/pkg/glib2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/glib2/trunk/Makefile	2010-07-06 12:40:26 UTC (rev 10457)
+++ csw/mgar/pkg/glib2/trunk/Makefile	2010-07-06 14:03:10 UTC (rev 10458)
@@ -40,6 +40,9 @@
 CONFIGURE_ARGS += --with-libiconv=gnu
 CONFIGURE_ARGS += --enable-static
 
+# DTrace compilation fails for 64 bit, disable for now
+CONFIGURE_ARGS += --disable-dtrace
+
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2
 
 BUILD64 = 1
@@ -50,7 +53,7 @@
 RUNTIME_DEP_PKGS_CSWglib2 += CSWggettextrt
 RUNTIME_DEP_PKGS_CSWglib2 += CSWiconv
 RUNTIME_DEP_PKGS_CSWglib2 += CSWzlib
-RUNTIME_DEP_PKGS_CSWglib2devel += CSWfam
+RUNTIME_DEP_PKGS_CSWglib2devel += CSWgamin
 RUNTIME_DEP_PKGS_CSWglib2devel += CSWggettextrt
 RUNTIME_DEP_PKGS_CSWglib2devel += CSWglib2
 RUNTIME_DEP_PKGS_CSWglib2devel += CSWiconv


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From dmichelsen at users.sourceforge.net  Tue Jul  6 16:59:47 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Tue, 06 Jul 2010 14:59:47 +0000
Subject: [csw-devel] SF.net SVN: gar:[10459]
	csw/mgar/pkg/glib2/trunk/Makefile
Message-ID: <E1OW9ch-0003Vd-Sl@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 10459
          http://gar.svn.sourceforge.net/gar/?rev=10459&view=rev
Author:   dmichelsen
Date:     2010-07-06 14:59:47 +0000 (Tue, 06 Jul 2010)

Log Message:
-----------
glib2: Disable checks for now

Modified Paths:
--------------
    csw/mgar/pkg/glib2/trunk/Makefile

Modified: csw/mgar/pkg/glib2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/glib2/trunk/Makefile	2010-07-06 14:03:10 UTC (rev 10458)
+++ csw/mgar/pkg/glib2/trunk/Makefile	2010-07-06 14:59:47 UTC (rev 10459)
@@ -60,6 +60,8 @@
 RUNTIME_DEP_PKGS_CSWglib2devel += CSWpython
 RUNTIME_DEP_PKGS_CSWglib2devel += CSWzlib
 
+# Some tests fail, they may be harmless, disable for now, but check later!
+SKIPTEST ?= 1
 TEST_TARGET = check
 
 #provided by iconv


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 Jul  6 19:43:26 2010
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Tue, 06 Jul 2010 17:43:26 +0000
Subject: [csw-devel] SF.net SVN: gar:[10460] csw/mgar/gar/v2
Message-ID: <E1OWCB4-0004Kj-9J@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10460
          http://gar.svn.sourceforge.net/gar/?rev=10460&view=rev
Author:   wahwah
Date:     2010-07-06 17:43:26 +0000 (Tue, 06 Jul 2010)

Log Message:
-----------
mGAR v2: checkpkg, optimizing stats analysis, allowing to skip applying of the overrides.

Modified Paths:
--------------
    csw/mgar/gar/v2/bin/checkpkg
    csw/mgar/gar/v2/lib/python/checkpkg.py
    csw/mgar/gar/v2/lib/python/checkpkg_test.py
    csw/mgar/gar/v2/lib/python/dependency_checks.py

Modified: csw/mgar/gar/v2/bin/checkpkg
===================================================================
--- csw/mgar/gar/v2/bin/checkpkg	2010-07-06 14:59:47 UTC (rev 10459)
+++ csw/mgar/gar/v2/bin/checkpkg	2010-07-06 17:43:26 UTC (rev 10460)
@@ -107,8 +107,9 @@
 SKIP_STATS_COLLECTION=0
 MD5_SUMS_CATALOG_FILE=""
 INSTALL_CONTENTS_FILES="/var/sadm/install/contents"
+ANALYZE=1
 
-while getopts hsdNM:o:c: opt; do
+while getopts hsdNM:o:c:A opt; do
 	case "${opt}" in
 	  c)
 	    INSTALL_CONTENTS_FILES="${INSTALL_CONTENTS_FILES} ${OPTARG}"
@@ -131,6 +132,9 @@
     M)
       MD5_SUMS_CATALOG_FILE="${OPTARG}"
       ;;
+    A)
+      ANALYZE=0
+      ;;
     *)
       echo "Unknown option '${opt}'"
       ;;
@@ -143,6 +147,7 @@
 readonly SAVED_TAGS_FILE
 readonly SAVE_TAGS
 readonly SKIP_STATS_COLLECTION
+readonly ANALYZE
 
 if [[ "${display_help}" -eq 1 ]] ; then
   print 'Usage: checkpkg [options] pkg1 [pkg2 ....]'
@@ -153,6 +158,7 @@
   print '   -d         display debug messages'
   print '   -N         skip statistics collection'
   print '   -M <file>  use package md5sums from a catalog file'
+  print '   -A         Do not analyze the results.'
   exit 0
 fi
 
@@ -359,15 +365,20 @@
   fi
 done
 
+if [[ "${ANALYZE}" -eq 1 ]]; then
 # Collecting errors and applying the overrides.
 # This has to use the original files.
-${command_basedir}/analyze_module_results.py \
-    -e "${EXTRACTDIR}" \
-    "$@"
-if [[ "$?" -ne 0 ]]; then
-	errmsg "${RED}Modular checks are reporting errors.${COLOR_RESET}"
+  echo "Applying the overrides and analyzing the results."
+  ${command_basedir}/analyze_module_results.py \
+      -e "${EXTRACTDIR}" \
+      "$@"
+  if [[ "$?" -ne 0 ]]; then
+    errmsg "${RED}Modular checks are reporting errors.${COLOR_RESET}"
+  else
+    print "${GREEN}All modular tests were successful.${COLOR_RESET}"
+  fi
 else
-	print "${GREEN}All modular tests were successful.${COLOR_RESET}"
+	echo "Skipping result analysis."
 fi
 
 print ""

Modified: csw/mgar/gar/v2/lib/python/checkpkg.py
===================================================================
--- csw/mgar/gar/v2/lib/python/checkpkg.py	2010-07-06 14:59:47 UTC (rev 10459)
+++ csw/mgar/gar/v2/lib/python/checkpkg.py	2010-07-06 17:43:26 UTC (rev 10460)
@@ -553,85 +553,107 @@
     return dict([[str(x.pkgname), str(x.pkg_desc)] for x in res])
 
 
-def ExpandRunpath(runpath, isalist):
-  # Emulating $ISALIST expansion
-  if '$ISALIST' in runpath:
-    expanded_list = [runpath.replace('$ISALIST', isa) for isa in isalist]
-  else:
-    expanded_list = [runpath]
-  return expanded_list
+class LddEmulator(object):
+  """A class to emulate ldd(1)
 
-def ExpandSymlink(symlink, target, input_path):
-  # A lot of time is spent here, e.g. 13841985 calls, 206s.
-  # TODO: Optimize this.  Make it a class and add a 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
-  return result
+  Used primarily to resolve SONAMEs and detect package dependencies.
+  """
+  def __init__(self):
+    self.runpath_expand_cache = {}
+    self.symlink_expand_cache = {}
+    self.symlink64_cache = {}
+    self.runpath_sanitize_cache = {}
 
-def Emulate64BitSymlinks(runpath_list):
-  """Need to emulate the 64 -> amd64, 64 -> sparcv9 symlink
+  def ExpandRunpath(self, runpath, isalist):
+    key = (runpath, tuple(isalist))
+    if key not in self.runpath_expand_cache:
+      # Emulating $ISALIST expansion
+      if '$ISALIST' in runpath:
+        expanded_list = [runpath.replace('$ISALIST', isa) for isa in isalist]
+      else:
+        expanded_list = [runpath]
+      self.runpath_expand_cache[key] = expanded_list
+    return self.runpath_expand_cache[key]
 
-  Since we don't know the architecture, we'll adding both amd64 and sparcv9.
-  It should be safe.
-  """
-  symlinked_list = []
-  for runpath in runpath_list:
-    for symlink, expansion_list in SYSTEM_SYMLINKS:
-      for target in expansion_list:
-        expanded = ExpandSymlink(symlink, target, runpath)
-        if expanded not in symlinked_list:
-          symlinked_list.append(expanded)
-  return symlinked_list
+  def ExpandSymlink(self, symlink, target, input_path):
+    key = (symlink, target, input_path)
+    if key not in self.symlink_expand_cache:
+      # A lot of time is spent here, e.g. 13841985 calls, 206s.
+      # TODO: Optimize this.  Make it a class and add a 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
 
-def SanitizeRunpath(runpath):
-  while True:
-    if runpath.endswith("/"):
-      runpath = runpath[:-1]
-    elif "//" in runpath:
-      runpath = runpath.replace("//", "/")
-    else:
-      break
-  return runpath
+    Since we don't know the architecture, we'll adding both amd64 and sparcv9.
+    It should be safe.
+    """
+    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:
+      new_runpath = runpath
+      while True:
+        if new_runpath.endswith("/"):
+          new_runpath = new_runpath[:-1]
+        elif "//" in new_runpath:
+          new_runpath = new_runpath.replace("//", "/")
+        else:
+          break
+      self.runpath_sanitize_cache[runpath] = new_runpath
+    return self.runpath_sanitize_cache[runpath]
 
-def ResolveSoname(runpath, soname, isalist, path_list):
-  """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"]
+  def ResolveSoname(self, runpath, soname, isalist, path_list):
+    """Emulates ldd behavior, minimal implementation.
 
-  The function returns the one path.
-  """
-  runpath = SanitizeRunpath(runpath)
-  runpath_list = ExpandRunpath(runpath, isalist)
-  runpath_list = Emulate64BitSymlinks(runpath_list)
-  # 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 = 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]
+    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.
+    """
+    runpath = self.SanitizeRunpath(runpath)
+    runpath_list = self.ExpandRunpath(runpath, isalist)
+    runpath_list = self.Emulate64BitSymlinks(runpath_list)
+    # 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: []}
@@ -653,6 +675,10 @@
     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])
   binary_data["RUNPATH RPATH the same"] = (runpath == rpath)
   binary_data["RPATH set"] = bool(rpath)
   binary_data["RUNPATH set"] = bool(runpath)
@@ -880,7 +906,7 @@
     count = itertools.count()
     bar = progressbar.ProgressBar()
     bar.maxval = len(pkgs_data) * len(self.individual_checks)
-    logging.info("Running checks.")
+    logging.info("Running individual checks.")
     bar.start()
     for pkg_data in pkgs_data:
       pkgname = pkg_data["basic_stats"]["pkgname"]
@@ -917,7 +943,7 @@
   if ret:
     logging.error("Calling isalist has failed.")
   isalist = re.split(r"\s+", stdout.strip())
-  return isalist
+  return tuple(isalist)
 
 
 class PackageStats(DatabaseClient):

Modified: csw/mgar/gar/v2/lib/python/checkpkg_test.py
===================================================================
--- csw/mgar/gar/v2/lib/python/checkpkg_test.py	2010-07-06 14:59:47 UTC (rev 10459)
+++ csw/mgar/gar/v2/lib/python/checkpkg_test.py	2010-07-06 17:43:26 UTC (rev 10460)
@@ -39,55 +39,56 @@
 
   def setUp(self):
     self.pkgmap_mocker = mox.Mox()
+    self.e = checkpkg.LddEmulator()
 
   def testExpandRunpath_1(self):
     isalist = ["foo", "bar"]
     runpath = "/opt/csw/lib/$ISALIST"
     expected = ["/opt/csw/lib/foo", "/opt/csw/lib/bar"]
-    self.assertEquals(expected, checkpkg.ExpandRunpath(runpath, isalist))
+    self.assertEquals(expected, self.e.ExpandRunpath(runpath, isalist))
 
   def testExpandRunpath_2(self):
     isalist = ["foo", "bar"]
     runpath = "/opt/csw/mysql5/lib/$ISALIST/mysql"
     expected = ["/opt/csw/mysql5/lib/foo/mysql",
                 "/opt/csw/mysql5/lib/bar/mysql"]
-    self.assertEquals(expected, checkpkg.ExpandRunpath(runpath, isalist))
+    self.assertEquals(expected, self.e.ExpandRunpath(runpath, isalist))
 
   def testEmulate64BitSymlinks_1(self):
     runpath_list = ["/opt/csw/mysql5/lib/foo/mysql/64"]
     expected = "/opt/csw/mysql5/lib/foo/mysql/amd64"
-    self.assertTrue(expected in checkpkg.Emulate64BitSymlinks(runpath_list))
+    self.assertTrue(expected in self.e.Emulate64BitSymlinks(runpath_list))
 
   def testEmulate64BitSymlinks_2(self):
     runpath_list = ["/opt/csw/mysql5/lib/64/mysql/foo"]
     expected = "/opt/csw/mysql5/lib/amd64/mysql/foo"
-    result = checkpkg.Emulate64BitSymlinks(runpath_list)
+    result = self.e.Emulate64BitSymlinks(runpath_list)
     self.assertTrue(expected in result, "%s not in %s" % (expected, result))
 
   def testEmulate64BitSymlinks_3(self):
     runpath_list = ["/opt/csw/mysql5/lib/64/mysql/foo"]
     expected = "/opt/csw/mysql5/lib/sparcv9/mysql/foo"
-    result = checkpkg.Emulate64BitSymlinks(runpath_list)
+    result = self.e.Emulate64BitSymlinks(runpath_list)
     self.assertTrue(expected in result, "%s not in %s" % (expected, result))
 
   def testEmulate64BitSymlinks_4(self):
     """No repeated paths because of symlink expansion"""
     runpath_list = ["/opt/csw/lib"]
     expected = "/opt/csw/lib"
-    result = checkpkg.Emulate64BitSymlinks(runpath_list)
+    result = self.e.Emulate64BitSymlinks(runpath_list)
     self.assertEquals(1, len(result), "len(%s) != %s" % (result, 1))
 
   def testEmulateSymlinks_3(self):
     runpath_list = ["/opt/csw/bdb4"]
     expected = "/opt/csw/bdb42"
-    result = checkpkg.Emulate64BitSymlinks(runpath_list)
+    result = self.e.Emulate64BitSymlinks(runpath_list)
     self.assertTrue(expected in result, "%s not in %s" % (expected, result))
 
   def testEmulateSymlinks_4(self):
     runpath_list = ["/opt/csw/bdb42"]
     expected = "/opt/csw/bdb42"
     not_expected = "/opt/csw/bdb422"
-    result = checkpkg.Emulate64BitSymlinks(runpath_list)
+    result = self.e.Emulate64BitSymlinks(runpath_list)
     self.assertTrue(expected in result,
                     "%s not in %s" % (expected, result))
     self.assertFalse(not_expected in result,
@@ -97,7 +98,7 @@
     """Install time symlink expansion."""
     runpath_list = ["/opt/csw/lib/i386"]
     expected = "/opt/csw/lib"
-    result = checkpkg.Emulate64BitSymlinks(runpath_list)
+    result = self.e.Emulate64BitSymlinks(runpath_list)
     self.assertTrue(expected in result, "%s not in %s" % (expected, result))
 
   def testEmulateSymlinks_6(self):
@@ -105,7 +106,7 @@
     runpath_list = ["/opt/csw/lib/i386"]
     expected = "/opt/csw/lib"
     not_expected = "/opt/csw/lib/i386"
-    result = checkpkg.ExpandSymlink("/opt/csw/lib/i386",
+    result = self.e.ExpandSymlink("/opt/csw/lib/i386",
                                     "/opt/csw/lib",
                                     "/opt/csw/lib/i386")
     self.assertTrue(expected in result, "%s not in %s" % (expected, result))
@@ -114,11 +115,11 @@
 
   def testSanitizeRunpath_1(self):
     self.assertEqual("/opt/csw/lib",
-                     checkpkg.SanitizeRunpath("/opt/csw/lib/"))
+                     self.e.SanitizeRunpath("/opt/csw/lib/"))
 
   def testSanitizeRunpath_2(self):
     self.assertEqual("/opt/csw/lib",
-                     checkpkg.SanitizeRunpath("/opt//csw////lib/"))
+                     self.e.SanitizeRunpath("/opt//csw////lib/"))
 
 
 
@@ -137,18 +138,18 @@
                            'libnsl.so.1',
                            'libm.so.1',
                            'libz.so.1'],
-        'runpath': ['/opt/csw/lib/$ISALIST',
+        'runpath': ('/opt/csw/lib/$ISALIST',
                     '/opt/csw/lib',
                     '/opt/csw/mysql5/lib/$ISALIST',
                     '/opt/csw/mysql5/lib',
-                    '/opt/csw/mysql5/lib/$ISALIST/mysql'],
+                    '/opt/csw/mysql5/lib/$ISALIST/mysql'),
         'soname': 'libmysqlclient.so.15',
     }
     self.assertEqual(expected,
                      checkpkg.ParseDumpOutput(dump_1.DATA_DUMP_OUTPUT))
 
   def testEmpty(self):
-    expected_runpath = []
+    expected_runpath = ()
     self.assertEqual(
         expected_runpath,
         checkpkg.ParseDumpOutput(dump_2.DATA_DUMP_OUTPUT)["runpath"])
@@ -166,11 +167,11 @@
                            'libnsl.so.1',
                            'libm.so.1',
                            'libz.so.1'],
-        'runpath': ['/opt/csw/lib/$ISALIST',
+        'runpath': ('/opt/csw/lib/$ISALIST',
                     '/opt/csw/lib',
                     '/opt/csw/mysql5/lib/$ISALIST',
                     '/opt/csw/mysql5/lib',
-                    '/opt/csw/mysql5/lib/$ISALIST/mysql'],
+                    '/opt/csw/mysql5/lib/$ISALIST/mysql'),
         'soname': 'libmysqlclient.so.15',
     }
     self.assertEqual(

Modified: csw/mgar/gar/v2/lib/python/dependency_checks.py
===================================================================
--- csw/mgar/gar/v2/lib/python/dependency_checks.py	2010-07-06 14:59:47 UTC (rev 10459)
+++ csw/mgar/gar/v2/lib/python/dependency_checks.py	2010-07-06 17:43:26 UTC (rev 10460)
@@ -21,6 +21,7 @@
   orphan_sonames = []
   required_deps = []
   isalist = pkg_data["isalist"]
+  ldd_emulator = checkpkg.LddEmulator()
   for binary_info in pkg_data["binaries_dump_info"]:
     for soname in binary_info["needed sonames"]:
       resolved = False
@@ -32,10 +33,10 @@
                    path_list)
       runpath_list = binary_info["runpath"] + checkpkg.SYS_DEFAULT_RUNPATH
       for runpath in runpath_list:
-        resolved_path = checkpkg.ResolveSoname(runpath,
-                                               soname,
-                                               isalist,
-                                               path_list)
+        resolved_path = ldd_emulator.ResolveSoname(runpath,
+                                                   soname,
+                                                   isalist,
+                                                   path_list)
         if resolved_path:
           logger.debug("%s needed by %s:",
                  soname, binary_info["path"])


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 Jul  6 21:00:35 2010
From: theferret at users.sourceforge.net (theferret at users.sourceforge.net)
Date: Tue, 06 Jul 2010 19:00:35 +0000
Subject: [csw-devel] SF.net SVN: gar:[10461] csw/mgar/pkg/glib
Message-ID: <E1OWDNj-0005c5-8b@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10461
          http://gar.svn.sourceforge.net/gar/?rev=10461&view=rev
Author:   theferret
Date:     2010-07-06 19:00:34 +0000 (Tue, 06 Jul 2010)

Log Message:
-----------
glib: added simple branch dir for quick rebuild without libtool files

Added Paths:
-----------
    csw/mgar/pkg/glib/branch-c/
    csw/mgar/pkg/glib/branch-c/Makefile
    csw/mgar/pkg/glib/branch-c/copyright
    csw/mgar/pkg/glib/branch-c/pkginfo
    csw/mgar/pkg/glib/branch-c/prototype


Property changes on: csw/mgar/pkg/glib/branch-c
___________________________________________________________________
Added: svn:ignore
   + cookies
download
work
cswstage
build


Added: csw/mgar/pkg/glib/branch-c/Makefile
===================================================================
--- csw/mgar/pkg/glib/branch-c/Makefile	                        (rev 0)
+++ csw/mgar/pkg/glib/branch-c/Makefile	2010-07-06 19:00:34 UTC (rev 10461)
@@ -0,0 +1,172 @@
+# This file is from TEMPLATES/createpkg/Makefile.lib32
+# You MUST build this with gnu make, unfortunately.
+# Mainly just because of the ARCH expansion, but also for "?="
+
+# Customize your prototype file(s) as needed
+
+# Organization: variable defintions up top,
+# targets in second half.
+# Note that assignments with "?=" mean "assign if not already assigned.
+
+# Where do we keep local downloads of software src files
+ARCHIVEDIR ?= /home/src
+
+# We only have this lib for legacy purposes, really.
+# existing deps need "libglib-1.2.so.0"
+ARCHIVENAME ?= glib-1.2.10.tar.gz 
+EXTRACTPROG ?= /usr/sfw/bin/gtar zfx
+
+# Only use ONE here. The name is used for compat with 'gar'.
+MASTER_SITES ?= http://ftp.gnome.org/pub/gnome/sources/glib/1.2
+
+ARCH := $(shell /bin/uname -p)
+
+LDFLAGS_COMMON :=
+
+SRCDIR= build/*
+
+# DO NOT specify the arch-64 stuff such as -m64 here.
+# the individual targets will do that.
+
+CFLAGS_COMMON   ?= -mt -xnorunpath -xO3
+CXXFLAGS_COMMON ?= -mt -norunpath  -xO3
+CFLAGS_sparc    ?= -xarch=v8
+CFLAGS_i386     ?= -xarch=386
+
+# Keep this arch-neutral if possible. add arch-specific tweaks
+# to arch-specific target
+CONFIGURE=./configure --prefix=/opt/csw --enable-static=no
+
+
+
+CREATEPKG=createpkg -r `pwd`/build/*/cswstage
+
+
+all:	$(ARCH)-32
+#all:	$(ARCH)-32 package
+
+# ARCH-XX handles configure, build, and stage for its own combo
+# 
+
+EXTRACTPROG ?= /bin/echo ERROR: need to set EXTRACTPROG ; exit 1 ;
+
+
+
+extract:	build/.extract.done
+
+build/.extract.done:
+	test -d build || mkdir build
+	@if test -f  $(ARCHIVEDIR)/$(ARCHIVENAME) ; then \
+		echo Extracting $(ARCHIVENAME) under build dir... ;\
+		( cd build && $(EXTRACTPROG) $(ARCHIVEDIR)/$(ARCHIVENAME) ) ; \
+	else echo Cannot extract - $(ARCHIVEDIR)/$(ARCHIVENAME) does not exist ;\
+		exit 1; \
+	fi
+	touch build/.extract.done
+	
+
+clean distclean:
+	@echo Calling $@ in $(SRCDIR)
+	$(MAKE) -C $(SRCDIR) $@
+
+
+reallyclean:	distclean
+	@echo Removing any milestone files in build as well...
+	@rm -f build/.??*
+	@echo '(However, leaving src tree intact, with any patches in it)'
+	@echo '(If you want, you could rm -r build, then make extract once more)'
+
+garchive:
+	@echo Call the fetch target instead: it does the same thing.
+
+
+# Downloads the source code to the common ARCHIVEDIR
+fetch:	$(ARCHIVEDIR)/$(ARCHIVENAME)
+	@echo fetch done
+
+$(ARCHIVEDIR)/$(ARCHIVENAME):
+	wget -P $(ARCHIVEDIR) $(MASTER_SITES)/$(ARCHIVENAME)
+
+patch:
+	@echo patch: patching is handled automatically as part of the configure phase.
+
+stage-preserved:
+	@if test -f preserve-$(ARCH).tar ; then \
+		echo Copying preserved arch-specific files; \
+		cat preserve-$(ARCH).tar |(cd $(SRCDIR)/cswstage && tar xvf -);\
+	fi
+	@if test -f preserve.tar ; then \
+		echo Copying preserved arch-neutral files; \
+		cat preserve.tar |(cd $(SRCDIR)/cswstage && tar xvf -);\
+	fi
+		
+package:	stage-preserved
+	$(CREATEPKG)
+
+
+# split out generic $(ARCH) sections to platform-specific sections if needed.
+# but it usually should not be neccessary
+
+
+$(ARCH)-32 ::   configure-$(ARCH)-32 build-$(ARCH)-32 stage-$(ARCH)-32
+	@echo Completed $(ARCH)-32 configure, build and stage
+	touch build/.$(ARCH)-32.done
+
+
+
+build/.$(ARCH)-32.done:	$(ARCH)-32
+
+# Since we share the same src tree, we should only need to
+# pre-configure patching one time for all.
+build/.patch-preconf.done:	build/.extract.done
+	if test -f patchfile.preconf ; then \
+	 gpatch -d $(SRCDIR) -p0  <patchfile.preconf ; fi
+	touch $@
+
+
+#Note: I WANT to use LDFLAGS=-R$$ORIGIN, but stupid libtool
+# wont allow it! so force it at build time
+build/.configure-$(ARCH)-32.done:	build/.patch-preconf.done
+	@echo handling $@ target
+	(cd $(SRCDIR) ; \
+	  CFLAGS="$(CFLAGS_COMMON) $(CFLAGS_$(ARCH))" \
+	  CXXFLAGS="$(CXXFLAGS_COMMON)" \
+	  LDFLAGS='-R/opt/csw/lib -L/opt/csw/lib' \
+	  $(CONFIGURE) )
+	if test -f patchfile.postconf ; then \
+	 gpatch -d $(SRCDIR) -p0  <patchfile.postconf ; fi
+	touch $@
+
+
+# See note about LDFLAGS and ORIGIN, higher up	
+build/.build-$(ARCH)-32.done:
+	@echo handling $@ target
+	LD_OPTIONS='-R$$ORIGIN' $(MAKE) -C $(SRCDIR) $(MFLAGS)
+	touch $@
+
+
+
+## NOTE: This is a DESTRUCTIVE target build!!
+## 'stagepkg'  will destroy any prior "cswstage" directory!!!
+## So, we remove all 64bit milestones
+build/.stage-$(ARCH)-32.done:
+	@echo Handling stage of $(ARCH)-32
+	(cd $(SRCDIR) ; MAKE=gmake stagepkg)
+	(cd $(SRCDIR); cp COPYING cswstage/.)
+	@rm -f build/.*64.done
+	touch $@
+
+
+
+#These are the easy-to-type targets. They just trigger the real ones.
+configure-$(ARCH)-32:	build/.configure-$(ARCH)-32.done
+	@echo $@ done
+build-$(ARCH)-32:	build/.build-$(ARCH)-32.done
+	@echo $@ done
+stage-$(ARCH)-32:	build/.stage-$(ARCH)-32.done
+	@echo $@ done
+
+# manual targets
+pkgproto:
+	cat $(SRCDIR)/cswstage/prototype | sed 's/root root$$/root bin/'>prototype
+	@echo Dont forget to add a COPYING line !!

Added: csw/mgar/pkg/glib/branch-c/copyright
===================================================================
--- csw/mgar/pkg/glib/branch-c/copyright	                        (rev 0)
+++ csw/mgar/pkg/glib/branch-c/copyright	2010-07-06 19:00:34 UTC (rev 10461)
@@ -0,0 +1 @@
+See /opt/csw/share/doc/glib/COPYING for full license (LGPL2)

Added: csw/mgar/pkg/glib/branch-c/pkginfo
===================================================================
--- csw/mgar/pkg/glib/branch-c/pkginfo	                        (rev 0)
+++ csw/mgar/pkg/glib/branch-c/pkginfo	2010-07-06 19:00:34 UTC (rev 10461)
@@ -0,0 +1,7 @@
+PKG=CSWglib
+NAME=glib - utility library commonly associated with GNOME programs
+VERSION=1.2.10,REV=YYYY.MM.DD
+CATEGORY=application
+VENDOR=http://www.gnome.org/ packaged for CSW by Philip Brown
+HOTLINE=http://www.opencsw.org/bugtrack/
+EMAIL=phil at opencsw.org

Added: csw/mgar/pkg/glib/branch-c/prototype
===================================================================
--- csw/mgar/pkg/glib/branch-c/prototype	                        (rev 0)
+++ csw/mgar/pkg/glib/branch-c/prototype	2010-07-06 19:00:34 UTC (rev 10461)
@@ -0,0 +1,36 @@
+i pkginfo
+i copyright
+d none /opt/csw/include 0755 root bin
+d none /opt/csw/include/glib-1.2 0755 root bin
+f none /opt/csw/include/glib-1.2/glib.h 0644 root bin
+f none /opt/csw/include/glib-1.2/gmodule.h 0644 root bin
+d none /opt/csw/share 0755 root bin
+d none /opt/csw/share/info 0755 root bin
+f none /opt/csw/share/info/glib.info 0644 root bin
+d none /opt/csw/share/man 0755 root bin
+d none /opt/csw/share/man/man1 0755 root bin
+f none /opt/csw/share/man/man1/glib-config.1 0644 root bin
+d none /opt/csw/share/aclocal 0755 root bin
+f none /opt/csw/share/aclocal/glib.m4 0644 root bin
+d none /opt/csw/share/doc 0755 root bin
+d none /opt/csw/share/doc/glib 0755 root bin
+f none /opt/csw/share/doc/glib/COPYING=COPYING 0644 root bin
+d none /opt/csw/bin 0755 root bin
+f none /opt/csw/bin/glib-config 0755 root bin
+d none /opt/csw/lib 0755 root bin
+s none /opt/csw/lib/libglib.so=libglib-1.2.so.0.0.10
+d none /opt/csw/lib/pkgconfig 0755 root bin
+f none /opt/csw/lib/pkgconfig/glib.pc 0644 root bin
+f none /opt/csw/lib/pkgconfig/gmodule.pc 0644 root bin
+f none /opt/csw/lib/pkgconfig/gthread.pc 0644 root bin
+s none /opt/csw/lib/libgthread.so=libgthread-1.2.so.0.0.10
+f none /opt/csw/lib/libglib-1.2.so.0.0.10 0755 root bin
+s none /opt/csw/lib/libgmodule.so=libgmodule-1.2.so.0.0.10
+d none /opt/csw/lib/glib 0755 root bin
+d none /opt/csw/lib/glib/include 0755 root bin
+f none /opt/csw/lib/glib/include/glibconfig.h 0644 root bin
+s none /opt/csw/lib/libglib-1.2.so.0=libglib-1.2.so.0.0.10
+s none /opt/csw/lib/libgthread-1.2.so.0=libgthread-1.2.so.0.0.10
+f none /opt/csw/lib/libgmodule-1.2.so.0.0.10 0755 root bin
+f none /opt/csw/lib/libgthread-1.2.so.0.0.10 0755 root bin
+s none /opt/csw/lib/libgmodule-1.2.so.0=libgmodule-1.2.so.0.0.10


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From wahwah at users.sourceforge.net  Tue Jul  6 22:06:33 2010
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Tue, 06 Jul 2010 20:06:33 +0000
Subject: [csw-devel] SF.net SVN: gar:[10462]
	csw/mgar/gar/v2/lib/python/dependency_checks.py
Message-ID: <E1OWEPZ-0002MI-45@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 10462
          http://gar.svn.sourceforge.net/gar/?rev=10462&view=rev
Author:   wahwah
Date:     2010-07-06 20:06:32 +0000 (Tue, 06 Jul 2010)

Log Message:
-----------
mGAR v2: checkpkg, a bugfix for a concatenation of a list and a tuple.

Modified Paths:
--------------
    csw/mgar/gar/v2/lib/python/dependency_checks.py

Modified: csw/mgar/gar/v2/lib/python/dependency_checks.py
===================================================================
--- csw/mgar/gar/v2/lib/python/dependency_checks.py	2010-07-06 19:00:34 UTC (rev 10461)
+++ csw/mgar/gar/v2/lib/python/dependency_checks.py	2010-07-06 20:06:32 UTC (rev 10462)
@@ -31,7 +31,7 @@
                    binary_info["path"],
                    binary_info["runpath"],
                    path_list)
-      runpath_list = binary_info["runpath"] + checkpkg.SYS_DEFAULT_RUNPATH
+      runpath_list = binary_info["runpath"] + tuple(checkpkg.SYS_DEFAULT_RUNPATH)
       for runpath in runpath_list:
         resolved_path = ldd_emulator.ResolveSoname(runpath,
                                                    soname,


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 Jul  6 22:37:06 2010
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Tue, 06 Jul 2010 20:37:06 +0000
Subject: [csw-devel] SF.net SVN: gar:[10463] csw/mgar/gar/v2/lib/python
Message-ID: <E1OWEt8-0001s2-2Z@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 10463
          http://gar.svn.sourceforge.net/gar/?rev=10463&view=rev
Author:   wahwah
Date:     2010-07-06 20:37:05 +0000 (Tue, 06 Jul 2010)

Log Message:
-----------
mGAR v2: checkpkg, runpath stored as a tuple, updated the test data.

Modified Paths:
--------------
    csw/mgar/gar/v2/lib/python/dependency_checks.py
    csw/mgar/gar/v2/lib/python/package_checks_test.py
    csw/mgar/gar/v2/lib/python/testdata/checkpkg_pkgs_data_minimal.py
    csw/mgar/gar/v2/lib/python/testdata/checkpkg_test_data_CSWdjvulibrert.py
    csw/mgar/gar/v2/lib/python/testdata/rsync_pkg_stats.py

Modified: csw/mgar/gar/v2/lib/python/dependency_checks.py
===================================================================
--- csw/mgar/gar/v2/lib/python/dependency_checks.py	2010-07-06 20:06:32 UTC (rev 10462)
+++ csw/mgar/gar/v2/lib/python/dependency_checks.py	2010-07-06 20:37:05 UTC (rev 10463)
@@ -31,7 +31,7 @@
                    binary_info["path"],
                    binary_info["runpath"],
                    path_list)
-      runpath_list = binary_info["runpath"] + tuple(checkpkg.SYS_DEFAULT_RUNPATH)
+      runpath_list = tuple(binary_info["runpath"]) + tuple(checkpkg.SYS_DEFAULT_RUNPATH)
       for runpath in runpath_list:
         resolved_path = ldd_emulator.ResolveSoname(runpath,
                                                    soname,

Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py
===================================================================
--- csw/mgar/gar/v2/lib/python/package_checks_test.py	2010-07-06 20:06:32 UTC (rev 10462)
+++ csw/mgar/gar/v2/lib/python/package_checks_test.py	2010-07-06 20:37:05 UTC (rev 10463)
@@ -266,12 +266,12 @@
                             'libm.so.1',
                             'libc.so.1'],
          'path': 'opt/csw/lib/libImlib2.so.1.4.2',
-         'runpath': ['/opt/csw/lib/$ISALIST',
+         'runpath': ('/opt/csw/lib/$ISALIST',
                      '/opt/csw/lib',
                      '/usr/lib/$ISALIST',
                      '/usr/lib',
                      '/lib/$ISALIST',
-                     '/lib'],
+                     '/lib'),
          'soname': 'libImlib2.so.1',
          'soname_guessed': False,
     })
@@ -334,7 +334,7 @@
   FUNCTION_NAME = 'CheckRpath'
   def CheckpkgTest(self):
     binaries_dump_info = self.pkg_data["binaries_dump_info"]
-    binaries_dump_info[0]["runpath"] = testdata.rpaths.all_rpaths
+    binaries_dump_info[0]["runpath"] = tuple(testdata.rpaths.all_rpaths)
     self.pkg_data["binaries_dump_info"] = binaries_dump_info[0:1]
     BAD_PATHS = [
         '$ORIGIN/..',
@@ -434,7 +434,7 @@
   FUNCTION_NAME = 'SetCheckLibraries'
   def CheckpkgTest(self):
     binaries_dump_info = self.pkg_data["binaries_dump_info"]
-    binaries_dump_info[0]["runpath"] = ["/opt/csw/lib"]
+    binaries_dump_info[0]["runpath"] = ("/opt/csw/lib",)
     binaries_dump_info[0]["needed sonames"] = ["libdb-4.7.so"]
     self.pkg_data["depends"] = (("CSWfoo", None),)
     self.pkg_data["binaries_dump_info"] = binaries_dump_info[0:1]
@@ -492,11 +492,11 @@
         'binaries_dump_info': [{'base_name': 'bar',
                                 'needed sonames': ['libfoo.so.1'],
                                 'path': 'opt/csw/bin/bar',
-                                'runpath': ['/opt/csw/lib'],
+                                'runpath': ('/opt/csw/lib',),
                                 'soname': 'rsync',
                                 'soname_guessed': True}],
         'depends': (('CSWlibfoo', None),),
-        'isalist': [],
+        'isalist': (),
         'pkgmap': [],
         }
   CSWlibfoo_DATA = {
@@ -505,7 +505,7 @@
                         'stats_version': 1},
         'binaries_dump_info': [],
         'depends': [],
-        'isalist': [],
+        'isalist': (),
         'pkgmap': [],
       }
   def CheckpkgTest(self):
@@ -526,7 +526,7 @@
   FUNCTION_NAME = 'SetCheckLibraries'
   def CheckpkgTest(self):
     binaries_dump_info = self.pkg_data["binaries_dump_info"]
-    binaries_dump_info[0]["runpath"] = []
+    binaries_dump_info[0]["runpath"] = ()
     binaries_dump_info[0]["needed sonames"] = ["libbar.so"]
     binaries_dump_info[0]["path"] = 'opt/csw/lib/python/site-packages/foo.so'
     self.pkg_data["depends"] = tuple()
@@ -545,7 +545,7 @@
   FUNCTION_NAME = 'SetCheckLibraries'
   def CheckpkgTest(self):
     binaries_dump_info = self.pkg_data["binaries_dump_info"]
-    binaries_dump_info[0]["runpath"] = []
+    binaries_dump_info[0]["runpath"] = ()
     binaries_dump_info[0]["needed sonames"] = ["libnotfound.so"]
     binaries_dump_info[0]["path"] = 'opt/csw/lib/foo.so'
     self.pkg_data["depends"] = tuple()

Modified: csw/mgar/gar/v2/lib/python/testdata/checkpkg_pkgs_data_minimal.py
===================================================================
--- csw/mgar/gar/v2/lib/python/testdata/checkpkg_pkgs_data_minimal.py	2010-07-06 20:06:32 UTC (rev 10462)
+++ csw/mgar/gar/v2/lib/python/testdata/checkpkg_pkgs_data_minimal.py	2010-07-06 20:37:05 UTC (rev 10463)
@@ -8,7 +8,7 @@
  'binaries_dump_info': [{'base_name': 'foo',
                          'needed sonames': [],
                          'path': 'opt/csw/bin/foo',
-                         'runpath': [
+                         'runpath': (
                                      '/opt/csw/1/lib',
                                      '/opt/csw/lib',
                                      '/lib',
@@ -16,7 +16,7 @@
                                      '/usr/lib/$ISALIST',
                                      '/usr/lib',
                                      '/lib/$ISALIST',
-                                     '/lib'],
+                                     '/lib'),
                          'soname': 'foo',
                          'soname_guessed': True}],
  'depends': [],

Modified: csw/mgar/gar/v2/lib/python/testdata/checkpkg_test_data_CSWdjvulibrert.py
===================================================================
--- csw/mgar/gar/v2/lib/python/testdata/checkpkg_test_data_CSWdjvulibrert.py	2010-07-06 20:06:32 UTC (rev 10462)
+++ csw/mgar/gar/v2/lib/python/testdata/checkpkg_test_data_CSWdjvulibrert.py	2010-07-06 20:37:05 UTC (rev 10463)
@@ -31,7 +31,7 @@
                                             'libCrun.so.1',
                                             'libc.so.1'],
                          'path': 'opt/csw/lib/libdjvulibre.so.15',
-                         'runpath': ['/opt/csw/lib/$ISALIST',
+                         'runpath': ('/opt/csw/lib/$ISALIST',
                                      '/opt/csw/lib',
                                      '/opt/SUNWspro/lib/rw7',
                                      '/opt/SUNWspro/lib/v8',
@@ -42,7 +42,7 @@
                                      '/usr/lib/$ISALIST',
                                      '/usr/lib',
                                      '/lib/$ISALIST',
-                                     '/lib'],
+                                     '/lib'),
                          'soname': 'libdjvulibre.so.15',
                          'soname_guessed': False},
                         {'base_name': 'libdjvulibre.so.21.1.0',
@@ -53,7 +53,7 @@
                                             'libCrun.so.1',
                                             'libc.so.1'],
                          'path': 'opt/csw/lib/sparcv9/libdjvulibre.so.21.1.0',
-                         'runpath': ['/opt/csw/X11/lib/$ISALIST',
+                         'runpath': ('/opt/csw/X11/lib/$ISALIST',
                                      '/opt/csw/X11/lib/64',
                                      '/opt/csw/lib/$ISALIST',
                                      '/opt/csw/lib/64',
@@ -66,7 +66,7 @@
                                      '/usr/lib/$ISALIST',
                                      '/usr/lib',
                                      '/lib/$ISALIST',
-                                     '/lib'],
+                                     '/lib'),
                          'soname': 'libdjvulibre.so.21',
                          'soname_guessed': False},
                         {'base_name': 'libdjvulibre.so.21.1.0',
@@ -77,7 +77,7 @@
                                             'libCrun.so.1',
                                             'libc.so.1'],
                          'path': 'opt/csw/lib/libdjvulibre.so.21.1.0',
-                         'runpath': ['/opt/csw/X11/lib/$ISALIST',
+                         'runpath': ('/opt/csw/X11/lib/$ISALIST',
                                      '/opt/csw/X11/lib',
                                      '/opt/csw/lib/$ISALIST',
                                      '/opt/csw/lib',
@@ -92,7 +92,7 @@
                                      '/usr/lib/$ISALIST',
                                      '/usr/lib',
                                      '/lib/$ISALIST',
-                                     '/lib'],
+                                     '/lib'),
                          'soname': 'libdjvulibre.so.21',
                          'soname_guessed': False}],
  'depends': [('CSWcommon',
@@ -101,7 +101,7 @@
               'CSWisaexec isaexec - sneaky wrapper around Sun isaexec '),
              ('CSWjpeg',
               'CSWjpeg jpeg - JPEG library and tools by the Independent JPEG Group ')],
- 'isalist': ['sparcv9+vis2',
+ 'isalist': ('sparcv9+vis2',
              'sparcv9+vis',
              'sparcv9',
              'sparcv8plus+vis2',
@@ -110,7 +110,7 @@
              'sparcv8',
              'sparcv8-fsmuld',
              'sparcv7',
-             'sparc'],
+             'sparc'),
  'overrides': [],
  'pkginfo': {'ARCH': 'sparc',
              'CATEGORY': 'application',

Modified: csw/mgar/gar/v2/lib/python/testdata/rsync_pkg_stats.py
===================================================================
--- csw/mgar/gar/v2/lib/python/testdata/rsync_pkg_stats.py	2010-07-06 20:06:32 UTC (rev 10462)
+++ csw/mgar/gar/v2/lib/python/testdata/rsync_pkg_stats.py	2010-07-06 20:37:05 UTC (rev 10463)
@@ -33,12 +33,12 @@
                                             'libnsl.so.1',
                                             'libc.so.1'],
                          'path': 'opt/csw/bin/sparcv9/rsync',
-                         'runpath': ['/opt/csw/lib/$ISALIST',
+                         'runpath': ('/opt/csw/lib/$ISALIST',
                                      '/opt/csw/lib/64',
                                      '/usr/lib/$ISALIST',
                                      '/usr/lib',
                                      '/lib/$ISALIST',
-                                     '/lib'],
+                                     '/lib'),
                          'soname': 'rsync',
                          'soname_guessed': True},
                         {'base_name': 'rsync',
@@ -49,12 +49,12 @@
                                             'libnsl.so.1',
                                             'libc.so.1'],
                          'path': 'opt/csw/bin/sparcv8/rsync',
-                         'runpath': ['/opt/csw/lib/$ISALIST',
+                         'runpath': ('/opt/csw/lib/$ISALIST',
                                      '/opt/csw/lib',
                                      '/usr/lib/$ISALIST',
                                      '/usr/lib',
                                      '/lib/$ISALIST',
-                                     '/lib'],
+                                     '/lib'),
                          'soname': 'rsync',
                          'soname_guessed': True}],
  'depends': [['CSWcommon',


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 Jul  7 11:15:27 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 07 Jul 2010 09:15:27 +0000
Subject: [csw-devel] SF.net SVN: gar:[10464] csw/mgar/pkg/gtar/trunk/Makefile
Message-ID: <E1OWQj1-0007yB-LS@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 10464
          http://gar.svn.sourceforge.net/gar/?rev=10464&view=rev
Author:   dmichelsen
Date:     2010-07-07 09:15:27 +0000 (Wed, 07 Jul 2010)

Log Message:
-----------
gtar: Add gnulinks

Modified Paths:
--------------
    csw/mgar/pkg/gtar/trunk/Makefile

Modified: csw/mgar/pkg/gtar/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gtar/trunk/Makefile	2010-07-06 20:37:05 UTC (rev 10463)
+++ csw/mgar/pkg/gtar/trunk/Makefile	2010-07-07 09:15:27 UTC (rev 10464)
@@ -33,3 +33,9 @@
 EXTRA_MERGE_EXCLUDE_FILES = $(libdir)/charset.alias
 
 include gar/category.mk
+
+post-install-modulated:
+	ginstall -d $(DESTDIR)$(prefix)/gnu
+	$(foreach G,$(notdir $(wildcard $(DESTDIR)$(bindir)/*)),ln -s ../bin/$G $(DESTDIR)$(prefix)/gnu/$(patsubst g%,%,$G);)
+	@$(MAKECOOKIE)
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From dmichelsen at users.sourceforge.net  Wed Jul  7 11:22:35 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 07 Jul 2010 09:22:35 +0000
Subject: [csw-devel] SF.net SVN: gar:[10465] csw/mgar/pkg/patch/trunk
Message-ID: <E1OWQpv-0002v1-Nu@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 10465
          http://gar.svn.sourceforge.net/gar/?rev=10465&view=rev
Author:   dmichelsen
Date:     2010-07-07 09:22:35 +0000 (Wed, 07 Jul 2010)

Log Message:
-----------
patch: Fix issue with GAR now using git for patches

Modified Paths:
--------------
    csw/mgar/pkg/patch/trunk/Makefile
    csw/mgar/pkg/patch/trunk/checksums
    csw/mgar/pkg/patch/trunk/files/0001-Add-missing-strnlen.c-from-GNUlib.patch

Added Paths:
-----------
    csw/mgar/pkg/patch/trunk/files/0002-Add-missing-m4-files.patch

Modified: csw/mgar/pkg/patch/trunk/Makefile
===================================================================
--- csw/mgar/pkg/patch/trunk/Makefile	2010-07-07 09:15:27 UTC (rev 10464)
+++ csw/mgar/pkg/patch/trunk/Makefile	2010-07-07 09:22:35 UTC (rev 10465)
@@ -9,7 +9,8 @@
 
 MASTER_SITES = $(GNU_MIRROR)
 DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz 
-PATCHFILES = 0001-Add-missing-strnlen.c-from-GNUlib.patch
+PATCHFILES  = 0001-Add-missing-strnlen.c-from-GNUlib.patch
+PATCHFILES += 0002-Add-missing-m4-files.patch
 
 PACKAGES = CSWgpatch
 
@@ -27,3 +28,14 @@
 TEST_TARGET = check
 
 include gar/category.mk
+
+post-extract-modulated:
+	@# GARs usage of .git for patching in the package confuses the upstream building as
+	@# if it was bootstrapped.
+	-echo "exit 0" > $(WORKSRC)/update-version.sh
+
+post-install-modulated:
+	ginstall -d $(DESTDIR)$(prefix)/gnu
+	$(foreach G,$(notdir $(wildcard $(DESTDIR)$(bindir)/*)),ln -s ../bin/$G $(DESTDIR)$(prefix)/gnu/$(patsubst g%,%,$G);)
+	@$(MAKECOOKIE)
+

Modified: csw/mgar/pkg/patch/trunk/checksums
===================================================================
--- csw/mgar/pkg/patch/trunk/checksums	2010-07-07 09:15:27 UTC (rev 10464)
+++ csw/mgar/pkg/patch/trunk/checksums	2010-07-07 09:22:35 UTC (rev 10465)
@@ -1,2 +1,3 @@
-d976e6d1af14d714cffa3e6579cf7afa  0001-Add-missing-strnlen.c-from-GNUlib.patch
+46d02b036813c195171f723f162e3786  0001-Add-missing-strnlen.c-from-GNUlib.patch
+f18f4ae6a5d427f20941a439fcd7d61a  0002-Add-missing-m4-files.patch
 d758eb96d3f75047efc004a720d33daf  patch-2.6.1.tar.gz

Modified: csw/mgar/pkg/patch/trunk/files/0001-Add-missing-strnlen.c-from-GNUlib.patch
===================================================================
--- csw/mgar/pkg/patch/trunk/files/0001-Add-missing-strnlen.c-from-GNUlib.patch	2010-07-07 09:15:27 UTC (rev 10464)
+++ csw/mgar/pkg/patch/trunk/files/0001-Add-missing-strnlen.c-from-GNUlib.patch	2010-07-07 09:22:35 UTC (rev 10465)
@@ -1,7 +1,7 @@
-From 301697b91b91d3b08059a9e18ce8154040762d63 Mon Sep 17 00:00:00 2001
+From e45bf18c6a3355d54dc29b6b259ae21e83ff8041 Mon Sep 17 00:00:00 2001
 From: Dagobert Michelsen <dam at opencsw.org>
 Date: Thu, 11 Feb 2010 10:19:05 +0100
-Subject: [PATCH] Add missing strnlen.c from GNUlib
+Subject: [PATCH 1/2] Add missing strnlen.c from GNUlib
 
 ---
  gl/lib/strnlen.c |   31 +++++++++++++++++++++++++++++++
@@ -46,5 +46,5 @@
 +  return end ? (size_t) (end - string) : maxlen;
 +}
 -- 
-1.6.6
+1.7.1
 

Added: csw/mgar/pkg/patch/trunk/files/0002-Add-missing-m4-files.patch
===================================================================
--- csw/mgar/pkg/patch/trunk/files/0002-Add-missing-m4-files.patch	                        (rev 0)
+++ csw/mgar/pkg/patch/trunk/files/0002-Add-missing-m4-files.patch	2010-07-07 09:22:35 UTC (rev 10465)
@@ -0,0 +1,76 @@
+From e70f6d46e9a2f6df77a234e0a0404588c39bd142 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Wed, 30 Jun 2010 16:23:10 +0200
+Subject: [PATCH 2/2] Add missing m4 files
+
+---
+ gl/m4/safe-read.m4 |   18 ++++++++++++++++++
+ gl/m4/strnlen.m4   |   31 +++++++++++++++++++++++++++++++
+ 2 files changed, 49 insertions(+), 0 deletions(-)
+ create mode 100644 gl/m4/safe-read.m4
+ create mode 100644 gl/m4/strnlen.m4
+
+diff --git a/gl/m4/safe-read.m4 b/gl/m4/safe-read.m4
+new file mode 100644
+index 0000000..7a89d0a
+--- /dev/null
++++ b/gl/m4/safe-read.m4
+@@ -0,0 +1,18 @@
++# safe-read.m4 serial 5
++dnl Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
++dnl This file is free software; the Free Software Foundation
++dnl gives unlimited permission to copy and/or distribute it,
++dnl with or without modifications, as long as this notice is preserved.
++
++AC_DEFUN([gl_SAFE_READ],
++[
++  AC_LIBOBJ([safe-read])
++
++  gl_PREREQ_SAFE_READ
++])
++
++# Prerequisites of lib/safe-read.c.
++AC_DEFUN([gl_PREREQ_SAFE_READ],
++[
++  AC_REQUIRE([gt_TYPE_SSIZE_T])
++])
+diff --git a/gl/m4/strnlen.m4 b/gl/m4/strnlen.m4
+new file mode 100644
+index 0000000..1c97859
+--- /dev/null
++++ b/gl/m4/strnlen.m4
+@@ -0,0 +1,31 @@
++# strnlen.m4 serial 10
++dnl Copyright (C) 2002-2003, 2005-2007, 2009 Free Software Foundation, Inc.
++dnl This file is free software; the Free Software Foundation
++dnl gives unlimited permission to copy and/or distribute it,
++dnl with or without modifications, as long as this notice is preserved.
++
++AC_DEFUN([gl_FUNC_STRNLEN],
++[
++  dnl Persuade glibc <string.h> to declare strnlen().
++  AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
++
++  AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS])
++  AC_CHECK_DECLS_ONCE([strnlen])
++  if test $ac_cv_have_decl_strnlen = no; then
++    HAVE_DECL_STRNLEN=0
++  fi
++
++  AC_FUNC_STRNLEN
++  if test $ac_cv_func_strnlen_working = no; then
++    # This is necessary because automake-1.6.1 doesn't understand
++    # that the above use of AC_FUNC_STRNLEN means we may have to use
++    # lib/strnlen.c.
++    #AC_LIBOBJ([strnlen])
++    AC_DEFINE([strnlen], [rpl_strnlen],
++      [Define to rpl_strnlen if the replacement function should be used.])
++    gl_PREREQ_STRNLEN
++  fi
++])
++
++# Prerequisites of lib/strnlen.c.
++AC_DEFUN([gl_PREREQ_STRNLEN], [:])
+-- 
+1.7.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 Jul  7 11:29:17 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 07 Jul 2010 09:29:17 +0000
Subject: [csw-devel] SF.net SVN: gar:[10466]
	csw/mgar/pkg/patch/trunk/Makefile
Message-ID: <E1OWQwP-0008HH-1i@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 10466
          http://gar.svn.sourceforge.net/gar/?rev=10466&view=rev
Author:   dmichelsen
Date:     2010-07-07 09:29:16 +0000 (Wed, 07 Jul 2010)

Log Message:
-----------
patch: Add comment about bug report

Modified Paths:
--------------
    csw/mgar/pkg/patch/trunk/Makefile

Modified: csw/mgar/pkg/patch/trunk/Makefile
===================================================================
--- csw/mgar/pkg/patch/trunk/Makefile	2010-07-07 09:22:35 UTC (rev 10465)
+++ csw/mgar/pkg/patch/trunk/Makefile	2010-07-07 09:29:16 UTC (rev 10466)
@@ -9,6 +9,9 @@
 
 MASTER_SITES = $(GNU_MIRROR)
 DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz 
+
+# Add some missing files from gnulib until this is fixed:
+#   https://savannah.gnu.org/bugs/?30378
 PATCHFILES  = 0001-Add-missing-strnlen.c-from-GNUlib.patch
 PATCHFILES += 0002-Add-missing-m4-files.patch
 


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 Jul  7 13:58:00 2010
From: wbonnet at users.sourceforge.net (wbonnet at users.sourceforge.net)
Date: Wed, 07 Jul 2010 11:58:00 +0000
Subject: [csw-devel] SF.net SVN: gar:[10467] csw/mgar/pkg/seamonkey/trunk
Message-ID: <E1OWTGK-0002Cv-H4@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 10467
          http://gar.svn.sourceforge.net/gar/?rev=10467&view=rev
Author:   wbonnet
Date:     2010-07-07 11:58:00 +0000 (Wed, 07 Jul 2010)

Log Message:
-----------
Update to 1,1,18

Modified Paths:
--------------
    csw/mgar/pkg/seamonkey/trunk/Makefile
    csw/mgar/pkg/seamonkey/trunk/checksums

Modified: csw/mgar/pkg/seamonkey/trunk/Makefile
===================================================================
--- csw/mgar/pkg/seamonkey/trunk/Makefile	2010-07-07 09:29:16 UTC (rev 10466)
+++ csw/mgar/pkg/seamonkey/trunk/Makefile	2010-07-07 11:58:00 UTC (rev 10467)
@@ -1,7 +1,7 @@
 GARNAME = seamonkey
 GARVERSION = 1.1.18
 CATEGORIES = apps
-DISTNAME = $(GARNAME)
+DISTNAME = mozilla
 
 DESCRIPTION = Seamonkey all-in-one internet application suite
 define BLURB
@@ -16,6 +16,9 @@
 MASTER_SITES = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/$(GARVERSION)/
 UPSTREAM_MASTER_SITES = http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/
 
+# Build firefox only on solaris 10 platforms
+PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
+
 PACKAGES       			= CSWseamonkey
 CATALOGNAME_CSWseamonkey 	= $(GARNAME)
 SPKG_DESC_CSWseamonkey 		= $(DESCRIPTION)
@@ -38,7 +41,6 @@
 RUNTIME_DEP_PKGS_CSWseamonkey += CSWlibgnomeui
 RUNTIME_DEP_PKGS_CSWseamonkey += CSWlibidl
 RUNTIME_DEP_PKGS_CSWseamonkey += CSWlibpopt
-RUNTIME_DEP_PKGS_CSWseamonkey += CSWlibx11
 RUNTIME_DEP_PKGS_CSWseamonkey += CSWlibxft2
 RUNTIME_DEP_PKGS_CSWseamonkey += CSWlibxrender
 RUNTIME_DEP_PKGS_CSWseamonkey += CSWorbit2
@@ -84,13 +86,9 @@
 LICENSE = LICENSE
 
 # Variable for direct access to working dir
-WORK_BUILD   = $(WORKROOTDIR)/build-$(firstword $(MODULATIONS))/$(GARNAME)
+WORK_BUILD   = $(WORKSRC)
 WORK_INSTALL = $(WORKROOTDIR)/install-$(firstword $(MODULATIONS))
 
-post-extract:
-	mv $(WORKROOTDIR)/build-$(firstword $(MODULATIONS))/mozilla $(WORK_BUILD)
-	@$(MAKECOOKIE)
-
 pre-configure-modulated::
 	@cp $(FILEDIR)/.mozconfig  $(WORK_BUILD)/.mozconfig
 

Modified: csw/mgar/pkg/seamonkey/trunk/checksums
===================================================================
--- csw/mgar/pkg/seamonkey/trunk/checksums	2010-07-07 09:29:16 UTC (rev 10466)
+++ csw/mgar/pkg/seamonkey/trunk/checksums	2010-07-07 11:58:00 UTC (rev 10467)
@@ -1,13 +1,13 @@
-058f97fd1a482f544e00706fa4d9b85a  download/CSWseamonkey.postinstall
-b7484bcb84a902a5a110758cd5ffad99  download/CSWseamonkey.postremove
-23b32e46acefebe1eb21566d0336075e  download/SunOS5.mk.diff
-923bc1a8e0f98039c863a4f01dec9ec4  download/autoconf.mk.in.diff
-46527aded9c373b6095fea546d4d74f0  download/lber-int.h.diff
-46ef334e67dab2301b53b661494f9d58  download/ldap-int.h.diff
-e7054c1d1d6dc708805a6110ccfa7f70  download/ldappr-int.h.diff
-e06ffefa6534521de5ed91c812a4a9c6  download/legacydb.config.mk.diff
-f06035b459f608ed5032252bcaf87fb2  download/legacydb.manifest.mm.diff
-3b03f00259d6897e017254e9dceed493  download/packager.mk.diff
-ef4455becf3a12833dca7dd92854aeaa  download/seamonkey-1.1.18.source.tar.bz2
-c815868b27233888ae5623967cc012f5  download/softoken.config.mk.diff
-1150110fc60db3d7f5475e6906fe80c6  download/softoken.manifest.mm.diff
+058f97fd1a482f544e00706fa4d9b85a  CSWseamonkey.postinstall
+b7484bcb84a902a5a110758cd5ffad99  CSWseamonkey.postremove
+23b32e46acefebe1eb21566d0336075e  SunOS5.mk.diff
+923bc1a8e0f98039c863a4f01dec9ec4  autoconf.mk.in.diff
+46527aded9c373b6095fea546d4d74f0  lber-int.h.diff
+46ef334e67dab2301b53b661494f9d58  ldap-int.h.diff
+e7054c1d1d6dc708805a6110ccfa7f70  ldappr-int.h.diff
+e06ffefa6534521de5ed91c812a4a9c6  legacydb.config.mk.diff
+f06035b459f608ed5032252bcaf87fb2  legacydb.manifest.mm.diff
+3b03f00259d6897e017254e9dceed493  packager.mk.diff
+ef4455becf3a12833dca7dd92854aeaa  seamonkey-1.1.18.source.tar.bz2
+c815868b27233888ae5623967cc012f5  softoken.config.mk.diff
+1150110fc60db3d7f5475e6906fe80c6  softoken.manifest.mm.diff


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From bdwalton at users.sourceforge.net  Wed Jul  7 14:56:36 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Wed, 07 Jul 2010 12:56:36 +0000
Subject: [csw-devel] SF.net SVN: gar:[10468]
	csw/mgar/pkg/gnulinks/trunk/Makefile
Message-ID: <E1OWUB2-0003di-QI@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 10468
          http://gar.svn.sourceforge.net/gar/?rev=10468&view=rev
Author:   bdwalton
Date:     2010-07-07 12:56:36 +0000 (Wed, 07 Jul 2010)

Log Message:
-----------
gnulinks: drop links for CSWgpatch, CSWgm4 and CSWgtar

Modified Paths:
--------------
    csw/mgar/pkg/gnulinks/trunk/Makefile

Modified: csw/mgar/pkg/gnulinks/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gnulinks/trunk/Makefile	2010-07-07 11:58:00 UTC (rev 10467)
+++ csw/mgar/pkg/gnulinks/trunk/Makefile	2010-07-07 12:56:36 UTC (rev 10468)
@@ -6,7 +6,7 @@
 
 GLINKPKGS =  CSWggettext CSWggettextrt CSWbison CSWbinutils
 GLINKPKGS += CSWgsed CSWggetopt CSWfindutils
-GLINKPKGS += CSWgmake CSWgpatch CSWgm4 CSWgwhois CSWgtar
+GLINKPKGS += CSWgmake CSWgwhois
 BUILD_DEP_PKGS = $(GLINKPKGS) CSWpkgutil CSWbash
 
 DESCRIPTION = Creates native symlinks for GNU tools in /opt/csw/gnu


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 Jul  7 16:39:20 2010
From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net)
Date: Wed, 07 Jul 2010 14:39:20 +0000
Subject: [csw-devel] SF.net SVN: gar:[10469] csw/mgar/pkg/cpan
Message-ID: <E1OWVmS-00070U-1d@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 10469
          http://gar.svn.sourceforge.net/gar/?rev=10469&view=rev
Author:   bonivart
Date:     2010-07-07 14:39:19 +0000 (Wed, 07 Jul 2010)

Log Message:
-----------
Sys-SigAction: initial commit

Added Paths:
-----------
    csw/mgar/pkg/cpan/Sys-SigAction/
    csw/mgar/pkg/cpan/Sys-SigAction/branches/
    csw/mgar/pkg/cpan/Sys-SigAction/tags/
    csw/mgar/pkg/cpan/Sys-SigAction/trunk/
    csw/mgar/pkg/cpan/Sys-SigAction/trunk/Makefile
    csw/mgar/pkg/cpan/Sys-SigAction/trunk/checksums
    csw/mgar/pkg/cpan/Sys-SigAction/trunk/files/
    csw/mgar/pkg/cpan/Sys-SigAction/trunk/files/COPYING


Property changes on: csw/mgar/pkg/cpan/Sys-SigAction/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/Sys-SigAction/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Sys-SigAction/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/cpan/Sys-SigAction/trunk/Makefile	2010-07-07 14:39:19 UTC (rev 10469)
@@ -0,0 +1,17 @@
+GARNAME = Sys-SigAction
+GARVERSION = 0.11
+CATEGORIES = cpan
+AUTHOR = LBAXTER
+
+DESCRIPTION = Perl extension for Consistent Signal Handling
+define BLURB
+  Perl extension for Consistent Signal Handling
+endef
+
+DISTFILES += COPYING
+
+PACKAGES = CSWpmsyssigaction
+CATALOGNAME = pm_syssigaction
+ARCHALL = 1
+
+include gar/category.mk

Added: csw/mgar/pkg/cpan/Sys-SigAction/trunk/checksums
===================================================================
--- csw/mgar/pkg/cpan/Sys-SigAction/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/cpan/Sys-SigAction/trunk/checksums	2010-07-07 14:39:19 UTC (rev 10469)
@@ -0,0 +1,2 @@
+975011ede93d906c9676b3e23f2e7142  COPYING
+e37f1e69d6ac6ea4a9ffd7f845753e79  Sys-SigAction-0.11.tar.gz

Added: csw/mgar/pkg/cpan/Sys-SigAction/trunk/files/COPYING
===================================================================
--- csw/mgar/pkg/cpan/Sys-SigAction/trunk/files/COPYING	                        (rev 0)
+++ csw/mgar/pkg/cpan/Sys-SigAction/trunk/files/COPYING	2010-07-07 14:39:19 UTC (rev 10469)
@@ -0,0 +1,4 @@
+Copyright (c) 2004-2009 Lincoln A. Baxter
+
+You may distribute under the terms of either the GNU General Public
+License or the Artistic License, as specified in the Perl README file,


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From opk at users.sourceforge.net  Wed Jul  7 17:08:52 2010
From: opk at users.sourceforge.net (opk at users.sourceforge.net)
Date: Wed, 07 Jul 2010 15:08:52 +0000
Subject: [csw-devel] SF.net SVN: gar:[10470] csw/mgar/pkg/tkcvs/trunk
Message-ID: <E1OWWF2-00087Y-NA@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 10470
          http://gar.svn.sourceforge.net/gar/?rev=10470&view=rev
Author:   opk
Date:     2010-07-07 15:08:52 +0000 (Wed, 07 Jul 2010)

Log Message:
-----------
update tkcvs to 8.2.2

Modified Paths:
--------------
    csw/mgar/pkg/tkcvs/trunk/Makefile
    csw/mgar/pkg/tkcvs/trunk/checksums

Modified: csw/mgar/pkg/tkcvs/trunk/Makefile
===================================================================
--- csw/mgar/pkg/tkcvs/trunk/Makefile	2010-07-07 14:39:19 UTC (rev 10469)
+++ csw/mgar/pkg/tkcvs/trunk/Makefile	2010-07-07 15:08:52 UTC (rev 10470)
@@ -1,5 +1,5 @@
 GARNAME = tkcvs
-GARVERSION = 8.2.1
+GARVERSION = 8.2.2
 CATEGORIES = apps
 
 DESCRIPTION = A graphical front-end to CVS and Subversion

Modified: csw/mgar/pkg/tkcvs/trunk/checksums
===================================================================
--- csw/mgar/pkg/tkcvs/trunk/checksums	2010-07-07 14:39:19 UTC (rev 10469)
+++ csw/mgar/pkg/tkcvs/trunk/checksums	2010-07-07 15:08:52 UTC (rev 10470)
@@ -1 +1 @@
-7bbe24d80ebd7f0504a5b36e92541f43  download/tkcvs_8_2_1.tar.gz
+8ad8f5a3b32392fa02a2fffa42032432  tkcvs_8_2_2.tar.gz


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From opk at users.sourceforge.net  Thu Jul  8 16:09:21 2010
From: opk at users.sourceforge.net (opk at users.sourceforge.net)
Date: Thu, 08 Jul 2010 14:09:21 +0000
Subject: [csw-devel] SF.net SVN: gar:[10471]
	csw/mgar/pkg/tkcvs/trunk/Makefile
Message-ID: <E1OWrmz-00021w-O7@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 10471
          http://gar.svn.sourceforge.net/gar/?rev=10471&view=rev
Author:   opk
Date:     2010-07-08 14:09:21 +0000 (Thu, 08 Jul 2010)

Log Message:
-----------
add checkpkg overrides for tkcvs

Modified Paths:
--------------
    csw/mgar/pkg/tkcvs/trunk/Makefile

Modified: csw/mgar/pkg/tkcvs/trunk/Makefile
===================================================================
--- csw/mgar/pkg/tkcvs/trunk/Makefile	2010-07-07 15:08:52 UTC (rev 10470)
+++ csw/mgar/pkg/tkcvs/trunk/Makefile	2010-07-08 14:09:21 UTC (rev 10471)
@@ -30,6 +30,10 @@
 ARCHALL = 1
 RUNTIME_DEP_PKGS = CSWtcl CSWtk CSWtkdiff
 
+CHECKPKG_OVERRIDES_CSWtkcvs += surplus-dependency|CSWtcl
+CHECKPKG_OVERRIDES_CSWtkcvs += surplus-dependency|CSWtkdiff
+CHECKPKG_OVERRIDES_CSWtkcvs += surplus-dependency|CSWtk
+
 include gar/category.mk
 
 TCL_FILES = $(filter-out %/tkcvs.tcl,$(wildcard $(WORKSRC)/tkcvs/*.tcl))


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From skayser at users.sourceforge.net  Thu Jul  8 21:40:52 2010
From: skayser at users.sourceforge.net (skayser at users.sourceforge.net)
Date: Thu, 08 Jul 2010 19:40:52 +0000
Subject: [csw-devel] SF.net SVN: gar:[10472]
	csw/mgar/pkg/xterm/trunk/files/changelog.CSW
Message-ID: <E1OWwxo-0003V6-PT@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 10472
          http://gar.svn.sourceforge.net/gar/?rev=10472&view=rev
Author:   skayser
Date:     2010-07-08 19:40:52 +0000 (Thu, 08 Jul 2010)

Log Message:
-----------
xterm: update changelog.CSW

Modified Paths:
--------------
    csw/mgar/pkg/xterm/trunk/files/changelog.CSW

Modified: csw/mgar/pkg/xterm/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/xterm/trunk/files/changelog.CSW	2010-07-08 14:09:21 UTC (rev 10471)
+++ csw/mgar/pkg/xterm/trunk/files/changelog.CSW	2010-07-08 19:40:52 UTC (rev 10472)
@@ -1,3 +1,9 @@
+xterm (260,REV=2010.07.08)
+
+  * Updated to 260. (Fixes #4473)
+
+ -- Sebastian Kayser <skayser at opencsw.org>  Thu,  8 Jul 2010 21:40:22 +0200
+
 xterm (258,REV=2010.05.25)
 
   * Updated to 258. (Fixes #4186)


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 Jul  8 23:10:39 2010
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Thu, 08 Jul 2010 21:10:39 +0000
Subject: [csw-devel] SF.net SVN: gar:[10473] csw/mgar/gar/v2
Message-ID: <E1OWyMh-0007nt-Ay@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 10473
          http://gar.svn.sourceforge.net/gar/?rev=10473&view=rev
Author:   wahwah
Date:     2010-07-08 21:10:38 +0000 (Thu, 08 Jul 2010)

Log Message:
-----------
mGAR v2: checkpkg, better shared library resolution, by basenames, not by sonames.  Making the soname field optional, the way it should be.

Modified Paths:
--------------
    csw/mgar/gar/v2/bin/checkpkg_collect_stats.py
    csw/mgar/gar/v2/lib/python/checkpkg.py
    csw/mgar/gar/v2/lib/python/dependency_checks.py
    csw/mgar/gar/v2/lib/python/opencsw.py
    csw/mgar/gar/v2/lib/python/package_checks.py
    csw/mgar/gar/v2/lib/python/package_checks_test.py
    csw/mgar/gar/v2/lib/python/testdata/rsync_pkg_stats.py

Added Paths:
-----------
    csw/mgar/gar/v2/lib/python/testdata/ivtools_stats.py

Modified: csw/mgar/gar/v2/bin/checkpkg_collect_stats.py
===================================================================
--- csw/mgar/gar/v2/bin/checkpkg_collect_stats.py	2010-07-08 19:40:52 UTC (rev 10472)
+++ csw/mgar/gar/v2/bin/checkpkg_collect_stats.py	2010-07-08 21:10:38 UTC (rev 10473)
@@ -62,7 +62,7 @@
   bar = progressbar.ProgressBar()
   bar.maxval = total_packages
   bar.start()
-  logging.debug("Making sure package statistics are collected.")
+  logging.info("Unpacking and examining the srv4 files needed.")
   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

Modified: csw/mgar/gar/v2/lib/python/checkpkg.py
===================================================================
--- csw/mgar/gar/v2/lib/python/checkpkg.py	2010-07-08 19:40:52 UTC (rev 10472)
+++ csw/mgar/gar/v2/lib/python/checkpkg.py	2010-07-08 21:10:38 UTC (rev 10473)
@@ -32,7 +32,7 @@
 
 DEBUG_BREAK_PKGMAP_AFTER = False
 DB_SCHEMA_VERSION = 4L
-PACKAGE_STATS_VERSION = 6L
+PACKAGE_STATS_VERSION = 8L
 SYSTEM_PKGMAP = "/var/sadm/install/contents"
 NEEDED_SONAMES = "needed sonames"
 RUNPATH = "runpath"
@@ -77,6 +77,8 @@
     (r".*\.el$", u"CSWemacscommon"),
     (r".*\.elc$", u"CSWemacscommon"),
 )
+# Compiling the regexes ahead of time.
+DEPENDENCY_FILENAME_REGEXES = tuple([(re.compile(x), y) for x, y in DEPENDENCY_FILENAME_REGEXES])
 
 REPORT_TMPL = u"""#if $missing_deps or $surplus_deps or $orphan_sonames
 Dependency issues of $pkgname:
@@ -514,7 +516,7 @@
       return schema_on_disk;
     res = m.CswConfig.select(m.CswConfig.q.option_key == CONFIG_DB_SCHEMA)
     if res.count() < 1:
-      logging.info("No db schema value found, assuming %s.",
+      logging.debug("No db schema value found, assuming %s.",
                    schema_on_disk)
     elif res.count() == 1:
       schema_on_disk = res.getOne().int_value
@@ -565,6 +567,8 @@
     self.runpath_sanitize_cache = {}
 
   def ExpandRunpath(self, runpath, isalist):
+    # TODO: Implement $ORIGIN support
+    # Probably not here as it would make caching unusable.
     key = (runpath, tuple(isalist))
     if key not in self.runpath_expand_cache:
       # Emulating $ISALIST expansion
@@ -679,6 +683,8 @@
   # 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)
@@ -1031,7 +1037,11 @@
     pkg_stats = self.GetDbObject()
     if not pkg_stats:
       return False
-    return pkg_stats.stats_version == PACKAGE_STATS_VERSION
+    if pkg_stats.stats_version != PACKAGE_STATS_VERSION:
+      pkg_stats.destroySelf()
+    else:
+      return True
+    return False
 
   def GetDirFormatPkg(self):
     if not self.dir_format_pkg:
@@ -1071,13 +1081,7 @@
       ret = dump_proc.wait()
       binary_data = ParseDumpOutput(stdout)
       binary_data["path"] = binary
-      binary_data["soname_guessed"] = False
       binary_data["base_name"] = binary_base_name
-      if SONAME not in binary_data:
-        # The binary doesn't tell its SONAME.  We're guessing it's the
-        # same as the base file name.
-        binary_data[SONAME] = binary_base_name
-        binary_data["soname_guessed"] = True
       binaries_dump_info.append(binary_data)
     return binaries_dump_info
 

Modified: csw/mgar/gar/v2/lib/python/dependency_checks.py
===================================================================
--- csw/mgar/gar/v2/lib/python/dependency_checks.py	2010-07-08 19:40:52 UTC (rev 10472)
+++ csw/mgar/gar/v2/lib/python/dependency_checks.py	2010-07-08 21:10:38 UTC (rev 10473)
@@ -7,6 +7,8 @@
     ("/opt/csw/lib", "libdb-4.7.so", "Deprecated Berkeley DB location"),
     ("/opt/csw/lib/mysql", "libmysqlclient_r.so.15",
      "Please use /opt/csw/mysql5/..."),
+    ("/opt/csw/lib/sparcv9/mysql", "libmysqlclient_r.so.15",
+     "Please use /opt/csw/mysql5/..."),
     ("/opt/csw/lib/mysql", "libmysqlclient.so.15",
      "Please use /opt/csw/mysql5/..."),
 )
@@ -15,7 +17,7 @@
     r'^opt/csw/lib/python/site-packages.*',
 )
 
-def Libraries(pkg_data, error_mgr, logger, path_and_pkg_by_soname):
+def Libraries(pkg_data, error_mgr, logger, path_and_pkg_by_basename):
   pkgname = pkg_data["basic_stats"]["pkgname"]
   logger.debug("Libraries(): pkgname = %s", repr(pkgname))
   orphan_sonames = []
@@ -25,14 +27,15 @@
   for binary_info in pkg_data["binaries_dump_info"]:
     for soname in binary_info["needed sonames"]:
       resolved = False
-      path_list = path_and_pkg_by_soname[soname].keys()
+      path_list = path_and_pkg_by_basename[soname].keys()
       logger.debug("%s @ %s: looking for %s in %s",
                    soname,
                    binary_info["path"],
                    binary_info["runpath"],
                    path_list)
-      runpath_list = tuple(binary_info["runpath"]) + tuple(checkpkg.SYS_DEFAULT_RUNPATH)
-      for runpath in runpath_list:
+      runpath_tuple = (tuple(binary_info["runpath"])
+                      + tuple(checkpkg.SYS_DEFAULT_RUNPATH))
+      for runpath in runpath_tuple:
         resolved_path = ldd_emulator.ResolveSoname(runpath,
                                                    soname,
                                                    isalist,
@@ -41,9 +44,9 @@
           logger.debug("%s needed by %s:",
                  soname, binary_info["path"])
           logger.debug("=> %s provided by %s",
-              resolved_path, path_and_pkg_by_soname[soname][resolved_path])
+              resolved_path, path_and_pkg_by_basename[soname][resolved_path])
           resolved = True
-          req_pkg = path_and_pkg_by_soname[soname][resolved_path][-1]
+          req_pkg = path_and_pkg_by_basename[soname][resolved_path][-1]
           reason = ("provides %s/%s needed by %s"
                     % (resolved_path, soname, binary_info["path"]))
           for bad_path, bad_soname, msg in DEPRECATED_LIBRARY_LOCATIONS:
@@ -66,7 +69,7 @@
   # TODO: Report orphan sonames here
   return required_deps
 
-def ByFilename(pkg_data, error_mgr, logger, path_and_pkg_by_soname):
+def ByFilename(pkg_data, error_mgr, logger, path_and_pkg_by_basename):
   pkgname = pkg_data["basic_stats"]["pkgname"]
   req_pkgs_reasons = []
   dep_regexes = [(re.compile(x), x, y)

Modified: csw/mgar/gar/v2/lib/python/opencsw.py
===================================================================
--- csw/mgar/gar/v2/lib/python/opencsw.py	2010-07-08 19:40:52 UTC (rev 10472)
+++ csw/mgar/gar/v2/lib/python/opencsw.py	2010-07-08 21:10:38 UTC (rev 10473)
@@ -1193,6 +1193,13 @@
 def IsBinary(file_info):
   """Returns True or False depending on file metadata."""
   is_a_binary = False
+  if "mime_type" not in file_info:
+    # This would be a problem in the data.
+    return False
+  if not file_info["mime_type"]:
+    # This should never happen, but it seems to have happened at least once.
+    # TODO: Find the affected data and figure out why.
+    return false
   for mimetype in BIN_MIMETYPES:
     if mimetype in file_info["mime_type"]:
       is_a_binary = True

Modified: csw/mgar/gar/v2/lib/python/package_checks.py
===================================================================
--- csw/mgar/gar/v2/lib/python/package_checks.py	2010-07-08 19:40:52 UTC (rev 10472)
+++ csw/mgar/gar/v2/lib/python/package_checks.py	2010-07-08 21:10:38 UTC (rev 10473)
@@ -83,6 +83,7 @@
      r"%(subdir2)s?"
      r"$") % RPATH_PARTS,
     r"^\$ORIGIN$",
+    r"^\$ORIGIN/..$",
     r"^/usr(/(ccs|dt|openwin))?/lib(/sparcv9)?$",
 ]
 # Check ldd -r only for Perl modules
@@ -271,29 +272,33 @@
       needed_sonames.extend(binary_info["needed sonames"])
   needed_sonames = sorted(set(needed_sonames))
   # Finding candidate libraries from the filesystem (/var/sadm/install/contents)
-  path_and_pkg_by_soname = {}
+  path_and_pkg_by_basename = {}
   for needed_soname in needed_sonames:
-    path_and_pkg_by_soname[needed_soname] = error_mgr.GetPathsAndPkgnamesByBasename(
+    path_and_pkg_by_basename[needed_soname] = error_mgr.GetPathsAndPkgnamesByBasename(
         needed_soname)
   # Removing files from packages that are to be installed.
-  path_and_pkg_by_soname = RemovePackagesUnderInstallation(
-      path_and_pkg_by_soname, pkgs_to_be_installed)
+  path_and_pkg_by_basename = RemovePackagesUnderInstallation(
+      path_and_pkg_by_basename, pkgs_to_be_installed)
   # Adding overlay based on the given package set
   # Considering files from the set under examination.
   for pkg_data in pkgs_data:
     pkgname = pkg_data["basic_stats"]["pkgname"]
-    for binary_info in pkg_data["binaries_dump_info"]:
-      soname = binary_info["soname"]
-      binary_path, basename = os.path.split(binary_info["path"])
+    # Processing the whole pkgmap.  There yet no verification whether the files
+    # that are put in here are actually shared libraries, or symlinks to shared
+    # libraries.  Implementing symlink resolution would be a nice bonus.
+    for pkgmap_entry in pkg_data["pkgmap"]:
+      if "path" not in pkgmap_entry: continue
+      if not pkgmap_entry["path"]: continue
+      binary_path, basename = os.path.split(pkgmap_entry["path"])
       if not binary_path.startswith('/'):
         binary_path = "/" + binary_path
-      if soname not in path_and_pkg_by_soname:
-        path_and_pkg_by_soname[soname] = {}
-      path_and_pkg_by_soname[soname][binary_path] = [pkgname]
+      if basename not in path_and_pkg_by_basename:
+        path_and_pkg_by_basename[basename] = {}
+      path_and_pkg_by_basename[basename][binary_path] = [pkgname]
   # Resolving sonames for each binary
   for pkg_data in pkgs_data:
     pkgname = pkg_data["basic_stats"]["pkgname"]
-    check_args = (pkg_data, error_mgr, logger, path_and_pkg_by_soname)
+    check_args = (pkg_data, error_mgr, logger, path_and_pkg_by_basename)
     req_pkgs_reasons = depchecks.Libraries(*check_args)
     req_pkgs_reasons.extend(depchecks.ByFilename(*check_args))
     missing_reasons_by_pkg = {}
@@ -664,9 +669,15 @@
 
 
 def CheckLinkingAgainstSunX11(pkg_data, error_mgr, logger, messenger):
+  # Finding all shared libraries
+  shared_libs = []
+  for metadata in pkg_data["files_metadata"]:
+    if "sharedlib" in metadata["mime_type"]:
+      shared_libs.append(metadata["path"])
+  shared_libs = set(shared_libs)
   for binary_info in pkg_data["binaries_dump_info"]:
     for soname in binary_info["needed sonames"]:
-      if (".so" in binary_info["soname"]
+      if (binary_info["path"] in shared_libs
           and
           soname in DO_NOT_LINK_AGAINST_THESE_SONAMES):
         error_mgr.ReportError("linked-against-discouraged-library",

Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py
===================================================================
--- csw/mgar/gar/v2/lib/python/package_checks_test.py	2010-07-08 19:40:52 UTC (rev 10472)
+++ csw/mgar/gar/v2/lib/python/package_checks_test.py	2010-07-08 21:10:38 UTC (rev 10473)
@@ -15,10 +15,11 @@
 import testdata.checkpkg_test_data_CSWdjvulibrert as td_1
 import testdata.checkpkg_pkgs_data_minimal as td_2
 import testdata.rpaths
-from testdata.rsync_pkg_stats import pkg_stats as rsync_stats
+from testdata.rsync_pkg_stats import pkgstats as rsync_stats
+from testdata.ivtools_stats import pkgstats as ivtools_stats
 
 DEFAULT_PKG_STATS = None
-DEFAULT_PKG_DATA = rsync_stats
+DEFAULT_PKG_DATA = rsync_stats[0]
 
 
 class CheckpkgUnitTestHelper(object):
@@ -253,6 +254,7 @@
   def CheckpkgTest(self):
     self.pkg_data["binaries_dump_info"][0]["needed sonames"].append("libX11.so.4")
 
+
 class TestCheckLinkingAgainstSunX11_Bad(CheckpkgUnitTestHelper, unittest.TestCase):
   FUNCTION_NAME = 'CheckLinkingAgainstSunX11'
   def CheckpkgTest(self):
@@ -427,7 +429,7 @@
     ]
     # Calculating the parameters on the fly, it allows to write it a terse manner.
     for bad_path in BAD_PATHS:
-      self.error_mgr_mock.ReportError('bad-rpath-entry', '%s opt/csw/bin/sparcv9/rsync' % bad_path)
+      self.error_mgr_mock.ReportError('bad-rpath-entry', '%s opt/csw/bin/sparcv8/rsync' % bad_path)
 
 
 class TestCheckRpathBadPath(CheckpkgUnitTestHelper, unittest.TestCase):
@@ -445,8 +447,7 @@
     self.error_mgr_mock.ReportError(
         'CSWrsync',
         'deprecated-library',
-        u'opt/csw/bin/sparcv9/rsync Deprecated Berkeley DB location '
-        u'/opt/csw/lib/libdb-4.7.so')
+        u'opt/csw/bin/sparcv8/rsync Deprecated Berkeley DB location /opt/csw/lib/libdb-4.7.so')
     self.pkg_data = [self.pkg_data]
 
 
@@ -493,8 +494,10 @@
                                 'needed sonames': ['libfoo.so.1'],
                                 'path': 'opt/csw/bin/bar',
                                 'runpath': ('/opt/csw/lib',),
-                                'soname': 'rsync',
-                                'soname_guessed': True}],
+                                # Making sonames optional, because they are.
+                                # 'soname': 'rsync',
+                                # 'soname_guessed': True
+                                }],
         'depends': (('CSWlibfoo', None),),
         'isalist': (),
         'pkgmap': [],
@@ -763,5 +766,17 @@
     self.pkg_data = [self.CSWbar_DATA, self.CSWfoo_DATA]
 
 
+class TestSetCheckSharedLibraryConsistencyIvtools(CheckpkgUnitTestHelper,
+                                                  unittest.TestCase):
+  """This tests for a case in which the SONAME that we're looking for doesn't
+  match the filename."""
+  FUNCTION_NAME = 'SetCheckLibraries'
+  def CheckpkgTest(self):
+    self.pkg_data = ivtools_stats
+    self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libComUnidraw.so').AndReturn({})
+    # This error is thrown, but it shouldn't be:
+    # ReportError('CSWivtools', 'soname-not-found', 'libComUnidraw.so is needed by opt/csw/bin/comdraw')
+
+
 if __name__ == '__main__':
   unittest.main()

Added: csw/mgar/gar/v2/lib/python/testdata/ivtools_stats.py
===================================================================
--- csw/mgar/gar/v2/lib/python/testdata/ivtools_stats.py	                        (rev 0)
+++ csw/mgar/gar/v2/lib/python/testdata/ivtools_stats.py	2010-07-08 21:10:38 UTC (rev 10473)
@@ -0,0 +1,132 @@
+pkgstats = [{'bad_paths': {},
+  'basic_stats': {'catalogname': 'ivtools',
+                  'parsed_basename': {'arch': 'sparc',
+                                      'catalogname': 'ivtools',
+                                      'full_version_string': '1.1.3',
+                                      'osrel': 'SunOS5.8',
+                                      'revision_info': {},
+                                      'vendortag': 'CSW',
+                                      'version': '1.1.3',
+                                      'version_info': {'major version': '1',
+                                                       'minor version': '1',
+                                                       'patchlevel': '3'}},
+                  'pkg_basename': 'ivtools-1.1.3-SunOS5.8-sparc-CSW.pkg.gz',
+                  'pkg_path': '/tmp/pkg_VMve9j/ivtools-1.1.3-SunOS5.8-sparc-CSW.pkg.gz',
+                  'pkgname': 'CSWivtools',
+                  'stats_version': 6L},
+  'binaries': ['opt/csw/bin/comdraw',
+               'opt/csw/lib/libComUnidraw.so.1.1.3'],
+  'binaries_dump_info': [{'RPATH set': True,
+                          'RUNPATH RPATH the same': True,
+                          'RUNPATH set': True,
+                          'base_name': 'comdraw',
+                          'needed sonames': ['libComUnidraw.so'],
+                          'path': 'opt/csw/bin/comdraw',
+                          'runpath': ('/opt/csw/lib',),
+                          'soname': 'comdraw',
+                          'soname_guessed': True},
+                         {'RPATH set': True,
+                          'RUNPATH RPATH the same': True,
+                          'RUNPATH set': True,
+                          'base_name': 'libComUnidraw.so.1.1.3',
+                          'needed sonames': [],
+                          'path': 'opt/csw/lib/libComUnidraw.so.1.1.3',
+                          'runpath': ('/opt/csw/lib',),
+                          'soname': 'libComUnidraw.so.1.1.3',
+                          'soname_guessed': True}],
+  'depends': [],
+  'files_metadata': [
+                     {'endian': 'Big endian',
+                      'machine_id': 2,
+                      'mime_type': 'application/x-executable; charset=binary',
+                      'mime_type_by_hachoir': u'application/x-executable',
+                      'path': 'opt/csw/bin/comdraw'},
+                     {'endian': 'Big endian',
+                      'machine_id': 2,
+                      'mime_type': 'application/x-sharedlib; charset=binary',
+                      'mime_type_by_hachoir': u'application/x-executable',
+                      'path': 'opt/csw/lib/libComUnidraw.so.1.1.3'}],
+  'isalist': ('sparcv9+vis2',
+              'sparcv9+vis',
+              'sparcv9',
+              'sparcv8plus+vis2',
+              'sparcv8plus+vis',
+              'sparcv8plus',
+              'sparcv8',
+              'sparcv8-fsmuld',
+              'sparcv7',
+              'sparc'),
+  'overrides': [],
+  'pkgchk': {'return_code': 0,
+             'stderr_lines': ['rm: Cannot remove any directory in the path of the current working directory',
+                              '/var/tmp/aaaGUaqXc/CSWivtools'],
+             'stdout_lines': ['Checking uninstalled stream format package <CSWivtools> from </tmp/pkg_VMve9j/ivtools-1.1.3-SunOS5.8-sparc-CSW.pkg>',
+                              '## Checking control scripts.',
+                              '## Checking package objects.',
+                              '## Checking is complete.']},
+  'pkginfo': {'ARCH': 'sparc',
+              'CATEGORY': 'application',
+              'CLASSES': 'none',
+              'EMAIL': '...',
+              'HOTLINE': 'http://www.opencsw.org/bugtrack/',
+              'NAME': 'ivtools - a suite of free X Windows drawing editors',
+              'PKG': 'CSWivtools',
+              'PSTAMP': 'heimdall20040421105323',
+              'VENDOR': 'http://www.ivtools.org/ packaged for CSW by Murray Jensen',
+              'VERSION': '1.1.3'},
+  'pkgmap': [{'class': None,
+              'group': None,
+              'line': ': 1 25746',
+              'mode': None,
+              'path': None,
+              'type': '1',
+              'user': None},
+             {'class': 'none',
+              'group': 'bin',
+              'line': '1 d none /opt/csw/bin 0755 root bin',
+              'mode': '0755',
+              'path': '/opt/csw/bin',
+              'type': 'd',
+              'user': 'root'},
+             {'class': 'none',
+              'group': 'bin',
+              'line': '1 f none /opt/csw/bin/comdraw 0755 root bin 12184 37875 1082508565',
+              'mode': '0755',
+              'path': '/opt/csw/bin/comdraw',
+              'type': 'f',
+              'user': 'root'},
+             {'class': 'none',
+              'group': None,
+              'line': '1 s none /opt/csw/lib/libComUnidraw.so=libComUnidraw.so.1.1.3',
+              'mode': None,
+              'path': '/opt/csw/lib/libComUnidraw.so',
+              'type': 's',
+              'user': None},
+             {'class': 'none',
+              'group': 'bin',
+              'line': '1 f none /opt/csw/lib/libComUnidraw.so.1.1.3 0644 root bin 259064 43856 1082508565',
+              'mode': '0644',
+              'path': '/opt/csw/lib/libComUnidraw.so.1.1.3',
+              'type': 'f',
+              'user': 'root'},
+             {'class': None,
+              'group': None,
+              'line': '1 i copyright 2566 14385 1082211466',
+              'mode': None,
+              'path': None,
+              'type': 'i',
+              'user': None},
+             {'class': None,
+              'group': None,
+              'line': '1 i depend 12 941 1082386578',
+              'mode': None,
+              'path': None,
+              'type': 'i',
+              'user': None},
+             {'class': None,
+              'group': None,
+              'line': '1 i pkginfo 293 24989 1219228976',
+              'mode': None,
+              'path': None,
+              'type': 'i',
+              'user': None}]}]

Modified: csw/mgar/gar/v2/lib/python/testdata/rsync_pkg_stats.py
===================================================================
--- csw/mgar/gar/v2/lib/python/testdata/rsync_pkg_stats.py	2010-07-08 19:40:52 UTC (rev 10472)
+++ csw/mgar/gar/v2/lib/python/testdata/rsync_pkg_stats.py	2010-07-08 21:10:38 UTC (rev 10473)
@@ -1,185 +1,189 @@
-pkg_stats = {
- 'all_filenames': ['pkginfo',
-                   'pkgmap',
-                   'copyright',
-                   'depend',
-                   'rsyncd.conf.5',
-                   'rsync.1',
-                   'license',
-                   'rsync',
-                   'rsync'],
- 'bad_paths': {},
- 'basic_stats': {'catalogname': 'rsync',
-                 'parsed_basename': {'arch': 'sparc',
-                                     'catalogname': 'rsync',
-                                     'full_version_string': '3.0.7,REV=2010.02.17',
-                                     'osrel': 'SunOS5.8',
-                                     'revision_info': {'REV': '2010.02.17'},
-                                     'vendortag': 'CSW',
-                                     'version': '3.0.7',
-                                     'version_info': {'major version': '3',
-                                                      'minor version': '0',
-                                                      'patchlevel': '7'}},
-                 'pkg_basename': 'rsync-3.0.7,REV=2010.02.17-SunOS5.8-sparc-CSW.pkg.gz',
-                 'pkg_path': '/tmp/pkg_dhBeK1/rsync-3.0.7,REV=2010.02.17-SunOS5.8-sparc-CSW.pkg.gz',
-                 'pkgname': 'CSWrsync',
-                 'stats_version': 1},
- 'binaries': ['opt/csw/bin/sparcv9/rsync', 'opt/csw/bin/sparcv8/rsync'],
- 'binaries_dump_info': [{'base_name': 'rsync',
-                         'needed sonames': ['libpopt.so.0',
-                                            'libsec.so.1',
-                                            'libiconv.so.2',
-                                            'libsocket.so.1',
-                                            'libnsl.so.1',
-                                            'libc.so.1'],
-                         'path': 'opt/csw/bin/sparcv9/rsync',
-                         'runpath': ('/opt/csw/lib/$ISALIST',
-                                     '/opt/csw/lib/64',
-                                     '/usr/lib/$ISALIST',
-                                     '/usr/lib',
-                                     '/lib/$ISALIST',
-                                     '/lib'),
-                         'soname': 'rsync',
-                         'soname_guessed': True},
-                        {'base_name': 'rsync',
-                         'needed sonames': ['libpopt.so.0',
-                                            'libsec.so.1',
-                                            'libiconv.so.2',
-                                            'libsocket.so.1',
-                                            'libnsl.so.1',
-                                            'libc.so.1'],
-                         'path': 'opt/csw/bin/sparcv8/rsync',
-                         'runpath': ('/opt/csw/lib/$ISALIST',
-                                     '/opt/csw/lib',
-                                     '/usr/lib/$ISALIST',
-                                     '/usr/lib',
-                                     '/lib/$ISALIST',
-                                     '/lib'),
-                         'soname': 'rsync',
-                         'soname_guessed': True}],
- 'depends': [['CSWcommon',
-              'CSWcommon common - common files and dirs for CSW packages '],
-             ['CSWisaexec',
-              'CSWisaexec isaexec - sneaky wrapper around Sun isaexec '],
-             ['CSWiconv', 'CSWiconv libiconv - GNU iconv library '],
-             ['CSWlibpopt',
-              'CSWlibpopt libpopt - Popt is a C library for parsing command line parameters ']],
- 'files_metadata': None,
- 'isalist': ['sparcv9+vis2',
-             'sparcv9+vis',
-             'sparcv9',
-             'sparcv8plus+vis2',
-             'sparcv8plus+vis',
-             'sparcv8plus',
-             'sparcv8',
-             'sparcv8-fsmuld',
-             'sparcv7',
-             'sparc'],
- 'ldd_dash_r': [],
- 'overrides': [],
- 'pkgchk': [],
- 'pkginfo': {'ARCH': 'sparc',
-             'CATEGORY': 'application',
-             'CLASSES': 'none',
-             'EMAIL': 'maciej at opencsw.org',
-             'HOTLINE': 'http://www.opencsw.org/bugtrack/',
-             'NAME': 'rsync - utility which provides fast incremental file transfer',
-             'OPENCSW_CATALOGNAME': 'rsync',
-             'OPENCSW_MODE64': '32/64/isaexec',
-             'OPENCSW_REPOSITORY': 'https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/pkg/rsync/trunk at 8611',
-             'PKG': 'CSWrsync',
-             'PSTAMP': 'maciej at build8s-20100217094608',
-             'VENDOR': 'http://rsync.samba.org/ packaged for CSW by Maciej Blizinski',
-             'VERSION': '3.0.7,REV=2010.02.17',
-             'WORKDIR_FIRSTMOD': '../build-isa-sparcv8'},
- 'pkgmap': [{'class': None,
-             'group': None,
-             'line': ': 1 2912',
-             'mode': None,
-             'path': None,
-             'type': '1',
-             'user': None},
-            {'class': 'none',
-             'group': None,
-             'line': '1 l none /opt/csw/bin/rsync=/opt/csw/bin/isaexec',
-             'mode': None,
-             'path': '/opt/csw/bin/rsync',
-             'type': 'l',
-             'user': None},
-            {'class': 'none',
-             'group': 'bin',
-             'line': '1 f none /opt/csw/bin/sparcv8/rsync 0755 root bin 585864 12576 1266395028',
-             'mode': '0755',
-             'path': '/opt/csw/bin/sparcv8/rsync',
-             'type': 'f',
-             'user': 'root'},
-            {'class': 'none',
-             'group': 'bin',
-             'line': '1 f none /opt/csw/bin/sparcv9/rsync 0755 root bin 665520 60792 1266395239',
-             'mode': '0755',
-             'path': '/opt/csw/bin/sparcv9/rsync',
-             'type': 'f',
-             'user': 'root'},
-            {'class': 'none',
-             'group': 'bin',
-             'line': '1 d none /opt/csw/share/doc/rsync 0755 root bin',
-             'mode': '0755',
-             'path': '/opt/csw/share/doc/rsync',
-             'type': 'd',
-             'user': 'root'},
-            {'class': 'none',
-             'group': 'bin',
-             'line': '1 f none /opt/csw/share/doc/rsync/license 0644 root bin 35147 30328 1266396366',
-             'mode': '0644',
-             'path': '/opt/csw/share/doc/rsync/license',
-             'type': 'f',
-             'user': 'root'},
-            {'class': 'none',
-             'group': 'bin',
-             'line': '1 d none /opt/csw/share/man/man1 0755 root bin',
-             'mode': '0755',
-             'path': '/opt/csw/share/man/man1',
-             'type': 'd',
-             'user': 'root'},
-            {'class': 'none',
-             'group': 'bin',
-             'line': '1 f none /opt/csw/share/man/man1/rsync.1 0644 root bin 159739 65016 1266395027',
-             'mode': '0644',
-             'path': '/opt/csw/share/man/man1/rsync.1',
-             'type': 'f',
-             'user': 'root'},
-            {'class': 'none',
-             'group': 'bin',
-             'line': '1 d none /opt/csw/share/man/man5 0755 root bin',
-             'mode': '0755',
-             'path': '/opt/csw/share/man/man5',
-             'type': 'd',
-             'user': 'root'},
-            {'class': 'none',
-             'group': 'bin',
-             'line': '1 f none /opt/csw/share/man/man5/rsyncd.conf.5 0644 root bin 36372 24688 1266395027',
-             'mode': '0644',
-             'path': '/opt/csw/share/man/man5/rsyncd.conf.5',
-             'type': 'f',
-             'user': 'root'},
-            {'class': None,
-             'group': None,
-             'line': '1 i copyright 69 6484 1266396366',
-             'mode': None,
-             'path': None,
-             'type': 'i',
-             'user': None},
-            {'class': None,
-             'group': None,
-             'line': '1 i depend 236 21212 1266396368',
-             'mode': None,
-             'path': None,
-             'type': 'i',
-             'user': None},
-            {'class': None,
-             'group': None,
-             'line': '1 i pkginfo 511 43247 1266396371',
-             'mode': None,
-             'path': None,
-             'type': 'i',
-             'user': None}]}
+pkgstats = [{'bad_paths': {},
+  'basic_stats': {'catalogname': 'rsync',
+                  'parsed_basename': {'arch': 'sparc',
+                                      'catalogname': 'rsync',
+                                      'full_version_string': '3.0.7,REV=2010.02.17',
+                                      'osrel': 'SunOS5.8',
+                                      'revision_info': {'REV': '2010.02.17'},
+                                      'vendortag': 'CSW',
+                                      'version': '3.0.7',
+                                      'version_info': {'major version': '3',
+                                                       'minor version': '0',
+                                                       'patchlevel': '7'}},
+                  'pkg_basename': 'rsync-3.0.7,REV=2010.02.17-SunOS5.8-sparc-CSW.pkg.gz',
+                  'pkg_path': '/tmp/pkg_wq7Wyx/rsync-3.0.7,REV=2010.02.17-SunOS5.8-sparc-CSW.pkg.gz',
+                  'pkgname': 'CSWrsync',
+                  'stats_version': 7L},
+  'binaries': ['opt/csw/bin/sparcv8/rsync', 'opt/csw/bin/sparcv9/rsync'],
+  'binaries_dump_info': [{'RPATH set': True,
+                          'RUNPATH RPATH the same': True,
+                          'RUNPATH set': True,
+                          'base_name': 'rsync',
+                          'needed sonames': ['libpopt.so.0',
+                                             'libsec.so.1',
+                                             'libiconv.so.2',
+                                             'libsocket.so.1',
+                                             'libnsl.so.1',
+                                             'libc.so.1'],
+                          'path': 'opt/csw/bin/sparcv8/rsync',
+                          'runpath': ('/opt/csw/lib/$ISALIST',
+                                      '/opt/csw/lib')},
+                         {'RPATH set': True,
+                          'RUNPATH RPATH the same': True,
+                          'RUNPATH set': True,
+                          'base_name': 'rsync',
+                          'needed sonames': ['libpopt.so.0',
+                                             'libsec.so.1',
+                                             'libiconv.so.2',
+                                             'libsocket.so.1',
+                                             'libnsl.so.1',
+                                             'libc.so.1'],
+                          'path': 'opt/csw/bin/sparcv9/rsync',
+                          'runpath': ('/opt/csw/lib/$ISALIST',
+                                      '/opt/csw/lib/64')}],
+  'depends': [('CSWcommon',
+               'CSWcommon common - common files and dirs for CSW packages '),
+              ('CSWisaexec',
+               'CSWisaexec isaexec - sneaky wrapper around Sun isaexec '),
+              ('CSWiconv', 'CSWiconv libiconv - GNU iconv library '),
+              ('CSWlibpopt',
+               'CSWlibpopt libpopt - Popt is a C library for parsing command line parameters ')],
+  'files_metadata': [{'mime_type': 'text/troff; charset=us-ascii',
+                      'path': 'opt/csw/share/man/man5/rsyncd.conf.5'},
+                     {'mime_type': 'text/troff; charset=us-ascii',
+                      'path': 'opt/csw/share/man/man1/rsync.1'},
+                     {'mime_type': 'text/plain; charset=us-ascii',
+                      'path': 'opt/csw/share/doc/rsync/license'},
+                     {'endian': 'Big endian',
+                      'machine_id': 43,
+                      'mime_type': 'application/x-executable; charset=binary',
+                      'mime_type_by_hachoir': u'application/x-executable',
+                      'path': 'opt/csw/bin/sparcv9/rsync'},
+                     {'endian': 'Big endian',
+                      'machine_id': 2,
+                      'mime_type': 'application/x-executable; charset=binary',
+                      'mime_type_by_hachoir': u'application/x-executable',
+                      'path': 'opt/csw/bin/sparcv8/rsync'}],
+  'isalist': ('sparcv9+vis2',
+              'sparcv9+vis',
+              'sparcv9',
+              'sparcv8plus+vis2',
+              'sparcv8plus+vis',
+              'sparcv8plus',
+              'sparcv8',
+              'sparcv8-fsmuld',
+              'sparcv7',
+              'sparc'),
+  'overrides': [],
+  'pkgchk': {'return_code': 0,
+             'stderr_lines': ['rm: Cannot remove any directory in the path of the current working directory',
+                              '/var/tmp/aaacuaqYV/CSWrsync'],
+             'stdout_lines': ['Checking uninstalled stream format package <CSWrsync> from </tmp/pkg_wq7Wyx/rsync-3.0.7,REV=2010.02.17-SunOS5.8-sparc-CSW.pkg>',
+                              '## Checking control scripts.',
+                              '## Checking package objects.',
+                              '## Checking is complete.']},
+  'pkginfo': {'ARCH': 'sparc',
+              'CATEGORY': 'application',
+              'CLASSES': 'none',
+              'EMAIL': 'maciej at opencsw.org',
+              'HOTLINE': 'http://www.opencsw.org/bugtrack/',
+              'NAME': 'rsync - utility which provides fast incremental file transfer',
+              'OPENCSW_CATALOGNAME': 'rsync',
+              'OPENCSW_MODE64': '32/64/isaexec',
+              'OPENCSW_REPOSITORY': 'https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/pkg/rsync/trunk at 8611',
+              'PKG': 'CSWrsync',
+              'PSTAMP': 'maciej at build8s-20100217094608',
+              'VENDOR': 'http://rsync.samba.org/ packaged for CSW by Maciej Blizinski',
+              'VERSION': '3.0.7,REV=2010.02.17',
+              'WORKDIR_FIRSTMOD': '../build-isa-sparcv8'},
+  'pkgmap': [{'class': None,
+              'group': None,
+              'line': ': 1 2912',
+              'mode': None,
+              'path': None,
+              'type': '1',
+              'user': None},
+             {'class': 'none',
+              'group': None,
+              'line': '1 l none /opt/csw/bin/rsync=/opt/csw/bin/isaexec',
+              'mode': None,
+              'path': '/opt/csw/bin/rsync',
+              'type': 'l',
+              'user': None},
+             {'class': 'none',
+              'group': 'bin',
+              'line': '1 f none /opt/csw/bin/sparcv8/rsync 0755 root bin 585864 12576 1266395028',
+              'mode': '0755',
+              'path': '/opt/csw/bin/sparcv8/rsync',
+              'type': 'f',
+              'user': 'root'},
+             {'class': 'none',
+              'group': 'bin',
+              'line': '1 f none /opt/csw/bin/sparcv9/rsync 0755 root bin 665520 60792 1266395239',
+              'mode': '0755',
+              'path': '/opt/csw/bin/sparcv9/rsync',
+              'type': 'f',
+              'user': 'root'},
+             {'class': 'none',
+              'group': 'bin',
+              'line': '1 d none /opt/csw/share/doc/rsync 0755 root bin',
+              'mode': '0755',
+              'path': '/opt/csw/share/doc/rsync',
+              'type': 'd',
+              'user': 'root'},
+             {'class': 'none',
+              'group': 'bin',
+              'line': '1 f none /opt/csw/share/doc/rsync/license 0644 root bin 35147 30328 1266396366',
+              'mode': '0644',
+              'path': '/opt/csw/share/doc/rsync/license',
+              'type': 'f',
+              'user': 'root'},
+             {'class': 'none',
+              'group': 'bin',
+              'line': '1 d none /opt/csw/share/man/man1 0755 root bin',
+              'mode': '0755',
+              'path': '/opt/csw/share/man/man1',
+              'type': 'd',
+              'user': 'root'},
+             {'class': 'none',
+              'group': 'bin',
+              'line': '1 f none /opt/csw/share/man/man1/rsync.1 0644 root bin 159739 65016 1266395027',
+              'mode': '0644',
+              'path': '/opt/csw/share/man/man1/rsync.1',
+              'type': 'f',
+              'user': 'root'},
+             {'class': 'none',
+              'group': 'bin',
+              'line': '1 d none /opt/csw/share/man/man5 0755 root bin',
+              'mode': '0755',
+              'path': '/opt/csw/share/man/man5',
+              'type': 'd',
+              'user': 'root'},
+             {'class': 'none',
+              'group': 'bin',
+              'line': '1 f none /opt/csw/share/man/man5/rsyncd.conf.5 0644 root bin 36372 24688 1266395027',
+              'mode': '0644',
+              'path': '/opt/csw/share/man/man5/rsyncd.conf.5',
+              'type': 'f',
+              'user': 'root'},
+             {'class': None,
+              'group': None,
+              'line': '1 i copyright 69 6484 1266396366',
+              'mode': None,
+              'path': None,
+              'type': 'i',
+              'user': None},
+             {'class': None,
+              'group': None,
+              'line': '1 i depend 236 21212 1266396368',
+              'mode': None,
+              'path': None,
+              'type': 'i',
+              'user': None},
+             {'class': None,
+              'group': None,
+              'line': '1 i pkginfo 511 43247 1266396371',
+              'mode': None,
+              'path': None,
+              'type': 'i',
+              'user': None}]}]


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From bdwalton at users.sourceforge.net  Fri Jul  9 02:20:10 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Fri, 09 Jul 2010 00:20:10 +0000
Subject: [csw-devel] SF.net SVN: gar:[10474] csw/mgar/pkg/gtar/trunk/Makefile
Message-ID: <E1OX1K6-0005F3-HP@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 10474
          http://gar.svn.sourceforge.net/gar/?rev=10474&view=rev
Author:   bdwalton
Date:     2010-07-09 00:20:10 +0000 (Fri, 09 Jul 2010)

Log Message:
-----------
gtar: remove grmt to prevent file dup with CSWgcpio

Modified Paths:
--------------
    csw/mgar/pkg/gtar/trunk/Makefile

Modified: csw/mgar/pkg/gtar/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gtar/trunk/Makefile	2010-07-08 21:10:38 UTC (rev 10473)
+++ csw/mgar/pkg/gtar/trunk/Makefile	2010-07-09 00:20:10 UTC (rev 10474)
@@ -35,6 +35,7 @@
 include gar/category.mk
 
 post-install-modulated:
+	rm $(DESTDIR)/opt/csw/libexec/grmt
 	ginstall -d $(DESTDIR)$(prefix)/gnu
 	$(foreach G,$(notdir $(wildcard $(DESTDIR)$(bindir)/*)),ln -s ../bin/$G $(DESTDIR)$(prefix)/gnu/$(patsubst g%,%,$G);)
 	@$(MAKECOOKIE)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From bdwalton at users.sourceforge.net  Fri Jul  9 02:33:08 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Fri, 09 Jul 2010 00:33:08 +0000
Subject: [csw-devel] SF.net SVN: gar:[10475] csw/mgar/gar/v2/gar.mk
Message-ID: <E1OX1We-0003g5-Qc@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10475
          http://gar.svn.sourceforge.net/gar/?rev=10475&view=rev
Author:   bdwalton
Date:     2010-07-09 00:33:08 +0000 (Fri, 09 Jul 2010)

Log Message:
-----------
gar/v2: add makecookie statement back to check-prereqs

Modified Paths:
--------------
    csw/mgar/gar/v2/gar.mk

Modified: csw/mgar/gar/v2/gar.mk
===================================================================
--- csw/mgar/gar/v2/gar.mk	2010-07-09 00:20:10 UTC (rev 10474)
+++ csw/mgar/gar/v2/gar.mk	2010-07-09 00:33:08 UTC (rev 10475)
@@ -304,6 +304,7 @@
 
 check-prereqs:
 	@$(abspath $(GARBIN)/check_for_deps) $(ALL_PREREQ_PKGS)
+	@$(MAKECOOKIE)
 
 prerequisitepkg-%:
 	@echo " ==> Verifying for installed package $*: \c"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From bdwalton at users.sourceforge.net  Fri Jul  9 03:14:17 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Fri, 09 Jul 2010 01:14:17 +0000
Subject: [csw-devel] SF.net SVN: gar:[10476] csw/mgar/pkg/gtar/trunk/Makefile
Message-ID: <E1OX2AT-0004Ml-J0@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10476
          http://gar.svn.sourceforge.net/gar/?rev=10476&view=rev
Author:   bdwalton
Date:     2010-07-09 01:14:17 +0000 (Fri, 09 Jul 2010)

Log Message:
-----------
gtar: disable building grmt via configure option

Modified Paths:
--------------
    csw/mgar/pkg/gtar/trunk/Makefile

Modified: csw/mgar/pkg/gtar/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gtar/trunk/Makefile	2010-07-09 00:33:08 UTC (rev 10475)
+++ csw/mgar/pkg/gtar/trunk/Makefile	2010-07-09 01:14:17 UTC (rev 10476)
@@ -28,6 +28,7 @@
 
 NOISALIST = 1
 CONFIGURE_ARGS = $(DIRPATHS) --program-prefix=g
+CONFIGURE_ARGS += --with-rmt=/opt/csw/libexec/grmt
 TEST_SCRIPTS =
 
 EXTRA_MERGE_EXCLUDE_FILES = $(libdir)/charset.alias
@@ -35,7 +36,6 @@
 include gar/category.mk
 
 post-install-modulated:
-	rm $(DESTDIR)/opt/csw/libexec/grmt
 	ginstall -d $(DESTDIR)$(prefix)/gnu
 	$(foreach G,$(notdir $(wildcard $(DESTDIR)$(bindir)/*)),ln -s ../bin/$G $(DESTDIR)$(prefix)/gnu/$(patsubst g%,%,$G);)
 	@$(MAKECOOKIE)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From bdwalton at users.sourceforge.net  Fri Jul  9 03:15:39 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Fri, 09 Jul 2010 01:15:39 +0000
Subject: [csw-devel] SF.net SVN: gar:[10477] csw/mgar/pkg/gtar/trunk/Makefile
Message-ID: <E1OX2Bn-0000pt-4S@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 10477
          http://gar.svn.sourceforge.net/gar/?rev=10477&view=rev
Author:   bdwalton
Date:     2010-07-09 01:15:38 +0000 (Fri, 09 Jul 2010)

Log Message:
-----------
gtar: depend on gcpio for buildtime and runtime

Modified Paths:
--------------
    csw/mgar/pkg/gtar/trunk/Makefile

Modified: csw/mgar/pkg/gtar/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gtar/trunk/Makefile	2010-07-09 01:14:17 UTC (rev 10476)
+++ csw/mgar/pkg/gtar/trunk/Makefile	2010-07-09 01:15:38 UTC (rev 10477)
@@ -24,7 +24,8 @@
 
 SPKG_SOURCEURL = http://www.gnu.org/software/tar/
 
-RUNTIME_DEP_PKGS = CSWggettextrt CSWiconv
+BUILD_DEP_PKGS = CSWgcpio
+RUNTIME_DEP_PKGS = CSWggettextrt CSWiconv CSWgcpio
 
 NOISALIST = 1
 CONFIGURE_ARGS = $(DIRPATHS) --program-prefix=g


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From bdwalton at users.sourceforge.net  Fri Jul  9 03:27:36 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Fri, 09 Jul 2010 01:27:36 +0000
Subject: [csw-devel] SF.net SVN: gar:[10478] csw/mgar/pkg/gtar/trunk/Makefile
Message-ID: <E1OX2NM-0004Z9-GH@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10478
          http://gar.svn.sourceforge.net/gar/?rev=10478&view=rev
Author:   bdwalton
Date:     2010-07-09 01:27:36 +0000 (Fri, 09 Jul 2010)

Log Message:
-----------
gtar: checkpkg override for gcpio dep

Modified Paths:
--------------
    csw/mgar/pkg/gtar/trunk/Makefile

Modified: csw/mgar/pkg/gtar/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gtar/trunk/Makefile	2010-07-09 01:15:38 UTC (rev 10477)
+++ csw/mgar/pkg/gtar/trunk/Makefile	2010-07-09 01:27:36 UTC (rev 10478)
@@ -34,6 +34,8 @@
 
 EXTRA_MERGE_EXCLUDE_FILES = $(libdir)/charset.alias
 
+CHECKPKG_OVERRIDES_CSWgtar += surplus-dependency|CSWgcpio
+
 include gar/category.mk
 
 post-install-modulated:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From wahwah at users.sourceforge.net  Fri Jul  9 11:50:35 2010
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Fri, 09 Jul 2010 09:50:35 +0000
Subject: [csw-devel] SF.net SVN: gar:[10479] csw/mgar/gar/v2/lib/python
Message-ID: <E1OXAE7-0001sH-Ir@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 10479
          http://gar.svn.sourceforge.net/gar/?rev=10479&view=rev
Author:   wahwah
Date:     2010-07-09 09:50:35 +0000 (Fri, 09 Jul 2010)

Log Message:
-----------
mGAR checkpkg: support for $ORIGIN in rpath, one-time message support in the messenger class.

Modified Paths:
--------------
    csw/mgar/gar/v2/lib/python/checkpkg.py
    csw/mgar/gar/v2/lib/python/checkpkg_test.py
    csw/mgar/gar/v2/lib/python/dependency_checks.py
    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/checkpkg.py
===================================================================
--- csw/mgar/gar/v2/lib/python/checkpkg.py	2010-07-09 01:27:36 UTC (rev 10478)
+++ csw/mgar/gar/v2/lib/python/checkpkg.py	2010-07-09 09:50:35 UTC (rev 10479)
@@ -18,6 +18,7 @@
 import socket
 import sqlite3
 import sqlobject
+import time
 from sqlobject import sqlbuilder
 import subprocess
 import textwrap
@@ -523,8 +524,10 @@
     return schema_on_disk
 
   def IsDatabaseUpToDate(self):
-    f_mtime = self.GetFileMtime()
-    d_mtime = self.GetDatabaseMtime()
+    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
@@ -532,7 +535,7 @@
     # 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 = int(f_mtime) <= int(d_mtime)
+    fresh = f_mtime <= d_mtime
     good_version = self.GetDatabaseSchemaVersion() >= DB_SCHEMA_VERSION
     logging.debug("IsDatabaseUpToDate: good_version=%s, fresh=%s",
                   repr(good_version), repr(fresh))
@@ -562,21 +565,45 @@
   """
   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):
+  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
+    """
     # TODO: Implement $ORIGIN support
     # Probably not here as it would make caching unusable.
     key = (runpath, tuple(isalist))
     if key not in self.runpath_expand_cache:
-      # Emulating $ISALIST expansion
+      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', isa) for isa in isalist]
       else:
         expanded_list = [runpath]
-      self.runpath_expand_cache[key] = expanded_list
+      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):
@@ -624,7 +651,7 @@
     return self.runpath_sanitize_cache[runpath]
 
 
-  def ResolveSoname(self, runpath, soname, isalist, path_list):
+  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"]
@@ -635,9 +662,6 @@
 
     The function returns the one path.
     """
-    runpath = self.SanitizeRunpath(runpath)
-    runpath_list = self.ExpandRunpath(runpath, isalist)
-    runpath_list = self.Emulate64BitSymlinks(runpath_list)
     # 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
@@ -862,11 +886,16 @@
   """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):
     self.messages.append(m)
 
+  def OneTimeMessage(self, key, m):
+    if key not in self.one_time_messages:
+      self.one_time_messages[key] = m
+
   def SuggestGarLine(self, m):
     self.gar_lines.append(m)
 
@@ -934,7 +963,8 @@
       function(pkgs_data, check_interface, logger=logger, messenger=messenger)
       if check_interface.errors:
         errors = self.SetErrorsToDict(check_interface.errors, errors)
-    return errors, messenger.messages, messenger.gar_lines
+    messages = messenger.messages + messenger.one_time_messages.values()
+    return errors, messages, messenger.gar_lines
 
   def Run(self):
     self._AutoregisterChecks()

Modified: csw/mgar/gar/v2/lib/python/checkpkg_test.py
===================================================================
--- csw/mgar/gar/v2/lib/python/checkpkg_test.py	2010-07-09 01:27:36 UTC (rev 10478)
+++ csw/mgar/gar/v2/lib/python/checkpkg_test.py	2010-07-09 09:50:35 UTC (rev 10479)
@@ -45,15 +45,59 @@
     isalist = ["foo", "bar"]
     runpath = "/opt/csw/lib/$ISALIST"
     expected = ["/opt/csw/lib/foo", "/opt/csw/lib/bar"]
-    self.assertEquals(expected, self.e.ExpandRunpath(runpath, isalist))
+    bin_path = "opt/csw/lib"
+    self.assertEquals(expected, self.e.ExpandRunpath(runpath, isalist, bin_path))
 
   def testExpandRunpath_2(self):
     isalist = ["foo", "bar"]
     runpath = "/opt/csw/mysql5/lib/$ISALIST/mysql"
     expected = ["/opt/csw/mysql5/lib/foo/mysql",
                 "/opt/csw/mysql5/lib/bar/mysql"]
-    self.assertEquals(expected, self.e.ExpandRunpath(runpath, isalist))
+    bin_path = "opt/csw/lib"
+    self.assertEquals(expected, self.e.ExpandRunpath(runpath, isalist, bin_path))
 
+  def testExpandRunpath_OriginSimple(self):
+    isalist = ()
+    runpath = "$ORIGIN"
+    expected = ["/opt/csw/lib"]
+    bin_path = "opt/csw/lib"
+    self.assertEquals(expected, self.e.ExpandRunpath(runpath, isalist, bin_path))
+
+  def testExpandRunpath_OriginDots(self):
+    isalist = ()
+    runpath = "$ORIGIN/.."
+    expected = ["/opt/csw/lib"]
+    bin_path = "opt/csw/lib/subdir"
+    self.assertEquals(expected, self.e.ExpandRunpath(runpath, isalist, bin_path))
+
+  def testExpandRunpath_Caching(self):
+    """Make sure that the cache doesn't mess it up.
+
+    Two invocations, where the only difference is the binary path.
+    """
+    isalist = ()
+    runpath = "/opt/csw/lib/foo"
+    expected = ["/opt/csw/lib/foo"]
+    bin_path = "opt/csw/lib"
+    self.assertEquals(expected, self.e.ExpandRunpath(runpath, isalist, bin_path))
+    expected = ["/opt/csw/lib/foo"]
+    bin_path = "/opt/csw/lib/foo"
+    self.assertEquals(expected, self.e.ExpandRunpath(runpath, isalist, bin_path))
+
+  def testExpandRunpath_OriginCaching(self):
+    """Make sure that the cache doesn't mess it up.
+
+    Two invocations, where the only difference is the binary path.
+    """
+    isalist = ()
+    runpath = "$ORIGIN"
+    expected = ["/opt/csw/lib"]
+    bin_path = "opt/csw/lib"
+    self.assertEquals(expected, self.e.ExpandRunpath(runpath, isalist, bin_path))
+    expected = ["/opt/csw/foo/lib"]
+    bin_path = "/opt/csw/foo/lib"
+    self.assertEquals(expected, self.e.ExpandRunpath(runpath, isalist, bin_path))
+
   def testEmulate64BitSymlinks_1(self):
     runpath_list = ["/opt/csw/mysql5/lib/foo/mysql/64"]
     expected = "/opt/csw/mysql5/lib/foo/mysql/amd64"
@@ -130,14 +174,14 @@
         'RPATH set': True,
         'RUNPATH RPATH the same': True,
         'RUNPATH set': True,
-        'needed sonames': ['librt.so.1',
+        'needed sonames': ('librt.so.1',
                            'libresolv.so.2',
                            'libc.so.1',
                            'libgen.so.1',
                            'libsocket.so.1',
                            'libnsl.so.1',
                            'libm.so.1',
-                           'libz.so.1'],
+                           'libz.so.1'),
         'runpath': ('/opt/csw/lib/$ISALIST',
                     '/opt/csw/lib',
                     '/opt/csw/mysql5/lib/$ISALIST',
@@ -159,14 +203,14 @@
         'RPATH set': True,
         'RUNPATH RPATH the same': False,
         'RUNPATH set': False,
-        'needed sonames': ['librt.so.1',
+        'needed sonames': ('librt.so.1',
                            'libresolv.so.2',
                            'libc.so.1',
                            'libgen.so.1',
                            'libsocket.so.1',
                            'libnsl.so.1',
                            'libm.so.1',
-                           'libz.so.1'],
+                           'libz.so.1'),
         'runpath': ('/opt/csw/lib/$ISALIST',
                     '/opt/csw/lib',
                     '/opt/csw/mysql5/lib/$ISALIST',

Modified: csw/mgar/gar/v2/lib/python/dependency_checks.py
===================================================================
--- csw/mgar/gar/v2/lib/python/dependency_checks.py	2010-07-09 01:27:36 UTC (rev 10478)
+++ csw/mgar/gar/v2/lib/python/dependency_checks.py	2010-07-09 09:50:35 UTC (rev 10479)
@@ -1,6 +1,7 @@
 # $Id$
 
 import checkpkg
+import os.path
 import re
 
 DEPRECATED_LIBRARY_LOCATIONS = (
@@ -17,7 +18,7 @@
     r'^opt/csw/lib/python/site-packages.*',
 )
 
-def Libraries(pkg_data, error_mgr, logger, path_and_pkg_by_basename):
+def Libraries(pkg_data, error_mgr, logger, messenger, path_and_pkg_by_basename):
   pkgname = pkg_data["basic_stats"]["pkgname"]
   logger.debug("Libraries(): pkgname = %s", repr(pkgname))
   orphan_sonames = []
@@ -25,6 +26,7 @@
   isalist = pkg_data["isalist"]
   ldd_emulator = checkpkg.LddEmulator()
   for binary_info in pkg_data["binaries_dump_info"]:
+    binary_path, binary_basename = os.path.split(binary_info["path"])
     for soname in binary_info["needed sonames"]:
       resolved = False
       path_list = path_and_pkg_by_basename[soname].keys()
@@ -35,11 +37,18 @@
                    path_list)
       runpath_tuple = (tuple(binary_info["runpath"])
                       + tuple(checkpkg.SYS_DEFAULT_RUNPATH))
+      runpath_history = []
       for runpath in runpath_tuple:
-        resolved_path = ldd_emulator.ResolveSoname(runpath,
+        runpath = ldd_emulator.SanitizeRunpath(runpath)
+        runpath_list = ldd_emulator.ExpandRunpath(runpath, isalist, binary_path)
+        runpath_list = ldd_emulator.Emulate64BitSymlinks(runpath_list)
+        # To accumulate all the runpaths that we were looking at
+        runpath_history += runpath_list
+        resolved_path = ldd_emulator.ResolveSoname(runpath_list,
                                                    soname,
                                                    isalist,
-                                                   path_list)
+                                                   path_list,
+                                                   binary_path)
         if resolved_path:
           logger.debug("%s needed by %s:",
                  soname, binary_info["path"])
@@ -61,6 +70,10 @@
           break
       if not resolved:
         orphan_sonames.append((soname, binary_info["path"]))
+        messenger.Message(
+            "%s could not be resolved for %s, with rpath %s, expanded to %s, "
+            "while the file was available at the following paths: %s"
+            % (soname, binary_info["path"], runpath_tuple, runpath_history, path_list))
   orphan_sonames = set(orphan_sonames)
   for soname, binary_path in orphan_sonames:
     error_mgr.ReportError(
@@ -69,7 +82,7 @@
   # TODO: Report orphan sonames here
   return required_deps
 
-def ByFilename(pkg_data, error_mgr, logger, path_and_pkg_by_basename):
+def ByFilename(pkg_data, error_mgr, logger, messenger, path_and_pkg_by_basename):
   pkgname = pkg_data["basic_stats"]["pkgname"]
   req_pkgs_reasons = []
   dep_regexes = [(re.compile(x), x, y)

Modified: csw/mgar/gar/v2/lib/python/package_checks.py
===================================================================
--- csw/mgar/gar/v2/lib/python/package_checks.py	2010-07-09 01:27:36 UTC (rev 10478)
+++ csw/mgar/gar/v2/lib/python/package_checks.py	2010-07-09 09:50:35 UTC (rev 10479)
@@ -298,14 +298,18 @@
   # Resolving sonames for each binary
   for pkg_data in pkgs_data:
     pkgname = pkg_data["basic_stats"]["pkgname"]
-    check_args = (pkg_data, error_mgr, logger, path_and_pkg_by_basename)
+    check_args = (pkg_data, error_mgr, logger, messenger,
+                  path_and_pkg_by_basename)
     req_pkgs_reasons = depchecks.Libraries(*check_args)
     req_pkgs_reasons.extend(depchecks.ByFilename(*check_args))
     missing_reasons_by_pkg = {}
     for pkg, reason in req_pkgs_reasons:
       if pkg not in missing_reasons_by_pkg:
-        missing_reasons_by_pkg[pkg] = set()
-      missing_reasons_by_pkg[pkg].add(reason)
+        missing_reasons_by_pkg[pkg] = list()
+      if len(missing_reasons_by_pkg[pkg]) < 4:
+        missing_reasons_by_pkg[pkg].append(reason)
+      elif len(missing_reasons_by_pkg[pkg]) == 4:
+        missing_reasons_by_pkg[pkg].append("...and more.")
     declared_deps = pkg_data["depends"]
     declared_deps_set = set([x[0] for x in declared_deps])
     req_pkgs_set = set([x[0] for x in req_pkgs_reasons])
@@ -876,7 +880,8 @@
             metadata["path"],
             metadata["machine_id"],
             cpu_type))
-      messenger.Message(
+      messenger.OneTimeMessage(
+          "binary-placement",
           "Files compiled for specific architectures must be placed in "
           "subdirectories that match the architecture.  "
           "For example, a sparcv8+ binary must not be placed under "

Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py
===================================================================
--- csw/mgar/gar/v2/lib/python/package_checks_test.py	2010-07-09 01:27:36 UTC (rev 10478)
+++ csw/mgar/gar/v2/lib/python/package_checks_test.py	2010-07-09 09:50:35 UTC (rev 10479)
@@ -339,7 +339,8 @@
     binaries_dump_info[0]["runpath"] = tuple(testdata.rpaths.all_rpaths)
     self.pkg_data["binaries_dump_info"] = binaries_dump_info[0:1]
     BAD_PATHS = [
-        '$ORIGIN/..',
+        # Whether this is a valid rpath, is debatable.
+        # '$ORIGIN/..',
         '$ORIGIN/../../../usr/lib/v9',
         '$ORIGIN/../../usr/lib',
         '$ORIGIN/../lib',


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 Jul  9 12:11:48 2010
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Fri, 09 Jul 2010 10:11:48 +0000
Subject: [csw-devel] SF.net SVN: gar:[10480]
	csw/mgar/gar/v2/lib/python/dependency_checks.py
Message-ID: <E1OXAYe-0004qf-4O@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10480
          http://gar.svn.sourceforge.net/gar/?rev=10480&view=rev
Author:   wahwah
Date:     2010-07-09 10:11:47 +0000 (Fri, 09 Jul 2010)

Log Message:
-----------
mGAR v2: checkpkg, better on-screen messages about soname resolution.

Modified Paths:
--------------
    csw/mgar/gar/v2/lib/python/dependency_checks.py

Modified: csw/mgar/gar/v2/lib/python/dependency_checks.py
===================================================================
--- csw/mgar/gar/v2/lib/python/dependency_checks.py	2010-07-09 09:50:35 UTC (rev 10479)
+++ csw/mgar/gar/v2/lib/python/dependency_checks.py	2010-07-09 10:11:47 UTC (rev 10480)
@@ -70,10 +70,15 @@
           break
       if not resolved:
         orphan_sonames.append((soname, binary_info["path"]))
+        if path_list:
+          path_msg = "was available at the following paths: %s." % path_list
+        else:
+          path_msg = ("was not present on the filesystem, "
+                      "nor in the packages under examination.")
         messenger.Message(
             "%s could not be resolved for %s, with rpath %s, expanded to %s, "
-            "while the file was available at the following paths: %s"
-            % (soname, binary_info["path"], runpath_tuple, runpath_history, path_list))
+            "while the file %s"
+            % (soname, binary_info["path"], runpath_tuple, runpath_history, path_msg))
   orphan_sonames = set(orphan_sonames)
   for soname, binary_path in orphan_sonames:
     error_mgr.ReportError(


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 Jul  9 12:12:24 2010
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Fri, 09 Jul 2010 10:12:24 +0000
Subject: [csw-devel] SF.net SVN: gar:[10481]
	csw/mgar/gar/v2/lib/python/package_checks.py
Message-ID: <E1OXAZE-0002hI-TF@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 10481
          http://gar.svn.sourceforge.net/gar/?rev=10481&view=rev
Author:   wahwah
Date:     2010-07-09 10:12:24 +0000 (Fri, 09 Jul 2010)

Log Message:
-----------
mGAR v2: checkpkg, a pointer at a typical case with sparcv8+ binaries.

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	2010-07-09 10:11:47 UTC (rev 10480)
+++ csw/mgar/gar/v2/lib/python/package_checks.py	2010-07-09 10:12:24 UTC (rev 10481)
@@ -886,7 +886,10 @@
           "subdirectories that match the architecture.  "
           "For example, a sparcv8+ binary must not be placed under "
           "/opt/csw/lib, but under /opt/csw/lib/sparcv8plus.  "
-          "For more information, visit "
+          "Typically, the case is that sparcv8+ binaries end up under bin/ "
+          "or under lib/ because of ignored CFLAGS.  "
+          "For more information about the OpenCSW binary placement policy, "
+          "visit "
           "http://www.opencsw.org/extend-it/contribute-packages/"
           "build-standards/"
           "architecture-optimization-using-isaexec-and-isalist/")


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 Jul  9 13:53:27 2010
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Fri, 09 Jul 2010 11:53:27 +0000
Subject: [csw-devel] SF.net SVN: gar:[10482]
	csw/mgar/gar/v2/bin/checkpkg_inspect_stats.py
Message-ID: <E1OXC91-0004sI-1U@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 10482
          http://gar.svn.sourceforge.net/gar/?rev=10482&view=rev
Author:   wahwah
Date:     2010-07-09 11:53:26 +0000 (Fri, 09 Jul 2010)

Log Message:
-----------
mGAR v2: checkpkg_inspect_stats.py, add an option to print the stats to stdout.

Modified Paths:
--------------
    csw/mgar/gar/v2/bin/checkpkg_inspect_stats.py

Modified: csw/mgar/gar/v2/bin/checkpkg_inspect_stats.py
===================================================================
--- csw/mgar/gar/v2/bin/checkpkg_inspect_stats.py	2010-07-09 10:12:24 UTC (rev 10481)
+++ csw/mgar/gar/v2/bin/checkpkg_inspect_stats.py	2010-07-09 11:53:26 UTC (rev 10482)
@@ -21,6 +21,8 @@
   parser.add_option("-d", "--debug", dest="debug",
                     default=False, action="store_true",
                     help="Turn on debugging messages")
+  parser.add_option("-p", "--print_stats", dest="print_stats",
+                    default=False, action="store_true")
   options, args = parser.parse_args()
   if options.debug:
     logging.basicConfig(level=logging.DEBUG)
@@ -31,7 +33,10 @@
   srv4_pkgs = [opencsw.CswSrv4File(x) for x in filenames]
   pkgstats = [checkpkg.PackageStats(x) for x in srv4_pkgs]
   pkgstats = [x.GetAllStats() for x in pkgstats]
-  code.interact(local=locals())
+  if options.print_stats:
+    pprint.pprint(pkgstats)
+  else:
+    code.interact(local=locals())
 
 if __name__ == '__main__':
-	main()
+  main()


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From bdwalton at users.sourceforge.net  Sat Jul 10 04:19:39 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Sat, 10 Jul 2010 02:19:39 +0000
Subject: [csw-devel] SF.net SVN: gar:[10483] csw/mgar/pkg/ruby/trunk
Message-ID: <E1OXPfH-0004cY-7o@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 10483
          http://gar.svn.sourceforge.net/gar/?rev=10483&view=rev
Author:   bdwalton
Date:     2010-07-10 02:19:38 +0000 (Sat, 10 Jul 2010)

Log Message:
-----------
ruby: patch-level version bump

Modified Paths:
--------------
    csw/mgar/pkg/ruby/trunk/Makefile
    csw/mgar/pkg/ruby/trunk/checksums

Modified: csw/mgar/pkg/ruby/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ruby/trunk/Makefile	2010-07-09 11:53:26 UTC (rev 10482)
+++ csw/mgar/pkg/ruby/trunk/Makefile	2010-07-10 02:19:38 UTC (rev 10483)
@@ -1,6 +1,6 @@
 GARNAME = ruby
 DISTVERSION = 1.8.7
-PATCHLEVEL = p249
+PATCHLEVEL = p299
 GARVERSION = $(DISTVERSION)
 CATEGORIES = lang
 

Modified: csw/mgar/pkg/ruby/trunk/checksums
===================================================================
--- csw/mgar/pkg/ruby/trunk/checksums	2010-07-09 11:53:26 UTC (rev 10482)
+++ csw/mgar/pkg/ruby/trunk/checksums	2010-07-10 02:19:38 UTC (rev 10483)
@@ -1,2 +1,2 @@
 36460ea6a145017c3ddd1173e903a511  rdoc_parse_order_fix.patch
-37200cc956a16996bbfd25bb4068f242  ruby-1.8.7-p249.tar.bz2
+244439a87d75ab24170a9c2b451ce351  ruby-1.8.7-p299.tar.bz2


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From bonivart at users.sourceforge.net  Sat Jul 10 15:49:40 2010
From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net)
Date: Sat, 10 Jul 2010 13:49:40 +0000
Subject: [csw-devel] SF.net SVN: gar:[10484]
	csw/mgar/pkg/cpan/Net-Netmask/trunk/Makefile
Message-ID: <E1OXaR2-00043x-9a@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 10484
          http://gar.svn.sourceforge.net/gar/?rev=10484&view=rev
Author:   bonivart
Date:     2010-07-10 13:49:40 +0000 (Sat, 10 Jul 2010)

Log Message:
-----------
Net-Netmask: clean up makefile

Modified Paths:
--------------
    csw/mgar/pkg/cpan/Net-Netmask/trunk/Makefile

Modified: csw/mgar/pkg/cpan/Net-Netmask/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Net-Netmask/trunk/Makefile	2010-07-10 02:19:38 UTC (rev 10483)
+++ csw/mgar/pkg/cpan/Net-Netmask/trunk/Makefile	2010-07-10 13:49:40 UTC (rev 10484)
@@ -14,7 +14,4 @@
 CATALOGNAME = pm_netnetmask
 ARCHALL = 1
 
-# We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
-
 include gar/category.mk


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From bonivart at users.sourceforge.net  Sat Jul 10 15:53:59 2010
From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net)
Date: Sat, 10 Jul 2010 13:53:59 +0000
Subject: [csw-devel] SF.net SVN: gar:[10485]
	csw/mgar/pkg/cpan/Crypt-RC5/trunk/Makefile
Message-ID: <E1OXaVD-0004yy-Tq@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 10485
          http://gar.svn.sourceforge.net/gar/?rev=10485&view=rev
Author:   bonivart
Date:     2010-07-10 13:53:59 +0000 (Sat, 10 Jul 2010)

Log Message:
-----------
Crypt-RC5: clean up makefile

Modified Paths:
--------------
    csw/mgar/pkg/cpan/Crypt-RC5/trunk/Makefile

Modified: csw/mgar/pkg/cpan/Crypt-RC5/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Crypt-RC5/trunk/Makefile	2010-07-10 13:49:40 UTC (rev 10484)
+++ csw/mgar/pkg/cpan/Crypt-RC5/trunk/Makefile	2010-07-10 13:53:59 UTC (rev 10485)
@@ -14,7 +14,4 @@
 CATALOGNAME = pm_cryptrc5
 ARCHALL = 1
 
-# We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
-
 include gar/category.mk


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From bonivart at users.sourceforge.net  Sat Jul 10 16:02:36 2010
From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net)
Date: Sat, 10 Jul 2010 14:02:36 +0000
Subject: [csw-devel] SF.net SVN: gar:[10486]
	csw/mgar/pkg/cpan/Unicode-Stringprep/trunk/Makefile
Message-ID: <E1OXadY-0004GR-0p@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 10486
          http://gar.svn.sourceforge.net/gar/?rev=10486&view=rev
Author:   bonivart
Date:     2010-07-10 14:02:35 +0000 (Sat, 10 Jul 2010)

Log Message:
-----------
Unicode-Stringprep: clean up makefile

Modified Paths:
--------------
    csw/mgar/pkg/cpan/Unicode-Stringprep/trunk/Makefile

Modified: csw/mgar/pkg/cpan/Unicode-Stringprep/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Unicode-Stringprep/trunk/Makefile	2010-07-10 13:53:59 UTC (rev 10485)
+++ csw/mgar/pkg/cpan/Unicode-Stringprep/trunk/Makefile	2010-07-10 14:02:35 UTC (rev 10486)
@@ -14,7 +14,4 @@
 
 LICENSE = LICENSE
 
-# We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
-
 include gar/category.mk


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From bonivart at users.sourceforge.net  Sat Jul 10 16:09:44 2010
From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net)
Date: Sat, 10 Jul 2010 14:09:44 +0000
Subject: [csw-devel] SF.net SVN: gar:[10487]
	csw/mgar/pkg/cpan/Net-IDN-Encode/trunk/Makefile
Message-ID: <E1OXakS-0005E9-7G@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 10487
          http://gar.svn.sourceforge.net/gar/?rev=10487&view=rev
Author:   bonivart
Date:     2010-07-10 14:09:43 +0000 (Sat, 10 Jul 2010)

Log Message:
-----------
Net-IDN-Encode: add Unicode-Stringprep as dep

Modified Paths:
--------------
    csw/mgar/pkg/cpan/Net-IDN-Encode/trunk/Makefile

Modified: csw/mgar/pkg/cpan/Net-IDN-Encode/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Net-IDN-Encode/trunk/Makefile	2010-07-10 14:02:35 UTC (rev 10486)
+++ csw/mgar/pkg/cpan/Net-IDN-Encode/trunk/Makefile	2010-07-10 14:09:43 UTC (rev 10487)
@@ -14,7 +14,6 @@
 
 LICENSE = LICENSE
 
-# We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
+RUNTIME_DEP_PKGS += CSWpmunicodestrprep
 
 include gar/category.mk


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From bonivart at users.sourceforge.net  Sat Jul 10 16:13:37 2010
From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net)
Date: Sat, 10 Jul 2010 14:13:37 +0000
Subject: [csw-devel] SF.net SVN: gar:[10488]
	csw/mgar/pkg/cpan/Test-Tester/trunk/Makefile
Message-ID: <E1OXaoD-0004Qb-1Z@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 10488
          http://gar.svn.sourceforge.net/gar/?rev=10488&view=rev
Author:   bonivart
Date:     2010-07-10 14:13:36 +0000 (Sat, 10 Jul 2010)

Log Message:
-----------
Test-Tester: clean up makefile

Modified Paths:
--------------
    csw/mgar/pkg/cpan/Test-Tester/trunk/Makefile

Modified: csw/mgar/pkg/cpan/Test-Tester/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Test-Tester/trunk/Makefile	2010-07-10 14:09:43 UTC (rev 10487)
+++ csw/mgar/pkg/cpan/Test-Tester/trunk/Makefile	2010-07-10 14:13:36 UTC (rev 10488)
@@ -14,7 +14,4 @@
 
 LICENSE = ARTISTIC
 
-# We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
-
 include gar/category.mk


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From bonivart at users.sourceforge.net  Sat Jul 10 16:26:59 2010
From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net)
Date: Sat, 10 Jul 2010 14:26:59 +0000
Subject: [csw-devel] SF.net SVN: gar:[10489]
	csw/mgar/pkg/cpan/IDNA-Punycode/trunk/Makefile
Message-ID: <E1OXb19-0005Ur-NI@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 10489
          http://gar.svn.sourceforge.net/gar/?rev=10489&view=rev
Author:   bonivart
Date:     2010-07-10 14:26:59 +0000 (Sat, 10 Jul 2010)

Log Message:
-----------
IDNA-Punycode: add Net-IDN-Encode as dep

Modified Paths:
--------------
    csw/mgar/pkg/cpan/IDNA-Punycode/trunk/Makefile

Modified: csw/mgar/pkg/cpan/IDNA-Punycode/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/IDNA-Punycode/trunk/Makefile	2010-07-10 14:13:36 UTC (rev 10488)
+++ csw/mgar/pkg/cpan/IDNA-Punycode/trunk/Makefile	2010-07-10 14:26:59 UTC (rev 10489)
@@ -14,7 +14,6 @@
 
 LICENSE = LICENSE
 
-# We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
+RUNTIME_DEP_PKGS += CSWpmnetidnencode
 
 include gar/category.mk


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From bonivart at users.sourceforge.net  Sat Jul 10 16:31:48 2010
From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net)
Date: Sat, 10 Jul 2010 14:31:48 +0000
Subject: [csw-devel] SF.net SVN: gar:[10490]
	csw/mgar/pkg/cpan/Net-IDN-Nameprep/trunk
Message-ID: <E1OXb5o-0004hl-EZ@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 10490
          http://gar.svn.sourceforge.net/gar/?rev=10490&view=rev
Author:   bonivart
Date:     2010-07-10 14:31:48 +0000 (Sat, 10 Jul 2010)

Log Message:
-----------
Net-IDN-Nameprep: add Unicode-Stringprep as dep

Modified Paths:
--------------
    csw/mgar/pkg/cpan/Net-IDN-Nameprep/trunk/Makefile
    csw/mgar/pkg/cpan/Net-IDN-Nameprep/trunk/checksums

Modified: csw/mgar/pkg/cpan/Net-IDN-Nameprep/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Net-IDN-Nameprep/trunk/Makefile	2010-07-10 14:26:59 UTC (rev 10489)
+++ csw/mgar/pkg/cpan/Net-IDN-Nameprep/trunk/Makefile	2010-07-10 14:31:48 UTC (rev 10490)
@@ -1,5 +1,5 @@
 GARNAME = Net-IDN-Nameprep
-GARVERSION = 1.000
+GARVERSION = 1.100
 CATEGORIES = cpan
 AUTHOR = CFAERBER
 
@@ -14,7 +14,6 @@
 
 LICENSE = LICENSE
 
-# We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
+RUNTIME_DEP_PKGS += CSWpmunicodestrprep
 
 include gar/category.mk

Modified: csw/mgar/pkg/cpan/Net-IDN-Nameprep/trunk/checksums
===================================================================
--- csw/mgar/pkg/cpan/Net-IDN-Nameprep/trunk/checksums	2010-07-10 14:26:59 UTC (rev 10489)
+++ csw/mgar/pkg/cpan/Net-IDN-Nameprep/trunk/checksums	2010-07-10 14:31:48 UTC (rev 10490)
@@ -1 +1 @@
-73071dc9b706e3f68b953bfdae52585f  Net-IDN-Nameprep-1.000.tar.gz
+e2f79e7d4defcdf6ab1a96c732b3fc0c  Net-IDN-Nameprep-1.100.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 Jul 10 16:35:47 2010
From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net)
Date: Sat, 10 Jul 2010 14:35:47 +0000
Subject: [csw-devel] SF.net SVN: gar:[10491]
	csw/mgar/pkg/cpan/Test-NoWarnings/trunk/Makefile
Message-ID: <E1OXb9f-0005bi-J0@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 10491
          http://gar.svn.sourceforge.net/gar/?rev=10491&view=rev
Author:   bonivart
Date:     2010-07-10 14:35:47 +0000 (Sat, 10 Jul 2010)

Log Message:
-----------
Test-NoWarnings: add Test-Tester as dep

Modified Paths:
--------------
    csw/mgar/pkg/cpan/Test-NoWarnings/trunk/Makefile

Modified: csw/mgar/pkg/cpan/Test-NoWarnings/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/Test-NoWarnings/trunk/Makefile	2010-07-10 14:31:48 UTC (rev 10490)
+++ csw/mgar/pkg/cpan/Test-NoWarnings/trunk/Makefile	2010-07-10 14:35:47 UTC (rev 10491)
@@ -14,7 +14,6 @@
 
 LICENSE = LICENSE
 
-# We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
+RUNTIME_DEP_PKGS += CSWpmtesttester
 
 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  Sun Jul 11 15:09:33 2010
From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net)
Date: Sun, 11 Jul 2010 13:09:33 +0000
Subject: [csw-devel] SF.net SVN: gar:[10492] csw/mgar/pkg/subversion/trunk
Message-ID: <E1OXwHl-0006yY-Ro@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 10492
          http://gar.svn.sourceforge.net/gar/?rev=10492&view=rev
Author:   rthurner
Date:     2010-07-11 13:09:33 +0000 (Sun, 11 Jul 2010)

Log Message:
-----------
subversion upgrade to svn-1.6.12

Modified Paths:
--------------
    csw/mgar/pkg/subversion/trunk/Makefile
    csw/mgar/pkg/subversion/trunk/checksums

Modified: csw/mgar/pkg/subversion/trunk/Makefile
===================================================================
--- csw/mgar/pkg/subversion/trunk/Makefile	2010-07-10 14:35:47 UTC (rev 10491)
+++ csw/mgar/pkg/subversion/trunk/Makefile	2010-07-11 13:09:33 UTC (rev 10492)
@@ -22,7 +22,7 @@
 #   http://subversion.apache.org/mailing-lists.html
 
 GARNAME = subversion
-GARVERSION = 1.6.11
+GARVERSION = 1.6.12
 CATEGORIES = utils
 
 DESCRIPTION = Version control rethought

Modified: csw/mgar/pkg/subversion/trunk/checksums
===================================================================
--- csw/mgar/pkg/subversion/trunk/checksums	2010-07-10 14:35:47 UTC (rev 10491)
+++ csw/mgar/pkg/subversion/trunk/checksums	2010-07-11 13:09:33 UTC (rev 10492)
@@ -5,6 +5,6 @@
 41ec540885de7c34625768aa1fb9682b  fixme.sh
 f107831ad0c702ff32e51df6a207237b  httpd-svn.conf.CSW
 f0aa58c145ae99f8e4d72499ab826169  javahl_headers_for_nested_classes.diff
-75419159b50661092c4137449940b5cc  subversion-1.6.11.tar.bz2
+a4b1d0d7f3a4587c59da9c1acf9dedd0  subversion-1.6.12.tar.bz2
 f7d05c59656dcf01fb844295c9912f78  subversion161.diff
 1b532d3055708a97771f5cd959983628  svn_access.conf.CSW


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 Jul 11 15:23:56 2010
From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net)
Date: Sun, 11 Jul 2010 13:23:56 +0000
Subject: [csw-devel] SF.net SVN: gar:[10493] csw/mgar/pkg
Message-ID: <E1OXwVg-0008Nh-Ri@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10493
          http://gar.svn.sourceforge.net/gar/?rev=10493&view=rev
Author:   rthurner
Date:     2010-07-11 13:23:56 +0000 (Sun, 11 Jul 2010)

Log Message:
-----------
openldap24: a test to provide version specific packages

Added Paths:
-----------
    csw/mgar/pkg/openldap24/
    csw/mgar/pkg/openldap24/branches/
    csw/mgar/pkg/openldap24/tags/
    csw/mgar/pkg/openldap24/trunk/
    csw/mgar/pkg/openldap24/trunk/Makefile
    csw/mgar/pkg/openldap24/trunk/checksums
    csw/mgar/pkg/openldap24/trunk/files/


Property changes on: csw/mgar/pkg/openldap24/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/openldap24/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openldap24/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/openldap24/trunk/Makefile	2010-07-11 13:23:56 UTC (rev 10493)
@@ -0,0 +1,34 @@
+# $Id$
+GARNAME = openldap
+GARVERSION = 2.4.22
+CATEGORIES = server
+
+DESCRIPTION = Brief description
+define BLURB
+  Long description
+endef
+
+MASTER_SITES = ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/
+DISTFILES  = $(GARNAME)-$(GARVERSION).tgz
+LICENSE = COPYRIGHT
+PACKAGES = CSWopenldap24
+
+# File name regex to get notifications about upstream software releases
+UFILES_REGEX = $(GARNAME)-(\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 = 
+
+EXTRA_LIB  = $(prefix)/bdb48/lib
+EXTRA_INC  = $(prefix)/bdb48/include
+
+
+RUNTIME_DEP_PKGS_CSWopenldap24   += CSWsasl CSWosslrt CSWlibnet CSWbdb48 CSWlibicu
+# where does this come from????
+CHECKPKG_OVERRIDES_CSWopenldap24 += missing-dependency|CSWoldaprt
+
+
+CONFIGURE_ARGS = $(DIRPATHS)
+
+include gar/category.mk


Property changes on: csw/mgar/pkg/openldap24/trunk/Makefile
___________________________________________________________________
Added: svn:keywords
   + Id

Added: csw/mgar/pkg/openldap24/trunk/checksums
===================================================================
--- csw/mgar/pkg/openldap24/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/openldap24/trunk/checksums	2010-07-11 13:23:56 UTC (rev 10493)
@@ -0,0 +1 @@
+ef01b52255ce8e3fbf8aa34f6fe7598b  openldap-2.4.22.tgz


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 Jul 11 15:26:26 2010
From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net)
Date: Sun, 11 Jul 2010 13:26:26 +0000
Subject: [csw-devel] SF.net SVN: gar:[10494]
	csw/mgar/pkg/openldap24/trunk/Makefile
Message-ID: <E1OXwY6-0007Nd-Pb@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 10494
          http://gar.svn.sourceforge.net/gar/?rev=10494&view=rev
Author:   rthurner
Date:     2010-07-11 13:26:26 +0000 (Sun, 11 Jul 2010)

Log Message:
-----------
openldap24: upgrade to 2.4.23

Modified Paths:
--------------
    csw/mgar/pkg/openldap24/trunk/Makefile

Modified: csw/mgar/pkg/openldap24/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openldap24/trunk/Makefile	2010-07-11 13:23:56 UTC (rev 10493)
+++ csw/mgar/pkg/openldap24/trunk/Makefile	2010-07-11 13:26:26 UTC (rev 10494)
@@ -1,6 +1,6 @@
 # $Id$
 GARNAME = openldap
-GARVERSION = 2.4.22
+GARVERSION = 2.4.23
 CATEGORIES = server
 
 DESCRIPTION = Brief description


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 Jul 11 15:28:39 2010
From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net)
Date: Sun, 11 Jul 2010 13:28:39 +0000
Subject: [csw-devel] SF.net SVN: gar:[10495]
	csw/mgar/pkg/openldap24/trunk/checksums
Message-ID: <E1OXwaF-0008TV-S2@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10495
          http://gar.svn.sourceforge.net/gar/?rev=10495&view=rev
Author:   rthurner
Date:     2010-07-11 13:28:39 +0000 (Sun, 11 Jul 2010)

Log Message:
-----------
openldap24: update checksums as well

Modified Paths:
--------------
    csw/mgar/pkg/openldap24/trunk/checksums

Modified: csw/mgar/pkg/openldap24/trunk/checksums
===================================================================
--- csw/mgar/pkg/openldap24/trunk/checksums	2010-07-11 13:26:26 UTC (rev 10494)
+++ csw/mgar/pkg/openldap24/trunk/checksums	2010-07-11 13:28:39 UTC (rev 10495)
@@ -1 +1 @@
-ef01b52255ce8e3fbf8aa34f6fe7598b  openldap-2.4.22.tgz
+90150b8c0d0192e10b30157e68844ddf  openldap-2.4.23.tgz


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 Jul 11 16:03:11 2010
From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net)
Date: Sun, 11 Jul 2010 14:03:11 +0000
Subject: [csw-devel] SF.net SVN: gar:[10496] csw/mgar/pkg/mercurial/trunk
Message-ID: <E1OXx7f-0007IF-1o@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 10496
          http://gar.svn.sourceforge.net/gar/?rev=10496&view=rev
Author:   rthurner
Date:     2010-07-11 14:03:10 +0000 (Sun, 11 Jul 2010)

Log Message:
-----------
mercurial: upgrade to hg-1.6

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	2010-07-11 13:28:39 UTC (rev 10495)
+++ csw/mgar/pkg/mercurial/trunk/Makefile	2010-07-11 14:03:10 UTC (rev 10496)
@@ -1,5 +1,5 @@
 GARNAME = mercurial
-GARVERSION = 1.5.4
+GARVERSION = 1.6
 CATEGORIES = python
 
 DESCRIPTION = Fast, lightweight Source Control Management system

Modified: csw/mgar/pkg/mercurial/trunk/checksums
===================================================================
--- csw/mgar/pkg/mercurial/trunk/checksums	2010-07-11 13:28:39 UTC (rev 10495)
+++ csw/mgar/pkg/mercurial/trunk/checksums	2010-07-11 14:03:10 UTC (rev 10496)
@@ -1 +1 @@
-db0d673000463fae1ca5cb8a202315ae  mercurial-1.5.4.tar.gz
+e97772cb424d29d9382c41daafa6f92d  mercurial-1.6.tar.gz


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From j_arndt at users.sourceforge.net  Sun Jul 11 18:58:06 2010
From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net)
Date: Sun, 11 Jul 2010 16:58:06 +0000
Subject: [csw-devel] SF.net SVN: gar:[10497] csw/mgar/pkg/munin/trunk
Message-ID: <E1OXzqw-00038r-Ii@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 10497
          http://gar.svn.sourceforge.net/gar/?rev=10497&view=rev
Author:   j_arndt
Date:     2010-07-11 16:58:06 +0000 (Sun, 11 Jul 2010)

Log Message:
-----------
munin: update to version 1.4.5

Modified Paths:
--------------
    csw/mgar/pkg/munin/trunk/Makefile
    csw/mgar/pkg/munin/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/munin/trunk/files/Makefile.config.patch
    csw/mgar/pkg/munin/trunk/files/Makefile.patch
    csw/mgar/pkg/munin/trunk/files/munin-graph.in.patch
    csw/mgar/pkg/munin/trunk/files/munin-node.conf.in.patch
    csw/mgar/pkg/munin/trunk/files/munin.conf.in.patch
    csw/mgar/pkg/munin/trunk/files/perl.patch
    csw/mgar/pkg/munin/trunk/files/sunos_memory.in.patch

Removed Paths:
-------------
    csw/mgar/pkg/munin/trunk/files/makefile.config.diff
    csw/mgar/pkg/munin/trunk/files/makefile.diff
    csw/mgar/pkg/munin/trunk/files/munin-graph.in.diff
    csw/mgar/pkg/munin/trunk/files/munin-node.conf.in.diff
    csw/mgar/pkg/munin/trunk/files/munin.conf.in.diff
    csw/mgar/pkg/munin/trunk/files/perl.diff
    csw/mgar/pkg/munin/trunk/files/sunos_memory.in.diff

Modified: csw/mgar/pkg/munin/trunk/Makefile
===================================================================
--- csw/mgar/pkg/munin/trunk/Makefile	2010-07-11 14:03:10 UTC (rev 10496)
+++ csw/mgar/pkg/munin/trunk/Makefile	2010-07-11 16:58:06 UTC (rev 10497)
@@ -1,10 +1,10 @@
 GARNAME = munin
-GARVERSION = 1.4.3
+GARVERSION = 1.4.5
 CATEGORIES = apps
 
 SPKG_DESC_CSWmuninmaster = master component of the graphical network and system monitoring munin
 SPKG_DESC_CSWmuninnode = node component of the graphical network and system monitoring munin
-SPKG_DESC_CSWmunincommin = common files for munin node and master
+SPKG_DESC_CSWmunincommon = common files for munin node and master
 
 define BLURB
   Munin the monitoring tool surveys all your computers and remembers what it saw. It presents all the information in graphs through a web interface.
@@ -21,13 +21,13 @@
 DISTFILES += apache-munin.conf.CSW apache-munin-cgi.conf.CSW
 DISTFILES += README.CSW
 
-PATCHFILES += makefile.diff
-PATCHFILES += makefile.config.diff 
-PATCHFILES += sunos_memory.in.diff
-PATCHFILES += munin-node.conf.in.diff
-PATCHFILES += munin.conf.in.diff
-PATCHFILES += munin-graph.in.diff # match some paths to /{etc|var}/opt/csw/munin 
-PATCHFILES += perl.diff # shebang correctly set
+PATCHFILES += Makefile.patch
+PATCHFILES += Makefile.config.patch
+PATCHFILES += sunos_memory.in.patch
+PATCHFILES += munin-node.conf.in.patch
+PATCHFILES += munin.conf.in.patch
+PATCHFILES += munin-graph.in.patch # match some paths to /{etc|var}/opt/csw/munin 
+PATCHFILES += perl.patch # shebang correctly set
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz

Modified: csw/mgar/pkg/munin/trunk/checksums
===================================================================
--- csw/mgar/pkg/munin/trunk/checksums	2010-07-11 14:03:10 UTC (rev 10496)
+++ csw/mgar/pkg/munin/trunk/checksums	2010-07-11 16:58:06 UTC (rev 10497)
@@ -1,17 +1,17 @@
-58ab277c1a958459e5270da07f017fb3  download/CSWmunincommon.prototype
-390277cc59e2c37d5b0bd4f2c3441996  download/CSWmuninmaster.postinstall
-8bd7bf2d0356a424fe58c7b3058ee3b4  download/CSWmuninmaster.prototype
-c4064b92df7835bf37b18e799aa6177e  download/CSWmuninnode.prototype
-e6bafa4aa3cba7fc16e444ad168b4cd1  download/README.CSW
-59409f4b412953283c3df4546fd4886c  download/apache-munin-cgi.conf.CSW
-e701d132ba0b6f3dcc90190860f5aa6b  download/apache-munin.conf.CSW
-31aec7f9a9a452cc6c75c1096c937fdd  download/cswmuninnode
-50fa4a545f878d79e219891c6ac8d2d2  download/cswusergroup
-43264e38738fb609a453d22592f4b010  download/makefile.config.diff
-07148c7b093dea95f7fcda8bcac53059  download/makefile.diff
-229646facc4e2bca6511b20b3e5eb73f  download/munin-1.4.3.tar.gz
-523afc4767b0548a93bc7b47fc5996ec  download/munin-graph.in.diff
-0e7e3ae081db51996eb5c01a4f08139f  download/munin-node.conf.in.diff
-fed7c87522fed3224eac8cb507ddf8d0  download/munin.conf.in.diff
-bdb45d45fdf901092e6a5c4711e8223c  download/perl.diff
-3a39524074d4581373fa20cd5ff5e5b8  download/sunos_memory.in.diff
+58ab277c1a958459e5270da07f017fb3  CSWmunincommon.prototype
+390277cc59e2c37d5b0bd4f2c3441996  CSWmuninmaster.postinstall
+8bd7bf2d0356a424fe58c7b3058ee3b4  CSWmuninmaster.prototype
+c4064b92df7835bf37b18e799aa6177e  CSWmuninnode.prototype
+e777f0ddea3e09d0faf72780ad782995  Makefile.config.patch
+1e3c461f2beafce43d6b94f3af478e5e  Makefile.patch
+e6bafa4aa3cba7fc16e444ad168b4cd1  README.CSW
+59409f4b412953283c3df4546fd4886c  apache-munin-cgi.conf.CSW
+e701d132ba0b6f3dcc90190860f5aa6b  apache-munin.conf.CSW
+31aec7f9a9a452cc6c75c1096c937fdd  cswmuninnode
+50fa4a545f878d79e219891c6ac8d2d2  cswusergroup
+4ae84b9a27b686c3819d8d7b51d8cb4c  munin-1.4.5.tar.gz
+1a13b606a5c82958ed8e9bf139044988  munin-graph.in.patch
+803021ab0539f83936c9adec6bd9336c  munin-node.conf.in.patch
+e9d94e230c8719c5d7d3fe624e87bea2  munin.conf.in.patch
+c0e9f043fe5ea79a1fc7dfc91f09a961  perl.patch
+5673776262a0d1b2c386f45f0fd6a783  sunos_memory.in.patch

Added: csw/mgar/pkg/munin/trunk/files/Makefile.config.patch
===================================================================
--- csw/mgar/pkg/munin/trunk/files/Makefile.config.patch	                        (rev 0)
+++ csw/mgar/pkg/munin/trunk/files/Makefile.config.patch	2010-07-11 16:58:06 UTC (rev 10497)
@@ -0,0 +1,135 @@
+From 0298d86c798e9ad08f763a05932b3bdc1d5db118 Mon Sep 17 00:00:00 2001
+From: Juergen Arndt <ja at opencsw.org>
+Date: Sun, 11 Jul 2010 18:03:49 +0200
+Subject: [PATCH] set paths to match OpenCSW
+
+---
+ Makefile.config |   42 ++++++++++++++++++++++--------------------
+ 1 files changed, 22 insertions(+), 20 deletions(-)
+
+diff --git a/Makefile.config b/Makefile.config
+index 84f155b..cacaf20 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)
++
+ #
+ # the base of the Munin installation.
+ # 
+-PREFIX     = $(DESTDIR)/opt/munin
++PREFIX     = /opt/csw
+ 
+ # Where Munin keeps its configurations (server.conf, client.conf, ++)
+-CONFDIR    = $(DESTDIR)/etc/opt/munin
++CONFDIR    = /etc/opt/csw/munin
+ 
+ # Server only - where to put munin-cron
+ BINDIR     = $(PREFIX)/bin
+@@ -29,47 +31,47 @@ BINDIR     = $(PREFIX)/bin
+ SBINDIR    = $(PREFIX)/sbin
+ 
+ # Where to put text and html documentation
+-DOCDIR     = $(PREFIX)/doc
++DOCDIR     = $(PREFIX)/share/doc/munin
+ 
+ # Where to put man pages
+-MANDIR     = $(PREFIX)/man
++MANDIR     = $(PREFIX)/share/man
+ 
+ # Where to put internal binaries and plugin repository
+-LIBDIR     = $(PREFIX)/lib
++LIBDIR     = $(PREFIX)/libexec/munin
+ 
+ # Server only - Output directory
+-HTMLDIR    = $(PREFIX)/www/docs
+-CGIDIR     = $(PREFIX)/www/cgi
++HTMLDIR    = /var/opt/csw/munin/www
++CGIDIR     = /var/opt/csw/munin/www/cgi
+ 
+ # Server only - spool directory for data gathered from nodes by
+ # munin-gather - experimental.  Place on ramdisk to make munin
+ # scale better.  On many versions of Linux as well as on Solaris
+ # /tmp will be a ramdisk.
+ 
+-SSPOOLDIR  = $(PREFIX)/spool
++SSPOOLDIR  = /tmp/muninspool
+ 
+ # Suggested directory name for a pulic ramdisk based tmp directory.
+ # SSPOOLDIR := /tmp/muninspool
+ 
+ # Client only - Where to put RRD files and other intenal data
+-DBDIR      = $(DESTDIR)/var/opt/munin
++DBDIR      = /var/opt/csw/munin/db
+ 
+ # Client only - Where plugins should put their states. Must be writable by
+ # group "munin", and should be preserved between reboots
+ PLUGSTATE  = $(DBDIR)/plugin-state
+ 
+ # Where Munin should place its logs.
+-LOGDIR     = $(PREFIX)/log/munin
++LOGDIR     = /var/opt/csw/munin/log
+ 
+ # Location of PID files and other statefiles. On the server, must be
+ # writable by the user "munin".
+-STATEDIR   = $(DESTDIR)/var/run/munin
++STATEDIR   = /var/opt/csw/munin/run
+ 
+ # The perl interpreter to use
+-PERL       := $(shell which perl)
++PERL       := /opt/csw/bin/perl
+ 
+ # The python interpreter to use (used by some plugins)
+-PYTHON     := /usr/bin/env python
++PYTHON     := /opt/csw/bin/python
+ 
+ # The ruby interpreter to use (used by some plugins)
+ RUBY       := /usr/bin/env ruby
+@@ -95,11 +97,11 @@ JAVALIBDIR:= $(LIBDIR)
+ GOODSH     := $(shell PATH=`getconf PATH` sh -c 'type sh | sed "s/.* //"')
+ 
+ # Path of bash for bash specific plugins
+-BASH       := /bin/bash
++BASH       := /usr/bin/bash
+ 
+ # Server only - Where to install the perl libraries
+ PERLSITELIB := $(shell $(PERL) -V:sitelib | cut -d"'" -f2)
+-PERLLIB    = $(DESTDIR)$(PERLSITELIB)
++PERLLIB    = $(shell $(PERL) -V:sitelib | cut -d"'" -f2)
+ 
+ # Client only - Install plugins for this architecture
+ OSTYPE     := $(shell uname | tr '[A-Z]' '[a-z]')
+@@ -111,7 +113,7 @@ HOSTNAME   := $(shell hostname)
+ # What is the safest way to create a tempfile.
+ # Default is to figure it out by testing various methods.
+ # Replace this with a known platform-specific method
+-MKTEMP     := $(shell ./test-mktemp)
++MKTEMP     := $(shell mktemp)
+ 
+ # Munin version number.
+ VERSION    := $(shell ./getversion)
+@@ -126,9 +128,9 @@ PLUGINUSER := nobody
+ # Which command to use to check if the USER and GROUP to run Munin as, exists.
+ # These will work on most modern OSes:
+ #
+-GETENT     := $(shell which getent || which true 2>/dev/null)
+-CHECKUSER  := $(shell $(GETENT) passwd $(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistent. Create the user and retry; exit 2"))
+-CHECKGROUP := $(shell $(GETENT) group $(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistent. Create the group and retry; exit 2"))
++#GETENT     := $(shell which getent || which true 2>/dev/null)
++#CHECKUSER  := $(shell $(GETENT) passwd $(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistent. Create the user and retry; exit 2"))
++#CHECKGROUP := $(shell $(GETENT) group $(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistent. Create the group and retry; exit 2"))
+ 
+ # For OSX, comment out the previous two lines and comment in these
+ #
+@@ -159,4 +161,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
+

Added: csw/mgar/pkg/munin/trunk/files/Makefile.patch
===================================================================
--- csw/mgar/pkg/munin/trunk/files/Makefile.patch	                        (rev 0)
+++ csw/mgar/pkg/munin/trunk/files/Makefile.patch	2010-07-11 16:58:06 UTC (rev 10497)
@@ -0,0 +1,287 @@
+From 7ce22ffb9ee515d86ca799df9d8cc20fe723ffd0 Mon Sep 17 00:00:00 2001
+From: Juergen Arndt <ja at opencsw.org>
+Date: Sun, 11 Jul 2010 13:55:58 +0200
+Subject: [PATCH] expanded pathes to $(DESTDIR)
+
+---
+ Makefile |  177 ++++++++++++++++++++++++++++++--------------------------------
+ 1 files changed, 86 insertions(+), 91 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 88f8952..6099fc1 100644
+--- a/Makefile
++++ b/Makefile
+@@ -49,8 +49,8 @@ uninstall:
+ # This removes the installed config so that the next install-pass installs
+ # a new config.  Target _only_ suitable for maintainers.
+ unconfig:
+-	rm -f $(HTMLDIR)/.htaccess
+-	rm -f $(CONFDIR)/munin.conf
++	rm -f $(DESTDIR)$(HTMLDIR)/.htaccess
++	rm -f $(DESTDIR)$(CONFDIR)/munin.conf
+ 
+ tags:
+ 	-rm -f TAGS
+@@ -66,52 +66,51 @@ endif
+ 
+ install-pre: Makefile Makefile.config
+ 	@$(CHECKUSER)
+-	mkdir -p $(LOGDIR)
+-	mkdir -p $(STATEDIR)
+-	mkdir -p $(CONFDIR)
+-	$(CHOWN) $(USER) $(LOGDIR) $(STATEDIR)
++	mkdir -p $(DESTDIR)$(LOGDIR)
++	mkdir -p $(DESTDIR)$(STATEDIR)
++	mkdir -p $(DESTDIR)$(CONFDIR)
+ 
+ install-master-prime: $(INFILES_MASTER) install-pre install-master
+-	mkdir -p $(CONFDIR)/templates
+-	mkdir -p $(CONFDIR)/templates/partial
+-	mkdir -p $(CONFDIR)/munin-conf.d
+-	mkdir -p $(LIBDIR)
+-	mkdir -p $(BINDIR)
+-	mkdir -p $(PERLLIB)
+-	mkdir -p $(PERLLIB)/Munin/Master
+-	mkdir -p $(HTMLDIR)
+-	mkdir -p $(DBDIR)
+-	mkdir -p $(CGIDIR)
+-
+-	$(CHOWN) $(USER) $(HTMLDIR) $(DBDIR) 
+-	$(CHMOD) 0755 $(DBDIR)
++	mkdir -p $(DESTDIR)$(CONFDIR)/templates
++	mkdir -p $(DESTDIR)$(CONFDIR)/templates/partial
++	mkdir -p $(DESTDIR)$(CONFDIR)/munin-conf.d
++	mkdir -p $(DESTDIR)$(LIBDIR)
++	mkdir -p $(DESTDIR)$(BINDIR)
++	mkdir -p $(DESTDIR)$(PERLLIB)
++	mkdir -p $(DESTDIR)$(PERLLIB)/Munin/Master
++	mkdir -p $(DESTDIR)$(HTMLDIR)
++	mkdir -p $(DESTDIR)$(DBDIR)
++	mkdir -p $(DESTDIR)$(CGIDIR)
++
++	#$(CHOWN) $(USER) $(HTMLDIR) $(DBDIR) 
++	$(CHMOD) 0755 $(DESTDIR)$(DBDIR)
+ 
+ 	for p in master/www/*.tmpl master/www/*.png master/www/*.css resources/favicon.ico; do \
+-		$(INSTALL) -m 0644 "$$p" $(CONFDIR)/templates/ ; \
++		$(INSTALL) -m 0644 "$$p" $(DESTDIR)$(CONFDIR)/templates/ ; \
+ 	done
+ 
+ 	for p in master/www/partial/*.tmpl; do \
+-		$(INSTALL) -m 0644 "$$p" $(CONFDIR)/templates/partial/ ; \
++		$(INSTALL) -m 0644 "$$p" $(DESTDIR)$(CONFDIR)/templates/partial/ ; \
+ 	done
+ 
+-	$(INSTALL) -m 0644 master/www/definitions.html $(CONFDIR)/templates/
+-	$(INSTALL) -m 0755 master/DejaVuSansMono.ttf $(LIBDIR)/
+-	$(INSTALL) -m 0755 master/DejaVuSans.ttf $(LIBDIR)/
++	$(INSTALL) -m 0644 master/www/definitions.html $(DESTDIR)$(CONFDIR)/templates/
++	$(INSTALL) -m 0755 master/DejaVuSansMono.ttf $(DESTDIR)$(LIBDIR)/
++	$(INSTALL) -m 0755 master/DejaVuSans.ttf $(DESTDIR)$(LIBDIR)/
+ 
+-	test -f $(HTMLDIR)/.htaccess || $(INSTALL) -m 0644 build/master/www/munin-htaccess $(HTMLDIR)/.htaccess
+-	test -f "$(CONFDIR)/munin.conf"  || $(INSTALL) -m 0644 build/master/munin.conf $(CONFDIR)/
++	test -f $(DESTDIR)$(HTMLDIR)/.htaccess || $(INSTALL) -m 0644 build/master/www/munin-htaccess $(DESTDIR)$(HTMLDIR)/.htaccess
++	test -f "$(DESTDIR)$(CONFDIR)/munin.conf"  || $(INSTALL) -m 0644 build/master/munin.conf $(DESTDIR)$(CONFDIR)/
+ 
+-	$(INSTALL) -m 0755 build/master/_bin/munin-cron $(BINDIR)/
+-	$(INSTALL) -m 0755 build/master/_bin/munin-check $(BINDIR)/
+-	$(INSTALL) -m 0755 build/master/_bin/munin-update $(LIBDIR)/
+-	$(INSTALL) -m 0755 build/master/_bin/munin-graph $(LIBDIR)/
+-	$(INSTALL) -m 0755 build/master/_bin/munin-html $(LIBDIR)/
+-	$(INSTALL) -m 0755 build/master/_bin/munin-limits $(LIBDIR)/
+-	$(INSTALL) -m 0755 build/master/_bin/munin-cgi-graph $(CGIDIR)/
+-	$(INSTALL) -m 0755 build/master/_bin/munin-fastcgi-graph $(CGIDIR)/
++	$(INSTALL) -m 0755 build/master/_bin/munin-cron $(DESTDIR)$(BINDIR)/
++	$(INSTALL) -m 0755 build/master/_bin/munin-check $(DESTDIR)$(BINDIR)/
++	$(INSTALL) -m 0755 build/master/_bin/munin-update $(DESTDIR)$(LIBDIR)/
++	$(INSTALL) -m 0755 build/master/_bin/munin-graph $(DESTDIR)$(LIBDIR)/
++	$(INSTALL) -m 0755 build/master/_bin/munin-html $(DESTDIR)$(LIBDIR)/
++	$(INSTALL) -m 0755 build/master/_bin/munin-limits $(DESTDIR)$(LIBDIR)/
++	$(INSTALL) -m 0755 build/master/_bin/munin-cgi-graph $(DESTDIR)$(CGIDIR)/
++	$(INSTALL) -m 0755 build/master/_bin/munin-fastcgi-graph $(DESTDIR)$(CGIDIR)/
+ 
+ # Not ready to be installed yet	
+-# $(INSTALL) -m 0755 build/master/_bin/munin-gather $(LIBDIR)/
++# $(INSTALL) -m 0755 build/master/_bin/munin-gather $(DESTDIR)$(LIBDIR)/
+ 
+ # ALWAYS DO THE OS SPECIFIC PLUGINS LAST! THAT WAY THEY OVERWRITE THE
+ # GENERIC ONES
+@@ -122,28 +121,24 @@ install-node-plugins: install-plugins-prime
+ install-plugins-prime: install-plugins build $(PLUGINS) Makefile Makefile.config
+ 	@$(CHECKGROUP)
+ 
+-	mkdir -p $(CONFDIR)/plugins
+-	mkdir -p $(CONFDIR)/plugin-conf.d
+-	mkdir -p $(LIBDIR)/plugins
+-	mkdir -p $(PLUGSTATE)
+-
+-	$(CHOWN) $(PLUGINUSER):$(GROUP) $(PLUGSTATE)
+-	$(CHMOD) 0775 $(PLUGSTATE)
+-	$(CHMOD) 0755 $(CONFDIR)/plugin-conf.d
++	mkdir -p $(DESTDIR)$(CONFDIR)/plugins
++	mkdir -p $(DESTDIR)$(CONFDIR)/plugin-conf.d
++	mkdir -p $(DESTDIR)$(LIBDIR)/plugins
++	mkdir -p $(DESTDIR)$(PLUGSTATE)
+ 
+ 	for p in build/plugins/node.d/* build/plugins/node.d.$(OSTYPE)/* ; do \
+ 	    if test -f "$$p" ; then                            \
+ 		echo Installing $$p;                           \
+-		$(INSTALL) -m 0755 $$p $(LIBDIR)/plugins/;     \
++		$(INSTALL) -m 0755 $$p $(DESTDIR)$(LIBDIR)/plugins/;     \
+ 	    fi                                                 \
+ 	done
+-	-mv $(LIBDIR)/plugins/*.adv $(LIBDIR)
+-	$(INSTALL) -m 0644 build/plugins/plugins.history $(LIBDIR)/plugins/
+-	$(INSTALL) -m 0644 build/plugins/plugin.sh $(LIBDIR)/plugins/
++	-mv $(LIBDIR)/plugins/*.adv $(DESTDIR)$(LIBDIR)
++	$(INSTALL) -m 0644 build/plugins/plugins.history $(DESTDIR)$(LIBDIR)/plugins/
++	$(INSTALL) -m 0644 build/plugins/plugin.sh $(DESTDIR)$(LIBDIR)/plugins/
+ 
+ install-plugins-java: build-plugins-java
+-	mkdir -p $(JAVALIBDIR)
+-	$(INSTALL) -m 0644 build/plugins/javalib/munin-jmx-plugins.jar $(JAVALIBDIR)/
++	mkdir -p $(DESTDIR)$(JAVALIBDIR)
++	$(INSTALL) -m 0644 build/plugins/javalib/munin-jmx-plugins.jar $(DESTDIR)$(JAVALIBDIR)/
+ 
+ #TODO:
+ # configure plugins.  Or not. Better done under the direction of the installer
+@@ -152,30 +147,30 @@ install-plugins-java: build-plugins-java
+ install-node-prime: install-node-pre install-node
+ 
+ install-node-pre: build/node/munin-node.conf install-pre
+-	test -f "$(CONFDIR)/munin-node.conf" || $(INSTALL) -m 0644 build/node/munin-node.conf $(CONFDIR)/
++	test -f "$(DESTDIR)$(CONFDIR)/munin-node.conf" || $(INSTALL) -m 0644 build/node/munin-node.conf $(DESTDIR)$(CONFDIR)/
+ 
+ 
+ install-common-prime: build-common install-common
+ 
+ 
+ install-man: build-man Makefile Makefile.config
+-	mkdir -p $(MANDIR)/man1 $(MANDIR)/man5 $(MANDIR)/man8
+-	$(INSTALL) -m 0644 build/doc/munin-node.conf.5 $(MANDIR)/man5/
+-	$(INSTALL) -m 0644 build/doc/munin.conf.5 $(MANDIR)/man5/
+-	$(INSTALL) -m 0644 build/doc/munin-graph.8 $(MANDIR)/man8/
+-	$(INSTALL) -m 0644 build/doc/munin-update.8 $(MANDIR)/man8/
+-	$(INSTALL) -m 0644 build/doc/munin-limits.8 $(MANDIR)/man8/
+-	$(INSTALL) -m 0644 build/doc/munin-html.8 $(MANDIR)/man8/
+-	$(INSTALL) -m 0644 build/doc/munin-cron.8 $(MANDIR)/man8/
+-	$(INSTALL) -m 0644 build/doc/munin-check.8 $(MANDIR)/man8/
+-	$(INSTALL) -m 0644 build/doc/munin.8 $(MANDIR)/man8/
++	mkdir -p $(DESTDIR)$(MANDIR)/man1 $(DESTDIR)$(MANDIR)/man5 $(DESTDIR)$(MANDIR)/man8
++	$(INSTALL) -m 0644 build/doc/munin-node.conf.5 $(DESTDIR)$(MANDIR)/man5/
++	$(INSTALL) -m 0644 build/doc/munin.conf.5 $(DESTDIR)$(MANDIR)/man5/
++	$(INSTALL) -m 0644 build/doc/munin-graph.8 $(DESTDIR)$(MANDIR)/man8/
++	$(INSTALL) -m 0644 build/doc/munin-update.8 $(DESTDIR)$(MANDIR)/man8/
++	$(INSTALL) -m 0644 build/doc/munin-limits.8 $(DESTDIR)$(MANDIR)/man8/
++	$(INSTALL) -m 0644 build/doc/munin-html.8 $(DESTDIR)$(MANDIR)/man8/
++	$(INSTALL) -m 0644 build/doc/munin-cron.8 $(DESTDIR)$(MANDIR)/man8/
++	$(INSTALL) -m 0644 build/doc/munin-check.8 $(DESTDIR)$(MANDIR)/man8/
++	$(INSTALL) -m 0644 build/doc/munin.8 $(DESTDIR)$(MANDIR)/man8/
+ 
+ 
+ install-doc: build-doc
+-	mkdir -p $(DOCDIR)/resources
+-	$(INSTALL) -m 0644 README $(DOCDIR)/
+-	$(INSTALL) -m 0644 COPYING $(DOCDIR)/
+-	$(INSTALL) -m 0644 build/resources/* $(DOCDIR)/resources
++	mkdir -p $(DESTDIR)$(DOCDIR)/resources
++	$(INSTALL) -m 0644 README $(DESTDIR)$(DOCDIR)/
++	$(INSTALL) -m 0644 COPYING $(DESTDIR)$(DOCDIR)/
++	$(INSTALL) -m 0644 build/resources/* $(DESTDIR)$(DOCDIR)/resources
+ 
+ ######################################################################
+ 
+@@ -189,28 +184,28 @@ build/%: %.in
+ 	@echo "$< -> $@"
+ 	@mkdir -p build/`dirname $<`
+ 	@sed -e 's|@@PREFIX@@|$(PREFIX)|g'                      \
+-             -e 's|@@CONFDIR@@|$(CONFDIR)|g'                    \
+-             -e 's|@@BINDIR@@|$(BINDIR)|g'                      \
+-             -e 's|@@SBINDIR@@|$(SBINDIR)|g'                    \
+-             -e 's|@@DOCDIR@@|$(DOCDIR)|g'                      \
+-             -e 's|@@LIBDIR@@|$(LIBDIR)|g'                      \
++             -e 's|@@CONFDIR@@|$(DESTDIR)$(CONFDIR)|g'                    \
++             -e 's|@@BINDIR@@|$(DESTDIR)$(BINDIR)|g'                      \
++             -e 's|@@SBINDIR@@|$(DESTDIR)$(SBINDIR)|g'                    \
++             -e 's|@@DOCDIR@@|$(DESTDIR)$(DOCDIR)|g'                      \
++             -e 's|@@LIBDIR@@|$(DESTDIR)$(LIBDIR)|g'                      \
+              -e 's|@@MANDIR@@|$(MANDIR)|g'                      \
+-             -e 's|@@LOGDIR@@|$(LOGDIR)|g'                      \
+-             -e 's|@@HTMLDIR@@|$(HTMLDIR)|g'                    \
+-             -e 's|@@DBDIR@@|$(DBDIR)|g'                        \
+-             -e 's|@@STATEDIR@@|$(STATEDIR)|g'                  \
++             -e 's|@@LOGDIR@@|$(DESTDIR)$(LOGDIR)|g'                      \
++             -e 's|@@HTMLDIR@@|$(DESTDIR)$(HTMLDIR)|g'                    \
++             -e 's|@@DBDIR@@|$(DESTDIR)$(DBDIR)|g'                        \
++             -e 's|@@STATEDIR@@|$(DESTDIR)$(STATEDIR)|g'                  \
+              -e 's|@@PERL@@|$(PERL)|g'                          \
+-             -e 's|@@PERLLIB@@|$(PERLLIB)|g'                    \
++             -e 's|@@PERLLIB@@|$(DESTDIR)$(PERLLIB)|g'                    \
+              -e 's|@@PYTHON@@|$(PYTHON)|g'                      \
+              -e 's|@@RUBY@@|$(RUBY)|g'                          \
+              -e 's|@@JAVARUN@@|$(JAVARUN)|g'                    \
+-             -e 's|@@JAVALIBDIR@@|$(JAVALIBDIR)|g'              \
++             -e 's|@@JAVALIBDIR@@|$(DESTDIR)$(JAVALIBDIR)|g'              \
+              -e 's|@@OSTYPE@@|$(OSTYPE)|g'                      \
+              -e 's|@@HOSTNAME@@|$(HOSTNAME)|g'                  \
+              -e 's|@@MKTEMP@@|$(MKTEMP)|g'                      \
+              -e 's|@@VERSION@@|$(VERSION)|g'                    \
+-             -e 's|@@PLUGSTATE@@|$(PLUGSTATE)|g'                \
+-             -e 's|@@CGIDIR@@|$(CGIDIR)|g'                      \
++             -e 's|@@PLUGSTATE@@|$(DESTDIR)$(PLUGSTATE)|g'                \
++             -e 's|@@CGIDIR@@|$(DESTDIR)$(CGIDIR)|g'                      \
+              -e 's|@@USER@@|$(USER)|g'                          \
+              -e 's|@@GROUP@@|$(GROUP)|g'                        \
+              -e 's|@@PLUGINUSER@@|$(PLUGINUSER)|g'              \
+@@ -354,20 +349,20 @@ old-test: t/*.t
+ 	$(MAKE) $@ CONFIG=t/Makefile.config
+ else
+ test_plugins = id_default id_root env
+-old-test: t/*.t t/install $(addprefix $(CONFDIR)/plugins/,$(test_plugins))
++old-test: t/*.t t/install $(addprefix $(DESTDIR)$(CONFDIR)/plugins/,$(test_plugins))
+ 	@for test in t/*.t; do \
+ 		echo -n "$$test: "; \
+-		PERL5LIB=$(PERLLIB) $(PERL) $$test;\
++		PERL5LIB=$(DESTDIR)$(PERLLIB) $(PERL) $$test;\
+ 	done
+ endif
+ 
+ node-monkeywrench: install-node
+-	rm -rf $(CONFDIR)/plugins
+-	rm -rf $(LIBDIR)/plugins
+-	mkdir -p $(LIBDIR)/plugins
+-	mkdir -p $(CONFDIR)/plugins
+-	cp monkeywrench/plugin-break*_ $(LIBDIR)/plugins/
+-	$(SBINDIR)/munin-node-configure --suggest
++	rm -rf $(DESTDIR)$(CONFDIR)/plugins
++	rm -rf $(DESTDIR)$(LIBDIR)/plugins
++	mkdir -p $(DESTDIR)$(LIBDIR)/plugins
++	mkdir -p $(DESTDIR)$(CONFDIR)/plugins
++	cp monkeywrench/plugin-break*_ $(DESTDIR)$(LIBDIR)/plugins/
++	$(DESTDIR)$(SBINDIR)/munin-node-configure --suggest
+ 	echo 'Done?'
+ 
+ t/install: 
+@@ -391,12 +386,12 @@ build-common: common/Build
+ # can't seem to find a way to persuade it to write otherwhere.
+ install-%: %/Build
+ 	cd $* && $(PERL) Build install			\
+-            --install_path lib=$(PERLLIB)		\
+-            --install_path bin=$(BINDIR)		\
+-            --install_path script=$(BINDIR)		\
+-            --install_path sbin=$(SBINDIR)		\
+-            --install_path bindoc=$(MANDIR)/man1	\
+-            --install_path libdoc=$(MANDIR)/man3	\
++            --install_path lib=$(DESTDIR)$(PERLLIB)		\
++            --install_path bin=$(DESTDIR)$(BINDIR)		\
++            --install_path script=$(DESTDIR)$(BINDIR)		\
++            --install_path sbin=$(DESTDIR)$(SBINDIR)		\
++            --install_path bindoc=$(DESTDIR)$(MANDIR)/man1	\
++            --install_path libdoc=$(DESTDIR)$(MANDIR)/man3	\
+ 
+ test-%: %/Build
+ 	cd $* && $(PERL) Build test || true
+-- 
+1.7.1
+

Deleted: csw/mgar/pkg/munin/trunk/files/makefile.config.diff
===================================================================
--- csw/mgar/pkg/munin/trunk/files/makefile.config.diff	2010-07-11 14:03:10 UTC (rev 10496)
+++ csw/mgar/pkg/munin/trunk/files/makefile.config.diff	2010-07-11 16:58:06 UTC (rev 10497)
@@ -1,116 +0,0 @@
-diff --speed-large-files --minimal -Nru munin-1.4.3.orig/Makefile.config munin-1.4.3/Makefile.config
---- munin-1.4.3.orig/Makefile.config	2009-12-30 13:55:56.000000000 +0100
-+++ munin-1.4.3/Makefile.config	2010-01-27 12:26:29.445565248 +0100
-@@ -14,13 +14,15 @@
- # and LOGDIR as subdirectories.  Today, DBDIR contains configured
- # domains, as well as PLUGSTATE, and we risk collisions.
- 
-+DESTDIR=$(DESTDIR)
-+
- #
- # the base of the Munin installation.
- # 
--PREFIX     = $(DESTDIR)/opt/munin
-+PREFIX     = /opt/csw
- 
- # Where Munin keeps its configurations (server.conf, client.conf, ++)
--CONFDIR    = $(DESTDIR)/etc/opt/munin
-+CONFDIR    = /etc/opt/csw/munin
- 
- # Server only - where to put munin-cron
- BINDIR     = $(PREFIX)/bin
-@@ -29,17 +31,17 @@
- SBINDIR    = $(PREFIX)/sbin
- 
- # Where to put text and html documentation
--DOCDIR     = $(PREFIX)/doc
-+DOCDIR     = $(PREFIX)/share/doc/munin
- 
- # Where to put man pages
--MANDIR     = $(PREFIX)/man
-+MANDIR     = $(PREFIX)/share/man
- 
- # Where to put internal binaries and plugin repository
--LIBDIR     = $(PREFIX)/lib
-+LIBDIR     = $(PREFIX)/libexec/munin
- 
- # Server only - Output directory
--HTMLDIR    = $(PREFIX)/www/docs
--CGIDIR     = $(PREFIX)/www/cgi
-+HTMLDIR    = /var/opt/csw/munin/www
-+CGIDIR     = /var/opt/csw/munin/www/cgi
- 
- # Server only - spool directory for data gathered from nodes by
- # munin-gather - experimental.  Place on ramdisk to make munin
-@@ -52,24 +54,24 @@
- # SSPOOLDIR := /tmp/muninspool
- 
- # Client only - Where to put RRD files and other intenal data
--DBDIR      = $(DESTDIR)/var/opt/munin
-+DBDIR      = /var/opt/csw/munin/db
- 
- # Client only - Where plugins should put their states. Must be writable by
- # group "munin", and should be preserved between reboots
- PLUGSTATE  = $(DBDIR)/plugin-state
- 
- # Where Munin should place its logs.
--LOGDIR     = $(PREFIX)/log/munin
-+LOGDIR     = /var/opt/csw/munin/log
- 
- # Location of PID files and other statefiles. On the server, must be
- # writable by the user "munin".
--STATEDIR   = $(DESTDIR)/var/run/munin
-+STATEDIR   = /var/opt/csw/munin/run
- 
- # The perl interpreter to use
--PERL       := $(shell which perl)
-+PERL       := /opt/csw/bin/perl
- 
- # The python interpreter to use (used by some plugins)
--PYTHON     := /usr/bin/env python
-+PYTHON     := /opt/csw/bin/python
- 
- # The ruby interpreter to use (used by some plugins)
- RUBY       := /usr/bin/env ruby
-@@ -95,11 +97,11 @@
- GOODSH     := $(shell PATH=`getconf PATH` sh -c 'type sh | sed "s/.* //"')
- 
- # Path of bash for bash specific plugins
--BASH       := /bin/bash
-+BASH       := /usr/bin/bash
- 
- # Server only - Where to install the perl libraries
- PERLSITELIB := $(shell $(PERL) -V:sitelib | cut -d"'" -f2)
--PERLLIB    = $(DESTDIR)$(PERLSITELIB)
-+PERLLIB    = $(shell $(PERL) -V:sitelib | cut -d"'" -f2)
- 
- # Client only - Install plugins for this architecture
- OSTYPE     := $(shell uname | tr '[A-Z]' '[a-z]')
-@@ -111,7 +113,7 @@
- # What is the safest way to create a tempfile.
- # Default is to figure it out by testing various methods.
- # Replace this with a known platform-specific method
--MKTEMP     := $(shell ./test-mktemp)
-+MKTEMP     := $(shell mktemp)
- 
- # Munin version number.
- VERSION    := $(shell ./getversion)
-@@ -126,9 +128,9 @@
- # Which command to use to check if the USER and GROUP to run Munin as, exists.
- # These will work on most modern OSes:
- #
--GETENT     := $(shell which getent || which true 2>/dev/null)
--CHECKUSER  := $(shell $(GETENT) passwd $(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistent. Create the user and retry; exit 2"))
--CHECKGROUP := $(shell $(GETENT) group $(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistent. Create the group and retry; exit 2"))
-+#GETENT     := $(shell which getent || which true 2>/dev/null)
-+#CHECKUSER  := $(shell $(GETENT) passwd $(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistent. Create the user and retry; exit 2"))
-+#CHECKGROUP := $(shell $(GETENT) group $(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistent. Create the group and retry; exit 2"))
- 
- # For OSX, comment out the previous two lines and comment in these
- #
-@@ -159,4 +161,4 @@
- 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;' )

Deleted: csw/mgar/pkg/munin/trunk/files/makefile.diff
===================================================================
--- csw/mgar/pkg/munin/trunk/files/makefile.diff	2010-07-11 14:03:10 UTC (rev 10496)
+++ csw/mgar/pkg/munin/trunk/files/makefile.diff	2010-07-11 16:58:06 UTC (rev 10497)
@@ -1,273 +0,0 @@
-diff --speed-large-files --minimal -Nru munin-1.4.3.orig/Makefile munin-1.4.3/Makefile
---- munin-1.4.3.orig/Makefile	2009-12-30 13:55:56.000000000 +0100
-+++ munin-1.4.3/Makefile	2010-01-27 22:01:51.419441374 +0100
-@@ -49,8 +49,8 @@
- # This removes the installed config so that the next install-pass installs
- # a new config.  Target _only_ suitable for maintainers.
- unconfig:
--	rm -f $(HTMLDIR)/.htaccess
--	rm -f $(CONFDIR)/munin.conf
-+	rm -f $(DESTDIR)$(HTMLDIR)/.htaccess
-+	rm -f $(DESTDIR)$(CONFDIR)/munin.conf
- 
- tags:
- 	-rm -f TAGS
-@@ -66,52 +66,51 @@
- 
- install-pre: Makefile Makefile.config
- 	@$(CHECKUSER)
--	mkdir -p $(LOGDIR)
--	mkdir -p $(STATEDIR)
--	mkdir -p $(CONFDIR)
--	$(CHOWN) $(USER) $(LOGDIR) $(STATEDIR)
-+	mkdir -p $(DESTDIR)$(LOGDIR)
-+	mkdir -p $(DESTDIR)$(STATEDIR)
-+	mkdir -p $(DESTDIR)$(CONFDIR)
- 
- install-master-prime: $(INFILES_MASTER) install-pre install-master
--	mkdir -p $(CONFDIR)/templates
--	mkdir -p $(CONFDIR)/templates/partial
--	mkdir -p $(CONFDIR)/munin-conf.d
--	mkdir -p $(LIBDIR)
--	mkdir -p $(BINDIR)
--	mkdir -p $(PERLLIB)
--	mkdir -p $(PERLLIB)/Munin/Master
--	mkdir -p $(HTMLDIR)
--	mkdir -p $(DBDIR)
--	mkdir -p $(CGIDIR)
-+	mkdir -p $(DESTDIR)$(CONFDIR)/templates
-+	mkdir -p $(DESTDIR)$(CONFDIR)/templates/partial
-+	mkdir -p $(DESTDIR)$(CONFDIR)/munin-conf.d
-+	mkdir -p $(DESTDIR)$(LIBDIR)
-+	mkdir -p $(DESTDIR)$(BINDIR)
-+	mkdir -p $(DESTDIR)$(PERLLIB)
-+	mkdir -p $(DESTDIR)$(PERLLIB)/Munin/Master
-+	mkdir -p $(DESTDIR)$(HTMLDIR)
-+	mkdir -p $(DESTDIR)$(DBDIR)
-+	mkdir -p $(DESTDIR)$(CGIDIR)
- 
--	$(CHOWN) $(USER) $(HTMLDIR) $(DBDIR) 
--	$(CHMOD) 0755 $(DBDIR)
-+	#$(CHOWN) $(USER) $(DESTDIR)$(HTMLDIR) $(DESTDIR)$(DBDIR) 
-+	$(CHMOD) 0755 $(DESTDIR)$(DBDIR)
- 
- 	for p in master/www/*.tmpl master/www/*.png master/www/*.css resources/favicon.ico; do \
--		$(INSTALL) -m 0644 "$$p" $(CONFDIR)/templates/ ; \
-+		$(INSTALL) -m 0644 "$$p" $(DESTDIR)$(CONFDIR)/templates/ ; \
- 	done
- 
- 	for p in master/www/partial/*.tmpl; do \
--		$(INSTALL) -m 0644 "$$p" $(CONFDIR)/templates/partial/ ; \
-+		$(INSTALL) -m 0644 "$$p" $(DESTDIR)$(CONFDIR)/templates/partial/ ; \
- 	done
- 
--	$(INSTALL) -m 0644 master/www/definitions.html $(CONFDIR)/templates/
--	$(INSTALL) -m 0755 master/DejaVuSansMono.ttf $(LIBDIR)/
--	$(INSTALL) -m 0755 master/DejaVuSans.ttf $(LIBDIR)/
-+	$(INSTALL) -m 0644 master/www/definitions.html $(DESTDIR)$(CONFDIR)/templates/
-+	$(INSTALL) -m 0755 master/DejaVuSansMono.ttf $(DESTDIR)$(LIBDIR)/
-+	$(INSTALL) -m 0755 master/DejaVuSans.ttf $(DESTDIR)$(LIBDIR)/
- 
--	test -f $(HTMLDIR)/.htaccess || $(INSTALL) -m 0644 build/master/www/munin-htaccess $(HTMLDIR)/.htaccess
--	test -f "$(CONFDIR)/munin.conf"  || $(INSTALL) -m 0644 build/master/munin.conf $(CONFDIR)/
-+	test -f $(DESTDIR)$(HTMLDIR)/.htaccess || $(INSTALL) -m 0644 build/master/www/munin-htaccess $(DESTDIR)$(HTMLDIR)/.htaccess
-+	test -f "$(DESTDIR)$(CONFDIR)/munin.conf"  || $(INSTALL) -m 0644 build/master/munin.conf $(DESTDIR)$(CONFDIR)/
- 
--	$(INSTALL) -m 0755 build/master/_bin/munin-cron $(BINDIR)/
--	$(INSTALL) -m 0755 build/master/_bin/munin-check $(BINDIR)/
--	$(INSTALL) -m 0755 build/master/_bin/munin-update $(LIBDIR)/
--	$(INSTALL) -m 0755 build/master/_bin/munin-graph $(LIBDIR)/
--	$(INSTALL) -m 0755 build/master/_bin/munin-html $(LIBDIR)/
--	$(INSTALL) -m 0755 build/master/_bin/munin-limits $(LIBDIR)/
--	$(INSTALL) -m 0755 build/master/_bin/munin-cgi-graph $(CGIDIR)/
--	$(INSTALL) -m 0755 build/master/_bin/munin-fastcgi-graph $(CGIDIR)/
-+	$(INSTALL) -m 0755 build/master/_bin/munin-cron $(DESTDIR)$(BINDIR)/
-+	$(INSTALL) -m 0755 build/master/_bin/munin-check $(DESTDIR)$(BINDIR)/
-+	$(INSTALL) -m 0755 build/master/_bin/munin-update $(DESTDIR)$(LIBDIR)/
-+	$(INSTALL) -m 0755 build/master/_bin/munin-graph $(DESTDIR)$(LIBDIR)/
-+	$(INSTALL) -m 0755 build/master/_bin/munin-html $(DESTDIR)$(LIBDIR)/
-+	$(INSTALL) -m 0755 build/master/_bin/munin-limits $(DESTDIR)$(LIBDIR)/
-+	$(INSTALL) -m 0755 build/master/_bin/munin-cgi-graph $(DESTDIR)$(CGIDIR)/
-+	$(INSTALL) -m 0755 build/master/_bin/munin-fastcgi-graph $(DESTDIR)$(CGIDIR)/
- 
- # Not ready to be installed yet	
--# $(INSTALL) -m 0755 build/master/_bin/munin-gather $(LIBDIR)/
-+# $(INSTALL) -m 0755 build/master/_bin/munin-gather $(DESTDIR)$(LIBDIR)/
- 
- # ALWAYS DO THE OS SPECIFIC PLUGINS LAST! THAT WAY THEY OVERWRITE THE
- # GENERIC ONES
-@@ -122,28 +121,24 @@
- install-plugins-prime: install-plugins build $(PLUGINS) Makefile Makefile.config
- 	@$(CHECKGROUP)
- 
--	mkdir -p $(CONFDIR)/plugins
--	mkdir -p $(CONFDIR)/plugin-conf.d
--	mkdir -p $(LIBDIR)/plugins
--	mkdir -p $(PLUGSTATE)
--
--	$(CHOWN) $(PLUGINUSER):$(GROUP) $(PLUGSTATE)
--	$(CHMOD) 0775 $(PLUGSTATE)
--	$(CHMOD) 0755 $(CONFDIR)/plugin-conf.d
-+	mkdir -p $(DESTDIR)$(CONFDIR)/plugins
-+	mkdir -p $(DESTDIR)$(CONFDIR)/plugin-conf.d
-+	mkdir -p $(DESTDIR)$(LIBDIR)/plugins
-+	mkdir -p $(DESTDIR)$(PLUGSTATE)
- 
- 	for p in build/plugins/node.d/* build/plugins/node.d.$(OSTYPE)/* ; do \
- 	    if test -f "$$p" ; then                            \
- 		echo Installing $$p;                           \
--		$(INSTALL) -m 0755 $$p $(LIBDIR)/plugins/;     \
-+		$(INSTALL) -m 0755 $$p $(DESTDIR)$(LIBDIR)/plugins/;     \
- 	    fi                                                 \
- 	done
--	-mv $(LIBDIR)/plugins/*.adv $(LIBDIR)
--	$(INSTALL) -m 0644 build/plugins/plugins.history $(LIBDIR)/plugins/
--	$(INSTALL) -m 0644 build/plugins/plugin.sh $(LIBDIR)/plugins/
-+	-mv $(DESTDIR)$(LIBDIR)/plugins/*.adv $(DESTDIR)$(LIBDIR)
-+	$(INSTALL) -m 0644 build/plugins/plugins.history $(DESTDIR)$(LIBDIR)/plugins/
-+	$(INSTALL) -m 0644 build/plugins/plugin.sh $(DESTDIR)$(LIBDIR)/plugins/
- 
- install-plugins-java: build-plugins-java
--	mkdir -p $(JAVALIBDIR)
--	$(INSTALL) -m 0644 build/plugins/javalib/munin-jmx-plugins.jar $(JAVALIBDIR)/
-+	mkdir -p $(DESTDIR)$(JAVALIBDIR)
-+	$(INSTALL) -m 0644 build/plugins/javalib/munin-jmx-plugins.jar $(DESTDIR)$(JAVALIBDIR)/
- 
- #TODO:
- # configure plugins.  Or not. Better done under the direction of the installer
-@@ -152,30 +147,30 @@
- install-node-prime: install-node-pre install-node
- 
- install-node-pre: build/node/munin-node.conf install-pre
--	test -f "$(CONFDIR)/munin-node.conf" || $(INSTALL) -m 0644 build/node/munin-node.conf $(CONFDIR)/
-+	test -f "$(DESTDIR)$(CONFDIR)/munin-node.conf" || $(INSTALL) -m 0644 build/node/munin-node.conf $(DESTDIR)$(CONFDIR)/
- 
- 
- install-common-prime: build-common install-common
- 
- 
- install-man: build-man Makefile Makefile.config
--	mkdir -p $(MANDIR)/man1 $(MANDIR)/man5 $(MANDIR)/man8
--	$(INSTALL) -m 0644 build/doc/munin-node.conf.5 $(MANDIR)/man5/
--	$(INSTALL) -m 0644 build/doc/munin.conf.5 $(MANDIR)/man5/
--	$(INSTALL) -m 0644 build/doc/munin-graph.8 $(MANDIR)/man8/
--	$(INSTALL) -m 0644 build/doc/munin-update.8 $(MANDIR)/man8/
--	$(INSTALL) -m 0644 build/doc/munin-limits.8 $(MANDIR)/man8/
--	$(INSTALL) -m 0644 build/doc/munin-html.8 $(MANDIR)/man8/
--	$(INSTALL) -m 0644 build/doc/munin-cron.8 $(MANDIR)/man8/
--	$(INSTALL) -m 0644 build/doc/munin-check.8 $(MANDIR)/man8/
--	$(INSTALL) -m 0644 build/doc/munin.8 $(MANDIR)/man8/
-+	mkdir -p $(DESTDIR)$(MANDIR)/man1 $(DESTDIR)$(MANDIR)/man5 $(DESTDIR)$(MANDIR)/man8
-+	$(INSTALL) -m 0644 build/doc/munin-node.conf.5 $(DESTDIR)$(MANDIR)/man5/
-+	$(INSTALL) -m 0644 build/doc/munin.conf.5 $(DESTDIR)$(MANDIR)/man5/
-+	$(INSTALL) -m 0644 build/doc/munin-graph.8 $(DESTDIR)$(MANDIR)/man8/
-+	$(INSTALL) -m 0644 build/doc/munin-update.8 $(DESTDIR)$(MANDIR)/man8/
-+	$(INSTALL) -m 0644 build/doc/munin-limits.8 $(DESTDIR)$(MANDIR)/man8/
-+	$(INSTALL) -m 0644 build/doc/munin-html.8 $(DESTDIR)$(MANDIR)/man8/
-+	$(INSTALL) -m 0644 build/doc/munin-cron.8 $(DESTDIR)$(MANDIR)/man8/
-+	$(INSTALL) -m 0644 build/doc/munin-check.8 $(DESTDIR)$(MANDIR)/man8/
-+	$(INSTALL) -m 0644 build/doc/munin.8 $(DESTDIR)$(MANDIR)/man8/
- 
- 
- install-doc: build-doc
--	mkdir -p $(DOCDIR)/resources
--	$(INSTALL) -m 0644 README $(DOCDIR)/
--	$(INSTALL) -m 0644 COPYING $(DOCDIR)/
--	$(INSTALL) -m 0644 build/resources/* $(DOCDIR)/resources
-+	mkdir -p $(DESTDIR)$(DOCDIR)/resources
-+	$(INSTALL) -m 0644 README $(DESTDIR)$(DOCDIR)/
-+	$(INSTALL) -m 0644 COPYING $(DESTDIR)$(DOCDIR)/
-+	$(INSTALL) -m 0644 build/resources/* $(DESTDIR)$(DOCDIR)/resources
- 
- ######################################################################
- 
-@@ -189,28 +184,28 @@
- 	@echo "$< -> $@"
- 	@mkdir -p build/`dirname $<`
- 	@sed -e 's|@@PREFIX@@|$(PREFIX)|g'                      \
--             -e 's|@@CONFDIR@@|$(CONFDIR)|g'                    \
--             -e 's|@@BINDIR@@|$(BINDIR)|g'                      \
--             -e 's|@@SBINDIR@@|$(SBINDIR)|g'                    \
--             -e 's|@@DOCDIR@@|$(DOCDIR)|g'                      \
--             -e 's|@@LIBDIR@@|$(LIBDIR)|g'                      \
-+             -e 's|@@CONFDIR@@|$(DESTDIR)$(CONFDIR)|g'                    \
-+             -e 's|@@BINDIR@@|$(DESTDIR)$(BINDIR)|g'                      \
-+             -e 's|@@SBINDIR@@|$(DESTDIR)$(SBINDIR)|g'                    \
-+             -e 's|@@DOCDIR@@|$(DESTDIR)$(DOCDIR)|g'                      \
-+             -e 's|@@LIBDIR@@|$(DESTDIR)$(LIBDIR)|g'                      \
-              -e 's|@@MANDIR@@|$(MANDIR)|g'                      \
--             -e 's|@@LOGDIR@@|$(LOGDIR)|g'                      \
--             -e 's|@@HTMLDIR@@|$(HTMLDIR)|g'                    \
--             -e 's|@@DBDIR@@|$(DBDIR)|g'                        \
--             -e 's|@@STATEDIR@@|$(STATEDIR)|g'                  \
-+             -e 's|@@LOGDIR@@|$(DESTDIR)$(LOGDIR)|g'                      \
-+             -e 's|@@HTMLDIR@@|$(DESTDIR)$(HTMLDIR)|g'                    \
-+             -e 's|@@DBDIR@@|$(DESTDIR)$(DBDIR)|g'                        \
-+             -e 's|@@STATEDIR@@|$(DESTDIR)$(STATEDIR)|g'                  \
-              -e 's|@@PERL@@|$(PERL)|g'                          \
--             -e 's|@@PERLLIB@@|$(PERLLIB)|g'                    \
-+             -e 's|@@PERLLIB@@|$(DESTDIR)$(PERLLIB)|g'                    \
-              -e 's|@@PYTHON@@|$(PYTHON)|g'                      \
-              -e 's|@@RUBY@@|$(RUBY)|g'                          \
-              -e 's|@@JAVARUN@@|$(JAVARUN)|g'                    \
--             -e 's|@@JAVALIBDIR@@|$(JAVALIBDIR)|g'              \
-+             -e 's|@@JAVALIBDIR@@|$(DESTDIR)$(JAVALIBDIR)|g'              \
-              -e 's|@@OSTYPE@@|$(OSTYPE)|g'                      \
-              -e 's|@@HOSTNAME@@|$(HOSTNAME)|g'                  \
-              -e 's|@@MKTEMP@@|$(MKTEMP)|g'                      \
-              -e 's|@@VERSION@@|$(VERSION)|g'                    \
--             -e 's|@@PLUGSTATE@@|$(PLUGSTATE)|g'                \
--             -e 's|@@CGIDIR@@|$(CGIDIR)|g'                      \
-+             -e 's|@@PLUGSTATE@@|$(DESTDIR)$(PLUGSTATE)|g'                \
-+             -e 's|@@CGIDIR@@|$(DESTDIR)$(CGIDIR)|g'                      \
-              -e 's|@@USER@@|$(USER)|g'                          \
-              -e 's|@@GROUP@@|$(GROUP)|g'                        \
-              -e 's|@@PLUGINUSER@@|$(PLUGINUSER)|g'              \
-@@ -354,20 +349,20 @@
- 	$(MAKE) $@ CONFIG=t/Makefile.config
- else
- test_plugins = id_default id_root env
--old-test: t/*.t t/install $(addprefix $(CONFDIR)/plugins/,$(test_plugins))
-+old-test: t/*.t t/install $(addprefix $(DESTDIR)$(CONFDIR)/plugins/,$(test_plugins))
- 	@for test in t/*.t; do \
- 		echo -n "$$test: "; \
--		PERL5LIB=$(PERLLIB) $(PERL) $$test;\
-+		PERL5LIB=$(DESTDIR)$(PERLLIB) $(PERL) $$test;\
- 	done
- endif
- 
- node-monkeywrench: install-node
--	rm -rf $(CONFDIR)/plugins
--	rm -rf $(LIBDIR)/plugins
--	mkdir -p $(LIBDIR)/plugins
--	mkdir -p $(CONFDIR)/plugins
--	cp monkeywrench/plugin-break*_ $(LIBDIR)/plugins/
--	$(SBINDIR)/munin-node-configure --suggest
-+	rm -rf $(DESTDIR)$(CONFDIR)/plugins
-+	rm -rf $(DESTDIR)$(LIBDIR)/plugins
-+	mkdir -p $(DESTDIR)$(LIBDIR)/plugins
-+	mkdir -p $(DESTDIR)$(CONFDIR)/plugins
-+	cp monkeywrench/plugin-break*_ $(DESTDIR)$(LIBDIR)/plugins/
-+	$(DESTDIR)$(SBINDIR)/munin-node-configure --suggest
- 	echo 'Done?'
- 
- t/install: 
-@@ -391,12 +386,12 @@
- # can't seem to find a way to persuade it to write otherwhere.
- install-%: %/Build
- 	cd $* && $(PERL) Build install			\
--            --install_path lib=$(PERLLIB)		\
--            --install_path bin=$(BINDIR)		\
--            --install_path script=$(BINDIR)		\
--            --install_path sbin=$(SBINDIR)		\
--            --install_path bindoc=$(MANDIR)/man1	\
--            --install_path libdoc=$(MANDIR)/man3	\
-+            --install_path lib=$(DESTDIR)$(PERLLIB)		\
-+            --install_path bin=$(DESTDIR)$(BINDIR)		\
-+            --install_path script=$(DESTDIR)$(BINDIR)		\
-+            --install_path sbin=$(DESTDIR)$(SBINDIR)		\
-+            --install_path bindoc=$(DESTDIR)$(MANDIR)/man1	\
-+            --install_path libdoc=$(DESTDIR)$(MANDIR)/man3	\
- 
- test-%: %/Build
- 	cd $* && $(PERL) Build test || true

Deleted: csw/mgar/pkg/munin/trunk/files/munin-graph.in.diff
===================================================================
--- csw/mgar/pkg/munin/trunk/files/munin-graph.in.diff	2010-07-11 14:03:10 UTC (rev 10496)
+++ csw/mgar/pkg/munin/trunk/files/munin-graph.in.diff	2010-07-11 16:58:06 UTC (rev 10497)
@@ -1,18 +0,0 @@
-diff --speed-large-files --minimal -Nru munin-1.4.3.orig/master/_bin/munin-graph.in munin-1.4.3/master/_bin/munin-graph.in
---- munin-1.4.3.orig/master/_bin/munin-graph.in	2009-12-30 13:55:56.000000000 +0100
-+++ munin-1.4.3/master/_bin/munin-graph.in	2010-01-27 15:37:25.532990968 +0100
-@@ -135,10 +135,10 @@
- 
- =head1 FILES
- 
--	@@CONFDIR@@/munin.conf
--	@@DBDIR@@/*
--	@@LOGDIR@@/munin-graph
--	@@STATEDIR@@/*
-+	/etc/opt/csw/munin/munin.conf
-+	/var/opt/csw/munin/*
-+	/var/opt/csw/munin/munin-graph
-+	/var/opt/csw/munin/*
- 
- =head1 AUTHORS
- 

Added: csw/mgar/pkg/munin/trunk/files/munin-graph.in.patch
===================================================================
--- csw/mgar/pkg/munin/trunk/files/munin-graph.in.patch	                        (rev 0)
+++ csw/mgar/pkg/munin/trunk/files/munin-graph.in.patch	2010-07-11 16:58:06 UTC (rev 10497)
@@ -0,0 +1,31 @@
+From c7b05c6b5304a67c1b4226ba9473407a4953822d Mon Sep 17 00:00:00 2001
+From: Juergen Arndt <ja at opencsw.org>
+Date: Sun, 11 Jul 2010 15:21:09 +0200
+Subject: [PATCH] set path names to /var/opt/csw/munin
+
+---
+ master/_bin/munin-graph.in |    8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/master/_bin/munin-graph.in b/master/_bin/munin-graph.in
+index 804d2bd..1ea9ddc 100755
+--- a/master/_bin/munin-graph.in
++++ b/master/_bin/munin-graph.in
+@@ -135,10 +135,10 @@ needed. To force redrawing of graphs (after setup-changes et alia), use
+ 
+ =head1 FILES
+ 
+-	@@CONFDIR@@/munin.conf
+-	@@DBDIR@@/*
+-	@@LOGDIR@@/munin-graph
+-	@@STATEDIR@@/*
++	/etc/opt/csw/munin/munin.conf
++	/var/opt/csw/munin/*
++	/var/opt/csw/munin/munin-graph
++	/var/opt/csw/munin/*
+ 
+ =head1 AUTHORS
+ 
+-- 
+1.7.1
+

Deleted: csw/mgar/pkg/munin/trunk/files/munin-node.conf.in.diff
===================================================================
--- csw/mgar/pkg/munin/trunk/files/munin-node.conf.in.diff	2010-07-11 14:03:10 UTC (rev 10496)
+++ csw/mgar/pkg/munin/trunk/files/munin-node.conf.in.diff	2010-07-11 16:58:06 UTC (rev 10497)
@@ -1,23 +0,0 @@
-diff --speed-large-files --minimal -Nru munin-1.4.3.orig/node/munin-node.conf.in munin-1.4.3/node/munin-node.conf.in
---- munin-1.4.3.orig/node/munin-node.conf.in	2009-12-30 13:55:56.000000000 +0100
-+++ munin-1.4.3/node/munin-node.conf.in	2010-01-27 22:15:03.160953219 +0100
-@@ -3,8 +3,8 @@
- #
- 
- log_level 4
--log_file @@LOGDIR@@/munin-node.log
--pid_file @@STATEDIR@@/munin-node.pid
-+log_file /var/opt/csw/munin/munin-node.log
-+pid_file /var/opt/csw/munin/munin-node.pid
- 
- background 1
- setsid 1
-@@ -26,7 +26,7 @@
- # Set this if the client doesn't report the correct hostname when
- # telnetting to localhost, port 4949
- #
--#host_name @@HOSTNAME@@
-+#host_name yourhostname
- 
- # A list of addresses that are allowed to connect.  This must be a
- # regular expression, since Net::Server does not understand CIDR-style

Added: csw/mgar/pkg/munin/trunk/files/munin-node.conf.in.patch
===================================================================
--- csw/mgar/pkg/munin/trunk/files/munin-node.conf.in.patch	                        (rev 0)
+++ csw/mgar/pkg/munin/trunk/files/munin-node.conf.in.patch	2010-07-11 16:58:06 UTC (rev 10497)
@@ -0,0 +1,36 @@
+From 272b43ac170c907476ad5698c960fd84b31996c3 Mon Sep 17 00:00:00 2001
+From: Juergen Arndt <ja at opencsw.org>
+Date: Sun, 11 Jul 2010 18:25:14 +0200
+Subject: [PATCH] munin-node.conf.in: set some paths for OpenCSW, change hostname to "yourhostname"
+
+---
+ node/munin-node.conf.in |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/node/munin-node.conf.in b/node/munin-node.conf.in
+index 40793b2..67a92a5 100644
+--- a/node/munin-node.conf.in
++++ b/node/munin-node.conf.in
+@@ -3,8 +3,8 @@
+ #
+ 
+ log_level 4
+-log_file @@LOGDIR@@/munin-node.log
+-pid_file @@STATEDIR@@/munin-node.pid
++log_file /var/opt/csw/munin/munin-node.log
++pid_file /var/opt/csw/munin/run/munin-node.pid
+ 
+ background 1
+ setsid 1
+@@ -26,7 +26,7 @@ ignore_file \.pod$
+ # Set this if the client doesn't report the correct hostname when
+ # telnetting to localhost, port 4949
+ #
+-#host_name @@HOSTNAME@@
++#host_name yourhostname
+ 
+ # A list of addresses that are allowed to connect.  This must be a
+ # regular expression, since Net::Server does not understand CIDR-style
+-- 
+1.7.1
+

Deleted: csw/mgar/pkg/munin/trunk/files/munin.conf.in.diff
===================================================================
--- csw/mgar/pkg/munin/trunk/files/munin.conf.in.diff	2010-07-11 14:03:10 UTC (rev 10496)
+++ csw/mgar/pkg/munin/trunk/files/munin.conf.in.diff	2010-07-11 16:58:06 UTC (rev 10497)
@@ -1,12 +0,0 @@
-diff --speed-large-files --minimal -Nru munin-1.4.3.orig/master/munin.conf.in munin-1.4.3/master/munin.conf.in
---- munin-1.4.3.orig/master/munin.conf.in	2009-12-30 13:55:56.000000000 +0100
-+++ munin-1.4.3/master/munin.conf.in	2010-01-27 15:26:42.127815407 +0100
-@@ -57,7 +57,7 @@
- #contact.nagios.command /usr/bin/send_nsca nagios.host.comm -c /etc/nsca.conf
- 
- # a simple host tree
--[@@HOSTNAME@@]
-+[yourhostname]
-     address 127.0.0.1
-     use_node_name yes
- 

Added: csw/mgar/pkg/munin/trunk/files/munin.conf.in.patch
===================================================================
--- csw/mgar/pkg/munin/trunk/files/munin.conf.in.patch	                        (rev 0)
+++ csw/mgar/pkg/munin/trunk/files/munin.conf.in.patch	2010-07-11 16:58:06 UTC (rev 10497)
@@ -0,0 +1,25 @@
+From f94f6692eeb6875abf5e52ecf8a192ac3430c6e3 Mon Sep 17 00:00:00 2001
+From: Juergen Arndt <ja at opencsw.org>
+Date: Sun, 11 Jul 2010 15:25:17 +0200
+Subject: [PATCH] changed default hostname to "yourhostname"
+
+---
+ master/munin.conf.in |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/master/munin.conf.in b/master/munin.conf.in
+index 3688d88..79d9729 100644
+--- a/master/munin.conf.in
++++ b/master/munin.conf.in
+@@ -57,7 +57,7 @@ includedir @@CONFDIR@@/munin-conf.d
+ #contact.nagios.command /usr/bin/send_nsca nagios.host.comm -c /etc/nsca.conf
+ 
+ # a simple host tree
+-[@@HOSTNAME@@]
++[yourhostname]
+     address 127.0.0.1
+     use_node_name yes
+ 
+-- 
+1.7.1
+

Deleted: csw/mgar/pkg/munin/trunk/files/perl.diff
===================================================================
--- csw/mgar/pkg/munin/trunk/files/perl.diff	2010-07-11 14:03:10 UTC (rev 10496)
+++ csw/mgar/pkg/munin/trunk/files/perl.diff	2010-07-11 16:58:06 UTC (rev 10497)
@@ -1,45 +0,0 @@
-diff --speed-large-files --minimal -Nru munin-1.4.3.orig/master/_bin/munin-update.in munin-1.4.3/master/_bin/munin-update.in
---- munin-1.4.3.orig/master/_bin/munin-update.in	2009-12-30 13:55:56.000000000 +0100
-+++ munin-1.4.3/master/_bin/munin-update.in	2010-01-27 15:45:19.655925252 +0100
-@@ -1,4 +1,4 @@
--#! /usr/bin/perl
-+#!/opt/csw/bin/perl
- 
- use warnings;
- use strict;
-diff --speed-large-files --minimal -Nru munin-1.4.3.orig/node/bin/munindoc munin-1.4.3/node/bin/munindoc
---- munin-1.4.3.orig/node/bin/munindoc	2009-12-30 13:55:56.000000000 +0100
-+++ munin-1.4.3/node/bin/munindoc	2010-01-27 15:45:11.095300986 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#/opt/csw/bin/perl -w
- # -*- perl -*-
- #
- # This script provides the basis for a plugin documentation system for
-diff --speed-large-files --minimal -Nru munin-1.4.3.orig/node/sbin/munin-node munin-1.4.3/node/sbin/munin-node
---- munin-1.4.3.orig/node/sbin/munin-node	2009-12-30 13:55:56.000000000 +0100
-+++ munin-1.4.3/node/sbin/munin-node	2010-01-27 15:45:47.944337631 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -wT
-+#!/opt/csw/bin/perl -wT
- # -*- cperl -*-
- #
- # Copyright (C) 2002-2009 Audun Ytterdal, Jimmy Olsen, Tore Anderson,
-diff --speed-large-files --minimal -Nru munin-1.4.3.orig/node/sbin/munin-node-configure munin-1.4.3/node/sbin/munin-node-configure
---- munin-1.4.3.orig/node/sbin/munin-node-configure	2009-12-30 13:55:56.000000000 +0100
-+++ munin-1.4.3/node/sbin/munin-node-configure	2010-01-27 15:46:18.906920790 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!/opt/csw/bin/perl -w
- # -*- cperl -*-
- #
- # Copyright (C) 2003-2006 Jimmy Olsen, Nicolai Langfeldt.
-diff --speed-large-files --minimal -Nru munin-1.4.3.orig/node/sbin/munin-run munin-1.4.3/node/sbin/munin-run
---- munin-1.4.3.orig/node/sbin/munin-run	2009-12-30 13:55:56.000000000 +0100
-+++ munin-1.4.3/node/sbin/munin-run	2010-01-27 15:46:36.558632214 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -wT
-+#!/opt/csw/bin/perl -wT
- # -*- perl -*-
- 
- # Copyright (C) 2004-2009

Added: csw/mgar/pkg/munin/trunk/files/perl.patch
===================================================================
--- csw/mgar/pkg/munin/trunk/files/perl.patch	                        (rev 0)
+++ csw/mgar/pkg/munin/trunk/files/perl.patch	2010-07-11 16:58:06 UTC (rev 10497)
@@ -0,0 +1,66 @@
+From 15dad8e4d26c0e482e0fbb44fb8190faad852f27 Mon Sep 17 00:00:00 2001
+From: Juergen Arndt <ja at opencsw.org>
+Date: Sun, 11 Jul 2010 15:31:43 +0200
+Subject: [PATCH] set shebang to /opt/csw/bin/perl
+
+---
+ master/_bin/munin-update.in    |    2 +-
+ node/bin/munindoc              |    2 +-
+ node/sbin/munin-node           |    2 +-
+ node/sbin/munin-node-configure |    2 +-
+ node/sbin/munin-run            |    2 +-
+ 5 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/master/_bin/munin-update.in b/master/_bin/munin-update.in
+index 8ff7794..0d044ae 100755
+--- a/master/_bin/munin-update.in
++++ b/master/_bin/munin-update.in
+@@ -1,4 +1,4 @@
+-#! /usr/bin/perl
++#! /opt/csw/bin/perl
+ 
+ use warnings;
+ use strict;
+diff --git a/node/bin/munindoc b/node/bin/munindoc
+index e36f87b..e2334a1 100755
+--- a/node/bin/munindoc
++++ b/node/bin/munindoc
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -w
++#!/opt/csw/bin/perl -w
+ # -*- perl -*-
+ #
+ # This script provides the basis for a plugin documentation system for
+diff --git a/node/sbin/munin-node b/node/sbin/munin-node
+index 5980d5e..389e73e 100755
+--- a/node/sbin/munin-node
++++ b/node/sbin/munin-node
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -wT
++#!/opt/csw/bin/perl -wT
+ # -*- cperl -*-
+ #
+ # Copyright (C) 2002-2009 Audun Ytterdal, Jimmy Olsen, Tore Anderson,
+diff --git a/node/sbin/munin-node-configure b/node/sbin/munin-node-configure
+index b262924..c8a8dea 100755
+--- a/node/sbin/munin-node-configure
++++ b/node/sbin/munin-node-configure
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -w
++#!/opt/csw/bin/perl -w
+ # -*- cperl -*-
+ #
+ # Copyright (C) 2003-2006 Jimmy Olsen, Nicolai Langfeldt.
+diff --git a/node/sbin/munin-run b/node/sbin/munin-run
+index 3d28b6a..09fc71d 100755
+--- a/node/sbin/munin-run
++++ b/node/sbin/munin-run
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -wT
++#!/opt/csw/bin/perl -wT
+ # -*- perl -*-
+ 
+ # Copyright (C) 2004-2009
+-- 
+1.7.1
+

Deleted: csw/mgar/pkg/munin/trunk/files/sunos_memory.in.diff
===================================================================
--- csw/mgar/pkg/munin/trunk/files/sunos_memory.in.diff	2010-07-11 14:03:10 UTC (rev 10496)
+++ csw/mgar/pkg/munin/trunk/files/sunos_memory.in.diff	2010-07-11 16:58:06 UTC (rev 10497)
@@ -1,21 +0,0 @@
-diff --speed-large-files --minimal -Nru munin-1.4.3.orig/plugins/node.d.sunos/memory.in munin-1.4.3/plugins/node.d.sunos/memory.in
---- munin-1.4.3.orig/plugins/node.d.sunos/memory.in	2009-12-30 13:55:56.000000000 +0100
-+++ munin-1.4.3/plugins/node.d.sunos/memory.in	2010-01-27 15:08:58.425391715 +0100
-@@ -17,7 +17,7 @@
- The following shows the default settings for this plugin:
- 
-   [memory]
--     env.top /usr/local/bin/top
-+     env.top /opt/csw/bin/top
- 
- You can also set warning and critical limits with these env settings:
- 
-@@ -61,7 +61,7 @@
- 
- . $MUNIN_LIBDIR/plugins/plugin.sh
- 
--TOP=${top:-/usr/local/bin/top}
-+TOP=${top:-/opt/csw/bin/top}
- 
- if [ "$1" = "autoconf" ]; then
-     if [ -x $TOP ] ; then

Added: csw/mgar/pkg/munin/trunk/files/sunos_memory.in.patch
===================================================================
--- csw/mgar/pkg/munin/trunk/files/sunos_memory.in.patch	                        (rev 0)
+++ csw/mgar/pkg/munin/trunk/files/sunos_memory.in.patch	2010-07-11 16:58:06 UTC (rev 10497)
@@ -0,0 +1,34 @@
+From fd284599a4d41b327f87750c92bbeb22935df8b6 Mon Sep 17 00:00:00 2001
+From: Juergen Arndt <ja at opencsw.org>
+Date: Sun, 11 Jul 2010 15:01:31 +0200
+Subject: [PATCH] use top from OpenCSW
+
+---
+ plugins/node.d.sunos/memory.in |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/plugins/node.d.sunos/memory.in b/plugins/node.d.sunos/memory.in
+index 7b9300e..eeabbcb 100755
+--- a/plugins/node.d.sunos/memory.in
++++ b/plugins/node.d.sunos/memory.in
+@@ -17,7 +17,7 @@ top installed.
+ The following shows the default settings for this plugin:
+ 
+   [memory]
+-     env.top /usr/local/bin/top
++     env.top /opt/csw/bin/top
+ 
+ You can also set warning and critical limits with these env settings:
+ 
+@@ -61,7 +61,7 @@ Fixme: Using kstat would be much better
+ 
+ . $MUNIN_LIBDIR/plugins/plugin.sh
+ 
+-TOP=${top:-/usr/local/bin/top}
++TOP=${top:-/opt/csw/bin/top}
+ 
+ if [ "$1" = "autoconf" ]; then
+     if [ -x $TOP ] ; then
+-- 
+1.7.1
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From rthurner at users.sourceforge.net  Sun Jul 11 20:00:17 2010
From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net)
Date: Sun, 11 Jul 2010 18:00:17 +0000
Subject: [csw-devel] SF.net SVN: gar:[10498]
	csw/mgar/pkg/subversion/trunk/Makefile
Message-ID: <E1OY0p7-0004Nz-Gi@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 10498
          http://gar.svn.sourceforge.net/gar/?rev=10498&view=rev
Author:   rthurner
Date:     2010-07-11 18:00:17 +0000 (Sun, 11 Jul 2010)

Log Message:
-----------
subversion: checkpkg toggle left, toggle right continues ...

Modified Paths:
--------------
    csw/mgar/pkg/subversion/trunk/Makefile

Modified: csw/mgar/pkg/subversion/trunk/Makefile
===================================================================
--- csw/mgar/pkg/subversion/trunk/Makefile	2010-07-11 16:58:06 UTC (rev 10497)
+++ csw/mgar/pkg/subversion/trunk/Makefile	2010-07-11 18:00:17 UTC (rev 10498)
@@ -83,6 +83,13 @@
 
 SPKG_DESC_CSWjavasvn       = Subversion Java Language Binding
 CATALOGNAME_CSWjavasvn     = javasvn
+RUNTIME_DEP_PKGS_CSWjavasvn += CSWexpat
+RUNTIME_DEP_PKGS_CSWjavasvn += CSWsvn
+RUNTIME_DEP_PKGS_CSWjavasvn += CSWiconv
+RUNTIME_DEP_PKGS_CSWjavasvn += CSWapache2rt
+RUNTIME_DEP_PKGS_CSWjavasvn += CSWggettextrt
+RUNTIME_DEP_PKGS_CSWjavasvn += CSWneon
+RUNTIME_DEP_PKGS_CSWjavasvn += CSWoldaprt
 PKGFILES_CSWjavasvn        = $(SVNLIB)/.*java.*
 PKGFILES_CSWjavasvn       += $(docdir)/$(CATALOGNAME_CSWjavasvn)/changelog.CSW
 
@@ -95,12 +102,26 @@
 
 SPKG_DESC_CSWrbsvn         = Subversion Ruby Language Binding
 CATALOGNAME_CSWrbsvn       = rbsvn
+RUNTIME_DEP_PKGS_CSWrbsvn += CSWggettextrt
+RUNTIME_DEP_PKGS_CSWrbsvn += CSWsvn
+RUNTIME_DEP_PKGS_CSWrbsvn += CSWiconv
+RUNTIME_DEP_PKGS_CSWrbsvn += CSWapache2rt
+RUNTIME_DEP_PKGS_CSWrbsvn += CSWruby
+RUNTIME_DEP_PKGS_CSWrbsvn += CSWoldaprt
+RUNTIME_DEP_PKGS_CSWrbsvn += CSWexpat
 PKGFILES_CSWrbsvn          = $(libdir)/ruby.*
 PKGFILES_CSWrbsvn         += $(SVNLIB)/.*swig_ruby.*
 PKGFILES_CSWrbsvn         += $(docdir)/$(CATALOGNAME_CSWrbsvn)/changelog.CSW
 
 SPKG_DESC_CSWpythonsvn       = Subversion Python Language Binding
 CATALOGNAME_CSWpythonsvn     = pythonsvn
+RUNTIME_DEP_PKGS_CSWpythonsvn += CSWexpat
+RUNTIME_DEP_PKGS_CSWpythonsvn += CSWpython
+RUNTIME_DEP_PKGS_CSWpythonsvn += CSWsvn
+RUNTIME_DEP_PKGS_CSWpythonsvn += CSWiconv
+RUNTIME_DEP_PKGS_CSWpythonsvn += CSWapache2rt
+RUNTIME_DEP_PKGS_CSWpythonsvn += CSWggettextrt
+RUNTIME_DEP_PKGS_CSWpythonsvn += CSWoldaprt
 PKGFILES_CSWpythonsvn        = $(libdir)/python.*
 PKGFILES_CSWpythonsvn       += $(SVNLIB)/.*swig_py.*
 PKGFILES_CSWpythonsvn       += $(docdir)/$(CATALOGNAME_CSWpythonsvn)/changelog.CSW


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 Jul 12 04:55:30 2010
From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net)
Date: Mon, 12 Jul 2010 02:55:30 +0000
Subject: [csw-devel] SF.net SVN: gar:[10499]
	csw/mgar/pkg/subversion/trunk/Makefile
Message-ID: <E1OY9B4-0005dV-3a@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 10499
          http://gar.svn.sourceforge.net/gar/?rev=10499&view=rev
Author:   rthurner
Date:     2010-07-12 02:55:29 +0000 (Mon, 12 Jul 2010)

Log Message:
-----------
subversion: toggle checkpkg exceptions again

Modified Paths:
--------------
    csw/mgar/pkg/subversion/trunk/Makefile

Modified: csw/mgar/pkg/subversion/trunk/Makefile
===================================================================
--- csw/mgar/pkg/subversion/trunk/Makefile	2010-07-11 18:00:17 UTC (rev 10498)
+++ csw/mgar/pkg/subversion/trunk/Makefile	2010-07-12 02:55:29 UTC (rev 10499)
@@ -42,11 +42,7 @@
 PACKAGES += CSWsvn-contrib CSWsvn-tools
 
 SPKG_DESC_CSWsvn           = Version control rethought
-SPKG_DESC_CSWsvn-tools     = Additional subversion tools
-SPKG_DESC_CSWsvn-contrib   = Contributed subversion scripts
 CATALOGNAME_CSWsvn         = subversion
-CATALOGNAME_CSWsvn-contrib = subversion_contrib
-CATALOGNAME_CSWsvn-tools   = subversion_tools
 RUNTIME_DEP_PKGS_CSWsvn      = CSWbdb48
 RUNTIME_DEP_PKGS_CSWsvn      += CSWexpat
 RUNTIME_DEP_PKGS_CSWsvn      += CSWggettextrt
@@ -65,11 +61,18 @@
 PKGFILES_CSWsvn-devel     += $(docdir)/$(CATALOGNAME_CSWsvn-devel)/changelog.CSW
 CHECKPKG_OVERRIDES_CSWsvn-devel += archall-devel-package
 
-
+SPKG_DESC_CSWsvn-contrib   = Contributed subversion scripts
+CATALOGNAME_CSWsvn-contrib = subversion_contrib
 PKGFILES_CSWsvn-contrib    = $(docdir)/subversion/contrib.*
 ARCHALL_CSWsvn-contrib     = 1
 
+SPKG_DESC_CSWsvn-tools     = Additional subversion tools
+CATALOGNAME_CSWsvn-tools   = subversion_tools
 PKGFILES_CSWsvn-tools      = $(docdir)/subversion/tools.*
+CHECKPKG_OVERRIDES_CSWsvn-tools += missing-dependency|CSWperl
+CHECKPKG_OVERRIDES_CSWsvn-tools += missing-dependency|CSWruby
+CHECKPKG_OVERRIDES_CSWsvn-tools += missing-dependency|CSWpython
+CHECKPKG_OVERRIDES_CSWsvn-tools += missing-dependency|CSWemacscommon
 ARCHALL_CSWsvn-tools       = 1
 
 SPKG_DESC_CSWap2svn        = Subversion Modules for Apache 2.2
@@ -83,18 +86,24 @@
 
 SPKG_DESC_CSWjavasvn       = Subversion Java Language Binding
 CATALOGNAME_CSWjavasvn     = javasvn
-RUNTIME_DEP_PKGS_CSWjavasvn += CSWexpat
 RUNTIME_DEP_PKGS_CSWjavasvn += CSWsvn
-RUNTIME_DEP_PKGS_CSWjavasvn += CSWiconv
-RUNTIME_DEP_PKGS_CSWjavasvn += CSWapache2rt
-RUNTIME_DEP_PKGS_CSWjavasvn += CSWggettextrt
-RUNTIME_DEP_PKGS_CSWjavasvn += CSWneon
-RUNTIME_DEP_PKGS_CSWjavasvn += CSWoldaprt
+CHECKPKG_OVERRIDES_CSWjavasvn += missing-dependency|CSWexpat
+CHECKPKG_OVERRIDES_CSWjavasvn += missing-dependency|CSWiconv
+CHECKPKG_OVERRIDES_CSWjavasvn += missing-dependency|CSWapache2rt
+CHECKPKG_OVERRIDES_CSWjavasvn += missing-dependency|CSWggettextrt
+CHECKPKG_OVERRIDES_CSWjavasvn += missing-dependency|CSWneon
+CHECKPKG_OVERRIDES_CSWjavasvn += missing-dependency|CSWoldaprt
 PKGFILES_CSWjavasvn        = $(SVNLIB)/.*java.*
 PKGFILES_CSWjavasvn       += $(docdir)/$(CATALOGNAME_CSWjavasvn)/changelog.CSW
 
 SPKG_DESC_CSWpmsvn         = Subversion Perl Language Binding
 CATALOGNAME_CSWpmsvn       = pm_subversion
+RUNTIME_DEP_PKGS_CSWpmsvn += CSWperl
+RUNTIME_DEP_PKGS_CSWpmsvn += CSWsvn
+CHECKPKG_OVERRIDES_CSWpmsvn += missing-dependency|CSWexpat
+CHECKPKG_OVERRIDES_CSWpmsvn += missing-dependency|CSWiconv
+CHECKPKG_OVERRIDES_CSWpmsvn += missing-dependency|CSWapache2rt
+CHECKPKG_OVERRIDES_CSWpmsvn += missing-dependency|CSWggettextrt
 PKGFILES_CSWpmsvn          = $(libdir)/perl.*
 PKGFILES_CSWpmsvn         += $(SVNLIB)/.*perl.*
 PKGFILES_CSWpmsvn         += $(mandir)/.*swig_perl.*
@@ -102,26 +111,26 @@
 
 SPKG_DESC_CSWrbsvn         = Subversion Ruby Language Binding
 CATALOGNAME_CSWrbsvn       = rbsvn
-RUNTIME_DEP_PKGS_CSWrbsvn += CSWggettextrt
+RUNTIME_DEP_PKGS_CSWrbsvn += CSWruby
 RUNTIME_DEP_PKGS_CSWrbsvn += CSWsvn
-RUNTIME_DEP_PKGS_CSWrbsvn += CSWiconv
-RUNTIME_DEP_PKGS_CSWrbsvn += CSWapache2rt
-RUNTIME_DEP_PKGS_CSWrbsvn += CSWruby
-RUNTIME_DEP_PKGS_CSWrbsvn += CSWoldaprt
-RUNTIME_DEP_PKGS_CSWrbsvn += CSWexpat
+CHECKPKG_OVERRIDES_CSWrbsvn += missing-dependency|CSWggettextrt
+CHECKPKG_OVERRIDES_CSWrbsvn += missing-dependency|CSWiconv
+CHECKPKG_OVERRIDES_CSWrbsvn += missing-dependency|CSWapache2rt
+CHECKPKG_OVERRIDES_CSWrbsvn += missing-dependency|CSWoldaprt
+CHECKPKG_OVERRIDES_CSWrbsvn += missing-dependency|CSWexpat
 PKGFILES_CSWrbsvn          = $(libdir)/ruby.*
 PKGFILES_CSWrbsvn         += $(SVNLIB)/.*swig_ruby.*
 PKGFILES_CSWrbsvn         += $(docdir)/$(CATALOGNAME_CSWrbsvn)/changelog.CSW
 
 SPKG_DESC_CSWpythonsvn       = Subversion Python Language Binding
 CATALOGNAME_CSWpythonsvn     = pythonsvn
-RUNTIME_DEP_PKGS_CSWpythonsvn += CSWexpat
 RUNTIME_DEP_PKGS_CSWpythonsvn += CSWpython
 RUNTIME_DEP_PKGS_CSWpythonsvn += CSWsvn
-RUNTIME_DEP_PKGS_CSWpythonsvn += CSWiconv
-RUNTIME_DEP_PKGS_CSWpythonsvn += CSWapache2rt
-RUNTIME_DEP_PKGS_CSWpythonsvn += CSWggettextrt
-RUNTIME_DEP_PKGS_CSWpythonsvn += CSWoldaprt
+CHECKPKG_OVERRIDES_CSWpythonsvn += missing-dependency|CSWexpat
+CHECKPKG_OVERRIDES_CSWpythonsvn += missing-dependency|CSWiconv
+CHECKPKG_OVERRIDES_CSWpythonsvn += missing-dependency|CSWapache2rt
+CHECKPKG_OVERRIDES_CSWpythonsvn += missing-dependency|CSWggettextrt
+CHECKPKG_OVERRIDES_CSWpythonsvn += missing-dependency|CSWoldaprt
 PKGFILES_CSWpythonsvn        = $(libdir)/python.*
 PKGFILES_CSWpythonsvn       += $(SVNLIB)/.*swig_py.*
 PKGFILES_CSWpythonsvn       += $(docdir)/$(CATALOGNAME_CSWpythonsvn)/changelog.CSW


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 Jul 12 05:27:29 2010
From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net)
Date: Mon, 12 Jul 2010 03:27:29 +0000
Subject: [csw-devel] SF.net SVN: gar:[10500]
	csw/mgar/pkg/subversion/trunk/Makefile
Message-ID: <E1OY9g1-0006i7-Rx@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 10500
          http://gar.svn.sourceforge.net/gar/?rev=10500&view=rev
Author:   rthurner
Date:     2010-07-12 03:27:29 +0000 (Mon, 12 Jul 2010)

Log Message:
-----------
subversion: arggghhhh .... checkpkg again. gmake reinstall remerge repackage gives a different result than gmake platforms

Modified Paths:
--------------
    csw/mgar/pkg/subversion/trunk/Makefile

Modified: csw/mgar/pkg/subversion/trunk/Makefile
===================================================================
--- csw/mgar/pkg/subversion/trunk/Makefile	2010-07-12 02:55:29 UTC (rev 10499)
+++ csw/mgar/pkg/subversion/trunk/Makefile	2010-07-12 03:27:29 UTC (rev 10500)
@@ -72,7 +72,6 @@
 CHECKPKG_OVERRIDES_CSWsvn-tools += missing-dependency|CSWperl
 CHECKPKG_OVERRIDES_CSWsvn-tools += missing-dependency|CSWruby
 CHECKPKG_OVERRIDES_CSWsvn-tools += missing-dependency|CSWpython
-CHECKPKG_OVERRIDES_CSWsvn-tools += missing-dependency|CSWemacscommon
 ARCHALL_CSWsvn-tools       = 1
 
 SPKG_DESC_CSWap2svn        = Subversion Modules for Apache 2.2
@@ -87,12 +86,6 @@
 SPKG_DESC_CSWjavasvn       = Subversion Java Language Binding
 CATALOGNAME_CSWjavasvn     = javasvn
 RUNTIME_DEP_PKGS_CSWjavasvn += CSWsvn
-CHECKPKG_OVERRIDES_CSWjavasvn += missing-dependency|CSWexpat
-CHECKPKG_OVERRIDES_CSWjavasvn += missing-dependency|CSWiconv
-CHECKPKG_OVERRIDES_CSWjavasvn += missing-dependency|CSWapache2rt
-CHECKPKG_OVERRIDES_CSWjavasvn += missing-dependency|CSWggettextrt
-CHECKPKG_OVERRIDES_CSWjavasvn += missing-dependency|CSWneon
-CHECKPKG_OVERRIDES_CSWjavasvn += missing-dependency|CSWoldaprt
 PKGFILES_CSWjavasvn        = $(SVNLIB)/.*java.*
 PKGFILES_CSWjavasvn       += $(docdir)/$(CATALOGNAME_CSWjavasvn)/changelog.CSW
 
@@ -101,9 +94,7 @@
 RUNTIME_DEP_PKGS_CSWpmsvn += CSWperl
 RUNTIME_DEP_PKGS_CSWpmsvn += CSWsvn
 CHECKPKG_OVERRIDES_CSWpmsvn += missing-dependency|CSWexpat
-CHECKPKG_OVERRIDES_CSWpmsvn += missing-dependency|CSWiconv
 CHECKPKG_OVERRIDES_CSWpmsvn += missing-dependency|CSWapache2rt
-CHECKPKG_OVERRIDES_CSWpmsvn += missing-dependency|CSWggettextrt
 PKGFILES_CSWpmsvn          = $(libdir)/perl.*
 PKGFILES_CSWpmsvn         += $(SVNLIB)/.*perl.*
 PKGFILES_CSWpmsvn         += $(mandir)/.*swig_perl.*
@@ -113,11 +104,8 @@
 CATALOGNAME_CSWrbsvn       = rbsvn
 RUNTIME_DEP_PKGS_CSWrbsvn += CSWruby
 RUNTIME_DEP_PKGS_CSWrbsvn += CSWsvn
-CHECKPKG_OVERRIDES_CSWrbsvn += missing-dependency|CSWggettextrt
 CHECKPKG_OVERRIDES_CSWrbsvn += missing-dependency|CSWiconv
-CHECKPKG_OVERRIDES_CSWrbsvn += missing-dependency|CSWapache2rt
 CHECKPKG_OVERRIDES_CSWrbsvn += missing-dependency|CSWoldaprt
-CHECKPKG_OVERRIDES_CSWrbsvn += missing-dependency|CSWexpat
 PKGFILES_CSWrbsvn          = $(libdir)/ruby.*
 PKGFILES_CSWrbsvn         += $(SVNLIB)/.*swig_ruby.*
 PKGFILES_CSWrbsvn         += $(docdir)/$(CATALOGNAME_CSWrbsvn)/changelog.CSW


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 Jul 12 05:35:38 2010
From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net)
Date: Mon, 12 Jul 2010 03:35:38 +0000
Subject: [csw-devel] SF.net SVN: gar:[10501]
	csw/mgar/pkg/subversion/trunk/Makefile
Message-ID: <E1OY9nu-0006ph-88@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 10501
          http://gar.svn.sourceforge.net/gar/?rev=10501&view=rev
Author:   rthurner
Date:     2010-07-12 03:35:38 +0000 (Mon, 12 Jul 2010)

Log Message:
-----------
subversion: checkpkg remove the rest ..

Modified Paths:
--------------
    csw/mgar/pkg/subversion/trunk/Makefile

Modified: csw/mgar/pkg/subversion/trunk/Makefile
===================================================================
--- csw/mgar/pkg/subversion/trunk/Makefile	2010-07-12 03:27:29 UTC (rev 10500)
+++ csw/mgar/pkg/subversion/trunk/Makefile	2010-07-12 03:35:38 UTC (rev 10501)
@@ -69,9 +69,6 @@
 SPKG_DESC_CSWsvn-tools     = Additional subversion tools
 CATALOGNAME_CSWsvn-tools   = subversion_tools
 PKGFILES_CSWsvn-tools      = $(docdir)/subversion/tools.*
-CHECKPKG_OVERRIDES_CSWsvn-tools += missing-dependency|CSWperl
-CHECKPKG_OVERRIDES_CSWsvn-tools += missing-dependency|CSWruby
-CHECKPKG_OVERRIDES_CSWsvn-tools += missing-dependency|CSWpython
 ARCHALL_CSWsvn-tools       = 1
 
 SPKG_DESC_CSWap2svn        = Subversion Modules for Apache 2.2
@@ -93,8 +90,6 @@
 CATALOGNAME_CSWpmsvn       = pm_subversion
 RUNTIME_DEP_PKGS_CSWpmsvn += CSWperl
 RUNTIME_DEP_PKGS_CSWpmsvn += CSWsvn
-CHECKPKG_OVERRIDES_CSWpmsvn += missing-dependency|CSWexpat
-CHECKPKG_OVERRIDES_CSWpmsvn += missing-dependency|CSWapache2rt
 PKGFILES_CSWpmsvn          = $(libdir)/perl.*
 PKGFILES_CSWpmsvn         += $(SVNLIB)/.*perl.*
 PKGFILES_CSWpmsvn         += $(mandir)/.*swig_perl.*
@@ -104,8 +99,6 @@
 CATALOGNAME_CSWrbsvn       = rbsvn
 RUNTIME_DEP_PKGS_CSWrbsvn += CSWruby
 RUNTIME_DEP_PKGS_CSWrbsvn += CSWsvn
-CHECKPKG_OVERRIDES_CSWrbsvn += missing-dependency|CSWiconv
-CHECKPKG_OVERRIDES_CSWrbsvn += missing-dependency|CSWoldaprt
 PKGFILES_CSWrbsvn          = $(libdir)/ruby.*
 PKGFILES_CSWrbsvn         += $(SVNLIB)/.*swig_ruby.*
 PKGFILES_CSWrbsvn         += $(docdir)/$(CATALOGNAME_CSWrbsvn)/changelog.CSW
@@ -114,11 +107,6 @@
 CATALOGNAME_CSWpythonsvn     = pythonsvn
 RUNTIME_DEP_PKGS_CSWpythonsvn += CSWpython
 RUNTIME_DEP_PKGS_CSWpythonsvn += CSWsvn
-CHECKPKG_OVERRIDES_CSWpythonsvn += missing-dependency|CSWexpat
-CHECKPKG_OVERRIDES_CSWpythonsvn += missing-dependency|CSWiconv
-CHECKPKG_OVERRIDES_CSWpythonsvn += missing-dependency|CSWapache2rt
-CHECKPKG_OVERRIDES_CSWpythonsvn += missing-dependency|CSWggettextrt
-CHECKPKG_OVERRIDES_CSWpythonsvn += missing-dependency|CSWoldaprt
 PKGFILES_CSWpythonsvn        = $(libdir)/python.*
 PKGFILES_CSWpythonsvn       += $(SVNLIB)/.*swig_py.*
 PKGFILES_CSWpythonsvn       += $(docdir)/$(CATALOGNAME_CSWpythonsvn)/changelog.CSW


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 Jul 12 05:38:59 2010
From: theferret at users.sourceforge.net (theferret at users.sourceforge.net)
Date: Mon, 12 Jul 2010 03:38:59 +0000
Subject: [csw-devel] SF.net SVN: gar:[10502] csw/mgar/pkg/xscreensaver/trunk
Message-ID: <E1OY9r9-0006sA-2F@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 10502
          http://gar.svn.sourceforge.net/gar/?rev=10502&view=rev
Author:   theferret
Date:     2010-07-12 03:38:58 +0000 (Mon, 12 Jul 2010)

Log Message:
-----------
xscreensaver: updated so it actually works now

Modified Paths:
--------------
    csw/mgar/pkg/xscreensaver/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/xscreensaver/trunk/README.pam
    csw/mgar/pkg/xscreensaver/trunk/copyright
    csw/mgar/pkg/xscreensaver/trunk/depend
    csw/mgar/pkg/xscreensaver/trunk/patchfile.preconf
    csw/mgar/pkg/xscreensaver/trunk/pkginfo
    csw/mgar/pkg/xscreensaver/trunk/prototype

Removed Paths:
-------------
    csw/mgar/pkg/xscreensaver/trunk/checksums
    csw/mgar/pkg/xscreensaver/trunk/files/

Property Changed:
----------------
    csw/mgar/pkg/xscreensaver/trunk/


Property changes on: csw/mgar/pkg/xscreensaver/trunk
___________________________________________________________________
Modified: svn:ignore
   - cookies
download
work


   + cookies
download
work
cswstage
build

Deleted: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2


Modified: csw/mgar/pkg/xscreensaver/trunk/Makefile
===================================================================
--- csw/mgar/pkg/xscreensaver/trunk/Makefile	2010-07-12 03:35:38 UTC (rev 10501)
+++ csw/mgar/pkg/xscreensaver/trunk/Makefile	2010-07-12 03:38:58 UTC (rev 10502)
@@ -1,21 +1,169 @@
-GARNAME = xscreensaver
-GARVERSION = 5.10
-CATEGORIES = utils
+# This file is from TEMPLATES/createpkg/Makefile.lib32
+# You MUST build this with gnu make, unfortunately.
+# Mainly just because of the ARCH expansion, but also for "?="
 
-DESCRIPTION = The ultimate screensaver collection
-define BLURB
-  A collection of free screen savers for X11 and MacOS.
-endef
+# Customize your prototype file(s) as needed
 
-MASTER_SITES = http://www.jwz.org/xscreensaver/
-DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
+# Organization: variable defintions up top,
+# targets in second half.
+# Note that assignments with "?=" mean "assign if not already assigned.
 
-# We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
+# Where do we keep local downloads of software src files
+ARCHIVEDIR ?= /home/src
+ARCHIVENAME ?= xscreensaver-5.11.tar.gz
+EXTRACTPROG ?= /usr/sfw/bin/gtar zfx
 
-PACKAGES = CSWxsave
-CATALOGNAME = xscreensaver
+# Only use ONE here. The name is used for compat with 'gar'.
+MASTER_SITES ?= http://www.jwz.org/xscreensaver/
 
-CONFIGURE_ARGS = $(DIRPATHS)
+ARCH := $(shell /bin/uname -p)
 
-include gar/category.mk
+LDFLAGS_COMMON :=
+
+SRCDIR= build/*
+
+# DO NOT specify the arch-64 stuff such as -m64 here.
+# the individual targets will do that.
+
+CFLAGS_COMMON   ?= -mt -xnorunpath -xO3
+CXXFLAGS_COMMON ?= -mt -norunpath  -xO3
+CFLAGS_sparc    ?= -xarch=v8
+CFLAGS_i386     ?= -xarch=386
+
+# Keep this arch-neutral if possible. add arch-specific tweaks
+# to arch-specific target
+CONFIGURE=./configure --prefix=/opt/csw --with-pam --with-gl \
+  --with-x-app-defaults=/opt/csw/lib/X11/app-defaults
+
+
+CREATEPKG=createpkg -r `pwd`/build/*/cswstage
+
+
+all:	$(ARCH)-32
+#all:	$(ARCH)-32 package
+
+# ARCH-XX handles configure, build, and stage for its own combo
+# 
+
+EXTRACTPROG ?= /bin/echo ERROR: need to set EXTRACTPROG ; exit 1 ;
+
+
+
+extract:	build/.extract.done
+
+build/.extract.done:
+	test -d build || mkdir build
+	@if test -f  $(ARCHIVEDIR)/$(ARCHIVENAME) ; then \
+		echo Extracting $(ARCHIVENAME) under build dir... ;\
+		( cd build && $(EXTRACTPROG) $(ARCHIVEDIR)/$(ARCHIVENAME) ) ; \
+	else echo Cannot extract - $(ARCHIVEDIR)/$(ARCHIVENAME) does not exist ;\
+		exit 1; \
+	fi
+	touch build/.extract.done
+	
+
+clean distclean:
+	@echo Calling $@ in $(SRCDIR)
+	$(MAKE) -C $(SRCDIR) $@
+
+
+reallyclean:	distclean
+	@echo Removing any milestone files in build as well...
+	@rm -f build/.??*
+	@echo '(However, leaving src tree intact, with any patches in it)'
+	@echo '(If you want, you could rm -r build, then make extract once more)'
+
+garchive:
+	@echo Call the fetch target instead: it does the same thing.
+
+
+# Downloads the source code to the common ARCHIVEDIR
+fetch:	$(ARCHIVEDIR)/$(ARCHIVENAME)
+	@echo fetch done
+
+$(ARCHIVEDIR)/$(ARCHIVENAME):
+	wget -P $(ARCHIVEDIR) $(MASTER_SITES)/$(ARCHIVENAME)
+
+patch:
+	@echo patch: patching is handled automatically as part of the configure phase.
+
+stage-preserved:
+	@if test -f preserve-$(ARCH).tar ; then \
+		echo Copying preserved arch-specific files; \
+		cat preserve-$(ARCH).tar |(cd $(SRCDIR)/cswstage && tar xvf -);\
+	fi
+	@if test -f preserve.tar ; then \
+		echo Copying preserved arch-neutral files; \
+		cat preserve.tar |(cd $(SRCDIR)/cswstage && tar xvf -);\
+	fi
+		
+package:	stage-preserved
+	$(CREATEPKG)
+
+
+# split out generic $(ARCH) sections to platform-specific sections if needed.
+# but it usually should not be neccessary
+
+
+$(ARCH)-32 ::   configure-$(ARCH)-32 build-$(ARCH)-32 stage-$(ARCH)-32
+	@echo Completed $(ARCH)-32 configure, build and stage
+	touch build/.$(ARCH)-32.done
+
+
+
+build/.$(ARCH)-32.done:	$(ARCH)-32
+
+# Since we share the same src tree, we should only need to
+# pre-configure patching one time for all.
+build/.patch-preconf.done:	build/.extract.done
+	if test -f patchfile.preconf ; then \
+	 gpatch -d $(SRCDIR) -p0  <patchfile.preconf ; fi
+	touch $@
+
+
+#Note: I WANT to use LDFLAGS=-R$$ORIGIN, but stupid libtool
+# wont allow it! so force it at build time
+build/.configure-$(ARCH)-32.done:	build/.patch-preconf.done
+	@echo handling $@ target
+	(cd $(SRCDIR) ; \
+	  CFLAGS="$(CFLAGS_COMMON) $(CFLAGS_$(ARCH))" \
+	  CPPFLAGS=-I/opt/csw/include \
+	  CXXFLAGS="$(CXXFLAGS_COMMON)" \
+	  LDFLAGS='-R/opt/csw/lib -L/opt/csw/lib' \
+	  $(CONFIGURE) )
+	if test -f patchfile.postconf ; then \
+	 gpatch -d $(SRCDIR) -p0  <patchfile.postconf ; fi
+	touch $@
+
+
+# See note about LDFLAGS and ORIGIN, higher up	
+build/.build-$(ARCH)-32.done:
+	@echo handling $@ target
+	LD_OPTIONS='-R$$ORIGIN' $(MAKE) -C $(SRCDIR) $(MFLAGS)
+	touch $@
+
+
+
+## NOTE: This is a DESTRUCTIVE target build!!
+## 'stagepkg'  will destroy any prior "cswstage" directory!!!
+## So, we remove all 64bit milestones
+build/.stage-$(ARCH)-32.done:
+	@echo Handling stage of $(ARCH)-32
+	(cd $(SRCDIR) ; MAKE=gmake stagepkg SHELL=/usr/xpg4/bin/sh install_prefix=`pwd`/cswstage install)
+	(cd $(SRCDIR); cp ../../README.pam cswstage/.)
+	touch $@
+
+
+
+#These are the easy-to-type targets. They just trigger the real ones.
+configure-$(ARCH)-32:	build/.configure-$(ARCH)-32.done
+	@echo $@ done
+build-$(ARCH)-32:	build/.build-$(ARCH)-32.done
+	@echo $@ done
+stage-$(ARCH)-32:	build/.stage-$(ARCH)-32.done
+	@echo $@ done
+
+# manual targets
+pkgproto:
+	cat $(SRCDIR)/cswstage/prototype | sed 's/root root$$/root bin/' | \
+	  sed "s:/opt/csw/bin/xscreensaver 4755:/opt/csw/bin/xscreensaver 4755:" >prototype

Added: csw/mgar/pkg/xscreensaver/trunk/README.pam
===================================================================
--- csw/mgar/pkg/xscreensaver/trunk/README.pam	                        (rev 0)
+++ csw/mgar/pkg/xscreensaver/trunk/README.pam	2010-07-12 03:38:58 UTC (rev 10502)
@@ -0,0 +1,16 @@
+xscreensaver will complain about pam "possibly" not working because
+/etc/pam.conf has not been modified.
+I am leery to modify people's pam.conf files. but if you want to add
+it yourself, it expects the following in there:
+
+        xscreensaver    auth requisite          pam_authtok_get.so.1
+        xscreensaver    auth required           pam_dhkeys.so.1
+        xscreensaver    auth required           pam_unix_auth.so.1
+        xscreensaver    auth required           pam_dial_auth.so.1
+
+For Solaris 10, I believe it should be
+        xscreensaver    auth requisite          pam_authtok_get.so.1
+        xscreensaver    auth required           pam_dhkeys.so.1
+        xscreensaver    auth required           pam_unix_cred.so.1
+        xscreensaver    auth required           pam_unix_auth.so.1
+        xscreensaver    auth required           pam_dial_auth.so.1

Deleted: csw/mgar/pkg/xscreensaver/trunk/checksums
===================================================================
--- csw/mgar/pkg/xscreensaver/trunk/checksums	2010-07-12 03:35:38 UTC (rev 10501)
+++ csw/mgar/pkg/xscreensaver/trunk/checksums	2010-07-12 03:38:58 UTC (rev 10502)
@@ -1 +0,0 @@
-0d7205f9da8e3f1b83bcda549d73a7c4  xscreensaver-5.10.tar.gz

Added: csw/mgar/pkg/xscreensaver/trunk/copyright
===================================================================
--- csw/mgar/pkg/xscreensaver/trunk/copyright	                        (rev 0)
+++ csw/mgar/pkg/xscreensaver/trunk/copyright	2010-07-12 03:38:58 UTC (rev 10502)
@@ -0,0 +1,12 @@
+
+[Copyright held by assorted authors, but all have given rights to
+ redistribute along the following lines...
+
+ * 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.  No representations are made about the suitability of this
+ * software for any purpose.  It is provided "as is" without express or
+ * implied warranty.
+]

Added: csw/mgar/pkg/xscreensaver/trunk/depend
===================================================================
--- csw/mgar/pkg/xscreensaver/trunk/depend	                        (rev 0)
+++ csw/mgar/pkg/xscreensaver/trunk/depend	2010-07-12 03:38:58 UTC (rev 10502)
@@ -0,0 +1,16 @@
+P	CSWfconfig
+P	CSWftype2
+P	CSWggettextrt
+P	CSWglib2
+P	CSWgtk2
+P	CSWjpeg
+P	CSWkrb5lib
+P	CSWlibatk
+P	CSWlibcairo
+P	CSWlibglade2
+P	CSWlibxml2
+P	CSWmesa
+P	CSWpango
+P	CSWxpm
+P	CSWperl
+P	CSWfortune

Added: csw/mgar/pkg/xscreensaver/trunk/patchfile.preconf
===================================================================
--- csw/mgar/pkg/xscreensaver/trunk/patchfile.preconf	                        (rev 0)
+++ csw/mgar/pkg/xscreensaver/trunk/patchfile.preconf	2010-07-12 03:38:58 UTC (rev 10502)
@@ -0,0 +1,88 @@
+diff --git hacks/asm6502.c hacks/asm6502.c
+index 90eed8d..5abe243 100644
+--- hacks/asm6502.c
++++ hacks/asm6502.c
+@@ -22,6 +22,8 @@
+ 
+ #define NDEBUG  /* Uncomment when done with debugging */
+ 
++#include "../config.h"
++
+ #include <stdlib.h>
+ #include <stdio.h>
+ /*#include <malloc.h>*/
+@@ -31,7 +33,12 @@
+ #include <assert.h>
+ #include <ctype.h>
+ #include <math.h>
++#ifdef HAVE_STDINT_H
+ #include <stdint.h>
++#endif
++#ifdef HAVE_INTTYPES_H
++#include <inttypes.h>
++#endif
+ #include <unistd.h>
+ 
+ #include "asm6502.h"
+diff --git hacks/fireworkx.c hacks/fireworkx.c
+index e0cfeee..687f7e2 100644
+--- hacks/fireworkx.c
++++ hacks/fireworkx.c
+@@ -28,6 +28,10 @@
+  */
+ 
+ #include <math.h>
++#ifdef __sun
++#define sqrtf(x) __sqrtf(x)
++#endif
++
+ #include "screenhack.h"
+ 
+ #define FWXVERSION "1.6"
+diff --git hacks/m6502.c hacks/m6502.c
+index 705af37..4f943bc 100644
+--- hacks/m6502.c
++++ hacks/m6502.c
+@@ -12,7 +12,14 @@
+  * Created: 07-May-2007 
+  */
+ 
+-#include <stdint.h> 
++#include "../config.h"
++#ifdef HAVE_STDINT_H
++#include <stdint.h>
++#endif
++#ifdef HAVE_INTTYPES_H
++#include <inttypes.h>
++#endif
++
+ #include <string.h>
+ #include "screenhack.h"
+ #include "analogtv.h"
+--- hacks/glx/glcells.c.orig	Fri Jul  9 18:55:25 2010
++++ hacks/glx/glcells.c	Fri Jul  9 18:57:16 2010
+@@ -28,6 +28,9 @@
+ 
+ #include "xlockmore.h"
+ #include <math.h>
++#ifdef __sun
++#define expf(f) __expf(f)
++#endif
+ 
+ /**********************************
+   DEFINES
+diff --git configure configure
+index e1e0f54..8cdefa0 100755
+--- configure
++++ configure
+@@ -17084,6 +17084,10 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ fi
+ rm -rf conftest*
+ 
++echo CSW FORCING have_mesa_gl=no
++have_mesa_gl=no
++ac_cv_have_mesa_gl=no
++
+   CPPFLAGS="$ac_save_CPPFLAGS"
+        fi
+ fi

Added: csw/mgar/pkg/xscreensaver/trunk/pkginfo
===================================================================
--- csw/mgar/pkg/xscreensaver/trunk/pkginfo	                        (rev 0)
+++ csw/mgar/pkg/xscreensaver/trunk/pkginfo	2010-07-12 03:38:58 UTC (rev 10502)
@@ -0,0 +1,8 @@
+PKG=CSWxsave
+NAME=xscreensaver - the ultimate screensaver collection
+VERSION=5.11,REV=YYYY.MM.DD
+CATEGORY=application
+VENDOR=http://www.jwz.org/xscreensaver/download.html packaged for CSW by Philip Brown
+HOTLINE=http://www.opencsw.org/bugtrack/
+EMAIL=phil at opencsw.org
+OPENCSW_REPOSITORY=https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/pkg/xscreensaver/trunk

Added: csw/mgar/pkg/xscreensaver/trunk/prototype
===================================================================
--- csw/mgar/pkg/xscreensaver/trunk/prototype	                        (rev 0)
+++ csw/mgar/pkg/xscreensaver/trunk/prototype	2010-07-12 03:38:58 UTC (rev 10502)
@@ -0,0 +1,703 @@
+i pkginfo
+i copyright
+i depend
+d none /opt/csw/libexec 0755 root bin
+d none /opt/csw/libexec/xscreensaver 0755 root bin
+f none /opt/csw/libexec/xscreensaver/bubble3d 0755 root bin
+f none /opt/csw/libexec/xscreensaver/fadeplot 0755 root bin
+f none /opt/csw/libexec/xscreensaver/glslideshow 0755 root bin
+f none /opt/csw/libexec/xscreensaver/attraction 0755 root bin
+f none /opt/csw/libexec/xscreensaver/endgame 0755 root bin
+f none /opt/csw/libexec/xscreensaver/blocktube 0755 root bin
+f none /opt/csw/libexec/xscreensaver/bouncingcow 0755 root bin
+f none /opt/csw/libexec/xscreensaver/fontglide 0755 root bin
+f none /opt/csw/libexec/xscreensaver/superquadrics 0755 root bin
+f none /opt/csw/libexec/xscreensaver/euler2d 0755 root bin
+f none /opt/csw/libexec/xscreensaver/starfish 0755 root bin
+f none /opt/csw/libexec/xscreensaver/flipflop 0755 root bin
+f none /opt/csw/libexec/xscreensaver/glblur 0755 root bin
+f none /opt/csw/libexec/xscreensaver/compass 0755 root bin
+f none /opt/csw/libexec/xscreensaver/pulsar 0755 root bin
+f none /opt/csw/libexec/xscreensaver/abstractile 0755 root bin
+f none /opt/csw/libexec/xscreensaver/apollonian 0755 root bin
+f none /opt/csw/libexec/xscreensaver/anemone 0755 root bin
+f none /opt/csw/libexec/xscreensaver/julia 0755 root bin
+f none /opt/csw/libexec/xscreensaver/glschool 0755 root bin
+f none /opt/csw/libexec/xscreensaver/providence 0755 root bin
+f none /opt/csw/libexec/xscreensaver/celtic 0755 root bin
+f none /opt/csw/libexec/xscreensaver/pacman 0755 root bin
+f none /opt/csw/libexec/xscreensaver/rd-bomb 0755 root bin
+f none /opt/csw/libexec/xscreensaver/fuzzyflakes 0755 root bin
+f none /opt/csw/libexec/xscreensaver/substrate 0755 root bin
+f none /opt/csw/libexec/xscreensaver/drift 0755 root bin
+f none /opt/csw/libexec/xscreensaver/glplanet 0755 root bin
+f none /opt/csw/libexec/xscreensaver/strange 0755 root bin
+f none /opt/csw/libexec/xscreensaver/rubik 0755 root bin
+f none /opt/csw/libexec/xscreensaver/loop 0755 root bin
+f none /opt/csw/libexec/xscreensaver/lcdscrub 0755 root bin
+f none /opt/csw/libexec/xscreensaver/flame 0755 root bin
+f none /opt/csw/libexec/xscreensaver/morph3d 0755 root bin
+f none /opt/csw/libexec/xscreensaver/wormhole 0755 root bin
+f none /opt/csw/libexec/xscreensaver/xspirograph 0755 root bin
+f none /opt/csw/libexec/xscreensaver/rotzoomer 0755 root bin
+f none /opt/csw/libexec/xscreensaver/triangle 0755 root bin
+f none /opt/csw/libexec/xscreensaver/xflame 0755 root bin
+f none /opt/csw/libexec/xscreensaver/xrayswarm 0755 root bin
+f none /opt/csw/libexec/xscreensaver/cynosure 0755 root bin
+f none /opt/csw/libexec/xscreensaver/intermomentary 0755 root bin
+f none /opt/csw/libexec/xscreensaver/queens 0755 root bin
+f none /opt/csw/libexec/xscreensaver/xlyap 0755 root bin
+f none /opt/csw/libexec/xscreensaver/ljlatest 0755 root bin
+f none /opt/csw/libexec/xscreensaver/interference 0755 root bin
+f none /opt/csw/libexec/xscreensaver/jigglypuff 0755 root bin
+f none /opt/csw/libexec/xscreensaver/gltext 0755 root bin
+f none /opt/csw/libexec/xscreensaver/braid 0755 root bin
+f none /opt/csw/libexec/xscreensaver/popsquares 0755 root bin
+f none /opt/csw/libexec/xscreensaver/engine 0755 root bin
+f none /opt/csw/libexec/xscreensaver/surfaces 0755 root bin
+f none /opt/csw/libexec/xscreensaver/sonar 0755 root bin
+f none /opt/csw/libexec/xscreensaver/dangerball 0755 root bin
+f none /opt/csw/libexec/xscreensaver/polyominoes 0755 root bin
+f none /opt/csw/libexec/xscreensaver/atlantis 0755 root bin
+f none /opt/csw/libexec/xscreensaver/glknots 0755 root bin
+f none /opt/csw/libexec/xscreensaver/barcode 0755 root bin
+f none /opt/csw/libexec/xscreensaver/deluxe 0755 root bin
+f none /opt/csw/libexec/xscreensaver/whirlwindwarp 0755 root bin
+f none /opt/csw/libexec/xscreensaver/crystal 0755 root bin
+f none /opt/csw/libexec/xscreensaver/epicycle 0755 root bin
+f none /opt/csw/libexec/xscreensaver/sierpinski3d 0755 root bin
+f none /opt/csw/libexec/xscreensaver/noseguy 0755 root bin
+f none /opt/csw/libexec/xscreensaver/klein 0755 root bin
+f none /opt/csw/libexec/xscreensaver/fliptext 0755 root bin
+f none /opt/csw/libexec/xscreensaver/cube21 0755 root bin
+f none /opt/csw/libexec/xscreensaver/slidescreen 0755 root bin
+f none /opt/csw/libexec/xscreensaver/mountain 0755 root bin
+f none /opt/csw/libexec/xscreensaver/cwaves 0755 root bin
+f none /opt/csw/libexec/xscreensaver/flipscreen3d 0755 root bin
+f none /opt/csw/libexec/xscreensaver/lockward 0755 root bin
+f none /opt/csw/libexec/xscreensaver/gears 0755 root bin
+f none /opt/csw/libexec/xscreensaver/gflux 0755 root bin
+f none /opt/csw/libexec/xscreensaver/menger 0755 root bin
+f none /opt/csw/libexec/xscreensaver/pedal 0755 root bin
+f none /opt/csw/libexec/xscreensaver/blinkbox 0755 root bin
+f none /opt/csw/libexec/xscreensaver/phosphor 0755 root bin
+f none /opt/csw/libexec/xscreensaver/bouboule 0755 root bin
+f none /opt/csw/libexec/xscreensaver/wander 0755 root bin
+f none /opt/csw/libexec/xscreensaver/sproingies 0755 root bin
+f none /opt/csw/libexec/xscreensaver/discrete 0755 root bin
+f none /opt/csw/libexec/xscreensaver/decayscreen 0755 root bin
+f none /opt/csw/libexec/xscreensaver/moebius 0755 root bin
+f none /opt/csw/libexec/xscreensaver/topblock 0755 root bin
+f none /opt/csw/libexec/xscreensaver/pinion 0755 root bin
+f none /opt/csw/libexec/xscreensaver/tangram 0755 root bin
+f none /opt/csw/libexec/xscreensaver/hypnowheel 0755 root bin
+f none /opt/csw/libexec/xscreensaver/distort 0755 root bin
+f none /opt/csw/libexec/xscreensaver/grav 0755 root bin
+f none /opt/csw/libexec/xscreensaver/speedmine 0755 root bin
+f none /opt/csw/libexec/xscreensaver/zoom 0755 root bin
+f none /opt/csw/libexec/xscreensaver/metaballs 0755 root bin
+f none /opt/csw/libexec/xscreensaver/xanalogtv 0755 root bin
+f none /opt/csw/libexec/xscreensaver/boxfit 0755 root bin
+f none /opt/csw/libexec/xscreensaver/kaleidescope 0755 root bin
+f none /opt/csw/libexec/xscreensaver/crackberg 0755 root bin
+f none /opt/csw/libexec/xscreensaver/voronoi 0755 root bin
+f none /opt/csw/libexec/xscreensaver/qix 0755 root bin
+f none /opt/csw/libexec/xscreensaver/piecewise 0755 root bin
+f none /opt/csw/libexec/xscreensaver/moebiusgears 0755 root bin
+f none /opt/csw/libexec/xscreensaver/glhanoi 0755 root bin
+f none /opt/csw/libexec/xscreensaver/swirl 0755 root bin
+f none /opt/csw/libexec/xscreensaver/cubestorm 0755 root bin
+f none /opt/csw/libexec/xscreensaver/halftone 0755 root bin
+f none /opt/csw/libexec/xscreensaver/gleidescope 0755 root bin
+f none /opt/csw/libexec/xscreensaver/spheremonics 0755 root bin
+f none /opt/csw/libexec/xscreensaver/polytopes 0755 root bin
+f none /opt/csw/libexec/xscreensaver/cloudlife 0755 root bin
+f none /opt/csw/libexec/xscreensaver/flow 0755 root bin
+f none /opt/csw/libexec/xscreensaver/timetunnel 0755 root bin
+f none /opt/csw/libexec/xscreensaver/cubicgrid 0755 root bin
+f none /opt/csw/libexec/xscreensaver/boing 0755 root bin
+f none /opt/csw/libexec/xscreensaver/sierpinski 0755 root bin
+f none /opt/csw/libexec/xscreensaver/coral 0755 root bin
+f none /opt/csw/libexec/xscreensaver/twang 0755 root bin
+f none /opt/csw/libexec/xscreensaver/sballs 0755 root bin
+f none /opt/csw/libexec/xscreensaver/bumps 0755 root bin
+f none /opt/csw/libexec/xscreensaver/pyro 0755 root bin
+f none /opt/csw/libexec/xscreensaver/munch 0755 root bin
+f none /opt/csw/libexec/xscreensaver/carousel 0755 root bin
+f none /opt/csw/libexec/xscreensaver/ifs 0755 root bin
+f none /opt/csw/libexec/xscreensaver/moire2 0755 root bin
+f none /opt/csw/libexec/xscreensaver/deco 0755 root bin
+f none /opt/csw/libexec/xscreensaver/petri 0755 root bin
+f none /opt/csw/libexec/xscreensaver/vermiculate 0755 root bin
+f none /opt/csw/libexec/xscreensaver/pipes 0755 root bin
+f none /opt/csw/libexec/xscreensaver/penetrate 0755 root bin
+f none /opt/csw/libexec/xscreensaver/rocks 0755 root bin
+f none /opt/csw/libexec/xscreensaver/starwars 0755 root bin
+f none /opt/csw/libexec/xscreensaver/memscroller 0755 root bin
+f none /opt/csw/libexec/xscreensaver/atunnel 0755 root bin
+f none /opt/csw/libexec/xscreensaver/mirrorblob 0755 root bin
+f none /opt/csw/libexec/xscreensaver/jigsaw 0755 root bin
+f none /opt/csw/libexec/xscreensaver/rubikblocks 0755 root bin
+f none /opt/csw/libexec/xscreensaver/blitspin 0755 root bin
+f none /opt/csw/libexec/xscreensaver/glsnake 0755 root bin
+f none /opt/csw/libexec/xscreensaver/interaggregate 0755 root bin
+f none /opt/csw/libexec/xscreensaver/glcells 0755 root bin
+f none /opt/csw/libexec/xscreensaver/antspotlight 0755 root bin
+f none /opt/csw/libexec/xscreensaver/imsmap 0755 root bin
+f none /opt/csw/libexec/xscreensaver/maze 0755 root bin
+f none /opt/csw/libexec/xscreensaver/flyingtoasters 0755 root bin
+f none /opt/csw/libexec/xscreensaver/ccurve 0755 root bin
+f none /opt/csw/libexec/xscreensaver/vidwhacker 0755 root bin
+f none /opt/csw/libexec/xscreensaver/squiral 0755 root bin
+f none /opt/csw/libexec/xscreensaver/nerverot 0755 root bin
+f none /opt/csw/libexec/xscreensaver/cage 0755 root bin
+f none /opt/csw/libexec/xscreensaver/penrose 0755 root bin
+f none /opt/csw/libexec/xscreensaver/photopile 0755 root bin
+f none /opt/csw/libexec/xscreensaver/moire 0755 root bin
+f none /opt/csw/libexec/xscreensaver/antinspect 0755 root bin
+f none /opt/csw/libexec/xscreensaver/cubenetic 0755 root bin
+f none /opt/csw/libexec/xscreensaver/galaxy 0755 root bin
+f none /opt/csw/libexec/xscreensaver/stairs 0755 root bin
+f none /opt/csw/libexec/xscreensaver/kumppa 0755 root bin
+f none /opt/csw/libexec/xscreensaver/ripples 0755 root bin
+f none /opt/csw/libexec/xscreensaver/hypertorus 0755 root bin
+f none /opt/csw/libexec/xscreensaver/truchet 0755 root bin
+f none /opt/csw/libexec/xscreensaver/lament 0755 root bin
+f none /opt/csw/libexec/xscreensaver/fiberlamp 0755 root bin
+f none /opt/csw/libexec/xscreensaver/bsod 0755 root bin
+f none /opt/csw/libexec/xscreensaver/circuit 0755 root bin
+f none /opt/csw/libexec/xscreensaver/flurry 0755 root bin
+f none /opt/csw/libexec/xscreensaver/xjack 0755 root bin
+f none /opt/csw/libexec/xscreensaver/molecule 0755 root bin
+f none /opt/csw/libexec/xscreensaver/fireworkx 0755 root bin
+f none /opt/csw/libexec/xscreensaver/juggler3d 0755 root bin
+f none /opt/csw/libexec/xscreensaver/webcollage-helper 0755 root bin
+f none /opt/csw/libexec/xscreensaver/rorschach 0755 root bin
+f none /opt/csw/libexec/xscreensaver/boxed 0755 root bin
+f none /opt/csw/libexec/xscreensaver/thornbird 0755 root bin
+f none /opt/csw/libexec/xscreensaver/lavalite 0755 root bin
+f none /opt/csw/libexec/xscreensaver/xmatrix 0755 root bin
+f none /opt/csw/libexec/xscreensaver/halo 0755 root bin
+f none /opt/csw/libexec/xscreensaver/hopalong 0755 root bin
+f none /opt/csw/libexec/xscreensaver/antmaze 0755 root bin
+f none /opt/csw/libexec/xscreensaver/apple2 0755 root bin
+f none /opt/csw/libexec/xscreensaver/blaster 0755 root bin
+f none /opt/csw/libexec/xscreensaver/m6502 0755 root bin
+f none /opt/csw/libexec/xscreensaver/eruption 0755 root bin
+f none /opt/csw/libexec/xscreensaver/polyhedra 0755 root bin
+f none /opt/csw/libexec/xscreensaver/spotlight 0755 root bin
+f none /opt/csw/libexec/xscreensaver/helix 0755 root bin
+f none /opt/csw/libexec/xscreensaver/slip 0755 root bin
+f none /opt/csw/libexec/xscreensaver/shadebobs 0755 root bin
+f none /opt/csw/libexec/xscreensaver/webcollage 0755 root bin
+f none /opt/csw/libexec/xscreensaver/glmatrix 0755 root bin
+f none /opt/csw/libexec/xscreensaver/pong 0755 root bin
+f none /opt/csw/libexec/xscreensaver/skytentacles 0755 root bin
+f none /opt/csw/libexec/xscreensaver/fluidballs 0755 root bin
+f none /opt/csw/libexec/xscreensaver/stonerview 0755 root bin
+f none /opt/csw/libexec/xscreensaver/goop 0755 root bin
+f none /opt/csw/libexec/xscreensaver/demon 0755 root bin
+f none /opt/csw/libexec/xscreensaver/noof 0755 root bin
+f none /opt/csw/libexec/xscreensaver/anemotaxis 0755 root bin
+f none /opt/csw/libexec/xscreensaver/greynetic 0755 root bin
+d none /opt/csw/share 0755 root bin
+d none /opt/csw/share/applications 0755 root bin
+f none /opt/csw/share/applications/xscreensaver-properties.desktop 0644 root bin
+d none /opt/csw/share/xscreensaver 0755 root bin
+d none /opt/csw/share/xscreensaver/glade 0755 root bin
+f none /opt/csw/share/xscreensaver/glade/screensaver-colorselector.png 0644 root bin
+f none /opt/csw/share/xscreensaver/glade/screensaver-locking.png 0644 root bin
+f none /opt/csw/share/xscreensaver/glade/screensaver-cmndln.png 0644 root bin
+f none /opt/csw/share/xscreensaver/glade/screensaver-power.png 0644 root bin
+f none /opt/csw/share/xscreensaver/glade/screensaver-diagnostic.png 0644 root bin
+f none /opt/csw/share/xscreensaver/glade/screensaver-snap.png 0644 root bin
+f none /opt/csw/share/xscreensaver/glade/xscreensaver-demo.glade2 0644 root bin
+d none /opt/csw/share/xscreensaver/config 0755 root bin
+f none /opt/csw/share/xscreensaver/config/attraction.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/triangle.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/sproingies.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/glknots.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/klein.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/apollonian.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/pong.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/skytentacles.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/gltext.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/molecule.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/xjack.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/stonerview.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/maze.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/coral.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/README 0644 root bin
+f none /opt/csw/share/xscreensaver/config/abstractile.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/moebius.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/sonar.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/dangerball.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/drift.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/penetrate.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/boing.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/fireworkx.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/deco.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/surfaces.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/zoom.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/tangram.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/xrayswarm.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/cubenetic.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/lockward.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/jigsaw.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/crackberg.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/hypertorus.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/rubikblocks.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/halftone.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/kaleidescope.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/glslideshow.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/galaxy.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/pulsar.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/wormhole.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/xspirograph.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/glhanoi.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/m6502.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/epicycle.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/engine.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/cubicgrid.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/topblock.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/flame.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/cloudlife.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/ifs.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/barcode.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/decayscreen.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/hypnowheel.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/squiral.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/gears.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/stairs.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/fontglide.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/fiberlamp.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/bumps.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/moire.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/blaster.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/anemotaxis.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/pedal.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/twang.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/braid.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/mountain.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/atlantis.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/bubble3d.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/rd-bomb.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/bouncingcow.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/distort.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/wander.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/fadeplot.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/noof.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/moebiusgears.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/atunnel.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/pyro.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/glmatrix.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/glblur.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/antspotlight.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/flow.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/voronoi.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/xmatrix.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/flyingtoasters.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/kumppa.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/munch.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/flipscreen3d.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/starfish.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/pipes.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/substrate.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/glsnake.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/discrete.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/julia.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/glcells.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/qix.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/slip.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/petri.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/penrose.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/cubestorm.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/gflux.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/carousel.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/lcdscrub.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/webcollage.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/eruption.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/fuzzyflakes.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/gleidescope.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/antmaze.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/mirrorblob.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/rorschach.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/sballs.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/truchet.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/ripples.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/lavalite.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/circuit.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/nerverot.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/bsod.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/photopile.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/spheremonics.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/blocktube.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/speedmine.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/celtic.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/interaggregate.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/strange.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/juggler3d.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/blitspin.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/blinkbox.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/boxfit.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/thornbird.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/swirl.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/pinion.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/sierpinski.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/antinspect.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/moire2.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/timetunnel.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/loop.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/superquadrics.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/cynosure.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/morph3d.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/polytopes.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/extrusion.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/whirlwindwarp.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/polyominoes.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/cwaves.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/demon.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/popsquares.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/xlyap.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/compass.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/queens.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/helix.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/grav.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/hopalong.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/deluxe.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/shadebobs.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/fliptext.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/apple2.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/greynetic.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/bouboule.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/rubik.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/goop.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/phosphor.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/noseguy.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/pacman.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/interference.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/spotlight.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/ccurve.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/glplanet.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/rocks.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/lament.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/jigglypuff.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/vidwhacker.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/providence.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/crystal.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/menger.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/piecewise.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/euler2d.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/vermiculate.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/fluidballs.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/slidescreen.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/polyhedra.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/halo.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/anemone.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/flipflop.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/xanalogtv.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/cage.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/glschool.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/flurry.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/metaballs.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/rotzoomer.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/starwars.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/cube21.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/imsmap.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/endgame.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/memscroller.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/sierpinski3d.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/xflame.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/boxed.xml 0644 root bin
+f none /opt/csw/share/xscreensaver/config/intermomentary.xml 0644 root bin
+d none /opt/csw/share/man 0755 root bin
+d none /opt/csw/share/man/man6 0755 root bin
+f none /opt/csw/share/man/man6/ljlatest.6 0644 root bin
+f none /opt/csw/share/man/man6/xflame.6 0644 root bin
+f none /opt/csw/share/man/man6/starfish.6 0644 root bin
+f none /opt/csw/share/man/man6/lockward.6 0644 root bin
+f none /opt/csw/share/man/man6/glsnake.6 0644 root bin
+f none /opt/csw/share/man/man6/crystal.6 0644 root bin
+f none /opt/csw/share/man/man6/abstractile.6 0644 root bin
+f none /opt/csw/share/man/man6/shadebobs.6 0644 root bin
+f none /opt/csw/share/man/man6/gflux.6 0644 root bin
+f none /opt/csw/share/man/man6/kumppa.6 0644 root bin
+f none /opt/csw/share/man/man6/grav.6 0644 root bin
+f none /opt/csw/share/man/man6/atlantis.6 0644 root bin
+f none /opt/csw/share/man/man6/galaxy.6 0644 root bin
+f none /opt/csw/share/man/man6/mountain.6 0644 root bin
+f none /opt/csw/share/man/man6/hopalong.6 0644 root bin
+f none /opt/csw/share/man/man6/spotlight.6 0644 root bin
+f none /opt/csw/share/man/man6/stairs.6 0644 root bin
+f none /opt/csw/share/man/man6/gltext.6 0644 root bin
+f none /opt/csw/share/man/man6/xmatrix.6 0644 root bin
+f none /opt/csw/share/man/man6/sballs.6 0644 root bin
+f none /opt/csw/share/man/man6/helix.6 0644 root bin
+f none /opt/csw/share/man/man6/squiral.6 0644 root bin
+f none /opt/csw/share/man/man6/qix.6 0644 root bin
+f none /opt/csw/share/man/man6/superquadrics.6 0644 root bin
+f none /opt/csw/share/man/man6/moire.6 0644 root bin
+f none /opt/csw/share/man/man6/zoom.6 0644 root bin
+f none /opt/csw/share/man/man6/antinspect.6 0644 root bin
+f none /opt/csw/share/man/man6/moebiusgears.6 0644 root bin
+f none /opt/csw/share/man/man6/cynosure.6 0644 root bin
+f none /opt/csw/share/man/man6/wormhole.6 0644 root bin
+f none /opt/csw/share/man/man6/xrayswarm.6 0644 root bin
+f none /opt/csw/share/man/man6/cube21.6 0644 root bin
+f none /opt/csw/share/man/man6/ripples.6 0644 root bin
+f none /opt/csw/share/man/man6/truchet.6 0644 root bin
+f none /opt/csw/share/man/man6/bsod.6 0644 root bin
+f none /opt/csw/share/man/man6/discrete.6 0644 root bin
+f none /opt/csw/share/man/man6/fuzzyflakes.6 0644 root bin
+f none /opt/csw/share/man/man6/euler2d.6 0644 root bin
+f none /opt/csw/share/man/man6/crackberg.6 0644 root bin
+f none /opt/csw/share/man/man6/attraction.6 0644 root bin
+f none /opt/csw/share/man/man6/flipscreen3d.6 0644 root bin
+f none /opt/csw/share/man/man6/rd-bomb.6 0644 root bin
+f none /opt/csw/share/man/man6/dangerball.6 0644 root bin
+f none /opt/csw/share/man/man6/anemotaxis.6 0644 root bin
+f none /opt/csw/share/man/man6/vermiculate.6 0644 root bin
+f none /opt/csw/share/man/man6/gears.6 0644 root bin
+f none /opt/csw/share/man/man6/cwaves.6 0644 root bin
+f none /opt/csw/share/man/man6/gleidescope.6 0644 root bin
+f none /opt/csw/share/man/man6/glschool.6 0644 root bin
+f none /opt/csw/share/man/man6/wander.6 0644 root bin
+f none /opt/csw/share/man/man6/polyhedra.6 0644 root bin
+f none /opt/csw/share/man/man6/sproingies.6 0644 root bin
+f none /opt/csw/share/man/man6/bumps.6 0644 root bin
+f none /opt/csw/share/man/man6/lament.6 0644 root bin
+f none /opt/csw/share/man/man6/menger.6 0644 root bin
+f none /opt/csw/share/man/man6/hypnowheel.6 0644 root bin
+f none /opt/csw/share/man/man6/apollonian.6 0644 root bin
+f none /opt/csw/share/man/man6/strange.6 0644 root bin
+f none /opt/csw/share/man/man6/interference.6 0644 root bin
+f none /opt/csw/share/man/man6/cubenetic.6 0644 root bin
+f none /opt/csw/share/man/man6/jigsaw.6 0644 root bin
+f none /opt/csw/share/man/man6/celtic.6 0644 root bin
+f none /opt/csw/share/man/man6/rubikblocks.6 0644 root bin
+f none /opt/csw/share/man/man6/demon.6 0644 root bin
+f none /opt/csw/share/man/man6/rorschach.6 0644 root bin
+f none /opt/csw/share/man/man6/fluidballs.6 0644 root bin
+f none /opt/csw/share/man/man6/glhanoi.6 0644 root bin
+f none /opt/csw/share/man/man6/moire2.6 0644 root bin
+f none /opt/csw/share/man/man6/flow.6 0644 root bin
+f none /opt/csw/share/man/man6/halftone.6 0644 root bin
+f none /opt/csw/share/man/man6/munch.6 0644 root bin
+f none /opt/csw/share/man/man6/extrusion.6 0644 root bin
+f none /opt/csw/share/man/man6/xlyap.6 0644 root bin
+f none /opt/csw/share/man/man6/cloudlife.6 0644 root bin
+f none /opt/csw/share/man/man6/rotzoomer.6 0644 root bin
+f none /opt/csw/share/man/man6/imsmap.6 0644 root bin
+f none /opt/csw/share/man/man6/queens.6 0644 root bin
+f none /opt/csw/share/man/man6/memscroller.6 0644 root bin
+f none /opt/csw/share/man/man6/intermomentary.6 0644 root bin
+f none /opt/csw/share/man/man6/decayscreen.6 0644 root bin
+f none /opt/csw/share/man/man6/drift.6 0644 root bin
+f none /opt/csw/share/man/man6/voronoi.6 0644 root bin
+f none /opt/csw/share/man/man6/fontglide.6 0644 root bin
+f none /opt/csw/share/man/man6/glmatrix.6 0644 root bin
+f none /opt/csw/share/man/man6/klein.6 0644 root bin
+f none /opt/csw/share/man/man6/bubble3d.6 0644 root bin
+f none /opt/csw/share/man/man6/boxfit.6 0644 root bin
+f none /opt/csw/share/man/man6/xscreensaver-gl-helper.6 0644 root bin
+f none /opt/csw/share/man/man6/blaster.6 0644 root bin
+f none /opt/csw/share/man/man6/nerverot.6 0644 root bin
+f none /opt/csw/share/man/man6/goop.6 0644 root bin
+f none /opt/csw/share/man/man6/noof.6 0644 root bin
+f none /opt/csw/share/man/man6/deluxe.6 0644 root bin
+f none /opt/csw/share/man/man6/spheremonics.6 0644 root bin
+f none /opt/csw/share/man/man6/providence.6 0644 root bin
+f none /opt/csw/share/man/man6/pinion.6 0644 root bin
+f none /opt/csw/share/man/man6/circuit.6 0644 root bin
+f none /opt/csw/share/man/man6/lcdscrub.6 0644 root bin
+f none /opt/csw/share/man/man6/coral.6 0644 root bin
+f none /opt/csw/share/man/man6/compass.6 0644 root bin
+f none /opt/csw/share/man/man6/epicycle.6 0644 root bin
+f none /opt/csw/share/man/man6/ifs.6 0644 root bin
+f none /opt/csw/share/man/man6/xanalogtv.6 0644 root bin
+f none /opt/csw/share/man/man6/flurry.6 0644 root bin
+f none /opt/csw/share/man/man6/penetrate.6 0644 root bin
+f none /opt/csw/share/man/man6/anemone.6 0644 root bin
+f none /opt/csw/share/man/man6/stonerview.6 0644 root bin
+f none /opt/csw/share/man/man6/mirrorblob.6 0644 root bin
+f none /opt/csw/share/man/man6/hypertorus.6 0644 root bin
+f none /opt/csw/share/man/man6/eruption.6 0644 root bin
+f none /opt/csw/share/man/man6/surfaces.6 0644 root bin
+f none /opt/csw/share/man/man6/photopile.6 0644 root bin
+f none /opt/csw/share/man/man6/slip.6 0644 root bin
+f none /opt/csw/share/man/man6/piecewise.6 0644 root bin
+f none /opt/csw/share/man/man6/pulsar.6 0644 root bin
+f none /opt/csw/share/man/man6/starwars.6 0644 root bin
+f none /opt/csw/share/man/man6/fireworkx.6 0644 root bin
+f none /opt/csw/share/man/man6/sierpinski3d.6 0644 root bin
+f none /opt/csw/share/man/man6/rubik.6 0644 root bin
+f none /opt/csw/share/man/man6/morph3d.6 0644 root bin
+f none /opt/csw/share/man/man6/whirlwindwarp.6 0644 root bin
+f none /opt/csw/share/man/man6/julia.6 0644 root bin
+f none /opt/csw/share/man/man6/kaleidescope.6 0644 root bin
+f none /opt/csw/share/man/man6/cage.6 0644 root bin
+f none /opt/csw/share/man/man6/speedmine.6 0644 root bin
+f none /opt/csw/share/man/man6/carousel.6 0644 root bin
+f none /opt/csw/share/man/man6/slidescreen.6 0644 root bin
+f none /opt/csw/share/man/man6/petri.6 0644 root bin
+f none /opt/csw/share/man/man6/atunnel.6 0644 root bin
+f none /opt/csw/share/man/man6/penrose.6 0644 root bin
+f none /opt/csw/share/man/man6/pipes.6 0644 root bin
+f none /opt/csw/share/man/man6/cubicgrid.6 0644 root bin
+f none /opt/csw/share/man/man6/bouncingcow.6 0644 root bin
+f none /opt/csw/share/man/man6/pedal.6 0644 root bin
+f none /opt/csw/share/man/man6/greynetic.6 0644 root bin
+f none /opt/csw/share/man/man6/braid.6 0644 root bin
+f none /opt/csw/share/man/man6/endgame.6 0644 root bin
+f none /opt/csw/share/man/man6/glblur.6 0644 root bin
+f none /opt/csw/share/man/man6/timetunnel.6 0644 root bin
+f none /opt/csw/share/man/man6/tangram.6 0644 root bin
+f none /opt/csw/share/man/man6/fliptext.6 0644 root bin
+f none /opt/csw/share/man/man6/barcode.6 0644 root bin
+f none /opt/csw/share/man/man6/flyingtoasters.6 0644 root bin
+f none /opt/csw/share/man/man6/twang.6 0644 root bin
+f none /opt/csw/share/man/man6/boxed.6 0644 root bin
+f none /opt/csw/share/man/man6/webcollage.6 0644 root bin
+f none /opt/csw/share/man/man6/thornbird.6 0644 root bin
+f none /opt/csw/share/man/man6/polyominoes.6 0644 root bin
+f none /opt/csw/share/man/man6/ccurve.6 0644 root bin
+f none /opt/csw/share/man/man6/metaballs.6 0644 root bin
+f none /opt/csw/share/man/man6/moebius.6 0644 root bin
+f none /opt/csw/share/man/man6/glknots.6 0644 root bin
+f none /opt/csw/share/man/man6/xjack.6 0644 root bin
+f none /opt/csw/share/man/man6/pyro.6 0644 root bin
+f none /opt/csw/share/man/man6/maze.6 0644 root bin
+f none /opt/csw/share/man/man6/deco.6 0644 root bin
+f none /opt/csw/share/man/man6/polytopes.6 0644 root bin
+f none /opt/csw/share/man/man6/skytentacles.6 0644 root bin
+f none /opt/csw/share/man/man6/cubestorm.6 0644 root bin
+f none /opt/csw/share/man/man6/blitspin.6 0644 root bin
+f none /opt/csw/share/man/man6/xspirograph.6 0644 root bin
+f none /opt/csw/share/man/man6/lavalite.6 0644 root bin
+f none /opt/csw/share/man/man6/sonar.6 0644 root bin
+f none /opt/csw/share/man/man6/apple2.6 0644 root bin
+f none /opt/csw/share/man/man6/glplanet.6 0644 root bin
+f none /opt/csw/share/man/man6/bouboule.6 0644 root bin
+f none /opt/csw/share/man/man6/juggler3d.6 0644 root bin
+f none /opt/csw/share/man/man6/halo.6 0644 root bin
+f none /opt/csw/share/man/man6/flipflop.6 0644 root bin
+f none /opt/csw/share/man/man6/distort.6 0644 root bin
+f none /opt/csw/share/man/man6/engine.6 0644 root bin
+f none /opt/csw/share/man/man6/jigglypuff.6 0644 root bin
+f none /opt/csw/share/man/man6/topblock.6 0644 root bin
+f none /opt/csw/share/man/man6/boing.6 0644 root bin
+f none /opt/csw/share/man/man6/noseguy.6 0644 root bin
+f none /opt/csw/share/man/man6/swirl.6 0644 root bin
+f none /opt/csw/share/man/man6/loop.6 0644 root bin
+f none /opt/csw/share/man/man6/sierpinski.6 0644 root bin
+f none /opt/csw/share/man/man6/vidwhacker.6 0644 root bin
+f none /opt/csw/share/man/man6/phosphor.6 0644 root bin
+f none /opt/csw/share/man/man6/pacman.6 0644 root bin
+f none /opt/csw/share/man/man6/rocks.6 0644 root bin
+f none /opt/csw/share/man/man6/blinkbox.6 0644 root bin
+f none /opt/csw/share/man/man6/blocktube.6 0644 root bin
+f none /opt/csw/share/man/man6/fiberlamp.6 0644 root bin
+f none /opt/csw/share/man/man6/interaggregate.6 0644 root bin
+f none /opt/csw/share/man/man6/molecule.6 0644 root bin
+f none /opt/csw/share/man/man6/antmaze.6 0644 root bin
+f none /opt/csw/share/man/man6/substrate.6 0644 root bin
+f none /opt/csw/share/man/man6/flame.6 0644 root bin
+f none /opt/csw/share/man/man6/fadeplot.6 0644 root bin
+f none /opt/csw/share/man/man6/glslideshow.6 0644 root bin
+f none /opt/csw/share/man/man6/triangle.6 0644 root bin
+f none /opt/csw/share/man/man6/antspotlight.6 0644 root bin
+f none /opt/csw/share/man/man6/glcells.6 0644 root bin
+f none /opt/csw/share/man/man6/pong.6 0644 root bin
+d none /opt/csw/share/man/man1 0755 root bin
+f none /opt/csw/share/man/man1/xscreensaver-text.1 0644 root bin
+f none /opt/csw/share/man/man1/xscreensaver-getimage-video.1 0644 root bin
+f none /opt/csw/share/man/man1/xscreensaver.1 0644 root bin
+f none /opt/csw/share/man/man1/xscreensaver-demo.1 0644 root bin
+f none /opt/csw/share/man/man1/xscreensaver-getimage-file.1 0644 root bin
+f none /opt/csw/share/man/man1/xscreensaver-command.1 0644 root bin
+f none /opt/csw/share/man/man1/xscreensaver-getimage.1 0644 root bin
+d none /opt/csw/share/locale 0755 root bin
+d none /opt/csw/share/locale/hu 0755 root bin
+d none /opt/csw/share/locale/hu/LC_MESSAGES 0755 root bin
+f none /opt/csw/share/locale/hu/LC_MESSAGES/xscreensaver.mo 0644 root bin
+d none /opt/csw/share/locale/es 0755 root bin
+d none /opt/csw/share/locale/es/LC_MESSAGES 0755 root bin
+f none /opt/csw/share/locale/es/LC_MESSAGES/xscreensaver.mo 0644 root bin
+d none /opt/csw/share/locale/wa 0755 root bin
+d none /opt/csw/share/locale/wa/LC_MESSAGES 0755 root bin
+f none /opt/csw/share/locale/wa/LC_MESSAGES/xscreensaver.mo 0644 root bin
+d none /opt/csw/share/locale/pl 0755 root bin
+d none /opt/csw/share/locale/pl/LC_MESSAGES 0755 root bin
+f none /opt/csw/share/locale/pl/LC_MESSAGES/xscreensaver.mo 0644 root bin
+d none /opt/csw/share/locale/et 0755 root bin
+d none /opt/csw/share/locale/et/LC_MESSAGES 0755 root bin
+f none /opt/csw/share/locale/et/LC_MESSAGES/xscreensaver.mo 0644 root bin
+d none /opt/csw/share/locale/pt_BR 0755 root bin
+d none /opt/csw/share/locale/pt_BR/LC_MESSAGES 0755 root bin
+f none /opt/csw/share/locale/pt_BR/LC_MESSAGES/xscreensaver.mo 0644 root bin
+d none /opt/csw/share/locale/nb 0755 root bin
+d none /opt/csw/share/locale/nb/LC_MESSAGES 0755 root bin
+f none /opt/csw/share/locale/nb/LC_MESSAGES/xscreensaver.mo 0644 root bin
+d none /opt/csw/share/locale/nl 0755 root bin
+d none /opt/csw/share/locale/nl/LC_MESSAGES 0755 root bin
+f none /opt/csw/share/locale/nl/LC_MESSAGES/xscreensaver.mo 0644 root bin
+d none /opt/csw/share/locale/fr 0755 root bin
+d none /opt/csw/share/locale/fr/LC_MESSAGES 0755 root bin
+f none /opt/csw/share/locale/fr/LC_MESSAGES/xscreensaver.mo 0644 root bin
+d none /opt/csw/share/locale/ru 0755 root bin
+d none /opt/csw/share/locale/ru/LC_MESSAGES 0755 root bin
+f none /opt/csw/share/locale/ru/LC_MESSAGES/xscreensaver.mo 0644 root bin
+d none /opt/csw/share/locale/ko 0755 root bin
+d none /opt/csw/share/locale/ko/LC_MESSAGES 0755 root bin
+f none /opt/csw/share/locale/ko/LC_MESSAGES/xscreensaver.mo 0644 root bin
+d none /opt/csw/share/locale/pt 0755 root bin
+d none /opt/csw/share/locale/pt/LC_MESSAGES 0755 root bin
+f none /opt/csw/share/locale/pt/LC_MESSAGES/xscreensaver.mo 0644 root bin
+d none /opt/csw/share/locale/zh_TW 0755 root bin
+d none /opt/csw/share/locale/zh_TW/LC_MESSAGES 0755 root bin
+f none /opt/csw/share/locale/zh_TW/LC_MESSAGES/xscreensaver.mo 0644 root bin
+d none /opt/csw/share/locale/sv 0755 root bin
+d none /opt/csw/share/locale/sv/LC_MESSAGES 0755 root bin
+f none /opt/csw/share/locale/sv/LC_MESSAGES/xscreensaver.mo 0644 root bin
+d none /opt/csw/share/locale/fi 0755 root bin
+d none /opt/csw/share/locale/fi/LC_MESSAGES 0755 root bin
+f none /opt/csw/share/locale/fi/LC_MESSAGES/xscreensaver.mo 0644 root bin
+d none /opt/csw/share/locale/zh_CN 0755 root bin
+d none /opt/csw/share/locale/zh_CN/LC_MESSAGES 0755 root bin
+f none /opt/csw/share/locale/zh_CN/LC_MESSAGES/xscreensaver.mo 0644 root bin
+d none /opt/csw/share/locale/ja 0755 root bin
+d none /opt/csw/share/locale/ja/LC_MESSAGES 0755 root bin
+f none /opt/csw/share/locale/ja/LC_MESSAGES/xscreensaver.mo 0644 root bin
+d none /opt/csw/share/locale/de 0755 root bin
+d none /opt/csw/share/locale/de/LC_MESSAGES 0755 root bin
+f none /opt/csw/share/locale/de/LC_MESSAGES/xscreensaver.mo 0644 root bin
+d none /opt/csw/share/locale/vi 0755 root bin
+d none /opt/csw/share/locale/vi/LC_MESSAGES 0755 root bin
+f none /opt/csw/share/locale/vi/LC_MESSAGES/xscreensaver.mo 0644 root bin
+d none /opt/csw/share/locale/da 0755 root bin
+d none /opt/csw/share/locale/da/LC_MESSAGES 0755 root bin
+f none /opt/csw/share/locale/da/LC_MESSAGES/xscreensaver.mo 0644 root bin
+d none /opt/csw/share/locale/sk 0755 root bin
+d none /opt/csw/share/locale/sk/LC_MESSAGES 0755 root bin
+f none /opt/csw/share/locale/sk/LC_MESSAGES/xscreensaver.mo 0644 root bin
+d none /opt/csw/share/locale/it 0755 root bin
+d none /opt/csw/share/locale/it/LC_MESSAGES 0755 root bin
+f none /opt/csw/share/locale/it/LC_MESSAGES/xscreensaver.mo 0644 root bin
+d none /opt/csw/share/locale/ca 0755 root bin
+d none /opt/csw/share/locale/ca/LC_MESSAGES 0755 root bin
+f none /opt/csw/share/locale/ca/LC_MESSAGES/xscreensaver.mo 0644 root bin
+d none /opt/csw/share/pixmaps 0755 root bin
+f none /opt/csw/share/pixmaps/xscreensaver.xpm 0644 root bin
+d none /opt/csw/bin 0755 root bin
+f none /opt/csw/bin/xscreensaver-getimage-video 0755 root bin
+f none /opt/csw/bin/xscreensaver-gl-helper 0755 root bin
+f none /opt/csw/bin/xscreensaver-getimage 0755 root bin
+f none /opt/csw/bin/xscreensaver-command 0755 root bin
+f none /opt/csw/bin/xscreensaver-getimage-file 0755 root bin
+f none /opt/csw/bin/xscreensaver-text 0755 root bin
+f none /opt/csw/bin/xscreensaver-demo 0755 root bin
+f none /opt/csw/bin/xscreensaver 0755 root bin
+d none /opt/csw/lib 0755 root bin
+d none /opt/csw/lib/X11 0755 root bin
+d none /opt/csw/lib/X11/app-defaults 0755 root bin
+f none /opt/csw/lib/X11/app-defaults/XScreenSaver 0644 root bin


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 Jul 12 05:49:27 2010
From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net)
Date: Mon, 12 Jul 2010 03:49:27 +0000
Subject: [csw-devel] SF.net SVN: gar:[10503]
	csw/mgar/pkg/subversion/trunk/Makefile
Message-ID: <E1OYA1H-000740-AG@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 10503
          http://gar.svn.sourceforge.net/gar/?rev=10503&view=rev
Author:   rthurner
Date:     2010-07-12 03:49:27 +0000 (Mon, 12 Jul 2010)

Log Message:
-----------
subversion checkpkg ... remove dependencies ...

Modified Paths:
--------------
    csw/mgar/pkg/subversion/trunk/Makefile

Modified: csw/mgar/pkg/subversion/trunk/Makefile
===================================================================
--- csw/mgar/pkg/subversion/trunk/Makefile	2010-07-12 03:38:58 UTC (rev 10502)
+++ csw/mgar/pkg/subversion/trunk/Makefile	2010-07-12 03:49:27 UTC (rev 10503)
@@ -82,14 +82,11 @@
 
 SPKG_DESC_CSWjavasvn       = Subversion Java Language Binding
 CATALOGNAME_CSWjavasvn     = javasvn
-RUNTIME_DEP_PKGS_CSWjavasvn += CSWsvn
 PKGFILES_CSWjavasvn        = $(SVNLIB)/.*java.*
 PKGFILES_CSWjavasvn       += $(docdir)/$(CATALOGNAME_CSWjavasvn)/changelog.CSW
 
 SPKG_DESC_CSWpmsvn         = Subversion Perl Language Binding
 CATALOGNAME_CSWpmsvn       = pm_subversion
-RUNTIME_DEP_PKGS_CSWpmsvn += CSWperl
-RUNTIME_DEP_PKGS_CSWpmsvn += CSWsvn
 PKGFILES_CSWpmsvn          = $(libdir)/perl.*
 PKGFILES_CSWpmsvn         += $(SVNLIB)/.*perl.*
 PKGFILES_CSWpmsvn         += $(mandir)/.*swig_perl.*
@@ -97,16 +94,12 @@
 
 SPKG_DESC_CSWrbsvn         = Subversion Ruby Language Binding
 CATALOGNAME_CSWrbsvn       = rbsvn
-RUNTIME_DEP_PKGS_CSWrbsvn += CSWruby
-RUNTIME_DEP_PKGS_CSWrbsvn += CSWsvn
 PKGFILES_CSWrbsvn          = $(libdir)/ruby.*
 PKGFILES_CSWrbsvn         += $(SVNLIB)/.*swig_ruby.*
 PKGFILES_CSWrbsvn         += $(docdir)/$(CATALOGNAME_CSWrbsvn)/changelog.CSW
 
 SPKG_DESC_CSWpythonsvn       = Subversion Python Language Binding
 CATALOGNAME_CSWpythonsvn     = pythonsvn
-RUNTIME_DEP_PKGS_CSWpythonsvn += CSWpython
-RUNTIME_DEP_PKGS_CSWpythonsvn += CSWsvn
 PKGFILES_CSWpythonsvn        = $(libdir)/python.*
 PKGFILES_CSWpythonsvn       += $(SVNLIB)/.*swig_py.*
 PKGFILES_CSWpythonsvn       += $(docdir)/$(CATALOGNAME_CSWpythonsvn)/changelog.CSW


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From opk at users.sourceforge.net  Mon Jul 12 14:38:35 2010
From: opk at users.sourceforge.net (opk at users.sourceforge.net)
Date: Mon, 12 Jul 2010 12:38:35 +0000
Subject: [csw-devel] SF.net SVN: gar:[10504] csw/mgar/pkg
Message-ID: <E1OYIHL-0001o5-6d@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 10504
          http://gar.svn.sourceforge.net/gar/?rev=10504&view=rev
Author:   opk
Date:     2010-07-12 12:38:34 +0000 (Mon, 12 Jul 2010)

Log Message:
-----------
work on getting pygtk components up-to-date

Modified Paths:
--------------
    csw/mgar/pkg/pycairo/trunk/Makefile
    csw/mgar/pkg/pycairo/trunk/checksums
    csw/mgar/pkg/pygobject/trunk/Makefile
    csw/mgar/pkg/pygobject/trunk/checksums
    csw/mgar/pkg/pygtk/trunk/Makefile
    csw/mgar/pkg/pygtk/trunk/checksums

Modified: csw/mgar/pkg/pycairo/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pycairo/trunk/Makefile	2010-07-12 03:49:27 UTC (rev 10503)
+++ csw/mgar/pkg/pycairo/trunk/Makefile	2010-07-12 12:38:34 UTC (rev 10504)
@@ -1,5 +1,5 @@
 GARNAME      = pycairo
-GARVERSION   = 1.8.6
+GARVERSION   = 1.8.8
 CATEGORIES   = lib
 
 DESCRIPTION  = Python binder for Cairo library

Modified: csw/mgar/pkg/pycairo/trunk/checksums
===================================================================
--- csw/mgar/pkg/pycairo/trunk/checksums	2010-07-12 03:49:27 UTC (rev 10503)
+++ csw/mgar/pkg/pycairo/trunk/checksums	2010-07-12 12:38:34 UTC (rev 10504)
@@ -1 +1 @@
-d10a68f88da0a6a02864bf8f0c25ee4d  download/pycairo-1.8.6.tar.gz
+054da6c125cb427a003f5fd6c54f853e  pycairo-1.8.8.tar.gz

Modified: csw/mgar/pkg/pygobject/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pygobject/trunk/Makefile	2010-07-12 03:49:27 UTC (rev 10503)
+++ csw/mgar/pkg/pygobject/trunk/Makefile	2010-07-12 12:38:34 UTC (rev 10504)
@@ -1,9 +1,9 @@
 GARNAME = pygobject
-GARVERSION = 2.20.0
+GARVERSION = 2.21.1
 CATEGORIES = lang
 RELVER = $(shell echo $(GARVERSION) | gsed -e 's/\.[0-9]\+$$//')
 
-DESCRIPTION = pygobject support for Python
+DESCRIPTION = Python bindings for the GObject library
 define BLURB
   This is a Python language binding for gobject.
 endef

Modified: csw/mgar/pkg/pygobject/trunk/checksums
===================================================================
--- csw/mgar/pkg/pygobject/trunk/checksums	2010-07-12 03:49:27 UTC (rev 10503)
+++ csw/mgar/pkg/pygobject/trunk/checksums	2010-07-12 12:38:34 UTC (rev 10504)
@@ -1,2 +1,2 @@
 bc2cdac34e1084f4d72eb2bf762e700c  0001-forcing-lglib-2.0.patch
-10e1fb79be3d698476a28b1e1b0c5640  pygobject-2.20.0.tar.bz2
+c12eef0cd6725dc7245c3db78ef85d2d  pygobject-2.21.1.tar.bz2

Modified: csw/mgar/pkg/pygtk/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pygtk/trunk/Makefile	2010-07-12 03:49:27 UTC (rev 10503)
+++ csw/mgar/pkg/pygtk/trunk/Makefile	2010-07-12 12:38:34 UTC (rev 10504)
@@ -1,5 +1,5 @@
 GARNAME = pygtk
-GARVERSION = 2.15.1
+GARVERSION = 2.17.0
 CATEGORIES = lang
 RELVER = $(shell echo $(GARVERSION) |gsed 's/\(^[0-9].*\.[0-9].*\)\.[0-9]*/\1/')
 
@@ -13,6 +13,7 @@
 STRIP_LIBTOOL = 1
 
 PACKAGES = CSWpygtk
+BUILD_DEP_PKGS = CSWpkgconfig CSWpygobject CSWglib2devel CSWlibatkdevel CSWpangodevel CSWpycairo CSWlibcairodevel CSWlibxcbdevel
 RUNTIME_DEP_PKGS_CSWpygtk  = CSWpython CSWfconfig CSWftype2 CSWggettextrt
 RUNTIME_DEP_PKGS_CSWpygtk += CSWglib2 CSWgtk2 CSWlibatk CSWlibcairo
 RUNTIME_DEP_PKGS_CSWpygtk += CSWlibglade2 CSWlibxml2 CSWpango

Modified: csw/mgar/pkg/pygtk/trunk/checksums
===================================================================
--- csw/mgar/pkg/pygtk/trunk/checksums	2010-07-12 03:49:27 UTC (rev 10503)
+++ csw/mgar/pkg/pygtk/trunk/checksums	2010-07-12 12:38:34 UTC (rev 10504)
@@ -1 +1 @@
-f8ef885df57bd022b2bfc138f6590c21  download/pygtk-2.15.1.tar.bz2
+43d704343d7ca04a6e4ddd4fa73a3c55  pygtk-2.17.0.tar.bz2


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From bdwalton at users.sourceforge.net  Mon Jul 12 15:09:25 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Mon, 12 Jul 2010 13:09:25 +0000
Subject: [csw-devel] SF.net SVN: gar:[10505]
	csw/mgar/pkg/logwatch/trunk/Makefile
Message-ID: <E1OYIlB-0005sI-B0@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10505
          http://gar.svn.sourceforge.net/gar/?rev=10505&view=rev
Author:   bdwalton
Date:     2010-07-12 13:09:25 +0000 (Mon, 12 Jul 2010)

Log Message:
-----------
logwatch: correct crontab entry

Modified Paths:
--------------
    csw/mgar/pkg/logwatch/trunk/Makefile

Modified: csw/mgar/pkg/logwatch/trunk/Makefile
===================================================================
--- csw/mgar/pkg/logwatch/trunk/Makefile	2010-07-12 12:38:34 UTC (rev 10504)
+++ csw/mgar/pkg/logwatch/trunk/Makefile	2010-07-12 13:09:25 UTC (rev 10505)
@@ -112,5 +112,5 @@
 		$(INSTALLDATA) logwatch.8 $(DESTDIR)$(MANDIR)/man8; \
 		$(INSTALLEXE) logwatch.wrapper $(DESTDIR)$(BINDIR)/logwatch; \
 		$(INSTALLDIR) $(DESTDIR)$(CRONDIR); \
-		echo "02 4 * * * /opt/csw/sbin/logwatch" > $(DESTDIR)$(CRONTABS) )
+		echo "02 4 * * * /opt/csw/bin/logwatch" > $(DESTDIR)$(CRONTABS) )
 	@$(MAKECOOKIE)
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From theferret at users.sourceforge.net  Mon Jul 12 17:49:38 2010
From: theferret at users.sourceforge.net (theferret at users.sourceforge.net)
Date: Mon, 12 Jul 2010 15:49:38 +0000
Subject: [csw-devel] SF.net SVN: gar:[10506]
	csw/mgar/pkg/libgnomecanvas/branch-c
Message-ID: <E1OYLGE-0005WF-Rr@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 10506
          http://gar.svn.sourceforge.net/gar/?rev=10506&view=rev
Author:   theferret
Date:     2010-07-12 15:49:38 +0000 (Mon, 12 Jul 2010)

Log Message:
-----------
libgnomecanvas: bumped up optimization, and fixed description line

Modified Paths:
--------------
    csw/mgar/pkg/libgnomecanvas/branch-c/Makefile
    csw/mgar/pkg/libgnomecanvas/branch-c/pkginfo

Modified: csw/mgar/pkg/libgnomecanvas/branch-c/Makefile
===================================================================
--- csw/mgar/pkg/libgnomecanvas/branch-c/Makefile	2010-07-12 13:09:25 UTC (rev 10505)
+++ csw/mgar/pkg/libgnomecanvas/branch-c/Makefile	2010-07-12 15:49:38 UTC (rev 10506)
@@ -8,6 +8,9 @@
 # targets in second half.
 # Note that assignments with "?=" mean "assign if not already assigned.
 
+# for intltool
+PATH:=/opt/csw/gnu:$(PATH)
+
 # Where do we keep local downloads of software src files
 ARCHIVEDIR ?= /home/src
 ARCHIVENAME ?= libgnomecanvas-2.30.1.tar.bz2
@@ -26,8 +29,8 @@
 # DO NOT specify the arch-64 stuff such as -m64 here.
 # the individual targets will do that.
 
-CFLAGS_COMMON   ?= -mt -xnorunpath -xO2
-CXXFLAGS_COMMON ?= -mt -norunpath  -xO2
+CFLAGS_COMMON   ?= -mt -xnorunpath -xO3
+CXXFLAGS_COMMON ?= -mt -norunpath  -xO3
 CFLAGS_sparc    ?= -xarch=v8
 CFLAGS_i386     ?= -xarch=386
 

Modified: csw/mgar/pkg/libgnomecanvas/branch-c/pkginfo
===================================================================
--- csw/mgar/pkg/libgnomecanvas/branch-c/pkginfo	2010-07-12 13:09:25 UTC (rev 10505)
+++ csw/mgar/pkg/libgnomecanvas/branch-c/pkginfo	2010-07-12 15:49:38 UTC (rev 10506)
@@ -1,5 +1,5 @@
 PKG=CSWlibgnomecanvas
-NAME=libgnomecanvas - description goes here
+NAME=libgnomecanvas - GNOME 2 canvas library
 VERSION=2.30.1,REV=2010.06.26
 CATEGORY=application
 VENDOR=http://www.gnome.org/ packaged for CSW by Philip Brown


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From j_arndt at users.sourceforge.net  Mon Jul 12 21:25:00 2010
From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net)
Date: Mon, 12 Jul 2010 19:25:00 +0000
Subject: [csw-devel] SF.net SVN: gar:[10507] csw/mgar/pkg/munin/trunk
Message-ID: <E1OYOce-0006wC-I4@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 10507
          http://gar.svn.sourceforge.net/gar/?rev=10507&view=rev
Author:   j_arndt
Date:     2010-07-12 19:25:00 +0000 (Mon, 12 Jul 2010)

Log Message:
-----------
munin: fixed paths in munin-htaccess.in

Modified Paths:
--------------
    csw/mgar/pkg/munin/trunk/Makefile
    csw/mgar/pkg/munin/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/munin/trunk/files/munin-htaccess.in.patch

Modified: csw/mgar/pkg/munin/trunk/Makefile
===================================================================
--- csw/mgar/pkg/munin/trunk/Makefile	2010-07-12 15:49:38 UTC (rev 10506)
+++ csw/mgar/pkg/munin/trunk/Makefile	2010-07-12 19:25:00 UTC (rev 10507)
@@ -26,6 +26,7 @@
 PATCHFILES += sunos_memory.in.patch
 PATCHFILES += munin-node.conf.in.patch
 PATCHFILES += munin.conf.in.patch
+PATCHFILES += munin-htaccess.in.patch
 PATCHFILES += munin-graph.in.patch # match some paths to /{etc|var}/opt/csw/munin 
 PATCHFILES += perl.patch # shebang correctly set
 

Modified: csw/mgar/pkg/munin/trunk/checksums
===================================================================
--- csw/mgar/pkg/munin/trunk/checksums	2010-07-12 15:49:38 UTC (rev 10506)
+++ csw/mgar/pkg/munin/trunk/checksums	2010-07-12 19:25:00 UTC (rev 10507)
@@ -11,6 +11,7 @@
 50fa4a545f878d79e219891c6ac8d2d2  cswusergroup
 4ae84b9a27b686c3819d8d7b51d8cb4c  munin-1.4.5.tar.gz
 1a13b606a5c82958ed8e9bf139044988  munin-graph.in.patch
+e96eab2e321a33517d88dfbe1d510211  munin-htaccess.in.patch
 803021ab0539f83936c9adec6bd9336c  munin-node.conf.in.patch
 e9d94e230c8719c5d7d3fe624e87bea2  munin.conf.in.patch
 c0e9f043fe5ea79a1fc7dfc91f09a961  perl.patch

Added: csw/mgar/pkg/munin/trunk/files/munin-htaccess.in.patch
===================================================================
--- csw/mgar/pkg/munin/trunk/files/munin-htaccess.in.patch	                        (rev 0)
+++ csw/mgar/pkg/munin/trunk/files/munin-htaccess.in.patch	2010-07-12 19:25:00 UTC (rev 10507)
@@ -0,0 +1,34 @@
+From 52ea662193a0922aef3c4f82fe2b672e70e5ee13 Mon Sep 17 00:00:00 2001
+From: Juergen Arndt <ja at opencsw.org>
+Date: Mon, 12 Jul 2010 20:55:23 +0200
+Subject: [PATCH] munin-htaccess.in: set paths for OpenCSW
+
+---
+ master/www/munin-htaccess.in |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/master/www/munin-htaccess.in b/master/www/munin-htaccess.in
+index f6c6321..c5f355d 100644
+--- a/master/www/munin-htaccess.in
++++ b/master/www/munin-htaccess.in
+@@ -2,14 +2,14 @@
+ # config file.
+ #
+ # For the .htaccess file option to work the munin www directory
+-# (@@HTMLDIR@@) must have "AllowOverride all" or something close
++# (/var/opt/csw/munin/www) must have "AllowOverride all" or something close
+ # to that set.
+ #
+ # As a config file enclose it in <directory> like so:
+ # 
+-# <directory @@HTMLDIR@@>
++# <directory /var/opt/csw/munin/www>
+ 
+-AuthUserFile @@CONFDIR@@/munin-htpasswd
++AuthUserFile /etc/opt/csw/munin/munin-htpasswd
+ AuthName "Munin"
+ AuthType Basic
+ require valid-user
+-- 
+1.7.1
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From j_arndt at users.sourceforge.net  Mon Jul 12 22:29:26 2010
From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net)
Date: Mon, 12 Jul 2010 20:29:26 +0000
Subject: [csw-devel] SF.net SVN: gar:[10508] csw/mgar/pkg/munin/trunk
Message-ID: <E1OYPd0-0004Mc-Vz@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10508
          http://gar.svn.sourceforge.net/gar/?rev=10508&view=rev
Author:   j_arndt
Date:     2010-07-12 20:29:26 +0000 (Mon, 12 Jul 2010)

Log Message:
-----------
munin: /var/opt/csw/munin/www/.htaccess now handled with cswpreserveconf

Modified Paths:
--------------
    csw/mgar/pkg/munin/trunk/Makefile
    csw/mgar/pkg/munin/trunk/checksums
    csw/mgar/pkg/munin/trunk/files/CSWmuninmaster.prototype

Modified: csw/mgar/pkg/munin/trunk/Makefile
===================================================================
--- csw/mgar/pkg/munin/trunk/Makefile	2010-07-12 19:25:00 UTC (rev 10507)
+++ csw/mgar/pkg/munin/trunk/Makefile	2010-07-12 20:29:26 UTC (rev 10508)
@@ -83,6 +83,7 @@
 	#mv $(DESTDIR)/opt/csw/lib/plugins $(DESTDIR)/opt/csw/lib/munin_plugins
 	@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
 	#@ginstall -d $(DESTDIR)/opt/csw/munin
 	@ginstall -d $(DESTDIR)/etc/opt/csw/munin/apache
 	@ginstall -m 644 $(FILEDIR)/apache-munin.conf.CSW $(DESTDIR)/etc/opt/csw/munin/apache/apache-munin.conf.CSW

Modified: csw/mgar/pkg/munin/trunk/checksums
===================================================================
--- csw/mgar/pkg/munin/trunk/checksums	2010-07-12 19:25:00 UTC (rev 10507)
+++ csw/mgar/pkg/munin/trunk/checksums	2010-07-12 20:29:26 UTC (rev 10508)
@@ -1,6 +1,6 @@
 58ab277c1a958459e5270da07f017fb3  CSWmunincommon.prototype
 390277cc59e2c37d5b0bd4f2c3441996  CSWmuninmaster.postinstall
-8bd7bf2d0356a424fe58c7b3058ee3b4  CSWmuninmaster.prototype
+35853c8c9bd199828b58b668e2056025  CSWmuninmaster.prototype
 c4064b92df7835bf37b18e799aa6177e  CSWmuninnode.prototype
 e777f0ddea3e09d0faf72780ad782995  Makefile.config.patch
 1e3c461f2beafce43d6b94f3af478e5e  Makefile.patch

Modified: csw/mgar/pkg/munin/trunk/files/CSWmuninmaster.prototype
===================================================================
--- csw/mgar/pkg/munin/trunk/files/CSWmuninmaster.prototype	2010-07-12 19:25:00 UTC (rev 10507)
+++ csw/mgar/pkg/munin/trunk/files/CSWmuninmaster.prototype	2010-07-12 20:29:26 UTC (rev 10508)
@@ -96,4 +96,4 @@
 d ugfiles /var/opt/csw/munin/log 0755 munin munin
 d ugfiles /var/opt/csw/munin/run 0755 munin munin
 d ugfiles /var/opt/csw/munin/www 0755 munin munin
-f ugfiles /var/opt/csw/munin/www/.htaccess 0644 munin munin
+f cswpreserveconf /var/opt/csw/munin/www/.htaccess.CSW 0644 munin munin


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 Jul 13 03:28:29 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Tue, 13 Jul 2010 01:28:29 +0000
Subject: [csw-devel] SF.net SVN: gar:[10509] csw/mgar/pkg/ruby/trunk/files
Message-ID: <E1OYUIO-0000X3-W7@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10509
          http://gar.svn.sourceforge.net/gar/?rev=10509&view=rev
Author:   bdwalton
Date:     2010-07-13 01:28:28 +0000 (Tue, 13 Jul 2010)

Log Message:
-----------
ruby: update gcc4 rbconfig.rb files for sol9 build

Modified Paths:
--------------
    csw/mgar/pkg/ruby/trunk/files/rbconfig.rb.GCC4.i386
    csw/mgar/pkg/ruby/trunk/files/rbconfig.rb.GCC4.sparc

Modified: csw/mgar/pkg/ruby/trunk/files/rbconfig.rb.GCC4.i386
===================================================================
--- csw/mgar/pkg/ruby/trunk/files/rbconfig.rb.GCC4.i386	2010-07-12 20:29:26 UTC (rev 10508)
+++ csw/mgar/pkg/ruby/trunk/files/rbconfig.rb.GCC4.i386	2010-07-13 01:28:28 UTC (rev 10509)
@@ -6,147 +6,148 @@
   RUBY_VERSION == "1.8.7" or
     raise "ruby lib version (1.8.7) doesn't match executable version (#{RUBY_VERSION})"
 
-  TOPDIR = File.dirname(__FILE__).chomp!("/lib/ruby/1.8/i386-solaris2.8")
+  TOPDIR = File.dirname(__FILE__).chomp!("/lib/ruby/1.8/i386-solaris2.9")
   DESTDIR = '' unless defined? DESTDIR
   CONFIG = {}
   CONFIG["DESTDIR"] = DESTDIR
   CONFIG["INSTALL"] = '/opt/csw/bin/ginstall -c'
+  CONFIG["EXEEXT"] = ""
   CONFIG["prefix"] = (TOPDIR || DESTDIR + "/opt/csw")
-  CONFIG["EXEEXT"] = ""
   CONFIG["ruby_install_name"] = "ruby"
   CONFIG["RUBY_INSTALL_NAME"] = "ruby"
   CONFIG["RUBY_SO_NAME"] = "ruby"
+  CONFIG["MANTYPE"] = "man"
+  CONFIG["NROFF"] = "/usr/bin/nroff"
+  CONFIG["configure_args"] = " '--prefix=/opt/csw' '--exec_prefix=/opt/csw' '--bindir=/opt/csw/bin' '--sbindir=/opt/csw/sbin' '--libexecdir=/opt/csw/libexec' '--datadir=/opt/csw/share' '--sysconfdir=/opt/csw/etc' '--sharedstatedir=/opt/csw/share' '--localstatedir=/opt/csw/var' '--libdir=/opt/csw/lib' '--infodir=/opt/csw/share/info' '--includedir=/opt/csw/include' '--mandir=/opt/csw/share/man' '--enable-pthread' '--enable-shared' '--with-tcl-dir=/opt/csw' '--with-tk-dir=/opt/csw' '--with-dbm-dir=/opt/csw/bdb47' '--with-gdbm-dir=/opt/csw' '--with-iconv-dir=/opt/csw' '--with-openssl-dir=/opt/csw' '--with-readline-dir=/opt/csw' '--with-zlib-dir=/opt/csw' '--enable-install-doc' 'CC=/opt/csw/gcc4/bin/gcc' 'CFLAGS=-mtune=i686 -O2 -pipe -m32 -march=i386' 'LDFLAGS=-L/opt/csw/gcc4/lib/. -m32 -march=i386 -R /opt/csw/gcc4/lib -L/opt/csw/X11/lib -L/opt/csw/lib' 'CPPFLAGS=-I/opt/csw/X11/include -I/opt/csw/include'"
+  CONFIG["vendordir"] = "$(libdir)/ruby/vendor_ruby"
+  CONFIG["sitedir"] = "$(libdir)/ruby/site_ruby"
+  CONFIG["sitearch"] = "i386-solaris2.9"
+  CONFIG["arch"] = "i386-solaris2.9"
+  CONFIG["MAKEFILES"] = "Makefile"
+  CONFIG["EXPORT_PREFIX"] = ""
+  CONFIG["COMMON_HEADERS"] = ""
+  CONFIG["COMMON_MACROS"] = ""
+  CONFIG["COMMON_LIBS"] = ""
+  CONFIG["MAINLIBS"] = ""
+  CONFIG["ENABLE_SHARED"] = "yes"
+  CONFIG["DLDLIBS"] = " -lc"
+  CONFIG["SOLIBS"] = "$(LIBS)"
+  CONFIG["LIBRUBYARG_SHARED"] = "-Wl,-R -Wl,$(libdir) -L$(libdir) -l$(RUBY_SO_NAME)"
+  CONFIG["LIBRUBYARG_STATIC"] = "-l$(RUBY_SO_NAME)-static"
+  CONFIG["LIBRUBYARG"] = "$(LIBRUBYARG_SHARED)"
+  CONFIG["LIBRUBY"] = "$(LIBRUBY_SO)"
+  CONFIG["LIBRUBY_ALIASES"] = "lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR).$(TEENY) lib$(RUBY_SO_NAME).so"
+  CONFIG["LIBRUBY_SO"] = "lib$(RUBY_SO_NAME).so.$(MAJOR)"
+  CONFIG["LIBRUBY_A"] = "lib$(RUBY_SO_NAME)-static.a"
+  CONFIG["RUBYW_INSTALL_NAME"] = ""
+  CONFIG["rubyw_install_name"] = ""
+  CONFIG["LIBRUBY_DLDFLAGS"] = " -Wl,-h,$(@F)"
+  CONFIG["LIBRUBY_LDSHARED"] = "$(CC) -shared"
+  CONFIG["debugflags"] = ""
+  CONFIG["optflags"] = ""
+  CONFIG["cflags"] = "$(optflags) $(debugflags)"
+  CONFIG["cppflags"] = "-I/opt/csw/X11/include -I/opt/csw/include"
+  CONFIG["RDOCTARGET"] = "install-doc"
+  CONFIG["ARCHFILE"] = ""
+  CONFIG["EXTOUT"] = ".ext"
+  CONFIG["PREP"] = "miniruby$(EXEEXT)"
+  CONFIG["setup"] = "Setup"
+  CONFIG["EXTSTATIC"] = ""
+  CONFIG["STRIP"] = "strip"
+  CONFIG["TRY_LINK"] = ""
+  CONFIG["LIBPATHENV"] = "LD_LIBRARY_PATH"
+  CONFIG["RPATHFLAG"] = " -Wl,-R%1$-s"
+  CONFIG["LIBPATHFLAG"] = " -L%1$-s"
+  CONFIG["LINK_SO"] = ""
+  CONFIG["LIBEXT"] = "a"
+  CONFIG["DLEXT2"] = ""
+  CONFIG["DLEXT"] = "so"
+  CONFIG["LDSHARED"] = "$(CC) -shared"
+  CONFIG["CCDLFLAGS"] = " -fPIC"
+  CONFIG["STATIC"] = ""
+  CONFIG["ARCH_FLAG"] = ""
+  CONFIG["DLDFLAGS"] = ""
+  CONFIG["ALLOCA"] = ""
+  CONFIG["MAKEDIRS"] = "mkdir -p"
+  CONFIG["CP"] = "cp"
+  CONFIG["RM"] = "rm -f"
+  CONFIG["INSTALL_DATA"] = "$(INSTALL) -m 644"
+  CONFIG["INSTALL_SCRIPT"] = "$(INSTALL)"
+  CONFIG["INSTALL_PROGRAM"] = "$(INSTALL)"
+  CONFIG["SET_MAKE"] = ""
+  CONFIG["LN_S"] = "ln -s"
+  CONFIG["OBJDUMP"] = ""
+  CONFIG["DLLWRAP"] = ""
+  CONFIG["WINDRES"] = ""
+  CONFIG["NM"] = ""
+  CONFIG["ASFLAGS"] = ""
+  CONFIG["AS"] = "as"
+  CONFIG["AR"] = "ar"
+  CONFIG["RANLIB"] = "ranlib"
+  CONFIG["YFLAGS"] = ""
+  CONFIG["YACC"] = "bison -y"
+  CONFIG["OUTFLAG"] = "-o "
+  CONFIG["CPPOUTFILE"] = "-o conftest.i"
+  CONFIG["GNU_LD"] = "no"
+  CONFIG["EGREP"] = "/opt/csw/bin/ggrep -E"
+  CONFIG["GREP"] = "/opt/csw/bin/ggrep"
+  CONFIG["CPP"] = "/opt/csw/gcc4/bin/gcc -E"
+  CONFIG["OBJEXT"] = "o"
+  CONFIG["CPPFLAGS"] = "-I/opt/csw/X11/include -I/opt/csw/include $(DEFS) $(cppflags)"
+  CONFIG["LDFLAGS"] = "-L. -L/opt/csw/gcc4/lib/. -m32 -march=i386 -R /opt/csw/gcc4/lib -L/opt/csw/X11/lib -L/opt/csw/lib"
+  CONFIG["CFLAGS"] = "-mtune=i686 -O2 -pipe -m32 -march=i386  -fPIC $(cflags)"
+  CONFIG["CC"] = "/opt/csw/gcc4/bin/gcc"
+  CONFIG["target_os"] = "solaris2.9"
+  CONFIG["target_vendor"] = "pc"
+  CONFIG["target_cpu"] = "i386"
+  CONFIG["target"] = "i386-pc-solaris2.9"
+  CONFIG["host_os"] = "solaris2.9"
+  CONFIG["host_vendor"] = "pc"
+  CONFIG["host_cpu"] = "i386"
+  CONFIG["host"] = "i386-pc-solaris2.9"
+  CONFIG["build_os"] = "solaris2.9"
+  CONFIG["build_vendor"] = "pc"
+  CONFIG["build_cpu"] = "i386"
+  CONFIG["build"] = "i386-pc-solaris2.9"
+  CONFIG["TEENY"] = "7"
+  CONFIG["MINOR"] = "8"
+  CONFIG["MAJOR"] = "1"
+  CONFIG["target_alias"] = ""
+  CONFIG["host_alias"] = ""
+  CONFIG["build_alias"] = ""
+  CONFIG["LIBS"] = "-lpthread -lrt -ldl -lcrypt -lm "
+  CONFIG["ECHO_T"] = ""
+  CONFIG["ECHO_N"] = "-n"
+  CONFIG["ECHO_C"] = ""
+  CONFIG["DEFS"] = "-D_FILE_OFFSET_BITS=64"
+  CONFIG["mandir"] = "$(DESTDIR)/opt/csw/share/man"
+  CONFIG["localedir"] = "$(datarootdir)/locale"
+  CONFIG["libdir"] = "$(DESTDIR)/opt/csw/lib"
+  CONFIG["psdir"] = "$(docdir)"
+  CONFIG["pdfdir"] = "$(docdir)"
+  CONFIG["dvidir"] = "$(docdir)"
+  CONFIG["htmldir"] = "$(docdir)"
+  CONFIG["infodir"] = "$(DESTDIR)/opt/csw/share/info"
+  CONFIG["docdir"] = "$(datarootdir)/doc/$(PACKAGE)"
+  CONFIG["oldincludedir"] = "/usr/include"
+  CONFIG["includedir"] = "$(DESTDIR)/opt/csw/include"
+  CONFIG["localstatedir"] = "$(DESTDIR)/opt/csw/var"
+  CONFIG["sharedstatedir"] = "$(DESTDIR)/opt/csw/share"
+  CONFIG["sysconfdir"] = "$(DESTDIR)/opt/csw/etc"
+  CONFIG["datadir"] = "$(DESTDIR)/opt/csw/share"
+  CONFIG["datarootdir"] = "$(prefix)/share"
+  CONFIG["libexecdir"] = "$(DESTDIR)/opt/csw/libexec"
+  CONFIG["sbindir"] = "$(DESTDIR)/opt/csw/sbin"
+  CONFIG["bindir"] = "$(DESTDIR)/opt/csw/bin"
+  CONFIG["exec_prefix"] = "$(DESTDIR)/opt/csw"
+  CONFIG["PACKAGE_URL"] = ""
+  CONFIG["PACKAGE_BUGREPORT"] = ""
+  CONFIG["PACKAGE_STRING"] = ""
+  CONFIG["PACKAGE_VERSION"] = ""
+  CONFIG["PACKAGE_TARNAME"] = ""
+  CONFIG["PACKAGE_NAME"] = ""
+  CONFIG["PATH_SEPARATOR"] = ":"
   CONFIG["SHELL"] = "/bin/bash"
-  CONFIG["PATH_SEPARATOR"] = ":"
-  CONFIG["PACKAGE_NAME"] = ""
-  CONFIG["PACKAGE_TARNAME"] = ""
-  CONFIG["PACKAGE_VERSION"] = ""
-  CONFIG["PACKAGE_STRING"] = ""
-  CONFIG["PACKAGE_BUGREPORT"] = ""
-  CONFIG["exec_prefix"] = "$(DESTDIR)/opt/csw"
-  CONFIG["bindir"] = "$(DESTDIR)/opt/csw/bin"
-  CONFIG["sbindir"] = "$(DESTDIR)/opt/csw/sbin"
-  CONFIG["libexecdir"] = "$(DESTDIR)/opt/csw/libexec"
-  CONFIG["datarootdir"] = "$(prefix)/share"
-  CONFIG["datadir"] = "$(DESTDIR)/opt/csw/share"
-  CONFIG["sysconfdir"] = "$(DESTDIR)/opt/csw/etc"
-  CONFIG["sharedstatedir"] = "$(DESTDIR)/opt/csw/share"
-  CONFIG["localstatedir"] = "$(DESTDIR)/opt/csw/var"
-  CONFIG["includedir"] = "$(DESTDIR)/opt/csw/include"
-  CONFIG["oldincludedir"] = "/usr/include"
-  CONFIG["docdir"] = "$(datarootdir)/doc/$(PACKAGE)"
-  CONFIG["infodir"] = "$(DESTDIR)/opt/csw/share/info"
-  CONFIG["htmldir"] = "$(docdir)"
-  CONFIG["dvidir"] = "$(docdir)"
-  CONFIG["pdfdir"] = "$(docdir)"
-  CONFIG["psdir"] = "$(docdir)"
-  CONFIG["libdir"] = "$(DESTDIR)/opt/csw/lib"
-  CONFIG["localedir"] = "$(datarootdir)/locale"
-  CONFIG["mandir"] = "$(DESTDIR)/opt/csw/share/man"
-  CONFIG["DEFS"] = "-D_FILE_OFFSET_BITS=64"
-  CONFIG["ECHO_C"] = ""
-  CONFIG["ECHO_N"] = "-n"
-  CONFIG["ECHO_T"] = ""
-  CONFIG["LIBS"] = "-lpthread -lrt -ldl -lcrypt -lm "
-  CONFIG["build_alias"] = ""
-  CONFIG["host_alias"] = ""
-  CONFIG["target_alias"] = ""
-  CONFIG["MAJOR"] = "1"
-  CONFIG["MINOR"] = "8"
-  CONFIG["TEENY"] = "7"
-  CONFIG["build"] = "i386-pc-solaris2.8"
-  CONFIG["build_cpu"] = "i386"
-  CONFIG["build_vendor"] = "pc"
-  CONFIG["build_os"] = "solaris2.8"
-  CONFIG["host"] = "i386-pc-solaris2.8"
-  CONFIG["host_cpu"] = "i386"
-  CONFIG["host_vendor"] = "pc"
-  CONFIG["host_os"] = "solaris2.8"
-  CONFIG["target"] = "i386-pc-solaris2.8"
-  CONFIG["target_cpu"] = "i386"
-  CONFIG["target_vendor"] = "pc"
-  CONFIG["target_os"] = "solaris2.8"
-  CONFIG["CC"] = "/opt/csw/gcc4/bin/gcc"
-  CONFIG["CFLAGS"] = "-mtune=i686 -O2 -pipe -m32 -march=i386 -I/opt/csw/include  -fPIC $(cflags)"
-  CONFIG["LDFLAGS"] = "-L. -L/opt/csw/gcc4/lib/. -m32 -march=i386 -R /opt/csw/gcc4/lib -L/opt/csw/lib"
-  CONFIG["CPPFLAGS"] = "-I/opt/csw/include $(DEFS) $(cppflags)"
-  CONFIG["OBJEXT"] = "o"
-  CONFIG["CPP"] = "/opt/csw/gcc4/bin/gcc -E"
-  CONFIG["GREP"] = "/opt/csw/bin/ggrep"
-  CONFIG["EGREP"] = "/opt/csw/bin/ggrep -E"
-  CONFIG["GNU_LD"] = "no"
-  CONFIG["CPPOUTFILE"] = "-o conftest.i"
-  CONFIG["OUTFLAG"] = "-o "
-  CONFIG["YACC"] = "bison -y"
-  CONFIG["YFLAGS"] = ""
-  CONFIG["RANLIB"] = "ranlib"
-  CONFIG["AR"] = "ar"
-  CONFIG["AS"] = "as"
-  CONFIG["ASFLAGS"] = ""
-  CONFIG["NM"] = ""
-  CONFIG["WINDRES"] = ""
-  CONFIG["DLLWRAP"] = ""
-  CONFIG["OBJDUMP"] = ""
-  CONFIG["LN_S"] = "ln -s"
-  CONFIG["SET_MAKE"] = ""
-  CONFIG["INSTALL_PROGRAM"] = "$(INSTALL)"
-  CONFIG["INSTALL_SCRIPT"] = "$(INSTALL)"
-  CONFIG["INSTALL_DATA"] = "$(INSTALL) -m 644"
-  CONFIG["RM"] = "rm -f"
-  CONFIG["CP"] = "cp"
-  CONFIG["MAKEDIRS"] = "mkdir -p"
-  CONFIG["ALLOCA"] = ""
-  CONFIG["DLDFLAGS"] = ""
-  CONFIG["ARCH_FLAG"] = ""
-  CONFIG["STATIC"] = ""
-  CONFIG["CCDLFLAGS"] = " -fPIC"
-  CONFIG["LDSHARED"] = "$(CC) -shared"
-  CONFIG["DLEXT"] = "so"
-  CONFIG["DLEXT2"] = ""
-  CONFIG["LIBEXT"] = "a"
-  CONFIG["LINK_SO"] = ""
-  CONFIG["LIBPATHFLAG"] = " -L%1$-s"
-  CONFIG["RPATHFLAG"] = " -Wl,-R%1$-s"
-  CONFIG["LIBPATHENV"] = "LD_LIBRARY_PATH"
-  CONFIG["TRY_LINK"] = ""
-  CONFIG["STRIP"] = "strip"
-  CONFIG["EXTSTATIC"] = ""
-  CONFIG["setup"] = "Setup"
-  CONFIG["PREP"] = "miniruby$(EXEEXT)"
-  CONFIG["EXTOUT"] = ".ext"
-  CONFIG["ARCHFILE"] = ""
-  CONFIG["RDOCTARGET"] = "install-doc"
-  CONFIG["cppflags"] = "-I/opt/csw/include"
-  CONFIG["cflags"] = "$(optflags) $(debugflags)"
-  CONFIG["optflags"] = ""
-  CONFIG["debugflags"] = ""
-  CONFIG["LIBRUBY_LDSHARED"] = "$(CC) -shared"
-  CONFIG["LIBRUBY_DLDFLAGS"] = " -Wl,-h,$(@|#_!!_#|F)"
-  CONFIG["rubyw_install_name"] = ""
-  CONFIG["RUBYW_INSTALL_NAME"] = ""
-  CONFIG["LIBRUBY_A"] = "lib$(RUBY_SO_NAME)-static.a"
-  CONFIG["LIBRUBY_SO"] = "lib$(RUBY_SO_NAME).so.$(MAJOR)"
-  CONFIG["LIBRUBY_ALIASES"] = "lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR).$(TEENY) lib$(RUBY_SO_NAME).so"
-  CONFIG["LIBRUBY"] = "$(LIBRUBY_SO)"
-  CONFIG["LIBRUBYARG"] = "$(LIBRUBYARG_SHARED)"
-  CONFIG["LIBRUBYARG_STATIC"] = "-l$(RUBY_SO_NAME)-static"
-  CONFIG["LIBRUBYARG_SHARED"] = "-Wl,-R -Wl,$(libdir) -L$(libdir) -l$(RUBY_SO_NAME)"
-  CONFIG["SOLIBS"] = "$(LIBS)"
-  CONFIG["DLDLIBS"] = " -lc"
-  CONFIG["ENABLE_SHARED"] = "yes"
-  CONFIG["MAINLIBS"] = ""
-  CONFIG["COMMON_LIBS"] = ""
-  CONFIG["COMMON_MACROS"] = ""
-  CONFIG["COMMON_HEADERS"] = ""
-  CONFIG["EXPORT_PREFIX"] = ""
-  CONFIG["MAKEFILES"] = "Makefile"
-  CONFIG["arch"] = "i386-solaris2.8"
-  CONFIG["sitearch"] = "i386-solaris2.8"
-  CONFIG["sitedir"] = "$(libdir)/ruby/site_ruby"
-  CONFIG["vendordir"] = "$(libdir)/ruby/vendor_ruby"
-  CONFIG["configure_args"] = " '--prefix=/opt/csw' '--exec_prefix=/opt/csw' '--bindir=/opt/csw/bin' '--sbindir=/opt/csw/sbin' '--libexecdir=/opt/csw/libexec' '--datadir=/opt/csw/share' '--sysconfdir=/opt/csw/etc' '--sharedstatedir=/opt/csw/share' '--localstatedir=/opt/csw/var' '--libdir=/opt/csw/lib' '--infodir=/opt/csw/share/info' '--includedir=/opt/csw/include' '--mandir=/opt/csw/share/man' '--enable-pthread' '--enable-shared' '--with-tcl-dir=/opt/csw' '--with-tk-dir=/opt/csw' '--with-dbm-dir=/opt/csw' '--with-gdbm-dir=/opt/csw' '--with-iconv-dir=/opt/csw' '--with-openssl-dir=/opt/csw' '--with-readline-dir=/opt/csw' '--with-zlib-dir=/opt/csw' '--enable-install-doc' 'CC=/opt/csw/gcc4/bin/gcc' 'CFLAGS=-mtune=i686 -O2 -pipe -m32 -march=i386 -I/opt/csw/include' 'LDFLAGS=-L/opt/csw/gcc4/lib/. -m32 -march=i386 -R /opt/csw/gcc4/lib -L/opt/csw/lib' 'CPPFLAGS=-I/opt/csw/include'"
-  CONFIG["NROFF"] = "/usr/bin/nroff"
-  CONFIG["MANTYPE"] = "man"
   CONFIG["ruby_version"] = "$(MAJOR).$(MINOR)"
   CONFIG["rubylibdir"] = "$(libdir)/ruby/$(ruby_version)"
   CONFIG["archdir"] = "$(rubylibdir)/$(arch)"

Modified: csw/mgar/pkg/ruby/trunk/files/rbconfig.rb.GCC4.sparc
===================================================================
--- csw/mgar/pkg/ruby/trunk/files/rbconfig.rb.GCC4.sparc	2010-07-12 20:29:26 UTC (rev 10508)
+++ csw/mgar/pkg/ruby/trunk/files/rbconfig.rb.GCC4.sparc	2010-07-13 01:28:28 UTC (rev 10509)
@@ -6,147 +6,148 @@
   RUBY_VERSION == "1.8.7" or
     raise "ruby lib version (1.8.7) doesn't match executable version (#{RUBY_VERSION})"
 
-  TOPDIR = File.dirname(__FILE__).chomp!("/lib/ruby/1.8/sparc-solaris2.8")
+  TOPDIR = File.dirname(__FILE__).chomp!("/lib/ruby/1.8/sparc-solaris2.9")
   DESTDIR = '' unless defined? DESTDIR
   CONFIG = {}
   CONFIG["DESTDIR"] = DESTDIR
   CONFIG["INSTALL"] = '/opt/csw/bin/ginstall -c'
+  CONFIG["EXEEXT"] = ""
   CONFIG["prefix"] = (TOPDIR || DESTDIR + "/opt/csw")
-  CONFIG["EXEEXT"] = ""
   CONFIG["ruby_install_name"] = "ruby"
   CONFIG["RUBY_INSTALL_NAME"] = "ruby"
   CONFIG["RUBY_SO_NAME"] = "ruby"
+  CONFIG["MANTYPE"] = "man"
+  CONFIG["NROFF"] = "/usr/bin/nroff"
+  CONFIG["configure_args"] = " '--prefix=/opt/csw' '--exec_prefix=/opt/csw' '--bindir=/opt/csw/bin' '--sbindir=/opt/csw/sbin' '--libexecdir=/opt/csw/libexec' '--datadir=/opt/csw/share' '--sysconfdir=/opt/csw/etc' '--sharedstatedir=/opt/csw/share' '--localstatedir=/opt/csw/var' '--libdir=/opt/csw/lib' '--infodir=/opt/csw/share/info' '--includedir=/opt/csw/include' '--mandir=/opt/csw/share/man' '--enable-pthread' '--enable-shared' '--with-tcl-dir=/opt/csw' '--with-tk-dir=/opt/csw' '--with-dbm-dir=/opt/csw/bdb47' '--with-gdbm-dir=/opt/csw' '--with-iconv-dir=/opt/csw' '--with-openssl-dir=/opt/csw' '--with-readline-dir=/opt/csw' '--with-zlib-dir=/opt/csw' '--enable-install-doc' 'CC=/opt/csw/gcc4/bin/gcc' 'CFLAGS=-O2 -pipe -mcpu=v8' 'LDFLAGS=-L/opt/csw/gcc4/lib/. -mcpu=v8 -R /opt/csw/gcc4/lib -L/opt/csw/X11/lib -L/opt/csw/lib' 'CPPFLAGS=-I/opt/csw/X11/include -I/opt/csw/include'"
+  CONFIG["vendordir"] = "$(libdir)/ruby/vendor_ruby"
+  CONFIG["sitedir"] = "$(libdir)/ruby/site_ruby"
+  CONFIG["sitearch"] = "sparc-solaris2.9"
+  CONFIG["arch"] = "sparc-solaris2.9"
+  CONFIG["MAKEFILES"] = "Makefile"
+  CONFIG["EXPORT_PREFIX"] = ""
+  CONFIG["COMMON_HEADERS"] = ""
+  CONFIG["COMMON_MACROS"] = ""
+  CONFIG["COMMON_LIBS"] = ""
+  CONFIG["MAINLIBS"] = ""
+  CONFIG["ENABLE_SHARED"] = "yes"
+  CONFIG["DLDLIBS"] = " -lc"
+  CONFIG["SOLIBS"] = "$(LIBS)"
+  CONFIG["LIBRUBYARG_SHARED"] = "-Wl,-R -Wl,$(libdir) -L$(libdir) -l$(RUBY_SO_NAME)"
+  CONFIG["LIBRUBYARG_STATIC"] = "-l$(RUBY_SO_NAME)-static"
+  CONFIG["LIBRUBYARG"] = "$(LIBRUBYARG_SHARED)"
+  CONFIG["LIBRUBY"] = "$(LIBRUBY_SO)"
+  CONFIG["LIBRUBY_ALIASES"] = "lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR).$(TEENY) lib$(RUBY_SO_NAME).so"
+  CONFIG["LIBRUBY_SO"] = "lib$(RUBY_SO_NAME).so.$(MAJOR)"
+  CONFIG["LIBRUBY_A"] = "lib$(RUBY_SO_NAME)-static.a"
+  CONFIG["RUBYW_INSTALL_NAME"] = ""
+  CONFIG["rubyw_install_name"] = ""
+  CONFIG["LIBRUBY_DLDFLAGS"] = " -Wl,-h,$(@F)"
+  CONFIG["LIBRUBY_LDSHARED"] = "$(CC) -shared"
+  CONFIG["debugflags"] = ""
+  CONFIG["optflags"] = ""
+  CONFIG["cflags"] = "$(optflags) $(debugflags)"
+  CONFIG["cppflags"] = "-I/opt/csw/X11/include -I/opt/csw/include"
+  CONFIG["RDOCTARGET"] = "install-doc"
+  CONFIG["ARCHFILE"] = ""
+  CONFIG["EXTOUT"] = ".ext"
+  CONFIG["PREP"] = "miniruby$(EXEEXT)"
+  CONFIG["setup"] = "Setup"
+  CONFIG["EXTSTATIC"] = ""
+  CONFIG["STRIP"] = "strip"
+  CONFIG["TRY_LINK"] = ""
+  CONFIG["LIBPATHENV"] = "LD_LIBRARY_PATH"
+  CONFIG["RPATHFLAG"] = " -Wl,-R%1$-s"
+  CONFIG["LIBPATHFLAG"] = " -L%1$-s"
+  CONFIG["LINK_SO"] = ""
+  CONFIG["LIBEXT"] = "a"
+  CONFIG["DLEXT2"] = ""
+  CONFIG["DLEXT"] = "so"
+  CONFIG["LDSHARED"] = "$(CC) -shared"
+  CONFIG["CCDLFLAGS"] = " -fPIC"
+  CONFIG["STATIC"] = ""
+  CONFIG["ARCH_FLAG"] = ""
+  CONFIG["DLDFLAGS"] = ""
+  CONFIG["ALLOCA"] = ""
+  CONFIG["MAKEDIRS"] = "mkdir -p"
+  CONFIG["CP"] = "cp"
+  CONFIG["RM"] = "rm -f"
+  CONFIG["INSTALL_DATA"] = "$(INSTALL) -m 644"
+  CONFIG["INSTALL_SCRIPT"] = "$(INSTALL)"
+  CONFIG["INSTALL_PROGRAM"] = "$(INSTALL)"
+  CONFIG["SET_MAKE"] = ""
+  CONFIG["LN_S"] = "ln -s"
+  CONFIG["OBJDUMP"] = ""
+  CONFIG["DLLWRAP"] = ""
+  CONFIG["WINDRES"] = ""
+  CONFIG["NM"] = ""
+  CONFIG["ASFLAGS"] = ""
+  CONFIG["AS"] = "as"
+  CONFIG["AR"] = "ar"
+  CONFIG["RANLIB"] = "ranlib"
+  CONFIG["YFLAGS"] = ""
+  CONFIG["YACC"] = "bison -y"
+  CONFIG["OUTFLAG"] = "-o "
+  CONFIG["CPPOUTFILE"] = "-o conftest.i"
+  CONFIG["GNU_LD"] = "no"
+  CONFIG["EGREP"] = "/opt/csw/bin/ggrep -E"
+  CONFIG["GREP"] = "/opt/csw/bin/ggrep"
+  CONFIG["CPP"] = "/opt/csw/gcc4/bin/gcc -E"
+  CONFIG["OBJEXT"] = "o"
+  CONFIG["CPPFLAGS"] = "-I/opt/csw/X11/include -I/opt/csw/include $(DEFS) $(cppflags)"
+  CONFIG["LDFLAGS"] = "-L. -L/opt/csw/gcc4/lib/. -mcpu=v8 -R /opt/csw/gcc4/lib -L/opt/csw/X11/lib -L/opt/csw/lib"
+  CONFIG["CFLAGS"] = "-O2 -pipe -mcpu=v8  -fPIC $(cflags)"
+  CONFIG["CC"] = "/opt/csw/gcc4/bin/gcc"
+  CONFIG["target_os"] = "solaris2.9"
+  CONFIG["target_vendor"] = "sun"
+  CONFIG["target_cpu"] = "sparc"
+  CONFIG["target"] = "sparc-sun-solaris2.9"
+  CONFIG["host_os"] = "solaris2.9"
+  CONFIG["host_vendor"] = "sun"
+  CONFIG["host_cpu"] = "sparc"
+  CONFIG["host"] = "sparc-sun-solaris2.9"
+  CONFIG["build_os"] = "solaris2.9"
+  CONFIG["build_vendor"] = "sun"
+  CONFIG["build_cpu"] = "sparc"
+  CONFIG["build"] = "sparc-sun-solaris2.9"
+  CONFIG["TEENY"] = "7"
+  CONFIG["MINOR"] = "8"
+  CONFIG["MAJOR"] = "1"
+  CONFIG["target_alias"] = ""
+  CONFIG["host_alias"] = ""
+  CONFIG["build_alias"] = ""
+  CONFIG["LIBS"] = "-lpthread -lrt -ldl -lcrypt -lm "
+  CONFIG["ECHO_T"] = ""
+  CONFIG["ECHO_N"] = "-n"
+  CONFIG["ECHO_C"] = ""
+  CONFIG["DEFS"] = "-D_FILE_OFFSET_BITS=64"
+  CONFIG["mandir"] = "$(DESTDIR)/opt/csw/share/man"
+  CONFIG["localedir"] = "$(datarootdir)/locale"
+  CONFIG["libdir"] = "$(DESTDIR)/opt/csw/lib"
+  CONFIG["psdir"] = "$(docdir)"
+  CONFIG["pdfdir"] = "$(docdir)"
+  CONFIG["dvidir"] = "$(docdir)"
+  CONFIG["htmldir"] = "$(docdir)"
+  CONFIG["infodir"] = "$(DESTDIR)/opt/csw/share/info"
+  CONFIG["docdir"] = "$(datarootdir)/doc/$(PACKAGE)"
+  CONFIG["oldincludedir"] = "/usr/include"
+  CONFIG["includedir"] = "$(DESTDIR)/opt/csw/include"
+  CONFIG["localstatedir"] = "$(DESTDIR)/opt/csw/var"
+  CONFIG["sharedstatedir"] = "$(DESTDIR)/opt/csw/share"
+  CONFIG["sysconfdir"] = "$(DESTDIR)/opt/csw/etc"
+  CONFIG["datadir"] = "$(DESTDIR)/opt/csw/share"
+  CONFIG["datarootdir"] = "$(prefix)/share"
+  CONFIG["libexecdir"] = "$(DESTDIR)/opt/csw/libexec"
+  CONFIG["sbindir"] = "$(DESTDIR)/opt/csw/sbin"
+  CONFIG["bindir"] = "$(DESTDIR)/opt/csw/bin"
+  CONFIG["exec_prefix"] = "$(DESTDIR)/opt/csw"
+  CONFIG["PACKAGE_URL"] = ""
+  CONFIG["PACKAGE_BUGREPORT"] = ""
+  CONFIG["PACKAGE_STRING"] = ""
+  CONFIG["PACKAGE_VERSION"] = ""
+  CONFIG["PACKAGE_TARNAME"] = ""
+  CONFIG["PACKAGE_NAME"] = ""
+  CONFIG["PATH_SEPARATOR"] = ":"
   CONFIG["SHELL"] = "/bin/bash"
-  CONFIG["PATH_SEPARATOR"] = ":"
-  CONFIG["PACKAGE_NAME"] = ""
-  CONFIG["PACKAGE_TARNAME"] = ""
-  CONFIG["PACKAGE_VERSION"] = ""
-  CONFIG["PACKAGE_STRING"] = ""
-  CONFIG["PACKAGE_BUGREPORT"] = ""
-  CONFIG["exec_prefix"] = "$(DESTDIR)/opt/csw"
-  CONFIG["bindir"] = "$(DESTDIR)/opt/csw/bin"
-  CONFIG["sbindir"] = "$(DESTDIR)/opt/csw/sbin"
-  CONFIG["libexecdir"] = "$(DESTDIR)/opt/csw/libexec"
-  CONFIG["datarootdir"] = "$(prefix)/share"
-  CONFIG["datadir"] = "$(DESTDIR)/opt/csw/share"
-  CONFIG["sysconfdir"] = "$(DESTDIR)/opt/csw/etc"
-  CONFIG["sharedstatedir"] = "$(DESTDIR)/opt/csw/share"
-  CONFIG["localstatedir"] = "$(DESTDIR)/opt/csw/var"
-  CONFIG["includedir"] = "$(DESTDIR)/opt/csw/include"
-  CONFIG["oldincludedir"] = "/usr/include"
-  CONFIG["docdir"] = "$(datarootdir)/doc/$(PACKAGE)"
-  CONFIG["infodir"] = "$(DESTDIR)/opt/csw/share/info"
-  CONFIG["htmldir"] = "$(docdir)"
-  CONFIG["dvidir"] = "$(docdir)"
-  CONFIG["pdfdir"] = "$(docdir)"
-  CONFIG["psdir"] = "$(docdir)"
-  CONFIG["libdir"] = "$(DESTDIR)/opt/csw/lib"
-  CONFIG["localedir"] = "$(datarootdir)/locale"
-  CONFIG["mandir"] = "$(DESTDIR)/opt/csw/share/man"
-  CONFIG["DEFS"] = "-D_FILE_OFFSET_BITS=64"
-  CONFIG["ECHO_C"] = ""
-  CONFIG["ECHO_N"] = "-n"
-  CONFIG["ECHO_T"] = ""
-  CONFIG["LIBS"] = "-lpthread -lrt -ldl -lcrypt -lm "
-  CONFIG["build_alias"] = ""
-  CONFIG["host_alias"] = ""
-  CONFIG["target_alias"] = ""
-  CONFIG["MAJOR"] = "1"
-  CONFIG["MINOR"] = "8"
-  CONFIG["TEENY"] = "7"
-  CONFIG["build"] = "sparc-sun-solaris2.8"
-  CONFIG["build_cpu"] = "sparc"
-  CONFIG["build_vendor"] = "sun"
-  CONFIG["build_os"] = "solaris2.8"
-  CONFIG["host"] = "sparc-sun-solaris2.8"
-  CONFIG["host_cpu"] = "sparc"
-  CONFIG["host_vendor"] = "sun"
-  CONFIG["host_os"] = "solaris2.8"
-  CONFIG["target"] = "sparc-sun-solaris2.8"
-  CONFIG["target_cpu"] = "sparc"
-  CONFIG["target_vendor"] = "sun"
-  CONFIG["target_os"] = "solaris2.8"
-  CONFIG["CC"] = "/opt/csw/gcc4/bin/gcc"
-  CONFIG["CFLAGS"] = "-O2 -pipe -mcpu=v8 -I/opt/csw/include  -fPIC $(cflags)"
-  CONFIG["LDFLAGS"] = "-L. -L/opt/csw/gcc4/lib/. -mcpu=v8 -R /opt/csw/gcc4/lib -L/opt/csw/lib"
-  CONFIG["CPPFLAGS"] = "-I/opt/csw/include $(DEFS) $(cppflags)"
-  CONFIG["OBJEXT"] = "o"
-  CONFIG["CPP"] = "/opt/csw/gcc4/bin/gcc -E"
-  CONFIG["GREP"] = "/opt/csw/bin/ggrep"
-  CONFIG["EGREP"] = "/opt/csw/bin/ggrep -E"
-  CONFIG["GNU_LD"] = "no"
-  CONFIG["CPPOUTFILE"] = "-o conftest.i"
-  CONFIG["OUTFLAG"] = "-o "
-  CONFIG["YACC"] = "bison -y"
-  CONFIG["YFLAGS"] = ""
-  CONFIG["RANLIB"] = "ranlib"
-  CONFIG["AR"] = "ar"
-  CONFIG["AS"] = "as"
-  CONFIG["ASFLAGS"] = ""
-  CONFIG["NM"] = ""
-  CONFIG["WINDRES"] = ""
-  CONFIG["DLLWRAP"] = ""
-  CONFIG["OBJDUMP"] = ""
-  CONFIG["LN_S"] = "ln -s"
-  CONFIG["SET_MAKE"] = ""
-  CONFIG["INSTALL_PROGRAM"] = "$(INSTALL)"
-  CONFIG["INSTALL_SCRIPT"] = "$(INSTALL)"
-  CONFIG["INSTALL_DATA"] = "$(INSTALL) -m 644"
-  CONFIG["RM"] = "rm -f"
-  CONFIG["CP"] = "cp"
-  CONFIG["MAKEDIRS"] = "mkdir -p"
-  CONFIG["ALLOCA"] = ""
-  CONFIG["DLDFLAGS"] = ""
-  CONFIG["ARCH_FLAG"] = ""
-  CONFIG["STATIC"] = ""
-  CONFIG["CCDLFLAGS"] = " -fPIC"
-  CONFIG["LDSHARED"] = "$(CC) -shared"
-  CONFIG["DLEXT"] = "so"
-  CONFIG["DLEXT2"] = ""
-  CONFIG["LIBEXT"] = "a"
-  CONFIG["LINK_SO"] = ""
-  CONFIG["LIBPATHFLAG"] = " -L%1$-s"
-  CONFIG["RPATHFLAG"] = " -Wl,-R%1$-s"
-  CONFIG["LIBPATHENV"] = "LD_LIBRARY_PATH"
-  CONFIG["TRY_LINK"] = ""
-  CONFIG["STRIP"] = "strip"
-  CONFIG["EXTSTATIC"] = ""
-  CONFIG["setup"] = "Setup"
-  CONFIG["PREP"] = "miniruby$(EXEEXT)"
-  CONFIG["EXTOUT"] = ".ext"
-  CONFIG["ARCHFILE"] = ""
-  CONFIG["RDOCTARGET"] = "install-doc"
-  CONFIG["cppflags"] = "-I/opt/csw/include"
-  CONFIG["cflags"] = "$(optflags) $(debugflags)"
-  CONFIG["optflags"] = ""
-  CONFIG["debugflags"] = ""
-  CONFIG["LIBRUBY_LDSHARED"] = "$(CC) -shared"
-  CONFIG["LIBRUBY_DLDFLAGS"] = " -Wl,-h,$(@|#_!!_#|F)"
-  CONFIG["rubyw_install_name"] = ""
-  CONFIG["RUBYW_INSTALL_NAME"] = ""
-  CONFIG["LIBRUBY_A"] = "lib$(RUBY_SO_NAME)-static.a"
-  CONFIG["LIBRUBY_SO"] = "lib$(RUBY_SO_NAME).so.$(MAJOR)"
-  CONFIG["LIBRUBY_ALIASES"] = "lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR).$(TEENY) lib$(RUBY_SO_NAME).so"
-  CONFIG["LIBRUBY"] = "$(LIBRUBY_SO)"
-  CONFIG["LIBRUBYARG"] = "$(LIBRUBYARG_SHARED)"
-  CONFIG["LIBRUBYARG_STATIC"] = "-l$(RUBY_SO_NAME)-static"
-  CONFIG["LIBRUBYARG_SHARED"] = "-Wl,-R -Wl,$(libdir) -L$(libdir) -l$(RUBY_SO_NAME)"
-  CONFIG["SOLIBS"] = "$(LIBS)"
-  CONFIG["DLDLIBS"] = " -lc"
-  CONFIG["ENABLE_SHARED"] = "yes"
-  CONFIG["MAINLIBS"] = ""
-  CONFIG["COMMON_LIBS"] = ""
-  CONFIG["COMMON_MACROS"] = ""
-  CONFIG["COMMON_HEADERS"] = ""
-  CONFIG["EXPORT_PREFIX"] = ""
-  CONFIG["MAKEFILES"] = "Makefile"
-  CONFIG["arch"] = "sparc-solaris2.8"
-  CONFIG["sitearch"] = "sparc-solaris2.8"
-  CONFIG["sitedir"] = "$(libdir)/ruby/site_ruby"
-  CONFIG["vendordir"] = "$(libdir)/ruby/vendor_ruby"
-  CONFIG["configure_args"] = " '--prefix=/opt/csw' '--exec_prefix=/opt/csw' '--bindir=/opt/csw/bin' '--sbindir=/opt/csw/sbin' '--libexecdir=/opt/csw/libexec' '--datadir=/opt/csw/share' '--sysconfdir=/opt/csw/etc' '--sharedstatedir=/opt/csw/share' '--localstatedir=/opt/csw/var' '--libdir=/opt/csw/lib' '--infodir=/opt/csw/share/info' '--includedir=/opt/csw/include' '--mandir=/opt/csw/share/man' '--enable-pthread' '--enable-shared' '--with-tcl-dir=/opt/csw' '--with-tk-dir=/opt/csw' '--with-dbm-dir=/opt/csw' '--with-gdbm-dir=/opt/csw' '--with-iconv-dir=/opt/csw' '--with-openssl-dir=/opt/csw' '--with-readline-dir=/opt/csw' '--with-zlib-dir=/opt/csw' '--enable-install-doc' 'CC=/opt/csw/gcc4/bin/gcc' 'CFLAGS=-O2 -pipe -mcpu=v8 -I/opt/csw/include' 'LDFLAGS=-L/opt/csw/gcc4/lib/. -mcpu=v8 -R /opt/csw/gcc4/lib -L/opt/csw/lib' 'CPPFLAGS=-I/opt/csw/include'"
-  CONFIG["NROFF"] = "/usr/bin/nroff"
-  CONFIG["MANTYPE"] = "man"
   CONFIG["ruby_version"] = "$(MAJOR).$(MINOR)"
   CONFIG["rubylibdir"] = "$(libdir)/ruby/$(ruby_version)"
   CONFIG["archdir"] = "$(rubylibdir)/$(arch)"


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 Jul 13 04:05:35 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Tue, 13 Jul 2010 02:05:35 +0000
Subject: [csw-devel] SF.net SVN: gar:[10510] csw/mgar/pkg/ruby/trunk/Makefile
Message-ID: <E1OYUsI-00060Z-WC@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 10510
          http://gar.svn.sourceforge.net/gar/?rev=10510&view=rev
Author:   bdwalton
Date:     2010-07-13 02:05:34 +0000 (Tue, 13 Jul 2010)

Log Message:
-----------
ruby: update bdb dep to 4.8

Modified Paths:
--------------
    csw/mgar/pkg/ruby/trunk/Makefile

Modified: csw/mgar/pkg/ruby/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ruby/trunk/Makefile	2010-07-13 01:28:28 UTC (rev 10509)
+++ csw/mgar/pkg/ruby/trunk/Makefile	2010-07-13 02:05:34 UTC (rev 10510)
@@ -7,7 +7,7 @@
 TEST_SCRIPTS =
 TEST_ARGS = test-all
 
-BUILD_DEP_PKGS = CSWbdb47 CSWgdbm CSWgfile CSWiconv CSWncurses CSWossldevel
+BUILD_DEP_PKGS = CSWbdb48devel CSWgdbm CSWgfile CSWiconv CSWncurses CSWossldevel
 BUILD_DEP_PKGS += CSWreadline CSWzlib
 
 PACKAGES = CSWruby CSWrubydoc CSWrubytk CSWrubydev CSWrubymode CSWrubymodeel
@@ -18,7 +18,7 @@
 
 LICENSE = COPYING
 
-RUNTIME_DEP_PKGS_CSWruby = CSWbdb47 CSWgdbm CSWiconv 
+RUNTIME_DEP_PKGS_CSWruby = CSWbdb48 CSWgdbm CSWiconv 
 RUNTIME_DEP_PKGS_CSWruby += CSWncurses CSWosslrt CSWreadline CSWzlib
 
 RUNTIME_DEP_PKGS_CSWrubydoc = CSWruby
@@ -82,7 +82,7 @@
 CONFIGURE_ARGS += --enable-shared
 CONFIGURE_ARGS += --with-tcl-dir=$(prefix)
 CONFIGURE_ARGS += --with-tk-dir=$(prefix)
-CONFIGURE_ARGS += --with-dbm-dir=$(prefix)/bdb47
+CONFIGURE_ARGS += --with-dbm-dir=$(prefix)/bdb48
 CONFIGURE_ARGS += --with-gdbm-dir=$(prefix)
 CONFIGURE_ARGS += --with-iconv-dir=$(prefix)
 CONFIGURE_ARGS += --with-openssl-dir=$(prefix)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From bdwalton at users.sourceforge.net  Tue Jul 13 04:28:19 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Tue, 13 Jul 2010 02:28:19 +0000
Subject: [csw-devel] SF.net SVN: gar:[10511] csw/mgar/pkg/ruby/trunk/Makefile
Message-ID: <E1OYVEJ-0008LQ-C1@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 10511
          http://gar.svn.sourceforge.net/gar/?rev=10511&view=rev
Author:   bdwalton
Date:     2010-07-13 02:28:19 +0000 (Tue, 13 Jul 2010)

Log Message:
-----------
ruby: skip multiconfig postinstall step when using gcc

Modified Paths:
--------------
    csw/mgar/pkg/ruby/trunk/Makefile

Modified: csw/mgar/pkg/ruby/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ruby/trunk/Makefile	2010-07-13 02:05:34 UTC (rev 10510)
+++ csw/mgar/pkg/ruby/trunk/Makefile	2010-07-13 02:28:19 UTC (rev 10511)
@@ -119,7 +119,10 @@
 
 RBCONFIG = /opt/csw/lib/ruby/1.8/$(GARCH)-solaris2.9/rbconfig.rb
 
-PI_TARGETS  = samples rbconfig rbscripts rubymode multiconfig
+PI_TARGETS  = samples rbconfig rbscripts rubymode
+ifndef USEGCC
+PI_TARGETS += multiconfig
+endif
 
 post-install-modulated: $(PI_TARGETS)
 	@$(MAKECOOKIE)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From bdwalton at users.sourceforge.net  Tue Jul 13 05:03:54 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Tue, 13 Jul 2010 03:03:54 +0000
Subject: [csw-devel] SF.net SVN: gar:[10512] csw/mgar/pkg/ruby/trunk/files
Message-ID: <E1OYVmk-0001xN-E5@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 10512
          http://gar.svn.sourceforge.net/gar/?rev=10512&view=rev
Author:   bdwalton
Date:     2010-07-13 03:03:54 +0000 (Tue, 13 Jul 2010)

Log Message:
-----------
ruby: update gcc4 rbconfig files to reflect bdb change

Modified Paths:
--------------
    csw/mgar/pkg/ruby/trunk/files/rbconfig.rb.GCC4.i386
    csw/mgar/pkg/ruby/trunk/files/rbconfig.rb.GCC4.sparc

Modified: csw/mgar/pkg/ruby/trunk/files/rbconfig.rb.GCC4.i386
===================================================================
--- csw/mgar/pkg/ruby/trunk/files/rbconfig.rb.GCC4.i386	2010-07-13 02:28:19 UTC (rev 10511)
+++ csw/mgar/pkg/ruby/trunk/files/rbconfig.rb.GCC4.i386	2010-07-13 03:03:54 UTC (rev 10512)
@@ -18,7 +18,7 @@
   CONFIG["RUBY_SO_NAME"] = "ruby"
   CONFIG["MANTYPE"] = "man"
   CONFIG["NROFF"] = "/usr/bin/nroff"
-  CONFIG["configure_args"] = " '--prefix=/opt/csw' '--exec_prefix=/opt/csw' '--bindir=/opt/csw/bin' '--sbindir=/opt/csw/sbin' '--libexecdir=/opt/csw/libexec' '--datadir=/opt/csw/share' '--sysconfdir=/opt/csw/etc' '--sharedstatedir=/opt/csw/share' '--localstatedir=/opt/csw/var' '--libdir=/opt/csw/lib' '--infodir=/opt/csw/share/info' '--includedir=/opt/csw/include' '--mandir=/opt/csw/share/man' '--enable-pthread' '--enable-shared' '--with-tcl-dir=/opt/csw' '--with-tk-dir=/opt/csw' '--with-dbm-dir=/opt/csw/bdb47' '--with-gdbm-dir=/opt/csw' '--with-iconv-dir=/opt/csw' '--with-openssl-dir=/opt/csw' '--with-readline-dir=/opt/csw' '--with-zlib-dir=/opt/csw' '--enable-install-doc' 'CC=/opt/csw/gcc4/bin/gcc' 'CFLAGS=-mtune=i686 -O2 -pipe -m32 -march=i386' 'LDFLAGS=-L/opt/csw/gcc4/lib/. -m32 -march=i386 -R /opt/csw/gcc4/lib -L/opt/csw/X11/lib -L/opt/csw/lib' 'CPPFLAGS=-I/opt/csw/X11/include -I/opt/csw/include'"
+  CONFIG["configure_args"] = " '--prefix=/opt/csw' '--exec_prefix=/opt/csw' '--bindir=/opt/csw/bin' '--sbindir=/opt/csw/sbin' '--libexecdir=/opt/csw/libexec' '--datadir=/opt/csw/share' '--sysconfdir=/opt/csw/etc' '--sharedstatedir=/opt/csw/share' '--localstatedir=/opt/csw/var' '--libdir=/opt/csw/lib' '--infodir=/opt/csw/share/info' '--includedir=/opt/csw/include' '--mandir=/opt/csw/share/man' '--enable-pthread' '--enable-shared' '--with-tcl-dir=/opt/csw' '--with-tk-dir=/opt/csw' '--with-dbm-dir=/opt/csw/bdb48' '--with-gdbm-dir=/opt/csw' '--with-iconv-dir=/opt/csw' '--with-openssl-dir=/opt/csw' '--with-readline-dir=/opt/csw' '--with-zlib-dir=/opt/csw' '--enable-install-doc' 'CC=/opt/csw/gcc4/bin/gcc' 'CFLAGS=-mtune=i686 -O2 -pipe -m32 -march=i386' 'LDFLAGS=-L/opt/csw/gcc4/lib/. -m32 -march=i386 -R /opt/csw/gcc4/lib -L/opt/csw/X11/lib -L/opt/csw/lib' 'CPPFLAGS=-I/opt/csw/X11/include -I/opt/csw/include'"
   CONFIG["vendordir"] = "$(libdir)/ruby/vendor_ruby"
   CONFIG["sitedir"] = "$(libdir)/ruby/site_ruby"
   CONFIG["sitearch"] = "i386-solaris2.9"

Modified: csw/mgar/pkg/ruby/trunk/files/rbconfig.rb.GCC4.sparc
===================================================================
--- csw/mgar/pkg/ruby/trunk/files/rbconfig.rb.GCC4.sparc	2010-07-13 02:28:19 UTC (rev 10511)
+++ csw/mgar/pkg/ruby/trunk/files/rbconfig.rb.GCC4.sparc	2010-07-13 03:03:54 UTC (rev 10512)
@@ -18,7 +18,7 @@
   CONFIG["RUBY_SO_NAME"] = "ruby"
   CONFIG["MANTYPE"] = "man"
   CONFIG["NROFF"] = "/usr/bin/nroff"
-  CONFIG["configure_args"] = " '--prefix=/opt/csw' '--exec_prefix=/opt/csw' '--bindir=/opt/csw/bin' '--sbindir=/opt/csw/sbin' '--libexecdir=/opt/csw/libexec' '--datadir=/opt/csw/share' '--sysconfdir=/opt/csw/etc' '--sharedstatedir=/opt/csw/share' '--localstatedir=/opt/csw/var' '--libdir=/opt/csw/lib' '--infodir=/opt/csw/share/info' '--includedir=/opt/csw/include' '--mandir=/opt/csw/share/man' '--enable-pthread' '--enable-shared' '--with-tcl-dir=/opt/csw' '--with-tk-dir=/opt/csw' '--with-dbm-dir=/opt/csw/bdb47' '--with-gdbm-dir=/opt/csw' '--with-iconv-dir=/opt/csw' '--with-openssl-dir=/opt/csw' '--with-readline-dir=/opt/csw' '--with-zlib-dir=/opt/csw' '--enable-install-doc' 'CC=/opt/csw/gcc4/bin/gcc' 'CFLAGS=-O2 -pipe -mcpu=v8' 'LDFLAGS=-L/opt/csw/gcc4/lib/. -mcpu=v8 -R /opt/csw/gcc4/lib -L/opt/csw/X11/lib -L/opt/csw/lib' 'CPPFLAGS=-I/opt/csw/X11/include -I/opt/csw/include'"
+  CONFIG["configure_args"] = " '--prefix=/opt/csw' '--exec_prefix=/opt/csw' '--bindir=/opt/csw/bin' '--sbindir=/opt/csw/sbin' '--libexecdir=/opt/csw/libexec' '--datadir=/opt/csw/share' '--sysconfdir=/opt/csw/etc' '--sharedstatedir=/opt/csw/share' '--localstatedir=/opt/csw/var' '--libdir=/opt/csw/lib' '--infodir=/opt/csw/share/info' '--includedir=/opt/csw/include' '--mandir=/opt/csw/share/man' '--enable-pthread' '--enable-shared' '--with-tcl-dir=/opt/csw' '--with-tk-dir=/opt/csw' '--with-dbm-dir=/opt/csw/bdb48' '--with-gdbm-dir=/opt/csw' '--with-iconv-dir=/opt/csw' '--with-openssl-dir=/opt/csw' '--with-readline-dir=/opt/csw' '--with-zlib-dir=/opt/csw' '--enable-install-doc' 'CC=/opt/csw/gcc4/bin/gcc' 'CFLAGS=-O2 -pipe -mcpu=v8' 'LDFLAGS=-L/opt/csw/gcc4/lib/. -mcpu=v8 -R /opt/csw/gcc4/lib -L/opt/csw/X11/lib -L/opt/csw/lib' 'CPPFLAGS=-I/opt/csw/X11/include -I/opt/csw/include'"
   CONFIG["vendordir"] = "$(libdir)/ruby/vendor_ruby"
   CONFIG["sitedir"] = "$(libdir)/ruby/site_ruby"
   CONFIG["sitearch"] = "sparc-solaris2.9"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From bonivart at users.sourceforge.net  Tue Jul 13 11:46:19 2010
From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net)
Date: Tue, 13 Jul 2010 09:46:19 +0000
Subject: [csw-devel] SF.net SVN: gar:[10513]
	csw/mgar/pkg/miltergreylist/trunk
Message-ID: <E1OYc4B-0000sw-FT@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 10513
          http://gar.svn.sourceforge.net/gar/?rev=10513&view=rev
Author:   bonivart
Date:     2010-07-13 09:46:19 +0000 (Tue, 13 Jul 2010)

Log Message:
-----------
milter-greylist: update to 4.2.6

Modified Paths:
--------------
    csw/mgar/pkg/miltergreylist/trunk/Makefile
    csw/mgar/pkg/miltergreylist/trunk/checksums

Modified: csw/mgar/pkg/miltergreylist/trunk/Makefile
===================================================================
--- csw/mgar/pkg/miltergreylist/trunk/Makefile	2010-07-13 03:03:54 UTC (rev 10512)
+++ csw/mgar/pkg/miltergreylist/trunk/Makefile	2010-07-13 09:46:19 UTC (rev 10513)
@@ -1,5 +1,5 @@
 GARNAME = miltergreylist
-GARVERSION = 4.2.5
+GARVERSION = 4.2.6
 #RELEASE = rc1
 #DISTVERSION = $(GARVERSION)$(RELEASE)
 DISTVERSION = $(GARVERSION)
@@ -16,6 +16,9 @@
 DISTFILES  = milter-greylist-$(DISTVERSION).tgz
 DISTFILES += COPYING
 
+PACKAGING_PLATFORMS += solaris9-sparc solaris9-i386
+PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386
+
 PATCHFILES += 0001-Path-and-user-changes-in-conf-file.patch
 
 RUNTIME_DEP_PKGS = CSWcurlrt CSWgeoip CSWlibspf2

Modified: csw/mgar/pkg/miltergreylist/trunk/checksums
===================================================================
--- csw/mgar/pkg/miltergreylist/trunk/checksums	2010-07-13 03:03:54 UTC (rev 10512)
+++ csw/mgar/pkg/miltergreylist/trunk/checksums	2010-07-13 09:46:19 UTC (rev 10513)
@@ -1,3 +1,3 @@
 608fd6143626c2dbdfc6dac0278e6fde  0001-Path-and-user-changes-in-conf-file.patch
 e61edd088404cd2a0eacb03ce70e2d5f  COPYING
-fa1e68ff0a8b759b946c09f92d40af9d  milter-greylist-4.2.5.tgz
+2572068e2b1b5b47fe4239f0ddebbce2  milter-greylist-4.2.6.tgz


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From bdwalton at users.sourceforge.net  Tue Jul 13 15:21:21 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Tue, 13 Jul 2010 13:21:21 +0000
Subject: [csw-devel] SF.net SVN: gar:[10514] csw/mgar/pkg/ruby/trunk/Makefile
Message-ID: <E1OYfQH-0002mS-0y@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 10514
          http://gar.svn.sourceforge.net/gar/?rev=10514&view=rev
Author:   bdwalton
Date:     2010-07-13 13:21:20 +0000 (Tue, 13 Jul 2010)

Log Message:
-----------
ruby: cleanup dep_pkgs lines; drop EXTRA_INC/LIB (no csw x11)

Modified Paths:
--------------
    csw/mgar/pkg/ruby/trunk/Makefile

Modified: csw/mgar/pkg/ruby/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ruby/trunk/Makefile	2010-07-13 09:46:19 UTC (rev 10513)
+++ csw/mgar/pkg/ruby/trunk/Makefile	2010-07-13 13:21:20 UTC (rev 10514)
@@ -7,8 +7,8 @@
 TEST_SCRIPTS =
 TEST_ARGS = test-all
 
-BUILD_DEP_PKGS = CSWbdb48devel CSWgdbm CSWgfile CSWiconv CSWncurses CSWossldevel
-BUILD_DEP_PKGS += CSWreadline CSWzlib
+BUILD_DEP_PKGS =  CSWbdb48devel CSWgdbm CSWgfile CSWiconv CSWncurses
+BUILD_DEP_PKGS += CSWreadline CSWzlib CSWossldevel
 
 PACKAGES = CSWruby CSWrubydoc CSWrubytk CSWrubydev CSWrubymode CSWrubymodeel
 
@@ -99,9 +99,6 @@
 
 COMPILE_ELISP = 1
 
-EXTRA_INC = $(prefix)/X11/include
-EXTRA_LIB = $(prefix)/X11/lib
-
 ifdef USEGCC
 GARCOMPILER = GNU
 RUNTIME_DEP_PKGS_CSWruby += CSWgcc4corert


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 Jul 13 15:24:30 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Tue, 13 Jul 2010 13:24:30 +0000
Subject: [csw-devel] SF.net SVN: gar:[10515] csw/mgar/pkg/ruby/trunk/Makefile
Message-ID: <E1OYfTK-0001q8-Qs@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 10515
          http://gar.svn.sourceforge.net/gar/?rev=10515&view=rev
Author:   bdwalton
Date:     2010-07-13 13:24:30 +0000 (Tue, 13 Jul 2010)

Log Message:
-----------
ruby: update gfile -> coreutils dependency; add checkpkg overrides

Modified Paths:
--------------
    csw/mgar/pkg/ruby/trunk/Makefile

Modified: csw/mgar/pkg/ruby/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ruby/trunk/Makefile	2010-07-13 13:21:20 UTC (rev 10514)
+++ csw/mgar/pkg/ruby/trunk/Makefile	2010-07-13 13:24:30 UTC (rev 10515)
@@ -7,7 +7,7 @@
 TEST_SCRIPTS =
 TEST_ARGS = test-all
 
-BUILD_DEP_PKGS =  CSWbdb48devel CSWgdbm CSWgfile CSWiconv CSWncurses
+BUILD_DEP_PKGS =  CSWbdb48devel CSWgdbm CSWcoreutils CSWiconv CSWncurses
 BUILD_DEP_PKGS += CSWreadline CSWzlib CSWossldevel
 
 PACKAGES = CSWruby CSWrubydoc CSWrubytk CSWrubydev CSWrubymode CSWrubymodeel
@@ -25,7 +25,7 @@
 
 RUNTIME_DEP_PKGS_CSWrubytk = CSWruby CSWtk CSWtcl
 
-RUNTIME_DEP_PKGS_CSWrubydev = CSWruby CSWgfile
+RUNTIME_DEP_PKGS_CSWrubydev = CSWruby CSWcoreutils
 
 RUNTIME_DEP_PKGS_CSWrubymode = CSWemacscommon
 
@@ -110,6 +110,10 @@
 SOS12_LD_FLAGS =
 endif
 
+CHECKPKG_OVERRIDES_CSWrubydev += surplus-dependency|CSWcoreutils
+CHECKPKG_OVERRIDES_CSWrubydoc += missing-dependency|CSWperl
+CHECKPKG_OVERRIDES_CSWrubydoc += missing-dependency|CSWpython
+
 include gar/category.mk
 
 SPKG_VERSION := $(SPKG_VERSION)$(PATCHLEVEL)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From opk at users.sourceforge.net  Tue Jul 13 16:26:33 2010
From: opk at users.sourceforge.net (opk at users.sourceforge.net)
Date: Tue, 13 Jul 2010 14:26:33 +0000
Subject: [csw-devel] SF.net SVN: gar:[10516]
	csw/mgar/pkg/pycairo/trunk/Makefile
Message-ID: <E1OYgRN-0005mv-9i@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 10516
          http://gar.svn.sourceforge.net/gar/?rev=10516&view=rev
Author:   opk
Date:     2010-07-13 14:26:33 +0000 (Tue, 13 Jul 2010)

Log Message:
-----------
need to link against cairo library

Modified Paths:
--------------
    csw/mgar/pkg/pycairo/trunk/Makefile

Modified: csw/mgar/pkg/pycairo/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pycairo/trunk/Makefile	2010-07-13 13:24:30 UTC (rev 10515)
+++ csw/mgar/pkg/pycairo/trunk/Makefile	2010-07-13 14:26:33 UTC (rev 10516)
@@ -24,7 +24,7 @@
 
 RUNTIME_DEP_PKGS_CSWpycairo = CSWlibcairo CSWpython
 
-CAIRO_LIBS = -L/opt/csw/lib -R/opt/csw/lib/$$ISALIST
+CAIRO_LIBS = -L/opt/csw/lib -R/opt/csw/lib/$$ISALIST -lcairo
 CAIRO_CFLAGS = -I/opt/csw/include -I/opt/csw/include/cairo
 COMPILER_EXPORTS += CAIRO_LIBS CAIRO_CFLAGS
 CONFIGURE_ARGS = $(DIRPATHS)


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 Jul 13 19:45:40 2010
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Tue, 13 Jul 2010 17:45:40 +0000
Subject: [csw-devel] SF.net SVN: gar:[10517] csw/mgar/pkg/cswclassutils/trunk
Message-ID: <E1OYjY4-0007XB-7d@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 10517
          http://gar.svn.sourceforge.net/gar/?rev=10517&view=rev
Author:   wahwah
Date:     2010-07-13 17:45:39 +0000 (Tue, 13 Jul 2010)

Log Message:
-----------
cswclassutils: Support for the removal of custom manifests.

Modified Paths:
--------------
    csw/mgar/pkg/cswclassutils/trunk/Makefile
    csw/mgar/pkg/cswclassutils/trunk/checksums
    csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinitsmf
    csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswinitsmf

Property Changed:
----------------
    csw/mgar/pkg/cswclassutils/trunk/Makefile

Modified: csw/mgar/pkg/cswclassutils/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cswclassutils/trunk/Makefile	2010-07-13 14:26:33 UTC (rev 10516)
+++ csw/mgar/pkg/cswclassutils/trunk/Makefile	2010-07-13 17:45:39 UTC (rev 10517)
@@ -1,4 +1,4 @@
-# $Id$
+# $HeadURL$
 
 GARNAME = cswclassutils
 GARVERSION = 1.38
@@ -27,7 +27,8 @@
 PROTOTYPE_USER_cas = bin
 PROTOTYPE_GROUP_cas = sys
 
-CHECKPKG_OVERRIDES_CSWcswclassutils += init-file-missing-cswinitsmf-class|/opt/csw/etc/init.d/csw.smf.sample|class=none
+CHECKPKG_OVERRIDES_CSWcswclassutils += init-file-missing-cswinitsmf-class
+CHECKPKG_OVERRIDES_CSWcswclassutils += init-file-wrong-location
 CHECKPKG_OVERRIDES_CSWcswclassutils += init-file-wrong-location|/opt/csw/etc/init.d/csw.smf.sample
 
 include gar/category.mk


Property changes on: csw/mgar/pkg/cswclassutils/trunk/Makefile
___________________________________________________________________
Modified: svn:keywords
   - Id
   + HeadURL

Modified: csw/mgar/pkg/cswclassutils/trunk/checksums
===================================================================
--- csw/mgar/pkg/cswclassutils/trunk/checksums	2010-07-13 14:26:33 UTC (rev 10516)
+++ csw/mgar/pkg/cswclassutils/trunk/checksums	2010-07-13 17:45:39 UTC (rev 10517)
@@ -1,9 +1,9 @@
 48a97af56d55bc90ce90303228ed8cc3  COPYING
 9846081f8109dc9149dc026b89fbf137  CSWcswclassutils.i.cswcpsampleconf
-25f1f5a680a6dc118d2c54333703974f  CSWcswclassutils.i.cswcrontab
+efd19a09c355319c7d649885e4f9f76e  CSWcswclassutils.i.cswcrontab
 5e2ae2c6bd828061f86d84f09087b06a  CSWcswclassutils.i.cswetcservices
 e19dc831fd25be25706febc428607993  CSWcswclassutils.i.cswinetd
-6abb13158fee906870d1d68dc0fae6f3  CSWcswclassutils.i.cswinitsmf
+a366d67b53662fc1182a4f1a94df1ef2  CSWcswclassutils.i.cswinitsmf
 a667515489aafc81d41159765faf698f  CSWcswclassutils.i.cswmigrateconf
 8ab721535d43dcef702538d394e7a2ce  CSWcswclassutils.i.cswpostmsg
 0fc6128391af4c9aebf72b84755532cb  CSWcswclassutils.i.cswpreserveconf
@@ -11,10 +11,10 @@
 4f816acb06e8f95add6faf8607859da2  CSWcswclassutils.i.cswtexinfo
 e906a50bc2d82e341f78d582f32ecb88  CSWcswclassutils.i.cswusergroup
 d278a28a6f901c4ff5f07c583b4cff3d  CSWcswclassutils.r.cswcpsampleconf
-b452d4e6b95df03b6b00c6e980bb1004  CSWcswclassutils.r.cswcrontab
+f988248725a4607110a13820a005b72f  CSWcswclassutils.r.cswcrontab
 d60261ddc46e2cc83ecbbfc586a7e686  CSWcswclassutils.r.cswetcservices
 9039ea60ad4c3f8994205fb242a49a72  CSWcswclassutils.r.cswinetd
-791db9c2f6685aca67043820d260fc60  CSWcswclassutils.r.cswinitsmf
+8c48bf822a51499535c1346edcd638ae  CSWcswclassutils.r.cswinitsmf
 f7a2a10bbf0f88c1909a31141e6d83ce  CSWcswclassutils.r.cswmigrateconf
 76a18fed9174724f866ede53edda41fc  CSWcswclassutils.r.cswpostmsg
 96453922952c92c6c5a024e54ed8525f  CSWcswclassutils.r.cswpreserveconf

Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinitsmf
===================================================================
--- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinitsmf	2010-07-13 14:26:33 UTC (rev 10516)
+++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.i.cswinitsmf	2010-07-13 17:45:39 UTC (rev 10517)
@@ -237,6 +237,8 @@
     if [ "$daemon" = "yes" -a "$AUTOENABLE" != "no" -a "$AUTOENABLE" != "false" ]; then
       load_smf_service_state "$FMRI/$service"
       if [ "$SMF_STATE" = "enabled" ]; then
+        echo "Clearing svc:/$FMRI/$service in case it's in the maintenance state..."
+        /usr/sbin/svcadm clear svc:/$FMRI/$service > /dev/null 2>&1
         echo Enabling svc:/$FMRI/$service ...
         /usr/sbin/svcadm enable svc:/$FMRI/$service > /dev/null 2>&1
       fi

Modified: csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswinitsmf
===================================================================
--- csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswinitsmf	2010-07-13 14:26:33 UTC (rev 10516)
+++ csw/mgar/pkg/cswclassutils/trunk/files/CSWcswclassutils.r.cswinitsmf	2010-07-13 17:45:39 UTC (rev 10517)
@@ -16,6 +16,7 @@
 # 2009-04-24 Temporarily disabled the "persistent state" code until it can be used
 #            per service, not just per package
 # 2009-05-28 Enabled persistent state code again after receiving patch from Yann.
+# 2010-07-13 <maciej> Added support for removing custom manifests
 
 DEBUG=		# clear to disable debug, set to anything to enable
 
@@ -65,11 +66,41 @@
   echo PACKAGE: $PKGINST SMF: $smf
 fi
 
+# We need to find all the manifests before removing the files.  First, we'll
+# build the list of files to remove and we'll process them later.
+init_files=
+while read file
+do
+  init_files="${init_files} ${file}"
+done
+
 # Stop service
 if [ "$smf" = "yes" ]; then
+  manifests=
+  fmris=
+  for file in ${init_files}
+  do
+    if grep '^#MANIFEST' $file >/dev/null; then
+      new_manifest="`grep '^#MANIFEST' $file \
+                 | awk '{print $2}'`"
+      manifests="${manifests} ${new_manifest}"
+      # For foo FMRI, this outputs both foo and foo:default.  If both are
+      # attempted to be stopped, there are warnings printed to the screen, but
+      # they are harmless.
+      fmris="${fmris} `svccfg inventory ${new_manifest} \
+                       | tr '/' '\n' \
+                       | tail -1`"
+    fi
+  done
+
   # Find out FMRI complete with service name
-  FMRI=`grep ${PKGINST}$ /var/sadm/install/contents | grep "^/var/opt/csw/svc/manifest" | egrep '\.xml ' | cut -d'/' -f7- | awk -F'.xml' '{print $1}'`
-  for i in `echo $FMRI | tr '\n' ' '`
+  FMRI="`grep ${PKGINST}$ /var/sadm/install/contents \
+      | grep '^/var/opt/csw/svc/manifest' \
+      | egrep '\.xml ' \
+      | cut -d'/' -f7- \
+      | awk -F'.xml' '{print $1}'` \
+      ${fmris}"
+  for i in ${FMRI}
   do
     save_smf_state "$i"
     echo "Disabling svc:/$i ..."
@@ -89,7 +120,7 @@
 
 # Remove files in class cswinitsmf
 echo "Removing class <cswinitsmf> ..."
-while read file
+for file in ${init_files}
 do
   echo $file
   if [ -d $file ]; then


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 Jul 13 19:46:58 2010
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Tue, 13 Jul 2010 17:46:58 +0000
Subject: [csw-devel] SF.net SVN: gar:[10518]
	csw/mgar/pkg/cswclassutils/trunk/checksums
Message-ID: <E1OYjZK-00010z-5X@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 10518
          http://gar.svn.sourceforge.net/gar/?rev=10518&view=rev
Author:   wahwah
Date:     2010-07-13 17:46:57 +0000 (Tue, 13 Jul 2010)

Log Message:
-----------
cswclassutils: Checksums for files with tags.

Modified Paths:
--------------
    csw/mgar/pkg/cswclassutils/trunk/checksums

Modified: csw/mgar/pkg/cswclassutils/trunk/checksums
===================================================================
--- csw/mgar/pkg/cswclassutils/trunk/checksums	2010-07-13 17:45:39 UTC (rev 10517)
+++ csw/mgar/pkg/cswclassutils/trunk/checksums	2010-07-13 17:46:57 UTC (rev 10518)
@@ -3,7 +3,7 @@
 efd19a09c355319c7d649885e4f9f76e  CSWcswclassutils.i.cswcrontab
 5e2ae2c6bd828061f86d84f09087b06a  CSWcswclassutils.i.cswetcservices
 e19dc831fd25be25706febc428607993  CSWcswclassutils.i.cswinetd
-a366d67b53662fc1182a4f1a94df1ef2  CSWcswclassutils.i.cswinitsmf
+daa26170a5c468775e2687fe15881b40  CSWcswclassutils.i.cswinitsmf
 a667515489aafc81d41159765faf698f  CSWcswclassutils.i.cswmigrateconf
 8ab721535d43dcef702538d394e7a2ce  CSWcswclassutils.i.cswpostmsg
 0fc6128391af4c9aebf72b84755532cb  CSWcswclassutils.i.cswpreserveconf
@@ -14,7 +14,7 @@
 f988248725a4607110a13820a005b72f  CSWcswclassutils.r.cswcrontab
 d60261ddc46e2cc83ecbbfc586a7e686  CSWcswclassutils.r.cswetcservices
 9039ea60ad4c3f8994205fb242a49a72  CSWcswclassutils.r.cswinetd
-8c48bf822a51499535c1346edcd638ae  CSWcswclassutils.r.cswinitsmf
+397c444e9da4c6281c657822a4963cb8  CSWcswclassutils.r.cswinitsmf
 f7a2a10bbf0f88c1909a31141e6d83ce  CSWcswclassutils.r.cswmigrateconf
 76a18fed9174724f866ede53edda41fc  CSWcswclassutils.r.cswpostmsg
 96453922952c92c6c5a024e54ed8525f  CSWcswclassutils.r.cswpreserveconf


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 Jul 14 00:54:38 2010
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Tue, 13 Jul 2010 22:54:38 +0000
Subject: [csw-devel] SF.net SVN: gar:[10519] csw/mgar/gar/v2/lib/python
Message-ID: <E1OYoN4-00057o-4i@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 10519
          http://gar.svn.sourceforge.net/gar/?rev=10519&view=rev
Author:   wahwah
Date:     2010-07-13 22:54:37 +0000 (Tue, 13 Jul 2010)

Log Message:
-----------
mGAR v2: checkpkg, adding a check for /opt/csw/var.

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	2010-07-13 17:46:57 UTC (rev 10518)
+++ csw/mgar/gar/v2/lib/python/package_checks.py	2010-07-13 22:54:37 UTC (rev 10519)
@@ -63,8 +63,14 @@
 DO_NOT_LINK_AGAINST_THESE_SONAMES = set([])
 
 DISCOURAGED_FILE_PATTERNS = (
-    r"\.py[co]$",
-    r"/lib\w+\.l?a$",
+    (r"\.py[co]$", ("Python compiled files are supposed to be compiled using"
+                    "the cswpycompile class action script. For more "
+                    "information, see "
+                    "http://wiki.opencsw.org/cswclassutils-package")),
+    (r"/lib\w+\.l?a$", "Static libraries aren't necessary on Solaris."),
+    (r"opt/csw/var($|/)", ("The /opt/csw/var directory is not writable on "
+                            "sparse non-global zones.  "
+                            "Please use /var/opt/csw instead.")),
 )
 RPATH_PARTS = {
     'prefix': r"(?P<prefix>/opt/csw)",
@@ -689,13 +695,14 @@
 
 
 def CheckDiscouragedFileNamePatterns(pkg_data, error_mgr, logger, messenger):
-  patterns = [re.compile(x) for x in DISCOURAGED_FILE_PATTERNS]
+  patterns = [(re.compile(x), y) for x, y in DISCOURAGED_FILE_PATTERNS]
   for entry in pkg_data["pkgmap"]:
     if entry["path"]:
-      for pattern in patterns:
-        if re.search(pattern, entry["path"]):
+      for pattern, msg in patterns:
+        if pattern.search(entry["path"]):
           error_mgr.ReportError("discouraged-path-in-pkgmap",
                                 entry["path"])
+          messenger.Message(msg)
 
 
 def CheckBadContent(pkg_data, error_mgr, logger, messenger):

Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py
===================================================================
--- csw/mgar/gar/v2/lib/python/package_checks_test.py	2010-07-13 17:46:57 UTC (rev 10518)
+++ csw/mgar/gar/v2/lib/python/package_checks_test.py	2010-07-13 22:54:37 UTC (rev 10519)
@@ -779,5 +779,27 @@
     # ReportError('CSWivtools', 'soname-not-found', 'libComUnidraw.so is needed by opt/csw/bin/comdraw')
 
 
+class TestCheckDiscouragedFileNamePatterns(CheckpkgUnitTestHelper,
+                                           unittest.TestCase):
+  """Throw an error if there's a conflicting file in the package set."""
+  FUNCTION_NAME = 'CheckDiscouragedFileNamePatterns'
+  CSWfoo_DATA = {
+        'basic_stats': {'catalogname': 'foo',
+                        'pkgname': 'CSWfoo',
+                        'stats_version': 1},
+        'binaries_dump_info': [],
+        'depends': tuple(),
+        'isalist': [],
+        'pkgmap': [
+          { "type": "d", "path": "/opt/csw/var", },
+          { "type": "d", "path": "/opt/csw/bin", },
+        ],
+  }
+  def CheckpkgTest(self):
+    self.pkg_data = self.CSWfoo_DATA
+    self.error_mgr_mock.ReportError(
+        'discouraged-path-in-pkgmap', '/opt/csw/var')
+
+
 if __name__ == '__main__':
   unittest.main()


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From bdwalton at users.sourceforge.net  Wed Jul 14 03:02:38 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Wed, 14 Jul 2010 01:02:38 +0000
Subject: [csw-devel] SF.net SVN: gar:[10520] csw/mgar/pkg/ruby/trunk/files
Message-ID: <E1OYqMw-0007NS-UN@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 10520
          http://gar.svn.sourceforge.net/gar/?rev=10520&view=rev
Author:   bdwalton
Date:     2010-07-14 01:02:38 +0000 (Wed, 14 Jul 2010)

Log Message:
-----------
ruby: update gcc4 rbconfig files for include/lib change

Modified Paths:
--------------
    csw/mgar/pkg/ruby/trunk/files/rbconfig.rb.GCC4.i386
    csw/mgar/pkg/ruby/trunk/files/rbconfig.rb.GCC4.sparc

Modified: csw/mgar/pkg/ruby/trunk/files/rbconfig.rb.GCC4.i386
===================================================================
--- csw/mgar/pkg/ruby/trunk/files/rbconfig.rb.GCC4.i386	2010-07-13 22:54:37 UTC (rev 10519)
+++ csw/mgar/pkg/ruby/trunk/files/rbconfig.rb.GCC4.i386	2010-07-14 01:02:38 UTC (rev 10520)
@@ -18,7 +18,7 @@
   CONFIG["RUBY_SO_NAME"] = "ruby"
   CONFIG["MANTYPE"] = "man"
   CONFIG["NROFF"] = "/usr/bin/nroff"
-  CONFIG["configure_args"] = " '--prefix=/opt/csw' '--exec_prefix=/opt/csw' '--bindir=/opt/csw/bin' '--sbindir=/opt/csw/sbin' '--libexecdir=/opt/csw/libexec' '--datadir=/opt/csw/share' '--sysconfdir=/opt/csw/etc' '--sharedstatedir=/opt/csw/share' '--localstatedir=/opt/csw/var' '--libdir=/opt/csw/lib' '--infodir=/opt/csw/share/info' '--includedir=/opt/csw/include' '--mandir=/opt/csw/share/man' '--enable-pthread' '--enable-shared' '--with-tcl-dir=/opt/csw' '--with-tk-dir=/opt/csw' '--with-dbm-dir=/opt/csw/bdb48' '--with-gdbm-dir=/opt/csw' '--with-iconv-dir=/opt/csw' '--with-openssl-dir=/opt/csw' '--with-readline-dir=/opt/csw' '--with-zlib-dir=/opt/csw' '--enable-install-doc' 'CC=/opt/csw/gcc4/bin/gcc' 'CFLAGS=-mtune=i686 -O2 -pipe -m32 -march=i386' 'LDFLAGS=-L/opt/csw/gcc4/lib/. -m32 -march=i386 -R /opt/csw/gcc4/lib -L/opt/csw/X11/lib -L/opt/csw/lib' 'CPPFLAGS=-I/opt/csw/X11/include -I/opt/csw/include'"
+  CONFIG["configure_args"] = " '--prefix=/opt/csw' '--exec_prefix=/opt/csw' '--bindir=/opt/csw/bin' '--sbindir=/opt/csw/sbin' '--libexecdir=/opt/csw/libexec' '--datadir=/opt/csw/share' '--sysconfdir=/opt/csw/etc' '--sharedstatedir=/opt/csw/share' '--localstatedir=/opt/csw/var' '--libdir=/opt/csw/lib' '--infodir=/opt/csw/share/info' '--includedir=/opt/csw/include' '--mandir=/opt/csw/share/man' '--enable-pthread' '--enable-shared' '--with-tcl-dir=/opt/csw' '--with-tk-dir=/opt/csw' '--with-dbm-dir=/opt/csw/bdb48' '--with-gdbm-dir=/opt/csw' '--with-iconv-dir=/opt/csw' '--with-openssl-dir=/opt/csw' '--with-readline-dir=/opt/csw' '--with-zlib-dir=/opt/csw' '--enable-install-doc' 'CC=/opt/csw/gcc4/bin/gcc' 'CFLAGS=-mtune=i686 -O2 -pipe -m32 -march=i386' 'LDFLAGS=-L/opt/csw/gcc4/lib/. -m32 -march=i386 -R /opt/csw/gcc4/lib -L/opt/csw/lib' 'CPPFLAGS=-I/opt/csw/include'"
   CONFIG["vendordir"] = "$(libdir)/ruby/vendor_ruby"
   CONFIG["sitedir"] = "$(libdir)/ruby/site_ruby"
   CONFIG["sitearch"] = "i386-solaris2.9"
@@ -46,7 +46,7 @@
   CONFIG["debugflags"] = ""
   CONFIG["optflags"] = ""
   CONFIG["cflags"] = "$(optflags) $(debugflags)"
-  CONFIG["cppflags"] = "-I/opt/csw/X11/include -I/opt/csw/include"
+  CONFIG["cppflags"] = "-I/opt/csw/include"
   CONFIG["RDOCTARGET"] = "install-doc"
   CONFIG["ARCHFILE"] = ""
   CONFIG["EXTOUT"] = ".ext"
@@ -93,8 +93,8 @@
   CONFIG["GREP"] = "/opt/csw/bin/ggrep"
   CONFIG["CPP"] = "/opt/csw/gcc4/bin/gcc -E"
   CONFIG["OBJEXT"] = "o"
-  CONFIG["CPPFLAGS"] = "-I/opt/csw/X11/include -I/opt/csw/include $(DEFS) $(cppflags)"
-  CONFIG["LDFLAGS"] = "-L. -L/opt/csw/gcc4/lib/. -m32 -march=i386 -R /opt/csw/gcc4/lib -L/opt/csw/X11/lib -L/opt/csw/lib"
+  CONFIG["CPPFLAGS"] = "-I/opt/csw/include $(DEFS) $(cppflags)"
+  CONFIG["LDFLAGS"] = "-L. -L/opt/csw/gcc4/lib/. -m32 -march=i386 -R /opt/csw/gcc4/lib -L/opt/csw/lib"
   CONFIG["CFLAGS"] = "-mtune=i686 -O2 -pipe -m32 -march=i386  -fPIC $(cflags)"
   CONFIG["CC"] = "/opt/csw/gcc4/bin/gcc"
   CONFIG["target_os"] = "solaris2.9"

Modified: csw/mgar/pkg/ruby/trunk/files/rbconfig.rb.GCC4.sparc
===================================================================
--- csw/mgar/pkg/ruby/trunk/files/rbconfig.rb.GCC4.sparc	2010-07-13 22:54:37 UTC (rev 10519)
+++ csw/mgar/pkg/ruby/trunk/files/rbconfig.rb.GCC4.sparc	2010-07-14 01:02:38 UTC (rev 10520)
@@ -18,7 +18,7 @@
   CONFIG["RUBY_SO_NAME"] = "ruby"
   CONFIG["MANTYPE"] = "man"
   CONFIG["NROFF"] = "/usr/bin/nroff"
-  CONFIG["configure_args"] = " '--prefix=/opt/csw' '--exec_prefix=/opt/csw' '--bindir=/opt/csw/bin' '--sbindir=/opt/csw/sbin' '--libexecdir=/opt/csw/libexec' '--datadir=/opt/csw/share' '--sysconfdir=/opt/csw/etc' '--sharedstatedir=/opt/csw/share' '--localstatedir=/opt/csw/var' '--libdir=/opt/csw/lib' '--infodir=/opt/csw/share/info' '--includedir=/opt/csw/include' '--mandir=/opt/csw/share/man' '--enable-pthread' '--enable-shared' '--with-tcl-dir=/opt/csw' '--with-tk-dir=/opt/csw' '--with-dbm-dir=/opt/csw/bdb48' '--with-gdbm-dir=/opt/csw' '--with-iconv-dir=/opt/csw' '--with-openssl-dir=/opt/csw' '--with-readline-dir=/opt/csw' '--with-zlib-dir=/opt/csw' '--enable-install-doc' 'CC=/opt/csw/gcc4/bin/gcc' 'CFLAGS=-O2 -pipe -mcpu=v8' 'LDFLAGS=-L/opt/csw/gcc4/lib/. -mcpu=v8 -R /opt/csw/gcc4/lib -L/opt/csw/X11/lib -L/opt/csw/lib' 'CPPFLAGS=-I/opt/csw/X11/include -I/opt/csw/include'"
+  CONFIG["configure_args"] = " '--prefix=/opt/csw' '--exec_prefix=/opt/csw' '--bindir=/opt/csw/bin' '--sbindir=/opt/csw/sbin' '--libexecdir=/opt/csw/libexec' '--datadir=/opt/csw/share' '--sysconfdir=/opt/csw/etc' '--sharedstatedir=/opt/csw/share' '--localstatedir=/opt/csw/var' '--libdir=/opt/csw/lib' '--infodir=/opt/csw/share/info' '--includedir=/opt/csw/include' '--mandir=/opt/csw/share/man' '--enable-pthread' '--enable-shared' '--with-tcl-dir=/opt/csw' '--with-tk-dir=/opt/csw' '--with-dbm-dir=/opt/csw/bdb48' '--with-gdbm-dir=/opt/csw' '--with-iconv-dir=/opt/csw' '--with-openssl-dir=/opt/csw' '--with-readline-dir=/opt/csw' '--with-zlib-dir=/opt/csw' '--enable-install-doc' 'CC=/opt/csw/gcc4/bin/gcc' 'CFLAGS=-O2 -pipe -mcpu=v8' 'LDFLAGS=-L/opt/csw/gcc4/lib/. -mcpu=v8 -R /opt/csw/gcc4/lib -L/opt/csw/lib' 'CPPFLAGS=-I/opt/csw/include'"
   CONFIG["vendordir"] = "$(libdir)/ruby/vendor_ruby"
   CONFIG["sitedir"] = "$(libdir)/ruby/site_ruby"
   CONFIG["sitearch"] = "sparc-solaris2.9"
@@ -46,7 +46,7 @@
   CONFIG["debugflags"] = ""
   CONFIG["optflags"] = ""
   CONFIG["cflags"] = "$(optflags) $(debugflags)"
-  CONFIG["cppflags"] = "-I/opt/csw/X11/include -I/opt/csw/include"
+  CONFIG["cppflags"] = "-I/opt/csw/include"
   CONFIG["RDOCTARGET"] = "install-doc"
   CONFIG["ARCHFILE"] = ""
   CONFIG["EXTOUT"] = ".ext"
@@ -93,8 +93,8 @@
   CONFIG["GREP"] = "/opt/csw/bin/ggrep"
   CONFIG["CPP"] = "/opt/csw/gcc4/bin/gcc -E"
   CONFIG["OBJEXT"] = "o"
-  CONFIG["CPPFLAGS"] = "-I/opt/csw/X11/include -I/opt/csw/include $(DEFS) $(cppflags)"
-  CONFIG["LDFLAGS"] = "-L. -L/opt/csw/gcc4/lib/. -mcpu=v8 -R /opt/csw/gcc4/lib -L/opt/csw/X11/lib -L/opt/csw/lib"
+  CONFIG["CPPFLAGS"] = "-I/opt/csw/include $(DEFS) $(cppflags)"
+  CONFIG["LDFLAGS"] = "-L. -L/opt/csw/gcc4/lib/. -mcpu=v8 -R /opt/csw/gcc4/lib -L/opt/csw/lib"
   CONFIG["CFLAGS"] = "-O2 -pipe -mcpu=v8  -fPIC $(cflags)"
   CONFIG["CC"] = "/opt/csw/gcc4/bin/gcc"
   CONFIG["target_os"] = "solaris2.9"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From opk at users.sourceforge.net  Wed Jul 14 14:11:09 2010
From: opk at users.sourceforge.net (opk at users.sourceforge.net)
Date: Wed, 14 Jul 2010 12:11:09 +0000
Subject: [csw-devel] SF.net SVN: gar:[10521]
	csw/mgar/pkg/pycairo/trunk/Makefile
Message-ID: <E1OZ0nt-0007fq-Nk@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 10521
          http://gar.svn.sourceforge.net/gar/?rev=10521&view=rev
Author:   opk
Date:     2010-07-14 12:11:09 +0000 (Wed, 14 Jul 2010)

Log Message:
-----------
adjustments to keep checkpkg happy

Modified Paths:
--------------
    csw/mgar/pkg/pycairo/trunk/Makefile

Modified: csw/mgar/pkg/pycairo/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pycairo/trunk/Makefile	2010-07-14 01:02:38 UTC (rev 10520)
+++ csw/mgar/pkg/pycairo/trunk/Makefile	2010-07-14 12:11:09 UTC (rev 10521)
@@ -2,8 +2,10 @@
 GARVERSION   = 1.8.8
 CATEGORIES   = lib
 
-DESCRIPTION  = Python binder for Cairo library
+DESCRIPTION  = Python binding for Cairo library
 define BLURB
+  This package contains the pycairo Python module which implements
+  a binding the the cairo Library.
 endef
 
 MASTER_SITES  = http://www.cairographics.org/releases/
@@ -17,12 +19,12 @@
 # We define upstream file regex so we can be notifed of 
 # new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
-PACKAGES = CSWpycairo
+PACKAGES = CSWpy-cairo
 
-CATALOGNAME_CSWpycairo      = pycairo
-SPKG_DESC_CSWpycairo        = $(DESCRIPTION)
+CATALOGNAME_CSWpy-cairo      = pycairo
+SPKG_DESC_CSWpy-cairo        = $(DESCRIPTION)
 
-RUNTIME_DEP_PKGS_CSWpycairo = CSWlibcairo CSWpython
+RUNTIME_DEP_PKGS_CSWpy-cairo = CSWlibcairo CSWpython
 
 CAIRO_LIBS = -L/opt/csw/lib -R/opt/csw/lib/$$ISALIST -lcairo
 CAIRO_CFLAGS = -I/opt/csw/include -I/opt/csw/include/cairo


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From opk at users.sourceforge.net  Wed Jul 14 14:29:09 2010
From: opk at users.sourceforge.net (opk at users.sourceforge.net)
Date: Wed, 14 Jul 2010 12:29:09 +0000
Subject: [csw-devel] SF.net SVN: gar:[10522]
	csw/mgar/pkg/pycairo/trunk/Makefile
Message-ID: <E1OZ15J-0008EG-ID@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 10522
          http://gar.svn.sourceforge.net/gar/?rev=10522&view=rev
Author:   opk
Date:     2010-07-14 12:29:09 +0000 (Wed, 14 Jul 2010)

Log Message:
-----------
fix catalogue

Modified Paths:
--------------
    csw/mgar/pkg/pycairo/trunk/Makefile

Modified: csw/mgar/pkg/pycairo/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pycairo/trunk/Makefile	2010-07-14 12:11:09 UTC (rev 10521)
+++ csw/mgar/pkg/pycairo/trunk/Makefile	2010-07-14 12:29:09 UTC (rev 10522)
@@ -21,7 +21,7 @@
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 PACKAGES = CSWpy-cairo
 
-CATALOGNAME_CSWpy-cairo      = pycairo
+CATALOGNAME_CSWpy-cairo      = py_cairo
 SPKG_DESC_CSWpy-cairo        = $(DESCRIPTION)
 
 RUNTIME_DEP_PKGS_CSWpy-cairo = CSWlibcairo CSWpython


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 Jul 14 15:56:57 2010
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Wed, 14 Jul 2010 13:56:57 +0000
Subject: [csw-devel] SF.net SVN: gar:[10523]
	csw/mgar/pkg/cswclassutils/trunk/Makefile
Message-ID: <E1OZ2SH-0003o3-45@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 10523
          http://gar.svn.sourceforge.net/gar/?rev=10523&view=rev
Author:   wahwah
Date:     2010-07-14 13:56:56 +0000 (Wed, 14 Jul 2010)

Log Message:
-----------
cswclassutils: Version bump, to reflect the cswinitsmf changes.

Modified Paths:
--------------
    csw/mgar/pkg/cswclassutils/trunk/Makefile

Modified: csw/mgar/pkg/cswclassutils/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cswclassutils/trunk/Makefile	2010-07-14 12:29:09 UTC (rev 10522)
+++ csw/mgar/pkg/cswclassutils/trunk/Makefile	2010-07-14 13:56:56 UTC (rev 10523)
@@ -1,7 +1,7 @@
 # $HeadURL$
 
 GARNAME = cswclassutils
-GARVERSION = 1.38
+GARVERSION = 1.39
 CATEGORIES = utils
 
 DESCRIPTION = CSW class action utilities


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 Jul 14 16:31:35 2010
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Wed, 14 Jul 2010 14:31:35 +0000
Subject: [csw-devel] SF.net SVN: gar:[10524]
	csw/mgar/gar/v2/lib/python/opencsw.py
Message-ID: <E1OZ2zn-00041I-Li@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 10524
          http://gar.svn.sourceforge.net/gar/?rev=10524&view=rev
Author:   wahwah
Date:     2010-07-14 14:31:35 +0000 (Wed, 14 Jul 2010)

Log Message:
-----------
mGAR v2: submitpkg, support 5.10 packages too.

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	2010-07-14 13:56:56 UTC (rev 10523)
+++ csw/mgar/gar/v2/lib/python/opencsw.py	2010-07-14 14:31:35 UTC (rev 10524)
@@ -38,7 +38,9 @@
 ARCH_SPARC = "sparc"
 ARCH_i386 = "i386"
 ARCH_ALL = "all"
+
 ARCHITECTURES = [ARCH_SPARC, ARCH_i386, ARCH_ALL]
+OS_RELS = [u"SunOS5.9", u"SunOS5.10"]
 MAJOR_VERSION = "major version"
 MINOR_VERSION = "minor version"
 PATCHLEVEL = "patchlevel"
@@ -290,16 +292,24 @@
   def __repr__(self):
     return u"StagingDir(%s)" % repr(self.dir_path)
 
-  def GetLatest(self, software, architectures=ARCHITECTURES):
+  def GetLatest(self, software, architectures=ARCHITECTURES, os_rels=OS_RELS):
     files = os.listdir(self.dir_path)
     package_files = []
-    for a in architectures:
-      relevant_pkgs = sorted(shutil.fnmatch.filter(files,
-                                                   "*-%s-*.pkg.gz" % a))
-      relevant_pkgs = sorted(shutil.fnmatch.filter(relevant_pkgs,
-                                                   "%s-*.pkg.gz" % software))
-      if relevant_pkgs:
-        package_files.append(relevant_pkgs[-1])
+    for os_rel in os_rels:
+      for a in architectures:
+        glob1 = "*-%s-%s-*.pkg.gz" % (os_rel, a)
+        logging.debug("files: %s", files)
+        logging.debug("glob1: %s", glob1)
+        relevant_pkgs = sorted(
+            shutil.fnmatch.filter(files, glob1))
+        logging.debug("relevant_pkgs: %s", relevant_pkgs)
+        glob2 = "%s-*.pkg.gz" % (software)
+        logging.debug("glob2: %s", glob2)
+        relevant_pkgs = sorted(
+            shutil.fnmatch.filter(relevant_pkgs, glob2))
+        logging.debug("relevant_pkgs: %s", relevant_pkgs)
+        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)))


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 Jul 14 17:20:09 2010
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Wed, 14 Jul 2010 15:20:09 +0000
Subject: [csw-devel] SF.net SVN: gar:[10525] csw/mgar/pkg/cswutils/trunk
Message-ID: <E1OZ3kn-00069u-Mv@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 10525
          http://gar.svn.sourceforge.net/gar/?rev=10525&view=rev
Author:   wahwah
Date:     2010-07-14 15:20:09 +0000 (Wed, 14 Jul 2010)

Log Message:
-----------
cswutils: Pulling files from Subversion instead of the local filesystem (which might contain modified files).

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	2010-07-14 14:31:35 UTC (rev 10524)
+++ csw/mgar/pkg/cswutils/trunk/Makefile	2010-07-14 15:20:09 UTC (rev 10525)
@@ -1,7 +1,7 @@
 # $Id$
 
 GARNAME = cswutils
-GARVERSION = 1.14.7
+GARVERSION = 1.15
 CATEGORIES = utils
 
 DESCRIPTION = Utilities for CSW maintainers
@@ -11,6 +11,9 @@
 SVNROOT = http://opencsw.svn.sourceforge.net/svnroot/opencsw/utilities/
 SVN_REV = 133
 
+SVNROOT_gar = https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2/lib/python/
+SVN_REV_gar = HEAD
+
 MASTER_SITES =
 SVN_FILES = compare_pkgs.py
 
@@ -48,14 +51,7 @@
 
 ARCHALL = 1
 
-CHECKPKG_OVERRIDES_CSWcswutils += surplus-dependency|CSWcoreutils
-CHECKPKG_OVERRIDES_CSWcswutils += surplus-dependency|CSWfakeroot
-CHECKPKG_OVERRIDES_CSWcswutils += surplus-dependency|CSWperl
-CHECKPKG_OVERRIDES_CSWcswutils += surplus-dependency|CSWpmhtmltree
-CHECKPKG_OVERRIDES_CSWcswutils += surplus-dependency|CSWpmlibwww
-CHECKPKG_OVERRIDES_CSWcswutils += surplus-dependency|CSWpmyaml
-CHECKPKG_OVERRIDES_CSWcswutils += surplus-dependency|CSWpy-libmagic
-CHECKPKG_OVERRIDES_CSWcswutils += surplus-dependency|CSWpy-hachoir-parser
+CHECKPKG_OVERRIDES_CSWcswutils += surplus-dependency
 CHECKPKG_OVERRIDES_CSWcswutils += pkgname-does-not-start-with-CSWpy-
 CHECKPKG_OVERRIDES_CSWcswutils += catalogname-does-not-start-with-py_
 
@@ -69,7 +65,8 @@
 
 $(foreach PY,$(PYFILES),$(DOWNLOADDIR)/$(PY)):
 	@echo "Grabbing $@"
-	@ln -s $(abspath gar/lib/python/$(notdir $@)) $(DOWNLOADDIR)/
+	@svn export -r $(SVN_REV_gar) $(SVNROOT_gar)$(subst -r$(SVN_REV_gar),,$(notdir $@))
+	@mv $(subst -r$(SVN_REV_gar),,$(notdir $@)) $@
 	@$(MAKECOOKIE)
 
 install-custom:

Modified: csw/mgar/pkg/cswutils/trunk/checksums
===================================================================
--- csw/mgar/pkg/cswutils/trunk/checksums	2010-07-14 14:31:35 UTC (rev 10524)
+++ csw/mgar/pkg/cswutils/trunk/checksums	2010-07-14 15:20:09 UTC (rev 10525)
@@ -1,14 +1,14 @@
 091b12575ebc0e45cf8c3d8b43d8b638  COPYING
 ab8a00cad3c3650318a3e552505e2715  checkpkg
 6ec3b6597e04714430987ccc199db3c4  checkpkg.8
-75f7b438f5f74208896c3fc2b9e77511  checkpkg.py
+569fb6bb35e1c4b31e6574377d762803  checkpkg.py
 2b5e6e6219b9ad9e48bcd119bd8a5f39  compare_pkgs.py-r133
 9a637f6546cc50974159a987302d91c0  cpan2pkg
 68c82dcd6955c4031e89bb9c9a1a9988  createpkg
 a605598f30195f9ab1b29fc3944d3b31  createpkg.8
-2cbdf8ec7baee8f43ae1773fa337c5f2  dependency_checks.py
-986dc7a5b2e005087359303ca395ee2c  opencsw.py
-9ae2168a248429d0126cb934320ae50b  package_checks.py
+ce94ddeb7c2eb4b1ffe0df7e1aed1f00  dependency_checks.py
+abcba01154fe286094d64557d0867b73  opencsw.py
+e80684a3e4e9b6c36db796789dd8fdbf  package_checks.py
 cd4496ee27bf86d5c8bc656c9c5974be  stagepkg
 8908a0a898aa07a7a928b2b8bd8384f0  stagepkg.8
 a9da7bd75daa9e8bce5dfa6c1d4e534d  submit_to_newpkgs.py


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  Wed Jul 14 20:22:41 2010
From: j_arndt at users.sourceforge.net (j_arndt at users.sourceforge.net)
Date: Wed, 14 Jul 2010 18:22:41 +0000
Subject: [csw-devel] SF.net SVN: gar:[10526] csw/mgar/pkg/munin/trunk
Message-ID: <E1OZ6bR-0008BD-3h@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 10526
          http://gar.svn.sourceforge.net/gar/?rev=10526&view=rev
Author:   j_arndt
Date:     2010-07-14 18:22:40 +0000 (Wed, 14 Jul 2010)

Log Message:
-----------
munin: moved munin-node.log to a new location, changed start script, that the node does not start in debug mode anymore

Modified Paths:
--------------
    csw/mgar/pkg/munin/trunk/checksums
    csw/mgar/pkg/munin/trunk/files/cswmuninnode
    csw/mgar/pkg/munin/trunk/files/munin-node.conf.in.patch

Modified: csw/mgar/pkg/munin/trunk/checksums
===================================================================
--- csw/mgar/pkg/munin/trunk/checksums	2010-07-14 15:20:09 UTC (rev 10525)
+++ csw/mgar/pkg/munin/trunk/checksums	2010-07-14 18:22:40 UTC (rev 10526)
@@ -7,12 +7,12 @@
 e6bafa4aa3cba7fc16e444ad168b4cd1  README.CSW
 59409f4b412953283c3df4546fd4886c  apache-munin-cgi.conf.CSW
 e701d132ba0b6f3dcc90190860f5aa6b  apache-munin.conf.CSW
-31aec7f9a9a452cc6c75c1096c937fdd  cswmuninnode
+2e0173bf615787eaf37e551b956dc9b8  cswmuninnode
 50fa4a545f878d79e219891c6ac8d2d2  cswusergroup
 4ae84b9a27b686c3819d8d7b51d8cb4c  munin-1.4.5.tar.gz
 1a13b606a5c82958ed8e9bf139044988  munin-graph.in.patch
 e96eab2e321a33517d88dfbe1d510211  munin-htaccess.in.patch
-803021ab0539f83936c9adec6bd9336c  munin-node.conf.in.patch
+05a23869a8c0e637a423c2559c150b4f  munin-node.conf.in.patch
 e9d94e230c8719c5d7d3fe624e87bea2  munin.conf.in.patch
 c0e9f043fe5ea79a1fc7dfc91f09a961  perl.patch
 5673776262a0d1b2c386f45f0fd6a783  sunos_memory.in.patch

Modified: csw/mgar/pkg/munin/trunk/files/cswmuninnode
===================================================================
--- csw/mgar/pkg/munin/trunk/files/cswmuninnode	2010-07-14 15:20:09 UTC (rev 10525)
+++ csw/mgar/pkg/munin/trunk/files/cswmuninnode	2010-07-14 18:22:40 UTC (rev 10526)
@@ -35,7 +35,7 @@
 {
         if [ -f $CONFIG_FILE ]; then
             wait 1
-            $BIN_FILE -c $CONFIG_FILE -d
+            $BIN_FILE -c $CONFIG_FILE
         fi
 }
 

Modified: csw/mgar/pkg/munin/trunk/files/munin-node.conf.in.patch
===================================================================
--- csw/mgar/pkg/munin/trunk/files/munin-node.conf.in.patch	2010-07-14 15:20:09 UTC (rev 10525)
+++ csw/mgar/pkg/munin/trunk/files/munin-node.conf.in.patch	2010-07-14 18:22:40 UTC (rev 10526)
@@ -1,23 +1,25 @@
-From 272b43ac170c907476ad5698c960fd84b31996c3 Mon Sep 17 00:00:00 2001
+From 0ffc51f49ec0107bb5346871640a14f3f65b50bb Mon Sep 17 00:00:00 2001
 From: Juergen Arndt <ja at opencsw.org>
-Date: Sun, 11 Jul 2010 18:25:14 +0200
-Subject: [PATCH] munin-node.conf.in: set some paths for OpenCSW, change hostname to "yourhostname"
+Date: Wed, 14 Jul 2010 20:06:33 +0200
+Subject: [PATCH] munin-node.conf.in: set logfiles and log level, change hostname to "yourhostname"
 
 ---
- node/munin-node.conf.in |    6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
+ node/munin-node.conf.in |    8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/node/munin-node.conf.in b/node/munin-node.conf.in
-index 40793b2..67a92a5 100644
+index 40793b2..d25e14d 100644
 --- a/node/munin-node.conf.in
 +++ b/node/munin-node.conf.in
-@@ -3,8 +3,8 @@
+@@ -2,9 +2,9 @@
+ # Example config-file for munin-node
  #
  
- log_level 4
+-log_level 4
 -log_file @@LOGDIR@@/munin-node.log
 -pid_file @@STATEDIR@@/munin-node.pid
-+log_file /var/opt/csw/munin/munin-node.log
++log_level 1
++log_file /var/opt/csw/munin/log/munin-node.log
 +pid_file /var/opt/csw/munin/run/munin-node.pid
  
  background 1


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 Jul 16 09:33:21 2010
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Fri, 16 Jul 2010 07:33:21 +0000
Subject: [csw-devel] SF.net SVN: gar:[10527] csw/mgar/pkg/sudo/trunk
Message-ID: <E1OZfQ9-000407-Ue@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 10527
          http://gar.svn.sourceforge.net/gar/?rev=10527&view=rev
Author:   wahwah
Date:     2010-07-16 07:33:21 +0000 (Fri, 16 Jul 2010)

Log Message:
-----------
sudo: Upgrade to 1.7.3

Modified Paths:
--------------
    csw/mgar/pkg/sudo/trunk/Makefile
    csw/mgar/pkg/sudo/trunk/checksums

Property Changed:
----------------
    csw/mgar/pkg/sudo/trunk/Makefile

Modified: csw/mgar/pkg/sudo/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sudo/trunk/Makefile	2010-07-14 18:22:40 UTC (rev 10526)
+++ csw/mgar/pkg/sudo/trunk/Makefile	2010-07-16 07:33:21 UTC (rev 10527)
@@ -1,5 +1,7 @@
+# $Id$
+
 GARNAME = sudo
-GARVERSION = 1.7.2p6
+GARVERSION = 1.7.3
 CATEGORIES = utils
 
 DESCRIPTION = Provides limited super user privileges
@@ -18,12 +20,14 @@
 # upstream software release
 UFILES_REGEX = $(GARNAME)-((\d+(?:\.\d+)*)(p\d+)?).tar.gz
 
-PACKAGES = CSWsudo CSWsudo-common
+PACKAGES += CSWsudo
+PACKAGES += CSWsudo-common
 
 CATALOGNAME_CSWsudo = sudo
 SPKG_DESC_CSWsudo = $(DESCRIPTION)
-SPKG_SOURCEURL_CSWsudo = http://www.sudo.ws
-RUNTIME_DEP_PKGS_CSWsudo = CSWsudo-common CSWggettextrt
+SPKG_SOURCEURL_CSWsudo = http://www.sudo.ws/sudo/
+RUNTIME_DEP_PKGS_CSWsudo += CSWsudo-common
+RUNTIME_DEP_PKGS_CSWsudo += CSWggettextrt
 
 CATALOGNAME_CSWsudo-common = sudo_common
 SPKG_DESC_CSWsudo-common = Common files for sudo
@@ -56,7 +60,7 @@
 PKGFILES_CSWsudo += $(bindir)/sudoedit\.minimal
 
 PROTOTYPE_MODIFIERS = sudo
-PROTOTYPE_FILES_sudo = $(bindir)/sudo(|edit).minimal
+PROTOTYPE_FILES_sudo = $(bindir)/sudo(edit)?.minimal
 PROTOTYPE_PERMS_sudo = 4755
 
 LICENSE = LICENSE


Property changes on: csw/mgar/pkg/sudo/trunk/Makefile
___________________________________________________________________
Added: svn:keywords
   + Id

Modified: csw/mgar/pkg/sudo/trunk/checksums
===================================================================
--- csw/mgar/pkg/sudo/trunk/checksums	2010-07-14 18:22:40 UTC (rev 10526)
+++ csw/mgar/pkg/sudo/trunk/checksums	2010-07-16 07:33:21 UTC (rev 10527)
@@ -1,3 +1,3 @@
 955d99eda1432c7b7e00d98b91e35a79  CSWsudo-common.postinstall
 157b2e5e38ca54eb36e0364706bd0292  install.diff
-c4f1a43e8ba94f6bf06d2211442148c4  sudo-1.7.2p6.tar.gz
+c22115b47cb2591bceedb914b673f031  sudo-1.7.3.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 Jul 16 22:26:50 2010
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Fri, 16 Jul 2010 20:26:50 +0000
Subject: [csw-devel] SF.net SVN: gar:[10528] csw/mgar/pkg/sudo/trunk/Makefile
Message-ID: <E1OZrUg-0006li-5m@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 10528
          http://gar.svn.sourceforge.net/gar/?rev=10528&view=rev
Author:   wahwah
Date:     2010-07-16 20:26:49 +0000 (Fri, 16 Jul 2010)

Log Message:
-----------
sudo: Adding the zlib dependency

Modified Paths:
--------------
    csw/mgar/pkg/sudo/trunk/Makefile

Modified: csw/mgar/pkg/sudo/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sudo/trunk/Makefile	2010-07-16 07:33:21 UTC (rev 10527)
+++ csw/mgar/pkg/sudo/trunk/Makefile	2010-07-16 20:26:49 UTC (rev 10528)
@@ -33,6 +33,8 @@
 SPKG_DESC_CSWsudo-common = Common files for sudo
 SPKG_SOURCEURL_CSWsudo-common = http://www.sudo.ws
 RUNTIME_DEP_PKGS_CSWsudo-common = CSWggettextrt
+RUNTIME_DEP_PKGS_CSWsudo += CSWzlib
+RUNTIME_DEP_PKGS_CSWsudo-common += CSWzlib
 
 DISTFILES += CSWsudo-common.postinstall 
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From rthurner at users.sourceforge.net  Sat Jul 17 21:43:07 2010
From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net)
Date: Sat, 17 Jul 2010 19:43:07 +0000
Subject: [csw-devel] SF.net SVN: gar:[10529]
	csw/mgar/pkg/subversion/trunk/Makefile
Message-ID: <E1OaDHv-0002eE-2W@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 10529
          http://gar.svn.sourceforge.net/gar/?rev=10529&view=rev
Author:   rthurner
Date:     2010-07-17 19:43:06 +0000 (Sat, 17 Jul 2010)

Log Message:
-----------
subversion: checkpkg toggling again

Modified Paths:
--------------
    csw/mgar/pkg/subversion/trunk/Makefile

Modified: csw/mgar/pkg/subversion/trunk/Makefile
===================================================================
--- csw/mgar/pkg/subversion/trunk/Makefile	2010-07-16 20:26:49 UTC (rev 10528)
+++ csw/mgar/pkg/subversion/trunk/Makefile	2010-07-17 19:43:06 UTC (rev 10529)
@@ -65,12 +65,20 @@
 CATALOGNAME_CSWsvn-contrib = subversion_contrib
 PKGFILES_CSWsvn-contrib    = $(docdir)/subversion/contrib.*
 ARCHALL_CSWsvn-contrib     = 1
+CHECKPKG_OVERRIDES_CSWsvn-contrib += missing-dependency|CSWperl
+CHECKPKG_OVERRIDES_CSWsvn-contrib += missing-dependency|CSWpython
+CHECKPKG_OVERRIDES_CSWsvn-contrib += missing-dependency|CSWemacscommon
 
 SPKG_DESC_CSWsvn-tools     = Additional subversion tools
 CATALOGNAME_CSWsvn-tools   = subversion_tools
 PKGFILES_CSWsvn-tools      = $(docdir)/subversion/tools.*
 ARCHALL_CSWsvn-tools       = 1
+CHECKPKG_OVERRIDES_CSWsvn-tools += missing-dependency|CSWperl
+CHECKPKG_OVERRIDES_CSWsvn-tools += missing-dependency|CSWruby
+CHECKPKG_OVERRIDES_CSWsvn-tools += missing-dependency|CSWpython
+CHECKPKG_OVERRIDES_CSWsvn-tools += missing-dependency|CSWemacscommon
 
+
 SPKG_DESC_CSWap2svn        = Subversion Modules for Apache 2.2
 CATALOGNAME_CSWap2svn      = ap2_subversion
 RUNTIME_DEP_PKGS_CSWap2svn    = CSWsvn
@@ -84,6 +92,19 @@
 CATALOGNAME_CSWjavasvn     = javasvn
 PKGFILES_CSWjavasvn        = $(SVNLIB)/.*java.*
 PKGFILES_CSWjavasvn       += $(docdir)/$(CATALOGNAME_CSWjavasvn)/changelog.CSW
+RUNTIME_DEP_PKGS_CSWjavasvn += CSWexpat
+RUNTIME_DEP_PKGS_CSWjavasvn += CSWsvn
+RUNTIME_DEP_PKGS_CSWjavasvn += CSWiconv
+RUNTIME_DEP_PKGS_CSWjavasvn += CSWapache2rt
+RUNTIME_DEP_PKGS_CSWjavasvn += CSWggettextrt
+RUNTIME_DEP_PKGS_CSWjavasvn += CSWneon
+RUNTIME_DEP_PKGS_CSWjavasvn += CSWoldaprt
+CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/lib|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0
+CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/SUNWspro/lib|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0
+CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/SUNWspro/lib/v8|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0
+CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/studio/SOS12/SUNWspro/lib|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0
+CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/studio/SOS12/SUNWspro/lib/rw7|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0
+CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/studio/SOS12/SUNWspro/lib/v8|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0
 
 SPKG_DESC_CSWpmsvn         = Subversion Perl Language Binding
 CATALOGNAME_CSWpmsvn       = pm_subversion
@@ -91,20 +112,44 @@
 PKGFILES_CSWpmsvn         += $(SVNLIB)/.*perl.*
 PKGFILES_CSWpmsvn         += $(mandir)/.*swig_perl.*
 PKGFILES_CSWpmsvn         += $(docdir)/$(CATALOGNAME_CSWpmsvn)/changelog.CSW
+RUNTIME_DEP_PKGS_CSWpmsvn += CSWperl
+RUNTIME_DEP_PKGS_CSWpmsvn += CSWexpat
+RUNTIME_DEP_PKGS_CSWpmsvn += CSWsvn
+RUNTIME_DEP_PKGS_CSWpmsvn += CSWiconv
+RUNTIME_DEP_PKGS_CSWpmsvn += CSWapache2rt
+RUNTIME_DEP_PKGS_CSWpmsvn += CSWggettextrt
+RUNTIME_DEP_PKGS_CSWpmsvn += CSWoldaprt
 
 SPKG_DESC_CSWrbsvn         = Subversion Ruby Language Binding
 CATALOGNAME_CSWrbsvn       = rbsvn
 PKGFILES_CSWrbsvn          = $(libdir)/ruby.*
 PKGFILES_CSWrbsvn         += $(SVNLIB)/.*swig_ruby.*
 PKGFILES_CSWrbsvn         += $(docdir)/$(CATALOGNAME_CSWrbsvn)/changelog.CSW
+RUNTIME_DEP_PKGS_CSWrbsvn += CSWggettextrt
+RUNTIME_DEP_PKGS_CSWrbsvn += CSWsvn
+RUNTIME_DEP_PKGS_CSWrbsvn += CSWiconv
+RUNTIME_DEP_PKGS_CSWrbsvn += CSWapache2rt
+RUNTIME_DEP_PKGS_CSWrbsvn += CSWruby
+RUNTIME_DEP_PKGS_CSWrbsvn += CSWoldaprt
+RUNTIME_DEP_PKGS_CSWrbsvn += CSWexpat
 
 SPKG_DESC_CSWpythonsvn       = Subversion Python Language Binding
 CATALOGNAME_CSWpythonsvn     = pythonsvn
 PKGFILES_CSWpythonsvn        = $(libdir)/python.*
 PKGFILES_CSWpythonsvn       += $(SVNLIB)/.*swig_py.*
 PKGFILES_CSWpythonsvn       += $(docdir)/$(CATALOGNAME_CSWpythonsvn)/changelog.CSW
+RUNTIME_DEP_PKGS_CSWpythonsvn += CSWexpat
+RUNTIME_DEP_PKGS_CSWpythonsvn += CSWpython
+RUNTIME_DEP_PKGS_CSWpythonsvn += CSWsvn
+RUNTIME_DEP_PKGS_CSWpythonsvn += CSWiconv
+RUNTIME_DEP_PKGS_CSWpythonsvn += CSWapache2rt
+RUNTIME_DEP_PKGS_CSWpythonsvn += CSWggettextrt
+RUNTIME_DEP_PKGS_CSWpythonsvn += CSWoldaprt
+CHECKPKG_OVERRIDES_CSWpythonsvn += pkgname-does-not-start-with-CSWpy-
+CHECKPKG_OVERRIDES_CSWpythonsvn += catalogname-does-not-start-with-py_
 
 
+
 DISTFILES += CSWsvn.checkinstall
 DISTFILES += CSWap2svn.postinstall CSWap2svn.preremove
 DISTFILES += httpd-svn.conf.CSW svn_access.conf.CSW


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From rthurner at users.sourceforge.net  Sat Jul 17 21:47:09 2010
From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net)
Date: Sat, 17 Jul 2010 19:47:09 +0000
Subject: [csw-devel] SF.net SVN: gar:[10530]
	csw/mgar/pkg/apache2/trunk/Makefile
Message-ID: <E1OaDLp-0002ii-5H@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 10530
          http://gar.svn.sourceforge.net/gar/?rev=10530&view=rev
Author:   rthurner
Date:     2010-07-17 19:47:08 +0000 (Sat, 17 Jul 2010)

Log Message:
-----------
apache2: use apr-util

Modified Paths:
--------------
    csw/mgar/pkg/apache2/trunk/Makefile

Modified: csw/mgar/pkg/apache2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apache2/trunk/Makefile	2010-07-17 19:43:06 UTC (rev 10529)
+++ csw/mgar/pkg/apache2/trunk/Makefile	2010-07-17 19:47:08 UTC (rev 10530)
@@ -43,7 +43,8 @@
 	(cd $(WORKDIR)/$(GARNAME)-$(GARVERSION); ./buildconf)
 
 # Build Configuration
-#CONFIGURE_ARGS += --with-apr=$(prefix)
+CONFIGURE_ARGS += --with-apr=$(prefix)
+CONFIGURE_ARGS += --with-apr-util=$(prefix)
 CONFIGURE_ARGS += --with-mpm=prefork
 CONFIGURE_ARGS += --disable-static
 
@@ -60,8 +61,8 @@
 
 FIXCONFIG_DIRS     = $(DESTDIR)
 FIXCONFIG_RMPATHS  = $(DESTDIR)
-FIXCONFIG_RMPATHS += $(CURDIR)/$(WORKSRC)/$(GARNAME)-$(GARVERSION)/srclib/apr-util
-FIXCONFIG_RMPATHS += $(CURDIR)/$(WORKSRC)/$(GARNAME)-$(GARVERSION)/srclib/apr-util/include
+#FIXCONFIG_RMPATHS += $(CURDIR)/$(WORKSRC)/$(GARNAME)-$(GARVERSION)/srclib/apr-util
+#FIXCONFIG_RMPATHS += $(CURDIR)/$(WORKSRC)/$(GARNAME)-$(GARVERSION)/srclib/apr-util/include
 #FIXCONFIG_RMPATHS += $(CURDIR)/$(WORKSRC)/$(GARNAME)-$(GARVERSION)/srclib/apr
 #FIXCONFIG_RMPATHS += $(CURDIR)/$(WORKSRC)/$(GARNAME)-$(GARVERSION)/srclib/apr/include
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From rthurner at users.sourceforge.net  Sat Jul 17 23:11:01 2010
From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net)
Date: Sat, 17 Jul 2010 21:11:01 +0000
Subject: [csw-devel] SF.net SVN: gar:[10531]
	csw/mgar/pkg/subversion/trunk/Makefile
Message-ID: <E1OaEez-0004J0-9a@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 10531
          http://gar.svn.sourceforge.net/gar/?rev=10531&view=rev
Author:   rthurner
Date:     2010-07-17 21:11:01 +0000 (Sat, 17 Jul 2010)

Log Message:
-----------
subversion: whitespace changes in Makefile

Modified Paths:
--------------
    csw/mgar/pkg/subversion/trunk/Makefile

Modified: csw/mgar/pkg/subversion/trunk/Makefile
===================================================================
--- csw/mgar/pkg/subversion/trunk/Makefile	2010-07-17 19:47:08 UTC (rev 10530)
+++ csw/mgar/pkg/subversion/trunk/Makefile	2010-07-17 21:11:01 UTC (rev 10531)
@@ -79,26 +79,26 @@
 CHECKPKG_OVERRIDES_CSWsvn-tools += missing-dependency|CSWemacscommon
 
 
-SPKG_DESC_CSWap2svn        = Subversion Modules for Apache 2.2
-CATALOGNAME_CSWap2svn      = ap2_subversion
+SPKG_DESC_CSWap2svn           = Subversion Modules for Apache 2.2
+CATALOGNAME_CSWap2svn         = ap2_subversion
 RUNTIME_DEP_PKGS_CSWap2svn    = CSWsvn
 RUNTIME_DEP_PKGS_CSWsvn      += CSWapache2rt
 RUNTIME_DEP_PKGS_CSWap2svn   += CSWggettextrt
 RUNTIME_DEP_PKGS_CSWap2svn   += CSWiconv
-PKGFILES_CSWap2svn         = $(prefix)/apache2.*
-PKGFILES_CSWap2svn        += $(docdir)/$(CATALOGNAME_CSWap2svn)/changelog.CSW
+PKGFILES_CSWap2svn            = $(prefix)/apache2.*
+PKGFILES_CSWap2svn           += $(docdir)/$(CATALOGNAME_CSWap2svn)/changelog.CSW
 
-SPKG_DESC_CSWjavasvn       = Subversion Java Language Binding
-CATALOGNAME_CSWjavasvn     = javasvn
-PKGFILES_CSWjavasvn        = $(SVNLIB)/.*java.*
-PKGFILES_CSWjavasvn       += $(docdir)/$(CATALOGNAME_CSWjavasvn)/changelog.CSW
-RUNTIME_DEP_PKGS_CSWjavasvn += CSWexpat
-RUNTIME_DEP_PKGS_CSWjavasvn += CSWsvn
-RUNTIME_DEP_PKGS_CSWjavasvn += CSWiconv
-RUNTIME_DEP_PKGS_CSWjavasvn += CSWapache2rt
-RUNTIME_DEP_PKGS_CSWjavasvn += CSWggettextrt
-RUNTIME_DEP_PKGS_CSWjavasvn += CSWneon
-RUNTIME_DEP_PKGS_CSWjavasvn += CSWoldaprt
+SPKG_DESC_CSWjavasvn           = Subversion Java Language Binding
+CATALOGNAME_CSWjavasvn         = javasvn
+PKGFILES_CSWjavasvn            = $(SVNLIB)/.*java.*
+PKGFILES_CSWjavasvn           += $(docdir)/$(CATALOGNAME_CSWjavasvn)/changelog.CSW
+RUNTIME_DEP_PKGS_CSWjavasvn   += CSWexpat
+RUNTIME_DEP_PKGS_CSWjavasvn   += CSWsvn
+RUNTIME_DEP_PKGS_CSWjavasvn   += CSWiconv
+RUNTIME_DEP_PKGS_CSWjavasvn   += CSWapache2rt
+RUNTIME_DEP_PKGS_CSWjavasvn   += CSWggettextrt
+RUNTIME_DEP_PKGS_CSWjavasvn   += CSWneon
+RUNTIME_DEP_PKGS_CSWjavasvn   += CSWoldaprt
 CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/lib|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0
 CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/SUNWspro/lib|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0
 CHECKPKG_OVERRIDES_CSWjavasvn += bad-rpath-entry|/opt/SUNWspro/lib/v8|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0
@@ -133,18 +133,18 @@
 RUNTIME_DEP_PKGS_CSWrbsvn += CSWoldaprt
 RUNTIME_DEP_PKGS_CSWrbsvn += CSWexpat
 
-SPKG_DESC_CSWpythonsvn       = Subversion Python Language Binding
-CATALOGNAME_CSWpythonsvn     = pythonsvn
-PKGFILES_CSWpythonsvn        = $(libdir)/python.*
-PKGFILES_CSWpythonsvn       += $(SVNLIB)/.*swig_py.*
-PKGFILES_CSWpythonsvn       += $(docdir)/$(CATALOGNAME_CSWpythonsvn)/changelog.CSW
-RUNTIME_DEP_PKGS_CSWpythonsvn += CSWexpat
-RUNTIME_DEP_PKGS_CSWpythonsvn += CSWpython
-RUNTIME_DEP_PKGS_CSWpythonsvn += CSWsvn
-RUNTIME_DEP_PKGS_CSWpythonsvn += CSWiconv
-RUNTIME_DEP_PKGS_CSWpythonsvn += CSWapache2rt
-RUNTIME_DEP_PKGS_CSWpythonsvn += CSWggettextrt
-RUNTIME_DEP_PKGS_CSWpythonsvn += CSWoldaprt
+SPKG_DESC_CSWpythonsvn           = Subversion Python Language Binding
+CATALOGNAME_CSWpythonsvn         = pythonsvn
+PKGFILES_CSWpythonsvn            = $(libdir)/python.*
+PKGFILES_CSWpythonsvn           += $(SVNLIB)/.*swig_py.*
+PKGFILES_CSWpythonsvn           += $(docdir)/$(CATALOGNAME_CSWpythonsvn)/changelog.CSW
+RUNTIME_DEP_PKGS_CSWpythonsvn   += CSWexpat
+RUNTIME_DEP_PKGS_CSWpythonsvn   += CSWpython
+RUNTIME_DEP_PKGS_CSWpythonsvn   += CSWsvn
+RUNTIME_DEP_PKGS_CSWpythonsvn   += CSWiconv
+RUNTIME_DEP_PKGS_CSWpythonsvn   += CSWapache2rt
+RUNTIME_DEP_PKGS_CSWpythonsvn   += CSWggettextrt
+RUNTIME_DEP_PKGS_CSWpythonsvn   += CSWoldaprt
 CHECKPKG_OVERRIDES_CSWpythonsvn += pkgname-does-not-start-with-CSWpy-
 CHECKPKG_OVERRIDES_CSWpythonsvn += catalogname-does-not-start-with-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  Sat Jul 17 23:17:13 2010
From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net)
Date: Sat, 17 Jul 2010 21:17:13 +0000
Subject: [csw-devel] SF.net SVN: gar:[10532] csw/mgar/pkg/bdb50/trunk
Message-ID: <E1OaEkz-0004RN-AC@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 10532
          http://gar.svn.sourceforge.net/gar/?rev=10532&view=rev
Author:   rthurner
Date:     2010-07-17 21:17:13 +0000 (Sat, 17 Jul 2010)

Log Message:
-----------
bdb50: upgrade to newest version

Modified Paths:
--------------
    csw/mgar/pkg/bdb50/trunk/Makefile
    csw/mgar/pkg/bdb50/trunk/checksums

Modified: csw/mgar/pkg/bdb50/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bdb50/trunk/Makefile	2010-07-17 21:11:01 UTC (rev 10531)
+++ csw/mgar/pkg/bdb50/trunk/Makefile	2010-07-17 21:17:13 UTC (rev 10532)
@@ -1,5 +1,5 @@
 GARNAME = db
-GARVERSION = 5.0.21
+GARVERSION = 5.0.26
 CATEGORIES = lib
 
 DESCRIPTION = Berkeley DB 5.0

Modified: csw/mgar/pkg/bdb50/trunk/checksums
===================================================================
--- csw/mgar/pkg/bdb50/trunk/checksums	2010-07-17 21:11:01 UTC (rev 10531)
+++ csw/mgar/pkg/bdb50/trunk/checksums	2010-07-17 21:17:13 UTC (rev 10532)
@@ -1 +1 @@
-9a749fd2e98fe15840493ddc34cc66d8  db-5.0.21.tar.gz
+8723c97c03d12c3afc8333df92d5089a  db-5.0.26.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  Sun Jul 18 11:38:39 2010
From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net)
Date: Sun, 18 Jul 2010 09:38:39 +0000
Subject: [csw-devel] SF.net SVN: gar:[10533] csw/mgar/pkg
Message-ID: <E1OaQKV-0000FG-E5@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10533
          http://gar.svn.sourceforge.net/gar/?rev=10533&view=rev
Author:   bonivart
Date:     2010-07-18 09:38:39 +0000 (Sun, 18 Jul 2010)

Log Message:
-----------
sshguard: initial commit, does not build

Added Paths:
-----------
    csw/mgar/pkg/sshguard/
    csw/mgar/pkg/sshguard/branches/
    csw/mgar/pkg/sshguard/tags/
    csw/mgar/pkg/sshguard/trunk/
    csw/mgar/pkg/sshguard/trunk/Makefile
    csw/mgar/pkg/sshguard/trunk/checksums
    csw/mgar/pkg/sshguard/trunk/files/


Property changes on: csw/mgar/pkg/sshguard/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/sshguard/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sshguard/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/sshguard/trunk/Makefile	2010-07-18 09:38:39 UTC (rev 10533)
@@ -0,0 +1,22 @@
+GARNAME = sshguard
+GARVERSION = 1.5rc3
+CATEGORIES = net
+
+DESCRIPTION = Protects networked hosts from brute force attacks
+define BLURB
+  Protects networked hosts from brute force attacks
+endef
+
+MASTER_SITES = $(SF_MIRRORS)
+SF_PROJ = $(GARNAME)
+DISTFILES  = $(GARNAME)-$(GARVERSION).tar.bz2
+
+# We define upstream file regex so we can be notifed of new upstream software release
+UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2
+
+GARCOMPILER = GNU
+
+CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS += --with-firewall=hosts
+
+include gar/category.mk

Added: csw/mgar/pkg/sshguard/trunk/checksums
===================================================================
--- csw/mgar/pkg/sshguard/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/sshguard/trunk/checksums	2010-07-18 09:38:39 UTC (rev 10533)
@@ -0,0 +1 @@
+388315aa687168f838ae3d5c9a486b00  sshguard-1.5rc3.tar.bz2


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From bonivart at users.sourceforge.net  Sun Jul 18 13:27:25 2010
From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net)
Date: Sun, 18 Jul 2010 11:27:25 +0000
Subject: [csw-devel] SF.net SVN: gar:[10534] csw/mgar/pkg/pkgutil/trunk
Message-ID: <E1OaS1l-0001yq-TW@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10534
          http://gar.svn.sourceforge.net/gar/?rev=10534&view=rev
Author:   bonivart
Date:     2010-07-18 11:27:25 +0000 (Sun, 18 Jul 2010)

Log Message:
-----------
pkgutil: update to 2.1 beta 1

Modified Paths:
--------------
    csw/mgar/pkg/pkgutil/trunk/Makefile
    csw/mgar/pkg/pkgutil/trunk/checksums

Modified: csw/mgar/pkg/pkgutil/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pkgutil/trunk/Makefile	2010-07-18 09:38:39 UTC (rev 10533)
+++ csw/mgar/pkg/pkgutil/trunk/Makefile	2010-07-18 11:27:25 UTC (rev 10534)
@@ -1,5 +1,5 @@
 GARNAME = pkgutil
-GARVERSION = 2.0
+GARVERSION = 2.1b1
 CATEGORIES = utils
 
 DESCRIPTION = Installs Solaris packages easily

Modified: csw/mgar/pkg/pkgutil/trunk/checksums
===================================================================
--- csw/mgar/pkg/pkgutil/trunk/checksums	2010-07-18 09:38:39 UTC (rev 10533)
+++ csw/mgar/pkg/pkgutil/trunk/checksums	2010-07-18 11:27:25 UTC (rev 10534)
@@ -5,4 +5,4 @@
 b5fffa0be100ddbb7262ce3a0a4e3bb7  build_sun_catalog.py
 7ad27336f90e73da3254a61d91025ee5  cswcatalog
 3a6b789b3d5e05f41d2363dd26a92acf  opencsw.py
-a889e3ceed745c05de5e64c8244d1092  pkgutil-2.0.zip
+098debdae1a6e215cc99ed64f4234da8  pkgutil-2.1b1.zip


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 Jul 19 00:32:53 2010
From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net)
Date: Sun, 18 Jul 2010 22:32:53 +0000
Subject: [csw-devel] SF.net SVN: gar:[10535]
	csw/mgar/pkg/subversion/trunk/Makefile
Message-ID: <E1OacPl-0007th-Lt@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 10535
          http://gar.svn.sourceforge.net/gar/?rev=10535&view=rev
Author:   rthurner
Date:     2010-07-18 22:32:53 +0000 (Sun, 18 Jul 2010)

Log Message:
-----------
subverison: ap2svn should depend on apache, not svn itself

Modified Paths:
--------------
    csw/mgar/pkg/subversion/trunk/Makefile

Modified: csw/mgar/pkg/subversion/trunk/Makefile
===================================================================
--- csw/mgar/pkg/subversion/trunk/Makefile	2010-07-18 11:27:25 UTC (rev 10534)
+++ csw/mgar/pkg/subversion/trunk/Makefile	2010-07-18 22:32:53 UTC (rev 10535)
@@ -82,7 +82,7 @@
 SPKG_DESC_CSWap2svn           = Subversion Modules for Apache 2.2
 CATALOGNAME_CSWap2svn         = ap2_subversion
 RUNTIME_DEP_PKGS_CSWap2svn    = CSWsvn
-RUNTIME_DEP_PKGS_CSWsvn      += CSWapache2rt
+RUNTIME_DEP_PKGS_CSWap2svn   += CSWapache2rt
 RUNTIME_DEP_PKGS_CSWap2svn   += CSWggettextrt
 RUNTIME_DEP_PKGS_CSWap2svn   += CSWiconv
 PKGFILES_CSWap2svn            = $(prefix)/apache2.*


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 Jul 19 01:58:52 2010
From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net)
Date: Sun, 18 Jul 2010 23:58:52 +0000
Subject: [csw-devel] SF.net SVN: gar:[10536]
	csw/mgar/pkg/apr-util/trunk/Makefile
Message-ID: <E1Oadky-0000Dt-3Y@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 10536
          http://gar.svn.sourceforge.net/gar/?rev=10536&view=rev
Author:   rthurner
Date:     2010-07-18 23:58:51 +0000 (Sun, 18 Jul 2010)

Log Message:
-----------
apr-util: include ldap support necessary for apache2 ldap

Modified Paths:
--------------
    csw/mgar/pkg/apr-util/trunk/Makefile

Modified: csw/mgar/pkg/apr-util/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apr-util/trunk/Makefile	2010-07-18 22:32:53 UTC (rev 10535)
+++ csw/mgar/pkg/apr-util/trunk/Makefile	2010-07-18 23:58:51 UTC (rev 10536)
@@ -22,6 +22,7 @@
 
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --with-apr=$(prefix)/bin/apr-1-config
+CONFIGURE_ARGS += --with-ldap
 #not yet
 #CONFIGURE_ARGS += --with-berkeley-db=$(prefix)/bdb48
 CONFIGURE_ARGS += --without-freetds --without-sqlite2


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 Jul 19 02:15:45 2010
From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net)
Date: Mon, 19 Jul 2010 00:15:45 +0000
Subject: [csw-devel] SF.net SVN: gar:[10537]
	csw/mgar/pkg/apr-util/trunk/Makefile
Message-ID: <E1Oae1J-0002RB-VS@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 10537
          http://gar.svn.sourceforge.net/gar/?rev=10537&view=rev
Author:   rthurner
Date:     2010-07-19 00:15:45 +0000 (Mon, 19 Jul 2010)

Log Message:
-----------
apr-util: depend on berkely db, and openldap. as well ignore some checkpg errors

Modified Paths:
--------------
    csw/mgar/pkg/apr-util/trunk/Makefile

Modified: csw/mgar/pkg/apr-util/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apr-util/trunk/Makefile	2010-07-18 23:58:51 UTC (rev 10536)
+++ csw/mgar/pkg/apr-util/trunk/Makefile	2010-07-19 00:15:45 UTC (rev 10537)
@@ -15,16 +15,21 @@
 CATALOGNAME = apr_util
 
 RUNTIME_DEP_PKGS = CSWapr CSWiconv CSWsqlite3rt CSWunixodbc CSWexpat
-#RUNTIME_DEP_PKGS += CSWbdb48
+RUNTIME_DEP_PKGS += CSWbdb48 CSWoldaprt
 
+CHECKPKG_OVERRIDES_CSWapr-util += binary-disallowed-placement|file=opt/csw/lib/sparcv9/libaprutil-1.so.0.3.9|arch_id=2|arch_name=sparcv8|bad_path=sparcv9
+CHECKPKG_OVERRIDES_CSWapr-util += binary-disallowed-placement|file=opt/csw/lib/sparcv9/apr-util-1/apr_dbd_sqlite3-1.so|arch_id=2|arch_name=sparcv8|bad_path=sparcv9
+CHECKPKG_OVERRIDES_CSWapr-util += binary-disallowed-placement|file=opt/csw/lib/sparcv9/apr-util-1/apr_ldap-1.so|arch_id=2|arch_name=sparcv8|bad_path=sparcv9
+CHECKPKG_OVERRIDES_CSWapr-util += binary-disallowed-placement|file=opt/csw/lib/sparcv9/apr-util-1/apr_dbd_odbc-1.so|arch_id=2|arch_name=sparcv8|bad_path=sparcv9
+
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --with-apr=$(prefix)/bin/apr-1-config
 CONFIGURE_ARGS += --with-ldap
-#not yet
-#CONFIGURE_ARGS += --with-berkeley-db=$(prefix)/bdb48
+CONFIGURE_ARGS += --with-ssl
+CONFIGURE_ARGS += --with-berkeley-db=$(prefix)/bdb48
 CONFIGURE_ARGS += --without-freetds --without-sqlite2
 
 BUILD64 = 1


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 Jul 19 02:30:36 2010
From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net)
Date: Mon, 19 Jul 2010 00:30:36 +0000
Subject: [csw-devel] SF.net SVN: gar:[10538]
	csw/mgar/pkg/apr-util/trunk/Makefile
Message-ID: <E1OaeFg-0002Nd-KJ@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 10538
          http://gar.svn.sourceforge.net/gar/?rev=10538&view=rev
Author:   rthurner
Date:     2010-07-19 00:30:36 +0000 (Mon, 19 Jul 2010)

Log Message:
-----------
apr-util: force berkely db version, as autoconf does not know it ..

Modified Paths:
--------------
    csw/mgar/pkg/apr-util/trunk/Makefile

Modified: csw/mgar/pkg/apr-util/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apr-util/trunk/Makefile	2010-07-19 00:15:45 UTC (rev 10537)
+++ csw/mgar/pkg/apr-util/trunk/Makefile	2010-07-19 00:30:36 UTC (rev 10538)
@@ -29,7 +29,7 @@
 CONFIGURE_ARGS += --with-apr=$(prefix)/bin/apr-1-config
 CONFIGURE_ARGS += --with-ldap
 CONFIGURE_ARGS += --with-ssl
-CONFIGURE_ARGS += --with-berkeley-db=$(prefix)/bdb48
+CONFIGURE_ARGS += --with-dbm=$(prefix)/bdb48
 CONFIGURE_ARGS += --without-freetds --without-sqlite2
 
 BUILD64 = 1


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 Jul 19 02:45:29 2010
From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net)
Date: Mon, 19 Jul 2010 00:45:29 +0000
Subject: [csw-devel] SF.net SVN: gar:[10539]
	csw/mgar/pkg/apr-util/trunk/Makefile
Message-ID: <E1OaeU5-0002k8-6O@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 10539
          http://gar.svn.sourceforge.net/gar/?rev=10539&view=rev
Author:   rthurner
Date:     2010-07-19 00:45:28 +0000 (Mon, 19 Jul 2010)

Log Message:
-----------
apr-util: autotools do not support bdb-48?? and --with-ssl is not known

Modified Paths:
--------------
    csw/mgar/pkg/apr-util/trunk/Makefile

Modified: csw/mgar/pkg/apr-util/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apr-util/trunk/Makefile	2010-07-19 00:30:36 UTC (rev 10538)
+++ csw/mgar/pkg/apr-util/trunk/Makefile	2010-07-19 00:45:28 UTC (rev 10539)
@@ -15,7 +15,7 @@
 CATALOGNAME = apr_util
 
 RUNTIME_DEP_PKGS = CSWapr CSWiconv CSWsqlite3rt CSWunixodbc CSWexpat
-RUNTIME_DEP_PKGS += CSWbdb48 CSWoldaprt
+RUNTIME_DEP_PKGS += CSWbdb47 CSWoldaprt
 
 CHECKPKG_OVERRIDES_CSWapr-util += binary-disallowed-placement|file=opt/csw/lib/sparcv9/libaprutil-1.so.0.3.9|arch_id=2|arch_name=sparcv8|bad_path=sparcv9
 CHECKPKG_OVERRIDES_CSWapr-util += binary-disallowed-placement|file=opt/csw/lib/sparcv9/apr-util-1/apr_dbd_sqlite3-1.so|arch_id=2|arch_name=sparcv8|bad_path=sparcv9
@@ -28,8 +28,7 @@
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --with-apr=$(prefix)/bin/apr-1-config
 CONFIGURE_ARGS += --with-ldap
-CONFIGURE_ARGS += --with-ssl
-CONFIGURE_ARGS += --with-dbm=$(prefix)/bdb48
+CONFIGURE_ARGS += --with-berkely-db=$(prefix)/bdb47
 CONFIGURE_ARGS += --without-freetds --without-sqlite2
 
 BUILD64 = 1


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 Jul 19 02:49:07 2010
From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net)
Date: Mon, 19 Jul 2010 00:49:07 +0000
Subject: [csw-devel] SF.net SVN: gar:[10540]
	csw/mgar/pkg/apr-util/trunk/Makefile
Message-ID: <E1OaeXb-0000vm-UC@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 10540
          http://gar.svn.sourceforge.net/gar/?rev=10540&view=rev
Author:   rthurner
Date:     2010-07-19 00:49:07 +0000 (Mon, 19 Jul 2010)

Log Message:
-----------
apr-util: try to do the same trick as with subversion to get newest bdb

Modified Paths:
--------------
    csw/mgar/pkg/apr-util/trunk/Makefile

Modified: csw/mgar/pkg/apr-util/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apr-util/trunk/Makefile	2010-07-19 00:45:28 UTC (rev 10539)
+++ csw/mgar/pkg/apr-util/trunk/Makefile	2010-07-19 00:49:07 UTC (rev 10540)
@@ -15,7 +15,7 @@
 CATALOGNAME = apr_util
 
 RUNTIME_DEP_PKGS = CSWapr CSWiconv CSWsqlite3rt CSWunixodbc CSWexpat
-RUNTIME_DEP_PKGS += CSWbdb47 CSWoldaprt
+RUNTIME_DEP_PKGS += CSWbdb48 CSWoldaprt
 
 CHECKPKG_OVERRIDES_CSWapr-util += binary-disallowed-placement|file=opt/csw/lib/sparcv9/libaprutil-1.so.0.3.9|arch_id=2|arch_name=sparcv8|bad_path=sparcv9
 CHECKPKG_OVERRIDES_CSWapr-util += binary-disallowed-placement|file=opt/csw/lib/sparcv9/apr-util-1/apr_dbd_sqlite3-1.so|arch_id=2|arch_name=sparcv8|bad_path=sparcv9
@@ -28,7 +28,7 @@
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --with-apr=$(prefix)/bin/apr-1-config
 CONFIGURE_ARGS += --with-ldap
-CONFIGURE_ARGS += --with-berkely-db=$(prefix)/bdb47
+CONFIGURE_ARGS += --with-berkeley-db=db.h:/opt/csw/bdb48/include:/opt/csw/bdb48/lib:db
 CONFIGURE_ARGS += --without-freetds --without-sqlite2
 
 BUILD64 = 1


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From wahwah at users.sourceforge.net  Mon Jul 19 10:39:22 2010
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Mon, 19 Jul 2010 08:39:22 +0000
Subject: [csw-devel] SF.net SVN: gar:[10541] csw/mgar/gar/v2
Message-ID: <E1Oalsg-0001sn-U5@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 10541
          http://gar.svn.sourceforge.net/gar/?rev=10541&view=rev
Author:   wahwah
Date:     2010-07-19 08:39:22 +0000 (Mon, 19 Jul 2010)

Log Message:
-----------
A major update to checkpkg.

* uses sqlite backend for stats storage; you may purge your ~/.checkpkg/stats
  directories

* performance tweaks allow it to process the whole catalog in 70 minutes
  including extracting all packages, or in 30 minutes for incremental updates

* understands alternative dependencies; if two packages provide foo.so.1,
  dependency on any of them is sufficient

* supports $ORIGIN in RPATH, including relative paths such as $ORIGIN/..

* offers better on-screen messages, e.g. explains the details of every
  soname-not-found error

Modified Paths:
--------------
    csw/mgar/gar/v2/bin/analyze_module_results.py
    csw/mgar/gar/v2/bin/checkpkg
    csw/mgar/gar/v2/bin/checkpkg_collect_stats.py
    csw/mgar/gar/v2/bin/checkpkg_collect_stats_test.py
    csw/mgar/gar/v2/bin/checkpkg_inspect_stats.py
    csw/mgar/gar/v2/bin/checkpkg_run_modules.py
    csw/mgar/gar/v2/bin/update_contents_cache.py
    csw/mgar/gar/v2/lib/python/checkpkg.py
    csw/mgar/gar/v2/lib/python/checkpkg_test.py
    csw/mgar/gar/v2/lib/python/dependency_checks.py
    csw/mgar/gar/v2/lib/python/models.py
    csw/mgar/gar/v2/lib/python/opencsw.py
    csw/mgar/gar/v2/lib/python/package_checks.py
    csw/mgar/gar/v2/lib/python/package_checks_test.py
    csw/mgar/gar/v2/tests/run_tests.py

Added Paths:
-----------
    csw/mgar/gar/v2/bin/pkgdb
    csw/mgar/gar/v2/lib/__init__.py
    csw/mgar/gar/v2/lib/python/__init__.py
    csw/mgar/gar/v2/lib/python/dependency_checks_test.py
    csw/mgar/gar/v2/lib/python/pkgdb.py
    csw/mgar/gar/v2/lib/python/testdata/javasvn_stats.py
    csw/mgar/gar/v2/lib/python/testdata/stubs.py
    csw/mgar/gar/v2/lib/python/testdata/sudo_stats.py
    csw/mgar/gar/v2/lib/python/testdata/tree_stats.py

Modified: csw/mgar/gar/v2/bin/analyze_module_results.py
===================================================================
--- csw/mgar/gar/v2/bin/analyze_module_results.py	2010-07-19 00:49:07 UTC (rev 10540)
+++ csw/mgar/gar/v2/bin/analyze_module_results.py	2010-07-19 08:39:22 UTC (rev 10541)
@@ -5,8 +5,10 @@
 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.
@@ -14,52 +16,55 @@
              "..", "lib", "python"]
 sys.path.append(os.path.join(*path_list))
 import checkpkg
-import opencsw
 import overrides
 
+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("-e", "--extract-dir", dest="extractdir",
-                    help="Directory with extracted packages "
-                         "(with error tag files)")
+  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
-  srv4_pkgs = [opencsw.CswSrv4File(x) for x in filenames]
-  pkgstats = [checkpkg.PackageStats(x) for x in srv4_pkgs]
+
+  # 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 = checkpkg.StatsListFromCatalog(filenames, options.catalog)
   overrides_list = [pkg.GetSavedOverrides() for pkg in pkgstats]
-  files = os.listdir(options.extractdir)
-  error_tags = []
-  no_files = len(files)
-  bar = progressbar.ProgressBar()
-  bar.maxval = no_files
-  bar.start()
-  counter = itertools.count()
-  for file_name in files:
-    full_path = os.path.join(options.extractdir, file_name)
-    error_tags.extend(checkpkg.ErrorTagsFromFile(full_path))
-    bar.update(counter.next())
-  bar.finish()
   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)
-  if tags_after_overrides:
-    print "If any of the reported errors were false positives, you can"
-    print "override them pasting the lines below to the GAR recipe."
-    for checkpkg_tag in tags_after_overrides:
-      print checkpkg_tag.ToGarSyntax()
-    print "Please note that checkpkg isn't suggesting you should "
-    print "use these overrides.  It only informs what the overrides could "
-    print "look like.  You need to understand what are the reported issues about"
-    print "and use your best judgement to decide whether to fix the underlying"
-    print "problems or override them."
-  if unapplied_overrides:
-    print "WARNING: Some overrides did not match any errors."
-    print "         They can be removed, as they don't take any effect anyway."
-    print "         If you're getting errors at the same time, maybe you didn't"
-    print "         specify the overrides correctly."
-    for override in unapplied_overrides:
-      print "* Unused %s" % override
   sys.exit(exit_code)
 
 

Modified: csw/mgar/gar/v2/bin/checkpkg
===================================================================
--- csw/mgar/gar/v2/bin/checkpkg	2010-07-19 00:49:07 UTC (rev 10540)
+++ csw/mgar/gar/v2/bin/checkpkg	2010-07-19 08:39:22 UTC (rev 10541)
@@ -108,8 +108,10 @@
 MD5_SUMS_CATALOG_FILE=""
 INSTALL_CONTENTS_FILES="/var/sadm/install/contents"
 ANALYZE=1
+PROFILE=0
+QUIET=0
 
-while getopts hsdNM:o:c:A opt; do
+while getopts hsdNM:o:c:Apq opt; do
 	case "${opt}" in
 	  c)
 	    INSTALL_CONTENTS_FILES="${INSTALL_CONTENTS_FILES} ${OPTARG}"
@@ -135,6 +137,11 @@
     A)
       ANALYZE=0
       ;;
+    p)
+      PROFILE=1
+      ;;
+    q) QUIET=1
+      ;;
     *)
       echo "Unknown option '${opt}'"
       ;;
@@ -148,6 +155,8 @@
 readonly SAVE_TAGS
 readonly SKIP_STATS_COLLECTION
 readonly ANALYZE
+readonly PROFILE
+readonly QUIET
 
 if [[ "${display_help}" -eq 1 ]] ; then
   print 'Usage: checkpkg [options] pkg1 [pkg2 ....]'
@@ -159,6 +168,8 @@
   print '   -N         skip statistics collection'
   print '   -M <file>  use package md5sums from a catalog file'
   print '   -A         Do not analyze the results.'
+  print '   -p         Enable profiling'
+  print '   -q         Display less messages'
   exit 0
 fi
 
@@ -242,6 +253,14 @@
 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}"
@@ -250,6 +269,8 @@
 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."
@@ -265,9 +286,6 @@
   fi
 fi
 
-debugmsg "checkpkg_module_dir: '$checkpkg_module_dir'"
-log_files=""
-module_name_format="%-40s"
 # TODO: A performance problem. The following line means that the md5sums are
 # calculated once more.
 if [ "${MD5_SUMS_CATALOG_FILE}" ]; then
@@ -280,55 +298,12 @@
   md5sums=`gmd5sum "$@" | awk '{print $1}'`
 fi
 debugmsg "All md5 sums: ${md5sums}"
-if [[ -d "${checkpkg_module_dir}" ]]; then
-	for plugin in "${checkpkg_module_dir}/${checkpkg_module_tag}"*; do
-		if [[ -x "${plugin}" ]]; then
-			plugin_base_name=`basename ${plugin}`
-			plugin_log="${EXTRACTDIR}/${plugin_base_name}.log"
-			log_files="${log_files} ${plugin_log}"
-			plugin_name="`echo ${plugin} | sed -e 's+.*/checkpkg-++' | sed -e 's+\.py$++'`"
-			error_tag_file="tags.${plugin_name}"
-			debugmsg "Executing: ${plugin} $extra_options -b \"${checkpkg_stats_basedir}\"" \
-		           "-o \"${EXTRACTDIR}/${error_tag_file}\" `echo ${md5sums}`"
-			printf "${BOLD}${module_name_format}${COLOR_RESET} running..." "${plugin_name}"
-			${plugin} \
-				$extra_options \
-				-b "${checkpkg_stats_basedir}" \
-				-o "${EXTRACTDIR}/${error_tag_file}" \
-				${md5sums} \
-				> "${plugin_log}" 2>&1
-			if [[ "$?" -ne 0 ]]; then
-				printf "\r${module_name_format} ${RED}[ERROR]${COLOR_RESET}        \\n" \
-				       "${plugin_name}"
-				test_suite_ok=0
-			else
-				printf "\r${module_name_format} [Done]        \\n" "${plugin_name}"
-			fi
-		else
-			debugmsg "'${plugin}' is not executable"
-		fi
-	done
-else
-	debugmsg "module dir ${checkpkg_module_dir} does not exist"
-fi
 
-for log_file in ${log_files}; do
-	log_len=`gsed -e 's/\s\+//g' "${log_file}" | gtr -s '\n' | gwc -c | awk '{print $1}'`
-	if [[ "${log_len}" -gt 1 ]]; then
-		print "printing ${log_file}..."
-		debugmsg ">> LOG START: ${log_file}"
-		cat "${log_file}"
-		debugmsg "<< LOG END: ${log_file}"
-	else
-		debugmsg "-- LOG ${log_file} is empty"
-	fi
-done
-
-# This check is special; it uses one executable for all the checks written in Python.
+# Running the checks.
 ${command_basedir}/checkpkg_run_modules.py \
     ${extra_options} \
     -b "${checkpkg_stats_basedir}" \
-    -o "${EXTRACTDIR}/tags.python-checks" \
+    ${quiet_options} \
     ${md5sums}
 if [[ "$?" -ne 0 ]]; then
   print "There was a problem analyzing package stats."
@@ -339,38 +314,13 @@
 	errmsg "One or more tests have finished with an error."
 fi
 
-if [[ "${DEBUG}" != "" ]]; then
-	override_info_printed=0
-	for tagfile in ${EXTRACTDIR}/tags.*; do
-		if [[ -s "${tagfile}" ]]; then
-			if [[ "${override_info_printed}" -ne 1 ]]; then
-				echo "# You can use the following lines to create overrides"
-				echo "# See http://wiki.opencsw.org/checkpkg"
-				override_info_printed=1
-			fi
-			echo "# ${tagfile}:"
-			cat "${tagfile}"
-		fi
-    if [[ "${SAVE_TAGS}" -eq 1 ]]; then
-    	echo "Saving ${tagfile} to `pwd`/${SAVED_TAGS_FILE}"
-      cat "${tagfile}" >> "${SAVED_TAGS_FILE}"
-    fi
-	done
-fi
-
-for tagfile in ${EXTRACTDIR}/tags.*; do
-  if [[ "${SAVE_TAGS}" -eq 1 ]]; then
-    echo "Saving ${tagfile} to ${SAVED_TAGS_FILE} (pwd = `pwd`)"
-    cat "${tagfile}" >> "${SAVED_TAGS_FILE}"
-  fi
-done
-
 if [[ "${ANALYZE}" -eq 1 ]]; then
 # Collecting errors and applying the overrides.
 # This has to use the original files.
   echo "Applying the overrides and analyzing the results."
   ${command_basedir}/analyze_module_results.py \
-      -e "${EXTRACTDIR}" \
+      ${catalog_options} \
+      ${quiet_options} \
       "$@"
   if [[ "$?" -ne 0 ]]; then
     errmsg "${RED}Modular checks are reporting errors.${COLOR_RESET}"

Modified: csw/mgar/gar/v2/bin/checkpkg_collect_stats.py
===================================================================
--- csw/mgar/gar/v2/bin/checkpkg_collect_stats.py	2010-07-19 00:49:07 UTC (rev 10540)
+++ csw/mgar/gar/v2/bin/checkpkg_collect_stats.py	2010-07-19 08:39:22 UTC (rev 10541)
@@ -22,14 +22,16 @@
 import checkpkg
 import opencsw
 
-
 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_file",
+  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)
@@ -39,30 +41,20 @@
   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)
-  packages = [opencsw.CswSrv4File(x, options.debug) for x in args]
-  if options.catalog_file:
-    # Using cached md5sums to save time: injecting md5sums
-    # from the catalog.
-    catalog = opencsw.OpencswCatalog(options.catalog_file)
-    md5s_by_basename = catalog.GetDataByBasename()
-    for pkg in packages:
-      basename = os.path.basename(pkg.pkg_path)
-      # It might be the case that a file is present on disk, but missing from
-      # the catalog file.
-      if basename in md5s_by_basename:
-        pkg.md5sum = md5s_by_basename[basename]["md5sum"]
-  stats_list = [checkpkg.PackageStats(pkg) for pkg in packages]
-  md5s_by_basename = None # To free memory
-  catalog = None          # To free memory
-  del(packages)
+  stats_list = checkpkg.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()
-  logging.info("Unpacking and examining the srv4 files needed.")
   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

Modified: csw/mgar/gar/v2/bin/checkpkg_collect_stats_test.py
===================================================================
--- csw/mgar/gar/v2/bin/checkpkg_collect_stats_test.py	2010-07-19 00:49:07 UTC (rev 10540)
+++ csw/mgar/gar/v2/bin/checkpkg_collect_stats_test.py	2010-07-19 08:39:22 UTC (rev 10541)
@@ -20,15 +20,6 @@
   def setUp(self):
     self.mocker = mox.Mox()
 
-  def testGetStatsPath(self):
-    mock_pkg = self.mocker.CreateMock(opencsw.CswSrv4File)
-    mock_pkg.GetMd5sum().AndReturn("abcdef")
-    self.mocker.ReplayAll()
-    sc = ccs.PackageStats(mock_pkg)
-    expected = "/home/joe/.checkpkg/stats/ab/abcdef"
-    self.assertEqual(expected, sc.GetStatsPath("/home/joe"))
-    self.mocker.VerifyAll()
 
-
 if __name__ == '__main__':
 	unittest.main()

Modified: csw/mgar/gar/v2/bin/checkpkg_inspect_stats.py
===================================================================
--- csw/mgar/gar/v2/bin/checkpkg_inspect_stats.py	2010-07-19 00:49:07 UTC (rev 10540)
+++ csw/mgar/gar/v2/bin/checkpkg_inspect_stats.py	2010-07-19 08:39:22 UTC (rev 10541)
@@ -34,6 +34,8 @@
   pkgstats = [checkpkg.PackageStats(x) for x in srv4_pkgs]
   pkgstats = [x.GetAllStats() for x in pkgstats]
   if options.print_stats:
+    print "import datetime"
+    print "pkgstats = ",
     pprint.pprint(pkgstats)
   else:
     code.interact(local=locals())

Modified: csw/mgar/gar/v2/bin/checkpkg_run_modules.py
===================================================================
--- csw/mgar/gar/v2/bin/checkpkg_run_modules.py	2010-07-19 00:49:07 UTC (rev 10540)
+++ csw/mgar/gar/v2/bin/checkpkg_run_modules.py	2010-07-19 08:39:22 UTC (rev 10541)
@@ -3,10 +3,13 @@
 
 """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"
 
@@ -34,10 +37,8 @@
                                             options.debug)
   # Running the checks, reporting and exiting.
   exit_code, screen_report, tags_report = check_manager.Run()
-  f = open(options.output, "w")
-  f.write(tags_report)
-  f.close()
-  if screen_report:
+  screen_report = unicode(screen_report)
+  if not options.quiet and screen_report:
     sys.stdout.write(screen_report)
   else:
     logging.debug("No screen report.")
@@ -45,4 +46,11 @@
 
 
 if __name__ == '__main__':
-  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()

Added: csw/mgar/gar/v2/bin/pkgdb
===================================================================
--- csw/mgar/gar/v2/bin/pkgdb	                        (rev 0)
+++ csw/mgar/gar/v2/bin/pkgdb	2010-07-19 08:39:22 UTC (rev 10541)
@@ -0,0 +1 @@
+link ../lib/python/pkgdb.py
\ No newline at end of file


Property changes on: csw/mgar/gar/v2/bin/pkgdb
___________________________________________________________________
Added: svn:special
   + *

Modified: csw/mgar/gar/v2/bin/update_contents_cache.py
===================================================================
--- csw/mgar/gar/v2/bin/update_contents_cache.py	2010-07-19 00:49:07 UTC (rev 10540)
+++ csw/mgar/gar/v2/bin/update_contents_cache.py	2010-07-19 08:39:22 UTC (rev 10541)
@@ -24,6 +24,11 @@
       dest="debug",
       default=False,
       action="store_true")
+  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)

Added: csw/mgar/gar/v2/lib/__init__.py
===================================================================
Added: csw/mgar/gar/v2/lib/python/__init__.py
===================================================================
Modified: csw/mgar/gar/v2/lib/python/checkpkg.py
===================================================================
--- csw/mgar/gar/v2/lib/python/checkpkg.py	2010-07-19 00:49:07 UTC (rev 10540)
+++ csw/mgar/gar/v2/lib/python/checkpkg.py	2010-07-19 08:39:22 UTC (rev 10541)
@@ -32,8 +32,8 @@
 import tag
 
 DEBUG_BREAK_PKGMAP_AFTER = False
-DB_SCHEMA_VERSION = 4L
-PACKAGE_STATS_VERSION = 8L
+DB_SCHEMA_VERSION = 5L
+PACKAGE_STATS_VERSION = 9L
 SYSTEM_PKGMAP = "/var/sadm/install/contents"
 NEEDED_SONAMES = "needed sonames"
 RUNPATH = "runpath"
@@ -42,7 +42,7 @@
 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.*", r"\*SUNW.*"]
+DO_NOT_REPORT_MISSING_RE = [r"\*?SUNW.*"]
 DUMP_BIN = "/usr/ccs/bin/dump"
 PSTAMP_RE = r"(?P<username>\w+)@(?P<hostname>[\w\.-]+)-(?P<timestamp>\d+)"
 DESCRIPTION_RE = r"^([\S]+) - (.*)$"
@@ -66,20 +66,11 @@
     "/lib",
 ]
 
+CONTENT_PKG_RE = r"^\*?(CSW|SUNW)[0-9a-zA-Z\-]?[0-9a-z\-]+$"
 
 # This shared library is present on Solaris 10 on amd64, but it's missing on
 # Solaris 8 on i386.  It's okay if it's missing.
 ALLOWED_ORPHAN_SONAMES = set([u"libm.so.2"])
-DEPENDENCY_FILENAME_REGEXES = (
-    (r".*\.pl$", u"CSWperl"),
-    (r".*\.pm$", u"CSWperl"),
-    (r".*\.py$", u"CSWpython"),
-    (r".*\.rb$", u"CSWruby"),
-    (r".*\.el$", u"CSWemacscommon"),
-    (r".*\.elc$", u"CSWemacscommon"),
-)
-# Compiling the regexes ahead of time.
-DEPENDENCY_FILENAME_REGEXES = tuple([(re.compile(x), y) for x, y in DEPENDENCY_FILENAME_REGEXES])
 
 REPORT_TMPL = u"""#if $missing_deps or $surplus_deps or $orphan_sonames
 Dependency issues of $pkgname:
@@ -170,19 +161,21 @@
 
 def GetOptions():
   parser = optparse.OptionParser()
-  parser.add_option("-b", dest="stats_basedir",
+  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")
-  parser.add_option("-o", "--output", dest="output",
-                    help="Output error tag file")
+  parser.add_option("-p", "--profile", dest="profile",
+                    default=False, action="store_true",
+                    help=("Turn on profiling"))
+  parser.add_option("-q", "--quiet", dest="quiet",
+                    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.")
-  if not options.output:
-    raise ConfigurationError("ERROR: the -o option is missing.")
   # Using set() to make the arguments unique.
   return options, set(args)
 
@@ -208,11 +201,16 @@
 
   CHECKPKG_DIR = ".checkpkg"
   SQLITE3_DBNAME_TMPL = "checkpkg-db-%(fqdn)s"
-  TABLES = (m.CswConfig,
-            m.CswFile,
-            m.CswPackage,
+  TABLES_THAT_NEED_UPDATES = (m.CswFile,)
+  TABLES = TABLES_THAT_NEED_UPDATES + (
+            m.Pkginst,
+            m.CswConfig,
             m.Srv4FileStats,
-            m.CheckpkgOverride)
+            m.CheckpkgOverride,
+            m.CheckpkgErrorTag,
+            m.Architecture,
+            m.OsRelease,
+            m.Maintainer)
   sqo_conn = None
   db_path = None
 
@@ -261,6 +259,7 @@
     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
@@ -268,6 +267,8 @@
       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:
@@ -303,13 +304,20 @@
       need_to_create_tables = True
     if need_to_create_tables:
       self.CreateTables()
+      self.PerformInitialDataImport()
     if not self.IsDatabaseUpToDate():
-      logging.info("Rebuilding the package cache, can take a few minutes.")
-      self.PurgeDatabase()
-      self.PopulateDatabase()
+      logging.debug("Rebuilding the package cache, can take a few minutes.")
+      self.ClearTablesForUpdates()
+      self.RefreshDatabase()
     self.initialized = True
 
-  def PopulateDatabase(self):
+  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:
@@ -343,8 +351,8 @@
       estimated_lines = break_after
     else:
       estimated_lines = contents_length / INSTALL_CONTENTS_AVG_LINE_LENGTH
-    # The progressbar library doesn't like to handle large numbers, and it
-    # displays up to 99% if we feed it a maxval in the range of hundreds of
+    # 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:
@@ -357,7 +365,7 @@
     # soname - {<path1>: <line1>, <path2>: <line2>, ...}
     logging.debug("Building database cache db of the %s file",
                   pkgmap_path)
-    print "Processing %s" % 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
@@ -380,7 +388,8 @@
       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())
+      # 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
@@ -398,7 +407,7 @@
         break
     bar.finish()
     self.sqlite_conn.commit()
-    logging.info("All lines of %s were processed.", pkgmap_path)
+    logging.debug("All lines of %s were processed.", pkgmap_path)
 
   def _ParsePkginfoLine(self, line):
     fields = re.split(c.WS_RE, line)
@@ -418,15 +427,19 @@
     bar.start()
     count = itertools.count()
     INSERT_SQL = """
-    INSERT INTO csw_package (pkgname, pkg_desc)
+    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)
-      # This is slow:
-      # pkg = m.CswPackage(pkgname=pkgname, pkg_desc=pkg_desc)
-      # This is much faster:
-      self.sqlite_conn.execute(INSERT_SQL, [pkgname, pkg_desc])
+      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.
@@ -444,13 +457,13 @@
       res.getOne().float_value = mtime
 
   def SetDatabaseSchemaVersion(self):
-    res = m.CswConfig.select(m.CswConfig.q.option_key==CONFIG_DB_SCHEMA)
-    if res.count() == 0:
+    try:
+      config_option = m.CswConfig.select(
+          m.CswConfig.q.option_key==CONFIG_DB_SCHEMA).getOne()
+      config_option.int_value = DB_SCHEMA_VERSION
+    except sqlobject.main.SQLObjectNotFound, e:
       version = m.CswConfig(option_key=CONFIG_DB_SCHEMA,
                             int_value=DB_SCHEMA_VERSION)
-    else:
-      config_option = res.getOne()
-      config_option.int_value = DB_SCHEMA_VERSION
 
   def GetPkgmapLineByBasename(self, filename):
     """Returns pkgmap lines by basename:
@@ -459,12 +472,9 @@
         path2: line2,
       }
     """
-    self._LazyInitializeDatabase()
     if filename in self.cache:
       return self.cache[filename]
-    # sql = "SELECT path, line FROM systempkgmap WHERE basename = ?;"
-    # c = self.conn.cursor()
-    # c.execute(sql, [filename])
+    self._LazyInitializeDatabase()
     res = m.CswFile.select(m.CswFile.q.basename==filename)
     lines = {}
     for obj in res:
@@ -472,15 +482,26 @@
     if len(lines) == 0:
       logging.debug("Cache doesn't contain filename %s", filename)
     self.cache[filename] = lines
-    logging.debug("GetPkgmapLineByBasename(%s) --> %s",
-                  filename, lines)
     return lines
 
   def _InferPackagesFromPkgmapLine(self, line):
-    """A stub of a function, to be enhanced."""
+    """Given a pkgmap line, return all packages it contains."""
     line = line.strip()
     parts = re.split(c.WS_RE, line)
-    return [parts[-1]]
+    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.
@@ -490,11 +511,35 @@
      "/opt/csw/1/lib": ["CSWfoomore"]}
     """
     lines = self.GetPkgmapLineByBasename(filename)
+    pkgs = {}
     # Infer packages
     for file_path in lines:
-      lines[file_path] = self._InferPackagesFromPkgmapLine(lines[file_path])
-    return 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)
@@ -541,20 +586,25 @@
                   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.info("Truncating all tables")
+      logging.debug("Truncating all tables")
       for table in self.TABLES:
         table.clearTable()
 
-  def GetInstalledPackages(self):
+  def GetInstalledPackages(self, initialize=True):
     """Returns a dictionary of all installed packages."""
-    self._LazyInitializeDatabase()
-    res = m.CswPackage.select()
+    if initialize:
+      self._LazyInitializeDatabase()
+    res = m.Pkginst.select()
     return dict([[str(x.pkgname), str(x.pkg_desc)] for x in res])
 
 
@@ -578,8 +628,6 @@
       isalist: isalist elements
       binary_path: Necessary to expand $ORIGIN
     """
-    # TODO: Implement $ORIGIN support
-    # Probably not here as it would make caching unusable.
     key = (runpath, tuple(isalist))
     if key not in self.runpath_expand_cache:
       origin_present = False
@@ -595,7 +643,8 @@
             binary_path = "/" + binary_path
           runpath = runpath.replace('$ORIGIN', binary_path)
       if '$ISALIST' in runpath:
-        expanded_list = [runpath.replace('$ISALIST', isa) for isa in isalist]
+        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]
@@ -609,8 +658,6 @@
   def ExpandSymlink(self, symlink, target, input_path):
     key = (symlink, target, input_path)
     if key not in self.symlink_expand_cache:
-      # A lot of time is spent here, e.g. 13841985 calls, 206s.
-      # TODO: Optimize this.  Make it a class and add a cache?
       symlink_re = re.compile(r"%s(/|$)" % symlink)
       if re.search(symlink_re, input_path):
         result = input_path.replace(symlink, target)
@@ -673,12 +720,12 @@
       # 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())
+    # 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])
+        # logging.debug("Found %s",
+        #               original_paths_by_expanded_paths[runpath_expanded])
         return original_paths_by_expanded_paths[runpath_expanded]
 
 
@@ -729,10 +776,7 @@
     self.packages = []
 
   def GetPackageStatsList(self):
-    stats_list = []
-    for md5sum in self.md5sum_list:
-      stats_list.append(PackageStats(None, self.stats_basedir, md5sum))
-    return stats_list
+    return [PackageStats(None, self.stats_basedir, x) for x in self.md5sum_list]
 
   def FormatReports(self, errors, messages, gar_lines):
     namespace = {
@@ -745,9 +789,7 @@
     }
     screen_t = Template.Template(SCREEN_ERROR_REPORT_TMPL, searchList=[namespace])
     tags_report_t = Template.Template(TAG_REPORT_TMPL, searchList=[namespace])
-    screen_report = unicode(screen_t)
-    tags_report = unicode(tags_report_t)
-    return screen_report, tags_report
+    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
@@ -765,7 +807,7 @@
     return errors
 
   def GetOptimizedAllStats(self, stats_obj_list):
-    logging.info("Loading package statistics.")
+    logging.info("Unwrapping candies...")
     pkgs_data = []
     counter = itertools.count()
     length = len(stats_obj_list)
@@ -795,7 +837,59 @@
     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)
@@ -817,19 +911,17 @@
     else:
       self.lines_dict = {}
 
-  def GetPkgmapLineByBasename(self, basename):
-    """Proxies calls to self.system_pkgmap."""
-    logging.warning("GetPkgmapLineByBasename(%s): deprecated function",
-                    basename)
-    return self.system_pkgmap.GetPkgmapLineByBasename(basename)
-
   def GetPathsAndPkgnamesByBasename(self, basename):
     """Proxies calls to self.system_pkgmap."""
     return self.system_pkgmap.GetPathsAndPkgnamesByBasename(basename)
 
-  def GetInstalledPackages(self):
-    return self.system_pkgmap.GetInstalledPackages()
+  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(
@@ -866,6 +958,8 @@
     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)
 
@@ -878,6 +972,9 @@
     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)
 
@@ -890,13 +987,16 @@
     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)
 
 
@@ -941,7 +1041,7 @@
     count = itertools.count()
     bar = progressbar.ProgressBar()
     bar.maxval = len(pkgs_data) * len(self.individual_checks)
-    logging.info("Running individual checks.")
+    logging.info("Tasting candies one by one...")
     bar.start()
     for pkg_data in pkgs_data:
       pkgname = pkg_data["basic_stats"]["pkgname"]
@@ -955,7 +1055,7 @@
         bar.update(count.next())
     bar.finish()
     # Set checks
-    logging.info("Running set checks.")
+    logging.info("Tasting them all at once...")
     for function in self.set_checks:
       logger = logging.getLogger(function.__name__)
       check_interface = SetCheckInterface(pkgmap)
@@ -989,31 +1089,12 @@
   instantiated object.
   TODO: Store overrides in a separate table for performance.
   """
-  # This list needs to be synchronized with the CollectStats() method.
-  STAT_FILES = [
-      "bad_paths",
-      "binaries",
-      "binaries_dump_info",
-      # "defined_symbols",
-      "depends",
-      "isalist",
-      # "ldd_dash_r",
-      "overrides",
-      "pkgchk",
-      "pkginfo",
-      "pkgmap",
-      # This entry needs to be last because of the assumption in the
-      # CollectStats() function.
-      "basic_stats",
-      "files_metadata",
-  ]
 
   def __init__(self, srv4_pkg, stats_basedir=None, md5sum=None, debug=False):
     super(PackageStats, self).__init__(debug=debug)
     self.srv4_pkg = srv4_pkg
     self.md5sum = md5sum
     self.dir_format_pkg = None
-    self.stats_path = None
     self.all_stats = {}
     self.stats_basedir = stats_basedir
     self.db_pkg_stats = None
@@ -1037,14 +1118,6 @@
       self.md5sum = self.srv4_pkg.GetMd5sum()
     return self.md5sum
 
-  def GetStatsPath(self):
-    if not self.stats_path:
-      md5sum = self.GetMd5sum()
-      two_chars = md5sum[0:2]
-      parts = [self.stats_basedir, two_chars, md5sum]
-      self.stats_path = os.path.join(*parts)
-    return self.stats_path
-
   def GetDbObject(self):
     if not self.db_pkg_stats:
       md5_sum = self.GetMd5sum()
@@ -1078,9 +1151,8 @@
       self.dir_format_pkg = self.srv4_pkg.GetDirFormatPkg()
     return self.dir_format_pkg
 
-  def MakeStatsDir(self):
-    stats_path = self.GetStatsPath()
-    self._MakeDirP(stats_path)
+  def GetMtime(self):
+    return self.srv4_pkg.GetMtime()
 
   def _MakeDirP(self, dir_path):
     """mkdir -p equivalent.
@@ -1125,6 +1197,7 @@
         basic_stats["pkg_basename"])
     basic_stats["pkgname"] = dir_pkg.pkgname
     basic_stats["catalogname"] = dir_pkg.GetCatalogname()
+    basic_stats["md5_sum"] = self.GetMd5sum()
     return basic_stats
 
   def GetOverrides(self):
@@ -1216,18 +1289,14 @@
 
   def CollectStats(self, force=False):
     """Lazy stats collection."""
-    if force:
+    if force or not self.StatsExist():
       return self._CollectStats()
-    if not self.StatsExist():
-      return self._CollectStats()
     return self.ReadSavedStats()
 
   def _CollectStats(self):
     """The list of variables needs to be synchronized with the one
     at the top of this class.
     """
-    stats_path = self.GetStatsPath()
-    self.MakeStatsDir()
     dir_pkg = self.GetDirFormatPkg()
     logging.debug("Collecting %s package statistics.", repr(dir_pkg.pkgname))
     override_dicts = self.GetOverrides()
@@ -1243,11 +1312,67 @@
         "bad_paths": dir_pkg.GetFilesContaining(BAD_CONTENT_REGEXES),
         "basic_stats": self.GetBasicStats(),
         "files_metadata": dir_pkg.GetFilesMetadata(),
+        "mtime": self.GetMtime(),
     }
-    db_pkg_stats = m.Srv4FileStats(md5_sum=self.GetMd5sum(),
-                                   pkgname=pkg_stats["basic_stats"]["pkgname"],
-                                   stats_version=PACKAGE_STATS_VERSION,
-                                   data=cPickle.dumps(pkg_stats))
+    pkgname = pkg_stats["basic_stats"]["pkgname"]
+    # Getting sqlobject representations.
+    try:
+      pkginst = m.Pkginst.select(m.Pkginst.q.pkgname==pkgname).getOne()
+    except sqlobject.main.SQLObjectNotFound, e:
+      logging.debug(e)
+      pkginst = m.Pkginst(pkgname=pkgname)
+    try:
+      res = m.Architecture.select(
+          m.Architecture.q.name==pkg_stats["pkginfo"]["ARCH"])
+      arch = res.getOne()
+    except sqlobject.main.SQLObjectNotFound, e:
+      logging.debug(e)
+      arch = m.Architecture(name=pkg_stats["pkginfo"]["ARCH"])
+    parsed_basename = pkg_stats["basic_stats"]["parsed_basename"]
+    os_rel_name = parsed_basename["osrel"]
+    try:
+      os_rel = m.OsRelease.select(
+          m.OsRelease.q.short_name==os_rel_name).getOne()
+    except sqlobject.main.SQLObjectNotFound, e:
+      logging.debug(e)
+      os_rel = m.OsRelease(short_name=os_rel_name, full_name=os_rel_name)
+    try:
+      maint_email = pkg_stats["pkginfo"]["EMAIL"]
+      maintainer = m.Maintainer.select(
+          m.Maintainer.q.email==maint_email).getOne()
+    except sqlobject.main.SQLObjectNotFound, e:
+      logging.debug(e)
+      maintainer = m.Maintainer(email=maint_email)
+
+    # If there are any previous records of the same pkginst, arch and os_rel,
+    # we're marking them as not-latest.
+    # This assumes that the packages are examined in a chronological order.
+    res = m.Srv4FileStats.select(sqlobject.AND(
+        m.Srv4FileStats.q.pkginst==pkginst,
+        m.Srv4FileStats.q.arch==arch,
+        m.Srv4FileStats.q.os_rel==os_rel))
+    for obj in res:
+      obj.latest = False
+
+    rev=None
+    if "revision_info" in parsed_basename:
+      if "REV" in parsed_basename["revision_info"]:
+        rev = parsed_basename["revision_info"]["REV"]
+    # Creating the object in the database.
+    db_pkg_stats = m.Srv4FileStats(
+        md5_sum=self.GetMd5sum(),
+        pkginst=pkginst,
+        catalogname=pkg_stats["basic_stats"]["catalogname"],
+        stats_version=PACKAGE_STATS_VERSION,
+        os_rel=os_rel,
+        arch=arch,
+        basename=pkg_stats["basic_stats"]["pkg_basename"],
+        maintainer=maintainer,
+        latest=True,
+        version_string=parsed_basename["full_version_string"],
+        rev=rev,
+        mtime=self.GetMtime(),
+        data=cPickle.dumps(pkg_stats))
     # Inserting overrides as rows into the database
     for override_dict in override_dicts:
       o = m.CheckpkgOverride(srv4_file=db_pkg_stats,
@@ -1288,6 +1413,13 @@
       override_list.append(overrides.Override(**d))
     return override_list
 
+  def GetSavedErrorTags(self):
+    pkg_stats = self.GetDbObject()
+    res = m.CheckpkgErrorTag.select(m.CheckpkgErrorTag.q.srv4_file==pkg_stats)
+    tag_list = [tag.CheckpkgTag(x.pkgname, x.tag_name, x.tag_info, x.msg)
+                for x in res]
+    return tag_list
+
   def ReadSavedStats(self):
     if not self.all_stats:
       md5_sum = self.GetMd5sum()
@@ -1378,3 +1510,24 @@
     pkgname, tag_name, tag_info = tag.ParseTagLine(line)
     error_tags.append(tag.CheckpkgTag(pkgname, tag_name, tag_info))
   return error_tags
+
+
+def StatsListFromCatalog(file_name_list, catalog_file_name=None, debug=False):
+  packages = [opencsw.CswSrv4File(x, debug) for x in file_name_list]
+  if catalog_file_name:
+    catalog = opencsw.OpencswCatalog(catalog_file_name)
+    md5s_by_basename = catalog.GetDataByBasename()
+    for pkg in packages:
+      basename = os.path.basename(pkg.pkg_path)
+      # It might be the case that a file is present on disk, but missing from
+      # the catalog file.
+      if basename in md5s_by_basename:
+        pkg.md5sum = md5s_by_basename[basename]["md5sum"]
+  stats_list = [PackageStats(pkg) for pkg in packages]
+  return stats_list
+
+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

Modified: csw/mgar/gar/v2/lib/python/checkpkg_test.py
===================================================================
--- csw/mgar/gar/v2/lib/python/checkpkg_test.py	2010-07-19 00:49:07 UTC (rev 10540)
+++ csw/mgar/gar/v2/lib/python/checkpkg_test.py	2010-07-19 08:39:22 UTC (rev 10541)
@@ -44,14 +44,15 @@
   def testExpandRunpath_1(self):
     isalist = ["foo", "bar"]
     runpath = "/opt/csw/lib/$ISALIST"
-    expected = ["/opt/csw/lib/foo", "/opt/csw/lib/bar"]
+    expected = ["/opt/csw/lib", "/opt/csw/lib/foo", "/opt/csw/lib/bar"]
     bin_path = "opt/csw/lib"
     self.assertEquals(expected, self.e.ExpandRunpath(runpath, isalist, bin_path))
 
   def testExpandRunpath_2(self):
     isalist = ["foo", "bar"]
     runpath = "/opt/csw/mysql5/lib/$ISALIST/mysql"
-    expected = ["/opt/csw/mysql5/lib/foo/mysql",
+    expected = ["/opt/csw/mysql5/lib/mysql",
+                "/opt/csw/mysql5/lib/foo/mysql",
                 "/opt/csw/mysql5/lib/bar/mysql"]
     bin_path = "opt/csw/lib"
     self.assertEquals(expected, self.e.ExpandRunpath(runpath, isalist, bin_path))
@@ -93,9 +94,22 @@
     runpath = "$ORIGIN"
     expected = ["/opt/csw/lib"]
     bin_path = "opt/csw/lib"
-    self.assertEquals(expected, self.e.ExpandRunpath(runpath, isalist, bin_path))
+    self.assertEquals(expected,
+                      self.e.ExpandRunpath(runpath, isalist, bin_path))
     expected = ["/opt/csw/foo/lib"]
     bin_path = "/opt/csw/foo/lib"
+    self.assertEquals(expected,
+                      self.e.ExpandRunpath(runpath, isalist, bin_path))
+
+  def testExpandRunpath_OnlyIsalist(self):
+    """Make sure that the cache doesn't mess it up.
+
+    Two invocations, where the only difference is the binary path.
+    """
+    isalist = ("bar",)
+    runpath = "/opt/csw/lib/$ISALIST"
+    expected = ["/opt/csw/lib", "/opt/csw/lib/bar"]
+    bin_path = "opt/csw/lib"
     self.assertEquals(expected, self.e.ExpandRunpath(runpath, isalist, bin_path))
 
   def testEmulate64BitSymlinks_1(self):
@@ -233,7 +247,38 @@
     spkgmap = checkpkg.SystemPkgmap()
     self.assertEqual(expected, spkgmap._ParsePkginfoLine(line))
 
+  def test_InferPackagesFromPkgmapLine(self):
+    line = ("/opt/csw/sbin d none 0755 root bin CSWfping CSWbonobo2 "
+            "CSWkrb5libdev CSWsasl CSWschilybase CSWschilyutils CSWstar "
+            "CSWcommon CSWcacertificates CSWfacter")
+    expected = ["CSWfping", "CSWbonobo2", "CSWkrb5libdev", "CSWsasl",
+                "CSWschilybase", "CSWschilyutils", "CSWstar", "CSWcommon",
+                "CSWcacertificates", "CSWfacter"]
+    spkgmap = checkpkg.SystemPkgmap()
+    self.assertEqual(expected, spkgmap._InferPackagesFromPkgmapLine(line))
 
+  def test_InferPackagesFromPkgmapLine_2(self):
+    line = ("/usr/lib/sparcv9/libpthread.so.1 f none 0755 root bin 41296 28258 "
+            "1018129099 SUNWcslx")
+    expected = ["SUNWcslx"]
+    spkgmap = checkpkg.SystemPkgmap()
+    self.assertEqual(expected, spkgmap._InferPackagesFromPkgmapLine(line))
+
+  def test_InferPackagesFromPkgmapLine_3(self):
+    line = ("/usr/lib/libCrun.so.1 f none 0755 root bin 63588 "
+            "6287 1256043984 SUNWlibC")
+    expected = ["SUNWlibC"]
+    spkgmap = checkpkg.SystemPkgmap()
+    self.assertEqual(expected, spkgmap._InferPackagesFromPkgmapLine(line))
+
+  def test_InferPackagesFromPkgmapLine_4(self):
+    line = ("/opt/csw/apache2/lib/libapr-1.so.0=libapr-1.so.0.3.8 s none "
+            "CSWapache2rt")
+    expected = ["CSWapache2rt"]
+    spkgmap = checkpkg.SystemPkgmap()
+    self.assertEqual(expected, spkgmap._InferPackagesFromPkgmapLine(line))
+
+
 class PackageStatsUnitTest(unittest.TestCase):
 
   def setUp(self):
@@ -384,7 +429,7 @@
     }
     screen_report, tags_report = m.FormatReports(tags, [], [])
     expected = u'# Tags reported by testname module\nCSWfoo: foo-tag foo-info\n'
-    self.assertEqual(expected, tags_report)
+    self.assertEqual(expected, unicode(tags_report))
 
   def test_2(self):
     m = checkpkg.CheckpkgManager2("testname", "/tmp", ["CSWfoo"])
@@ -400,9 +445,23 @@
                 u'CSWfoo: foo-tag foo-info\n'
                 u'CSWfoo: bar-tag bar-info\n'
                 u'CSWfoo: baz-tag\n')
-    self.assertEqual(expected, tags_report)
+    self.assertEqual(expected, unicode(tags_report))
 
 
+class SliceListUnitTest(unittest.TestCase):
 
+  def testOne(self):
+    l = [1, 2, 3, 4, 5]
+    s = 1
+    expected = [[1], [2], [3], [4], [5]]
+    self.assertTrue(expected, checkpkg.SliceList(l, s))
+
+  def testTwo(self):
+    l = [1, 2, 3, 4, 5]
+    s = 2
+    expected = [[1, 2], [3, 4], [5]]
+    self.assertTrue(expected, checkpkg.SliceList(l, s))
+
+
 if __name__ == '__main__':
   unittest.main()

Modified: csw/mgar/gar/v2/lib/python/dependency_checks.py
===================================================================
--- csw/mgar/gar/v2/lib/python/dependency_checks.py	2010-07-19 00:49:07 UTC (rev 10540)
+++ csw/mgar/gar/v2/lib/python/dependency_checks.py	2010-07-19 08:39:22 UTC (rev 10541)
@@ -8,8 +8,6 @@
     ("/opt/csw/lib", "libdb-4.7.so", "Deprecated Berkeley DB location"),
     ("/opt/csw/lib/mysql", "libmysqlclient_r.so.15",
      "Please use /opt/csw/mysql5/..."),
-    ("/opt/csw/lib/sparcv9/mysql", "libmysqlclient_r.so.15",
-     "Please use /opt/csw/mysql5/..."),
     ("/opt/csw/lib/mysql", "libmysqlclient.so.15",
      "Please use /opt/csw/mysql5/..."),
 )
@@ -18,7 +16,33 @@
     r'^opt/csw/lib/python/site-packages.*',
 )
 
-def Libraries(pkg_data, error_mgr, logger, messenger, path_and_pkg_by_basename):
+DEPENDENCY_FILENAME_REGEXES = (
+    (r".*\.pl$",   (u"CSWperl",)),
+    (r".*\.pm$",   (u"CSWperl",)),
+    (r".*\.py$",   (u"CSWpython",)),
+    (r".*\.rb$",   (u"CSWruby",)),
+    (r".*\.elc?$", (u"CSWemacscommon",)),
+)
+
+PREFERRED_DIRECTORY_PROVIDERS = set([u"CSWcommon"])
+
+def Libraries(pkg_data, error_mgr, logger, messenger, path_and_pkg_by_basename,
+              pkg_by_path):
+  """Checks shared libraries.
+
+  Returns:
+    [
+      (u"CSWfoo", "why is this needed"),
+    ]
+
+  New idea, a list of reasons:
+    [
+      [(u"CSWfoo", "why is it needed"),
+       (u"CSWfooalt", "there must be a reason"),
+       (u"CSWfooyetanother", "here's another one")],
+      [(u"CSWbar", "this serves another purpose")],
+    ]
+  """
   pkgname = pkg_data["basic_stats"]["pkgname"]
   logger.debug("Libraries(): pkgname = %s", repr(pkgname))
   orphan_sonames = []
@@ -30,14 +54,15 @@
     for soname in binary_info["needed sonames"]:
       resolved = False
       path_list = path_and_pkg_by_basename[soname].keys()
-      logger.debug("%s @ %s: looking for %s in %s",
-                   soname,
-                   binary_info["path"],
-                   binary_info["runpath"],
-                   path_list)
+      # logger.debug("%s @ %s: looking for %s in %s",
+      #              soname,
+      #              binary_info["path"],
+      #              binary_info["runpath"],
+      #              path_list)
       runpath_tuple = (tuple(binary_info["runpath"])
                       + tuple(checkpkg.SYS_DEFAULT_RUNPATH))
       runpath_history = []
+      alternative_deps = set()
       for runpath in runpath_tuple:
         runpath = ldd_emulator.SanitizeRunpath(runpath)
         runpath_list = ldd_emulator.ExpandRunpath(runpath, isalist, binary_path)
@@ -50,14 +75,11 @@
                                                    path_list,
                                                    binary_path)
         if resolved_path:
-          logger.debug("%s needed by %s:",
-                 soname, binary_info["path"])
-          logger.debug("=> %s provided by %s",
-              resolved_path, path_and_pkg_by_basename[soname][resolved_path])
           resolved = True
-          req_pkg = path_and_pkg_by_basename[soname][resolved_path][-1]
+          req_pkgs = path_and_pkg_by_basename[soname][resolved_path]
           reason = ("provides %s/%s needed by %s"
                     % (resolved_path, soname, binary_info["path"]))
+          # Looking for deprecated libraries.
           for bad_path, bad_soname, msg in DEPRECATED_LIBRARY_LOCATIONS:
             if resolved_path == bad_path and soname == bad_soname:
               logger.debug("Bad lib found: %s/%s", bad_path, bad_soname)
@@ -66,8 +88,10 @@
                   "deprecated-library",
                   ("%s %s %s/%s"
                    % (binary_info["path"], msg, resolved_path, soname)))
-          required_deps.append((req_pkg, reason))
-          break
+          for req_pkg in req_pkgs:
+            alternative_deps.add((req_pkg, reason))
+      # print "alternative_deps:", alternative_deps
+      required_deps.append(list(alternative_deps))
       if not resolved:
         orphan_sonames.append((soname, binary_info["path"]))
         if path_list:
@@ -87,16 +111,109 @@
   # TODO: Report orphan sonames here
   return required_deps
 
-def ByFilename(pkg_data, error_mgr, logger, messenger, path_and_pkg_by_basename):
+def ByFilename(pkg_data, error_mgr, logger, messenger,
+               path_and_pkg_by_basename, pkg_by_path):
   pkgname = pkg_data["basic_stats"]["pkgname"]
+  reason_group = []
   req_pkgs_reasons = []
   dep_regexes = [(re.compile(x), x, y)
-                 for x, y in checkpkg.DEPENDENCY_FILENAME_REGEXES]
-  for regex, regex_str, dep_pkgname in dep_regexes:
+                 for x, y in DEPENDENCY_FILENAME_REGEXES]
+  for regex, regex_str, dep_pkgnames in dep_regexes:
     for pkgmap_entry in pkg_data["pkgmap"]:
       if pkgmap_entry["path"] and regex.match(pkgmap_entry["path"]):
         msg = ("found file(s) matching %s, e.g. %s"
                % (regex_str, repr(pkgmap_entry["path"])))
-        req_pkgs_reasons.append((dep_pkgname, msg))
+        for dep_pkgname in dep_pkgnames:
+          reason_group.append((dep_pkgname, msg))
         break
+    if reason_group:
+      req_pkgs_reasons.append(reason_group)
+      reason_group = []
   return req_pkgs_reasons
+
+def ByDirectory(pkg_data, error_mgr, logger, messenger,
+                path_and_pkg_by_basename, pkg_by_path):
+  """Finds packages that provide each directory's parent.
+
+  1. For each directory
+    1.1. Find the parent
+    1.2. Add the parent to the list of packages to depend on.
+  """
+  pkgname = pkg_data["basic_stats"]["pkgname"]
+  req_pkgs_reasons = []
+  needed_dirs = set()
+  # Adding base dirs of all the files to the dirs that need to be checked.
+  for pkgmap_entry in pkg_data["pkgmap"]:
+    if "path" in pkgmap_entry and pkgmap_entry["path"]:
+      base_dir, dirname = os.path.split(pkgmap_entry["path"])
+      needed_dirs.add(base_dir)
+  for needed_dir in needed_dirs:
+    reason_group = []
+    # TODO: The preferred directory providers should not depend on other packages to
+    # provide directories.
+    if pkgname not in PREFERRED_DIRECTORY_PROVIDERS:
+      # If the path is provided by CSWcommon or other preferred package, don't
+      # mention other packages.
+      pkgs_to_mention = []
+      preferred_mentioned = False
+      for preferred_pkg in PREFERRED_DIRECTORY_PROVIDERS:
+        if preferred_pkg in pkg_by_path[needed_dir]:
+          pkgs_to_mention.append(preferred_pkg)
+          preferred_mentioned = True
+      if not preferred_mentioned:
+        if not pkg_by_path[needed_dir]:
+          # There's no sense in reporting '/' and ''.
+          if needed_dir and needed_dir != '/':
+            error_mgr.ReportError(pkgname, "base-dir-not-found", repr(needed_dir))
+        elif len(pkg_by_path[needed_dir]) < 5:
+          pkgs_to_mention = pkg_by_path[needed_dir]
+        else:
+          pkgs_to_mention = pkg_by_path[needed_dir][:5] + ["and/or others"]
+      msg = (u"%s provides directory %s is needed by the package %s"
+             % (pkgs_to_mention, needed_dir, pkgname))
+      for pkg_to_mention in pkgs_to_mention:
+        reason_group.append((pkg_to_mention, msg))
+      if reason_group:
+        req_pkgs_reasons.append(reason_group)
+    else:
+      error_mgr.ReportError(pkgname, "base-dir-not-provided-by-any-package", needed_dir)
+  return req_pkgs_reasons
+
+
+def GetPathAndPkgByBasename(error_mgr, logger, basenames,
+                            path_and_pkg_by_basename=None):
+  """{"<basename>": {"/path/1": ["CSWfoo1"], "/path/2": ["CSWfoo2"]}}"""
+  if not path_and_pkg_by_basename:
+    path_and_pkg_by_basename = {}
+  for basename in basenames:
+    path_and_pkg_by_basename[basename] = (
+        error_mgr.GetPathsAndPkgnamesByBasename(basename))
+  return path_and_pkg_by_basename
+
+def GetPkgByFullPath(error_mgr, logger, paths_to_verify, pkg_by_path):
+  """Resolves a list of paths to a mapping between paths and packages.
+
+  Returns: {"/opt/csw/lib": ["CSWcommon", "CSWfoo"]}
+  """
+  if not pkg_by_path:
+    pkg_by_path = {}
+  for path in paths_to_verify:
+    if path not in pkg_by_path:
+      result = error_mgr.GetPkgByPath(path)
+      # logger.warning("error_mgr.GetPkgByPath(%s) => %s", repr(path), repr(result))
+      pkg_by_path[path] = result
+  # logger.warning("New paths: %s" % pprint.pformat(pkg_by_path))
+  return pkg_by_path
+
+def MissingDepsFromReasonGroups(reason_groups, declared_deps_set):
+  missing_dep_groups = []
+  for reason_group in reason_groups:
+    dependency_fulfilled = False
+    pkgnames = [x for x, y in reason_group]
+    for pkgname in pkgnames:
+      if pkgname in declared_deps_set:
+        dependency_fulfilled = True
+        break
+    if not dependency_fulfilled:
+      missing_dep_groups.append(pkgnames)
+  return missing_dep_groups

Added: csw/mgar/gar/v2/lib/python/dependency_checks_test.py
===================================================================
--- csw/mgar/gar/v2/lib/python/dependency_checks_test.py	                        (rev 0)
+++ csw/mgar/gar/v2/lib/python/dependency_checks_test.py	2010-07-19 08:39:22 UTC (rev 10541)
@@ -0,0 +1,334 @@
+#!/opt/csw/bin/python2.6
+
+import checkpkg
+import copy
+import mox
+import unittest
+import pprint
+import dependency_checks as depchecks
+from testdata import stubs
+from testdata.tree_stats import pkgstats as tree_stats
+from testdata.sudo_stats import pkgstats as sudo_stats
+from testdata.javasvn_stats import pkgstats as javasvn_stats
+
+
+class TestGetPkgByFullPath(unittest.TestCase):
+
+  def testOneCall(self):
+    path_list = ["/foo", "/foo/bar"]
+    pkg_by_path = {"/foo": ["CSWfoo"]}
+    expected = {'/foo': ['CSWfoo'], '/foo/bar': ['CSWbar']}
+    self.mocker = mox.Mox()
+    self.error_mgr_mock = self.mocker.CreateMock(
+        checkpkg.SetCheckInterface)
+    self.error_mgr_mock.GetPkgByPath('/foo/bar').AndReturn(["CSWbar"])
+    self.mocker.ReplayAll()
+    logger_stub = stubs.LoggerStub()
+    self.assertEqual(
+        expected,
+        depchecks.GetPkgByFullPath(self.error_mgr_mock,
+                                   logger_stub,
+                                   path_list,
+                                   pkg_by_path))
+    self.mocker.VerifyAll()
+
+  def testDodgyCall(self):
+    paths_to_verify = set(
+     ['/opt/csw/bin',
+      '/opt/csw/bin/bar',
+      '/opt/csw/lib',
+      '/opt/csw/lib/libfoo.so.1'])
+    pkg_by_path = {'/opt/csw/bin/bar': ['CSWbar'],
+                   '/opt/csw/lib/libfoo.so.1': ['CSWbar']}
+    self.mocker = mox.Mox()
+    self.error_mgr_mock = self.mocker.CreateMock(
+        checkpkg.SetCheckInterface)
+    self.error_mgr_mock.GetPkgByPath('/opt/csw/lib').AndReturn(["CSWcommon"])
+    self.error_mgr_mock.GetPkgByPath('/opt/csw/bin').AndReturn(["CSWcommon"])
+    self.mocker.ReplayAll()
+    logger_stub = stubs.LoggerStub()
+    expected = {
+        '/opt/csw/bin': [u'CSWcommon'],
+        '/opt/csw/bin/bar': ['CSWbar'],
+        '/opt/csw/lib': [u'CSWcommon'],
+        '/opt/csw/lib/libfoo.so.1': ['CSWbar']}
+    self.assertEqual(
+        expected,
+        depchecks.GetPkgByFullPath(self.error_mgr_mock,
+                                   logger_stub,
+                                   paths_to_verify,
+                                   pkg_by_path))
+    self.mocker.VerifyAll()
+
+
+class TestByDirectory(unittest.TestCase):
+
+  def setUp(self):
+    self.mocker = mox.Mox()
+    self.logger_stub = stubs.LoggerStub()
+    self.messenger_stub = stubs.MessengerStub()
+    self.error_mgr_mock = self.mocker.CreateMock(
+        checkpkg.SetCheckInterface)
+    self.pkg_data = copy.deepcopy(tree_stats[0])
+
+  def testByDirectory_1(self):
+    path_and_pkg_by_basename = {
+         'libc.so.1': {u'/usr/lib': [u'SUNWcsl'],
+                       u'/usr/lib/libp/sparcv9': [u'SUNWdplx'],
+                       u'/usr/lib/sparcv9': [u'SUNWcslx']},
+         'license': {'/opt/csw/share/doc/tree': ['CSWtree']},
+         'man1': {'/opt/csw/share/man': ['CSWtree']},
+         'tree': {'/opt/csw/bin': ['CSWtree'],
+                  '/opt/csw/share/doc': ['CSWtree']},
+         'tree.1': {'/opt/csw/share/man/man1': ['CSWtree']}}
+    pkg_by_path = {
+       '/opt/csw/bin': [
+           u'CSWautogen', u'CSWbinutils', u'CSWbonobo2', u'CSWcommon',
+           u'CSWcryptopp', u'CSWcvs', u'CSWdejagnu', u'CSWemacs',
+           u'CSWemacsbincommon', u'CSWemacschooser', u'CSWenscript',
+           u'CSWevince', u'CSWexpect', u'CSWfacter', u'CSWfakeroot',
+           u'CSWfindutils', u'CSWflex', u'CSWfltk', u'CSWfoomaticfilters',
+           u'CSWgawk', u'CSWgdb', u'CSWgedit', u'CSWggv', u'CSWglib',
+           u'CSWgmake', u'CSWgnomedesktop', u'CSWgnomedocutils',
+           u'CSWgnomemenus', u'CSWgnuplot', u'CSWgperf', u'CSWgstplugins',
+           u'CSWgstreamer', u'CSWgtk', u'CSWgtk2', u'CSWgtkmmdevel',
+           u'CSWguile', u'CSWgwhois', u'CSWhevea', u'CSWhtmltidy', u'CSWimlib',
+           u'CSWisaexec', u'CSWjikes', u'CSWjove', u'CSWkrb5libdev', u'CSWksh',
+           u'CSWlatex2html', u'CSWlibbonoboui', u'CSWlibdvdreaddevel',
+           u'CSWlibgegl', u'CSWlibgnome', u'CSWlibgphoto2', u'CSWlibm17n',
+           u'CSWlibm17ndevel', u'CSWlibnet', u'CSWlibofx', u'CSWlibotf',
+           u'CSWlibotfdevel', u'CSWlibxft2', u'CSWlibxine', u'CSWlibxml',
+           u'CSWlsof', u'CSWm17ndb', u'CSWmbrowse', u'CSWmikmod', u'CSWmono',
+           u'CSWnautilus', u'CSWnetcat', u'CSWnetpbm', u'CSWngrep', u'CSWnmap',
+           u'CSWntop', u'CSWocaml', u'CSWopensp', u'CSWpango', u'CSWpkgget',
+           u'CSWpkgutil', u'CSWpmlclemktxtsimple', u'CSWpmnetsnmp',
+           u'CSWpmsvnmirror', u'CSWpstoedit', u'CSWpstree', u'CSWqt',
+           u'CSWrdist', u'CSWsamefile', u'CSWsbcl', u'CSWschilybase',
+           u'CSWschilyutils', u'CSWsdlsound', u'CSWsetoolkit', u'CSWstar',
+           u'CSWt1lib', u'CSWtaglibgcc', u'CSWtcl', u'CSWtetex', u'CSWtk',
+           u'CSWtransfig', u'CSWvte', u'CSWxmms', u'CSWxpm', u'CSWzope'],
+       '/opt/csw/bin/tree': ['CSWtree'],
+       '/opt/csw/share/doc': [
+           u'CSWcairomm', u'CSWtcpwrap', u'CSWfltk', u'CSWgsfonts',
+           u'CSWlibsigc++rt', u'CSWglibmmdevel', u'CSWgstreamer', u'CSWgtkmm2',
+           u'CSWksh', u'CSWlibgphoto2', u'CSWlibxine', u'CSWmeanwhile',
+           u'CSWsasl', u'CSWsbcl', u'CSWsilctoolkit', u'CSWt1lib',
+           u'CSWtaglibgcc', u'CSWtetex', u'CSWgperf', u'CSWjikes',
+           u'CSWlibgnome', u'CSWdejagnu', u'CSWnetpbm', u'CSWlibgnomeui',
+           u'CSWsetoolkit', u'CSWgtksourceview', u'CSWhevea', u'CSWopensprt',
+           u'CSWopensp', u'CSWplotutilrt', u'CSWplotutildevel',
+           u'CSWpstoeditrt', u'CSWpstoedit', u'CSWpstoeditdevel',
+           u'CSWopenspdevel', u'CSWlibdvdread', u'CSWlibdvdreaddevel',
+           u'CSWschilyutils', u'CSWstar', u'CSWautogenrt', u'CSWlatex2html',
+           u'CSWautogen', u'CSWlibotf', u'CSWlibotfdevel', u'CSWgcc3corert',
+           u'CSWgcc3g++rt', u'CSWlibofxrt', u'CSWgcc3adart', u'CSWgcc3rt',
+           u'CSWgcc3g++', u'CSWgcc3ada', u'CSWgcc3', u'CSWlibm17n',
+           u'CSWm17ndb', u'CSWlibm17ndevel', u'CSWgcc2core', u'CSWgcc2g++',
+           u'CSWgcc3g77rt', u'CSWgcc3g77', u'CSWgcc4g95', u'CSWemacscommon',
+           u'CSWemacsbincommon', u'CSWemacs', u'CSWcommon', u'CSWbashcmplt',
+           u'CSWcacertificates', u'CSWgstplugins', u'CSWgnomemenus',
+           u'CSWgnomedesktop', u'CSWnautilus', u'CSWlibofx', u'CSWgamin',
+           u'CSWpkgutil', u'CSWgcc3core', u'CSWgnomemime2'],
+       '/opt/csw/share/doc/tree': ['CSWtree'],
+       '/opt/csw/share/doc/tree/license': ['CSWtree'],
+       '/opt/csw/share/man': [
+           u'CSWgdbm', u'CSWlibnet', u'CSWbinutils', u'CSWtcpwrap',
+           u'CSWenscript', u'CSWffcall', u'CSWflex', u'CSWfltk', u'CSWfping',
+           u'CSWglib', u'CSWgmake', u'CSWgstreamer', u'CSWgtk', u'CSWgwhois',
+           u'CSWbonobo2', u'CSWkrb5libdev', u'CSWksh', u'CSWlibgphoto2',
+           u'CSWmikmod', u'CSWlibxine', u'CSWlsof', u'CSWngrep', u'CSWocaml',
+           u'CSWpmmd5', u'CSWpmlclemktxtsimple', u'CSWpmtextdiff', u'CSWsasl',
+           u'CSWpmprmsvldt', u'CSWpmmathinterpolate', u'CSWpmprmscheck',
+           u'CSWrdist', u'CSWsbcl', u'CSWtetex', u'CSWnetcat', u'CSWjikes',
+           u'CSWfoomaticfilters', u'CSWlibgnome', u'CSWexpect', u'CSWdejagnu',
+           u'CSWnetpbm', u'CSWpmmailsendmail', u'CSWgnomedocutils', u'CSWnmap',
+           u'CSWsetoolkit', u'CSWntop', u'CSWtransfig', u'CSWxmms',
+           u'CSWpstoedit', u'CSWgdb', u'CSWschilybase', u'CSWschilyutils',
+           u'CSWstar', u'CSWfindutils', u'CSWfakeroot', u'CSWautogen',
+           u'CSWpmmimetools', u'CSWpmclsautouse', u'CSWpmlogmessage',
+           u'CSWpmlogmsgsimple', u'CSWpmsvnsimple', u'CSWpmlistmoreut',
+           u'CSWpmunivrequire', u'CSWpmiodigest', u'CSWpmsvnmirror',
+           u'CSWpmhtmltmpl', u'CSWemacscommon', u'CSWcommon', u'CSWgnuplot',
+           u'CSWpkgget', u'CSWsamefile', u'CSWpmnetdnsreslvprg',
+           u'CSWpmx11protocol', u'CSWmono', u'CSWgstplugins',
+           u'CSWgnomedesktop', u'CSWevince', u'CSWgedit', u'CSWfacter',
+           u'CSWpmiopager', u'CSWxpm', u'CSWgawk', u'CSWpmcfginifls',
+           u'CSWlibxft2', u'CSWpango', u'CSWgtk2', u'CSWpkgutil'],
+       '/opt/csw/share/man/man1': ['CSWtree'],
+       '/opt/csw/share/man/man1/tree.1': ['CSWtree']}
+    result = depchecks.ByDirectory(self.pkg_data,
+                          self.error_mgr_mock,
+                          self.logger_stub,
+                          self.messenger_stub,
+                          path_and_pkg_by_basename, pkg_by_path)
+
+  def testByDirectory_2(self):
+    path_and_pkg_by_basename = {
+         'libc.so.1': {u'/usr/lib': [u'SUNWcsl'],
+                       u'/usr/lib/libp/sparcv9': [u'SUNWdplx'],
+                       u'/usr/lib/sparcv9': [u'SUNWcslx']},
+         'license': {'/opt/csw/share/doc/tree': ['CSWtree']},
+         'man1': {'/opt/csw/share/man': ['CSWtree']},
+         'tree': {'/opt/csw/bin': ['CSWtree'],
+                  '/opt/csw/share/doc': ['CSWtree']},
+         'tree.1': {'/opt/csw/share/man/man1': ['CSWtree']}}
+    pkg_by_path = {
+       '/opt/csw/bin': [u'CSWautogen', u'CSWbinutils', u'CSWcommon'],
+       '/opt/csw/bin/tree': ['CSWtree'],
+       '/opt/csw/share/doc': [
+           u'CSWemacsbincommon', u'CSWemacs', u'CSWcommon', u'CSWbashcmplt'],
+       '/opt/csw/share/doc/tree': ['CSWtree'],
+       '/opt/csw/share/doc/tree/license': ['CSWtree'],
+       '/opt/csw/share/man': [u'CSWcommon', u'CSWgnuplot'],
+       '/opt/csw/share/man/man1': ['CSWtree'],
+       '/opt/csw/share/man/man1/tree.1': ['CSWtree']}
+    result = depchecks.ByDirectory(self.pkg_data,
+                          self.error_mgr_mock,
+                          self.logger_stub,
+                          self.messenger_stub,
+                          path_and_pkg_by_basename, pkg_by_path)
+    expected = [
+       [('CSWtree',
+         u"['CSWtree'] provides directory /opt/csw/share/man/man1 is needed by the package CSWtree")],
+       [('CSWtree',
+         u"['CSWtree'] provides directory /opt/csw/share/doc/tree is needed by the package CSWtree")],
+       [(u'CSWcommon',
+         u"[u'CSWcommon'] provides directory /opt/csw/share/doc is needed by the package CSWtree")],
+       [(u'CSWcommon',
+         u"[u'CSWcommon'] provides directory /opt/csw/bin is needed by the package CSWtree")],
+       [(u'CSWcommon',
+         u"[u'CSWcommon'] provides directory /opt/csw/share/man is needed by the package CSWtree")]]
+    self.assertEquals(expected, result)
+
+  def testLibraries_1(self):
+    path_and_pkg_by_basename = {
+         'libc.so.1': {u'/usr/lib': [u'SUNWcsl'],
+                       u'/usr/lib/libp/sparcv9': [u'SUNWdplx'],
+                       u'/usr/lib/sparcv9': [u'SUNWcslx']},
+         'license': {'/opt/csw/share/doc/tree': ['CSWtree']},
+         'man1': {'/opt/csw/share/man': ['CSWtree']},
+         'tree': {'/opt/csw/bin': ['CSWtree'],
+                  '/opt/csw/share/doc': ['CSWtree']},
+         'tree.1': {'/opt/csw/share/man/man1': ['CSWtree']}}
+    pkg_by_path = {
+       '/opt/csw/bin': [u'CSWautogen', u'CSWbinutils', u'CSWcommon'],
+       '/opt/csw/bin/tree': ['CSWtree'],
+       '/opt/csw/share/doc': [
+           u'CSWemacsbincommon', u'CSWemacs', u'CSWcommon', u'CSWbashcmplt'],
+       '/opt/csw/share/doc/tree': ['CSWtree'],
+       '/opt/csw/share/doc/tree/license': ['CSWtree'],
+       '/opt/csw/share/man': [u'CSWcommon', u'CSWgnuplot'],
+       '/opt/csw/share/man/man1': ['CSWtree'],
+       '/opt/csw/share/man/man1/tree.1': ['CSWtree']}
+    result = depchecks.Libraries(self.pkg_data,
+                          self.error_mgr_mock,
+                          self.logger_stub,
+                          self.messenger_stub,
+                          path_and_pkg_by_basename, pkg_by_path)
+    # It needs to be a list.
+    expected = [[
+      (u'SUNWcsl', u'provides /usr/lib/libc.so.1 needed by opt/csw/bin/tree')]]
+    self.assertEqual(expected, result)
+
+  def testLibraries_Javasvn(self):
+    self.pkg_data = copy.deepcopy(javasvn_stats[0])
+    path_and_pkg_by_basename = {
+        'libCrun.so.1': {u'/usr/lib': [u'SUNWlibC'], u'/usr/lib/sparcv9': [u'SUNWlibCx']},
+        'libCstd.so.1': {u'/usr/lib': [u'SUNWlibC'], u'/usr/lib/sparcv9': [u'SUNWlibCx']},
+        'libapr-1.so.0': {u'/opt/csw/apache2/lib': [u'CSWapache2rt'], u'/opt/csw/lib': [u'CSWapr'], u'/opt/csw/lib/sparcv9': [u'CSWapr']},
+        'libaprutil-1.so.0': {u'/opt/csw/apache2/lib': [u'CSWapache2rt']},
+        'libc.so.1': {u'/usr/lib': [u'SUNWcsl'], u'/usr/lib/libp/sparcv9': [u'SUNWdplx'], u'/usr/lib/sparcv9': [u'SUNWcslx']},
+        'libdl.so.1': {u'/etc/lib': [u'SUNWcsr'], u'/usr/lib': [u'SUNWcsl'], u'/usr/lib/sparcv9': [u'SUNWcslx']},
+        'libexpat.so.1': {u'/opt/csw/lib': [u'CSWexpat'], u'/opt/csw/lib/sparcv9': [u'CSWexpat']},
+        'libiconv.so.2': {u'/opt/csw/lib': [u'CSWiconv'], u'/opt/csw/lib/sparcv9': [u'CSWiconv']},
+        'libintl.so.8': {u'/opt/csw/lib': [u'CSWggettextrt'], u'/opt/csw/lib/sparcv9': [u'CSWggettextrt']},
+        'liblber-2.4.so.2': {u'/opt/csw/lib': [u'CSWoldaprt'], u'/opt/csw/lib/sparcv9': [u'CSWoldaprt']},
+        'libldap-2.4.so.2': {u'/opt/csw/lib': [u'CSWoldaprt'], u'/opt/csw/lib/sparcv9': [u'CSWoldaprt']},
+        'libneon.so.27': {u'/opt/csw/lib': [u'CSWneon'], u'/opt/csw/lib/sparcv9': [u'CSWneon']},
+        'libnsl.so.1': {u'/usr/lib': [u'SUNWcsl'], u'/usr/lib/sparcv9': [u'SUNWcslx']},
+        'libpthread.so.1': {u'/usr/lib': [u'SUNWcsl'], u'/usr/lib/sparcv9': [u'SUNWcslx']},
+        'librt.so.1': {u'/usr/lib': [u'SUNWcsl'], u'/usr/lib/sparcv9': [u'SUNWcslx']},
+        'libsendfile.so.1': {u'/usr/lib': [u'SUNWcsl'], u'/usr/lib/sparcv9': [u'SUNWcslx']},
+        'libsocket.so.1': {u'/usr/lib': [u'SUNWcsl'], u'/usr/lib/sparcv9': [u'SUNWcslx']},
+        'libsvn_client-1.so.0': {u'/opt/csw/lib/svn': [u'CSWsvn']},
+        'libsvn_delta-1.so.0': {u'/opt/csw/lib/svn': [u'CSWsvn']},
+        'libsvn_diff-1.so.0': {u'/opt/csw/lib/svn': [u'CSWsvn']},
+        'libsvn_fs-1.so.0': {u'/opt/csw/lib/svn': [u'CSWsvn']},
+        'libsvn_ra-1.so.0': {u'/opt/csw/lib/svn': [u'CSWsvn']},
+        'libsvn_repos-1.so.0': {u'/opt/csw/lib/svn': [u'CSWsvn']},
+        'libsvn_subr-1.so.0': {u'/opt/csw/lib/svn': [u'CSWsvn']},
+        'libsvn_wc-1.so.0': {u'/opt/csw/lib/svn': [u'CSWsvn']},
+        'libuuid.so.1': {u'/usr/lib': [u'SUNWcsl'], u'/usr/lib/sparcv9': [u'SUNWcslx']},
+    }
+
+    expected = [
+     [(u'CSWggettextrt', u'provides /opt/csw/lib/libintl.so.8 needed by opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0')],
+     [(u'CSWsvn', u'provides /opt/csw/lib/svn/libsvn_repos-1.so.0 needed by opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0')],
+     [(u'CSWsvn', u'provides /opt/csw/lib/svn/libsvn_client-1.so.0 needed by opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0')],
+     [(u'CSWsvn', u'provides /opt/csw/lib/svn/libsvn_wc-1.so.0 needed by opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0')],
+     [(u'CSWsvn', u'provides /opt/csw/lib/svn/libsvn_ra-1.so.0 needed by opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0')],
+     [(u'CSWsvn', u'provides /opt/csw/lib/svn/libsvn_delta-1.so.0 needed by opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0')],
+     [(u'CSWsvn', u'provides /opt/csw/lib/svn/libsvn_diff-1.so.0 needed by opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0')],
+     [(u'CSWsvn', u'provides /opt/csw/lib/svn/libsvn_subr-1.so.0 needed by opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0')],
+     [(u'CSWsvn', u'provides /opt/csw/lib/svn/libsvn_fs-1.so.0 needed by opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0')],
+     [(u'CSWapache2rt', u'provides /opt/csw/apache2/lib/libaprutil-1.so.0 needed by opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0')],
+     [(u'CSWoldaprt', u'provides /opt/csw/lib/libldap-2.4.so.2 needed by opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0')],
+     [(u'CSWoldaprt', u'provides /opt/csw/lib/liblber-2.4.so.2 needed by opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0')],
+     [(u'CSWexpat', u'provides /opt/csw/lib/libexpat.so.1 needed by opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0')],
+     [(u'CSWiconv', u'provides /opt/csw/lib/libiconv.so.2 needed by opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0')],
+     [(u'CSWapr', u'provides /opt/csw/lib/libapr-1.so.0 needed by opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0'),
+      (u'CSWapache2rt', u'provides /opt/csw/apache2/lib/libapr-1.so.0 needed by opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0')],
+     [(u'SUNWcsl', u'provides /usr/lib/libuuid.so.1 needed by opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0')],
+     [(u'SUNWcsl', u'provides /usr/lib/libsendfile.so.1 needed by opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0')],
+     [(u'SUNWcsl', u'provides /usr/lib/librt.so.1 needed by opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0')],
+     [(u'SUNWcsl', u'provides /usr/lib/libnsl.so.1 needed by opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0')],
+     [(u'SUNWcsl', u'provides /usr/lib/libpthread.so.1 needed by opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0')],
+     [(u'SUNWcsl', u'provides /usr/lib/libdl.so.1 needed by opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0')],
+     [(u'CSWneon', u'provides /opt/csw/lib/libneon.so.27 needed by opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0')],
+     [(u'SUNWcsl', u'provides /usr/lib/libsocket.so.1 needed by opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0')],
+     [(u'SUNWcsl', u'provides /usr/lib/libc.so.1 needed by opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0')],
+     [(u'SUNWlibC', u'provides /usr/lib/libCstd.so.1 needed by opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0')],
+     [(u'SUNWlibC', u'provides /usr/lib/libCrun.so.1 needed by opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0')]]
+
+    # pkg_by_path is not important for depchecks.Libraries.
+    pkg_by_path = {}
+    result = depchecks.Libraries(self.pkg_data,
+                          self.error_mgr_mock,
+                          self.logger_stub,
+                          self.messenger_stub,
+                          path_and_pkg_by_basename, pkg_by_path)
+    self.assertEqual(expected, result)
+
+
+class TestMissingDepsFromReasonGroups(unittest.TestCase):
+
+  def testOne(self):
+    reason_groups = [
+        [(u"CSWfoo1", ""),
+         (u"CSWfoo2", "")],
+        [(u"CSWbar", "")],
+    ]
+    declared_deps = set([u"CSWfoo2"])
+    expected = [[u"CSWbar"]]
+    result = depchecks.MissingDepsFromReasonGroups(
+        reason_groups, declared_deps)
+    self.assertEqual(result, expected)
+
+
+class TestLibraries(unittest.TestCase):
+
+  def setUp(self):
+    self.mocker = mox.Mox()
+    self.logger_stub = stubs.LoggerStub()
+    self.messenger_stub = stubs.MessengerStub()
+    self.error_mgr_mock = self.mocker.CreateMock(
+        checkpkg.SetCheckInterface)
+    self.pkg_data = copy.deepcopy(sudo_stats)
+
+  def testOne(self):
+    pass
+
+
+
+if __name__ == '__main__':
+  unittest.main()


Property changes on: csw/mgar/gar/v2/lib/python/dependency_checks_test.py
___________________________________________________________________
Added: svn:executable
   + *

Modified: csw/mgar/gar/v2/lib/python/models.py
===================================================================
--- csw/mgar/gar/v2/lib/python/models.py	2010-07-19 00:49:07 UTC (rev 10540)
+++ csw/mgar/gar/v2/lib/python/models.py	2010-07-19 08:39:22 UTC (rev 10541)
@@ -5,11 +5,15 @@
 import sqlobject
 
 class DataSource(sqlobject.SQLObject):
-  "Represents: a /var/sadm/install/contents file, or CSW catalog."
+  """Represents: a /var/sadm/install/contents file, or CSW catalog.
+
+  - "local"
+  - "catalog"
+  """
   name = sqlobject.UnicodeCol(length=255, unique=True, notNone=True)
 
-class OsVersion(sqlobject.SQLObject):
-  "Short name: 5.9, long name: Solaris 9"
+class OsRelease(sqlobject.SQLObject):
+  "Short name: SunOS5.9, long name: Solaris 9"
   short_name = sqlobject.UnicodeCol(length=40, unique=True, notNone=True)
   full_name = sqlobject.UnicodeCol(length=255, unique=True, notNone=True)
 
@@ -17,6 +21,11 @@
   "One of: 'sparc', 'x86'."
   name = sqlobject.UnicodeCol(length=40, unique=True, notNone=True)
 
+class Maintainer(sqlobject.SQLObject):
+  """The maintainer of the package, identified by the e-mail address."""
+  email = sqlobject.UnicodeCol(length=255, unique=True, notNone=True)
+  full_name = sqlobject.UnicodeCol(length=255, default=None)
+
 class Host(sqlobject.SQLObject):
   "Hostname, as returned by socket.getfqdn()"
   fqdn = sqlobject.UnicodeCol(length=255, unique=True, notNone=True)
@@ -29,8 +38,7 @@
   int_value = sqlobject.IntCol(default=None)
   str_value = sqlobject.UnicodeCol(default=None)
 
-
-class CswPackage(sqlobject.SQLObject):
+class Pkginst(sqlobject.SQLObject):
   pkgname = sqlobject.UnicodeCol(length=255, unique=True, notNone=True)
   catalogname = sqlobject.UnicodeCol(default=None)
   pkg_desc = sqlobject.UnicodeCol(default=None)
@@ -42,13 +50,30 @@
   basename_idx = sqlobject.DatabaseIndex('basename')
 
 class Srv4FileStats(sqlobject.SQLObject):
+  """Represents a srv4 file."""
   md5_sum = sqlobject.UnicodeCol(notNone=True, unique=True)
-  pkgname = sqlobject.UnicodeCol(length=255, notNone=True)
+  pkginst = sqlobject.ForeignKey('Pkginst')
   stats_version = sqlobject.IntCol(notNone=True)
+  catalogname = sqlobject.UnicodeCol(notNone=True)
+  basename = sqlobject.UnicodeCol(notNone=True)
+  arch = sqlobject.ForeignKey('Architecture', notNone=True)
+  os_rel = sqlobject.ForeignKey('OsRelease', notNone=True)
+  maintainer = sqlobject.ForeignKey('Maintainer')
   data = sqlobject.UnicodeCol(notNone=True)
+  latest = sqlobject.BoolCol(notNone=True)
+  version_string = sqlobject.UnicodeCol(notNone=True)
+  rev = sqlobject.UnicodeCol(notNone=False)
+  mtime = sqlobject.DateTimeCol(notNone=False)
 
 class CheckpkgOverride(sqlobject.SQLObject):
   srv4_file = sqlobject.ForeignKey('Srv4FileStats')
   pkgname = sqlobject.UnicodeCol(default=None)
   tag_name = sqlobject.UnicodeCol(notNone=True)
   tag_info = sqlobject.UnicodeCol(default=None)
+
+class CheckpkgErrorTag(sqlobject.SQLObject):
+  srv4_file = sqlobject.ForeignKey('Srv4FileStats')
+  pkgname = sqlobject.UnicodeCol(default=None)
+  tag_name = sqlobject.UnicodeCol(notNone=True)
+  tag_info = sqlobject.UnicodeCol(default=None)
+  msg = sqlobject.UnicodeCol(default=None)

Modified: csw/mgar/gar/v2/lib/python/opencsw.py
===================================================================
--- csw/mgar/gar/v2/lib/python/opencsw.py	2010-07-19 00:49:07 UTC (rev 10540)
+++ csw/mgar/gar/v2/lib/python/opencsw.py	2010-07-19 08:39:22 UTC (rev 10541)
@@ -25,6 +25,7 @@
 import shutil
 import subprocess
 import tempfile
+import time
 import urllib2
 import overrides
 import configuration as c
@@ -38,7 +39,6 @@
 ARCH_SPARC = "sparc"
 ARCH_i386 = "i386"
 ARCH_ALL = "all"
-
 ARCHITECTURES = [ARCH_SPARC, ARCH_i386, ARCH_ALL]
 OS_RELS = [u"SunOS5.9", u"SunOS5.10"]
 MAJOR_VERSION = "major version"
@@ -436,6 +436,7 @@
     self.debug = debug
     self.pkgname = None
     self.md5sum = None
+    self.mtime = None
 
   def __repr__(self):
     return u"CswSrv4File(%s)" % repr(self.pkg_path)
@@ -456,6 +457,9 @@
       gzip_suffix = ".gz"
       pkg_suffix = ".pkg"
       if self.pkg_path.endswith("%s%s" % (pkg_suffix, gzip_suffix)):
+        # Causing the class to stat the .gz file.  This call throws away the
+        # result, but the result will be cached as a class instance member.
+        self.GetMtime()
         base_name_gz = os.path.split(self.pkg_path)[1]
         shutil.copy(self.pkg_path, self.GetWorkDir())
         self.pkg_path = os.path.join(self.GetWorkDir(), base_name_gz)
@@ -504,6 +508,14 @@
       logging.debug("GetPkgname(): %s", repr(self.pkgname))
     return self.pkgname
 
+  def GetMtime(self):
+    if not self.mtime:
+      # This fails if the file is not there.
+      s = os.stat(self.pkg_path)
+      t = time.gmtime(s.st_mtime)
+      self.mtime = datetime.datetime(*t[:6])
+    return self.mtime
+
   def TransformToDir(self):
     """Transforms the file to the directory format.
 
@@ -561,6 +573,11 @@
     ret = pkgchk_proc.wait()
     return ret, stdout, stderr
 
+  def GetFileMtime(self):
+    if not self.mtime:
+      self.mtime = os.stat(self.pkg_path).st_mtime
+    return self.mtime
+
   def __del__(self):
     if self.workdir:
       logging.debug("Removing %s", repr(self.workdir))
@@ -832,15 +849,19 @@
       def StripRe(x, strip_re):
         return re.sub(strip_re, "", x)
       root_re = re.compile(r"^root/")
-      magic_cookie = magic.open(0)
-      magic_cookie.load()
-      magic_cookie.setflags(magic.MAGIC_MIME)
+      file_magic = FileMagic()
       for file_path in all_files:
         full_path = unicode(self.MakeAbsolutePath(file_path))
         file_info = {
             "path": StripRe(file_path, root_re),
-            "mime_type": magic_cookie.file(full_path),
+            "mime_type": file_magic.GetFileMimeType(full_path)
         }
+        if not file_info["mime_type"]:
+          logging.error("Could not establish the mime type of %s",
+                        full_path)
+          # We really don't want that, as it misses binaries.
+          raise PackageError("Could not establish the mime type of %s"
+                             % full_path)
         if IsBinary(file_info):
           parser = hp.createParser(full_path)
           if not parser:
@@ -1200,6 +1221,7 @@
         self.by_basename[d["file_basename"]] = d
     return self.by_basename
 
+
 def IsBinary(file_info):
   """Returns True or False depending on file metadata."""
   is_a_binary = False
@@ -1209,9 +1231,45 @@
   if not file_info["mime_type"]:
     # This should never happen, but it seems to have happened at least once.
     # TODO: Find the affected data and figure out why.
-    return false
+    raise PackageError("file_info is missing mime_type:" % file_info)
   for mimetype in BIN_MIMETYPES:
     if mimetype in file_info["mime_type"]:
       is_a_binary = True
       break
   return is_a_binary
+
+
+class FileMagic(object):
+  """Libmagic sometimes returns None, which I think is a bug.
+  Trying to come up with a way to work around that.
+  """
+
+  def __init__(self):
+    self.cookie_count = 0
+    self.magic_cookie = None
+
+  def _GetCookie(self):
+    magic_cookie = magic.open(self.cookie_count)
+    self.cookie_count += 1
+    magic_cookie.load()
+    magic_cookie.setflags(magic.MAGIC_MIME)
+    return magic_cookie
+
+  def _LazyInit(self):
+    if not self.magic_cookie:
+      self.magic_cookie = self._GetCookie()
+
+  def GetFileMimeType(self, full_path):
+    """Trying to run magic.file() a few times, not accepting None."""
+    self._LazyInit()
+    mime = None
+    for i in xrange(10):
+      mime = self.magic_cookie.file(full_path)
+      if mime:
+        break;
+      else:
+        # Returned mime is null. Re-initializing the cookie and trying again.
+        logging.error("magic_cookie.file(%s) returned None. Retrying.",
+                      full_path)
+        self.magic_cookie = self._GetCookie()
+    return mime

Modified: csw/mgar/gar/v2/lib/python/package_checks.py
===================================================================
--- csw/mgar/gar/v2/lib/python/package_checks.py	2010-07-19 00:49:07 UTC (rev 10540)
+++ csw/mgar/gar/v2/lib/python/package_checks.py	2010-07-19 08:39:22 UTC (rev 10541)
@@ -13,6 +13,7 @@
 
 import copy
 import re
+import operator
 import os
 import checkpkg
 import opencsw
@@ -263,7 +264,7 @@
 def SetCheckLibraries(pkgs_data, error_mgr, logger, messenger):
   """Second version of the library checking code.
 
-  1. Collect all the data from the FS:
+  1. Collect all the needed data from the FS:
      {"<basename>": {"/path/1": ["CSWfoo1"], "/path/2": ["CSWfoo2"]}}
      1.1. find all needed sonames
      1.2. get all the data for needed sonames
@@ -273,18 +274,33 @@
   """
   needed_sonames = []
   pkgs_to_be_installed = [x["basic_stats"]["pkgname"] for x in pkgs_data]
+  paths_to_verify = set()
+  pkg_by_path = {}
+  logger.debug("Building needed_sonames, paths_to_verify and pkg_by_path...")
   for pkg_data in pkgs_data:
+    pkgname = pkg_data["basic_stats"]["pkgname"]
     for binary_info in pkg_data["binaries_dump_info"]:
       needed_sonames.extend(binary_info["needed sonames"])
+    # Creating an index of packages by path
+    for pkgmap_entry in pkg_data["pkgmap"]:
+      if "path" in pkgmap_entry and pkgmap_entry["path"]:
+        base_dir, basename = os.path.split(pkgmap_entry["path"])
+        paths_to_verify.add(base_dir)
+        paths_to_verify.add(pkgmap_entry["path"])
+        if pkgmap_entry["path"] not in pkg_by_path:
+          pkg_by_path[pkgmap_entry["path"]] = []
+        pkg_by_path[pkgmap_entry["path"]].append(pkgname)
   needed_sonames = sorted(set(needed_sonames))
   # Finding candidate libraries from the filesystem (/var/sadm/install/contents)
-  path_and_pkg_by_basename = {}
-  for needed_soname in needed_sonames:
-    path_and_pkg_by_basename[needed_soname] = error_mgr.GetPathsAndPkgnamesByBasename(
-        needed_soname)
+  path_and_pkg_by_basename = depchecks.GetPathAndPkgByBasename(
+      error_mgr, logger, needed_sonames)
   # Removing files from packages that are to be installed.
   path_and_pkg_by_basename = RemovePackagesUnderInstallation(
       path_and_pkg_by_basename, pkgs_to_be_installed)
+  # Populating the mapping using data from the local packages.  The call to
+  # GetPkgByFullPath will complete the mapping using data from the filesystem.
+  pkg_by_path = depchecks.GetPkgByFullPath(
+      error_mgr, logger, paths_to_verify, pkg_by_path)
   # Adding overlay based on the given package set
   # Considering files from the set under examination.
   for pkg_data in pkgs_data:
@@ -305,42 +321,64 @@
   for pkg_data in pkgs_data:
     pkgname = pkg_data["basic_stats"]["pkgname"]
     check_args = (pkg_data, error_mgr, logger, messenger,
-                  path_and_pkg_by_basename)
+                  path_and_pkg_by_basename, pkg_by_path)
     req_pkgs_reasons = depchecks.Libraries(*check_args)
     req_pkgs_reasons.extend(depchecks.ByFilename(*check_args))
+    # This test needs more work, or potentially, architectural changes.
+    # by_directory_reasons = depchecks.ByDirectory(*check_args)
+    # req_pkgs_reasons.extend(by_directory_reasons)
     missing_reasons_by_pkg = {}
-    for pkg, reason in req_pkgs_reasons:
-      if pkg not in missing_reasons_by_pkg:
-        missing_reasons_by_pkg[pkg] = list()
-      if len(missing_reasons_by_pkg[pkg]) < 4:
-        missing_reasons_by_pkg[pkg].append(reason)
-      elif len(missing_reasons_by_pkg[pkg]) == 4:
-        missing_reasons_by_pkg[pkg].append("...and more.")
+    for reason_group in req_pkgs_reasons:
+      for pkg, reason in reason_group:
+        if pkg not in missing_reasons_by_pkg:
+          missing_reasons_by_pkg[pkg] = []
+        if len(missing_reasons_by_pkg[pkg]) < 4:
+          missing_reasons_by_pkg[pkg].append(reason)
+        elif len(missing_reasons_by_pkg[pkg]) == 4:
+          missing_reasons_by_pkg[pkg].append("...and more.")
     declared_deps = pkg_data["depends"]
     declared_deps_set = set([x[0] for x in declared_deps])
-    req_pkgs_set = set([x[0] for x in req_pkgs_reasons])
-    missing_deps = req_pkgs_set.difference(declared_deps_set)
+    missing_dep_groups = depchecks.MissingDepsFromReasonGroups(
+        req_pkgs_reasons, declared_deps_set)
     pkgs_to_remove = set()
     for regex_str in checkpkg.DO_NOT_REPORT_MISSING_RE:
       regex = re.compile(regex_str)
-      for dep_pkgname in missing_deps:
+      for dep_pkgname in reduce(operator.add, missing_dep_groups, []):
         if re.match(regex, dep_pkgname):
           pkgs_to_remove.add(dep_pkgname)
-    if pkgname in missing_deps:
+    if pkgname in reduce(operator.add, missing_dep_groups, []):
       pkgs_to_remove.add(pkgname)
     logger.debug("Removing %s from the list of missing pkgs.", pkgs_to_remove)
-    missing_deps = missing_deps.difference(pkgs_to_remove)
-    surplus_deps = declared_deps_set.difference(req_pkgs_set)
+    new_missing_dep_groups = set()
+    for missing_deps in missing_dep_groups:
+      new_missing_deps = set()
+      for dep in missing_deps:
+        if dep not in pkgs_to_remove:
+          new_missing_deps.add(dep)
+      if new_missing_deps:
+        new_missing_dep_groups.add(tuple(new_missing_deps))
+    potential_req_pkgs = set(
+        (x for x, y in reduce(operator.add, req_pkgs_reasons, [])))
+    missing_dep_groups = new_missing_dep_groups
+    surplus_deps = declared_deps_set.difference(potential_req_pkgs)
     surplus_deps = surplus_deps.difference(checkpkg.DO_NOT_REPORT_SURPLUS)
-    missing_deps_reasons = []
-    for missing_dep in missing_deps:
-      error_mgr.ReportError(pkgname, "missing-dependency", "%s" % (missing_dep))
-      missing_deps_reasons.append((missing_dep, missing_reasons_by_pkg[missing_dep]))
+    # Using an index to avoid duplicated reasons.
+    missing_deps_reasons_by_pkg = []
+    missing_deps_idx = set()
+    for missing_deps in missing_dep_groups:
+      error_mgr.ReportError(pkgname,
+                            "missing-dependency",
+                            " or ".join(missing_deps))
+      for missing_dep in missing_deps:
+        item = (missing_dep, tuple(missing_reasons_by_pkg[missing_dep]))
+        if item not in missing_deps_idx:
+          missing_deps_reasons_by_pkg.append(item)
+          missing_deps_idx.add(item)
     for surplus_dep in surplus_deps:
       error_mgr.ReportError(pkgname, "surplus-dependency", surplus_dep)
     namespace = {
         "pkgname": pkgname,
-        "missing_deps": missing_deps_reasons,
+        "missing_deps": missing_deps_reasons_by_pkg,
         "surplus_deps": surplus_deps,
         "orphan_sonames": None,
     }
@@ -349,9 +387,19 @@
     if report.strip():
       for line in report.splitlines():
         messenger.Message(line)
-    for missing_dep in missing_deps:
-      messenger.SuggestGarLine(
-          "RUNTIME_DEP_PKGS_%s += %s" % (pkgname, missing_dep))
+    for missing_deps in missing_dep_groups:
+      alternatives = False
+      prefix = ""
+      if len(missing_deps) > 1:
+        alternatives = True
+        prefix = "  "
+      if alternatives:
+        messenger.SuggestGarLine("# One of the following:")
+      for missing_dep in missing_deps:
+        messenger.SuggestGarLine(
+            "%sRUNTIME_DEP_PKGS_%s += %s" % (prefix, pkgname, missing_dep))
+      if alternatives:
+        messenger.SuggestGarLine("# (end of the list of alternative dependencies)")
 
 
 def SetCheckDependencies(pkgs_data, error_mgr, logger, messenger):
@@ -682,8 +730,10 @@
   # Finding all shared libraries
   shared_libs = []
   for metadata in pkg_data["files_metadata"]:
-    if "sharedlib" in metadata["mime_type"]:
-      shared_libs.append(metadata["path"])
+    if "mime_type" in metadata and metadata["mime_type"]:
+      # TODO: Find out where mime_type is missing and why
+      if "sharedlib" in metadata["mime_type"]:
+        shared_libs.append(metadata["path"])
   shared_libs = set(shared_libs)
   for binary_info in pkg_data["binaries_dump_info"]:
     for soname in binary_info["needed sonames"]:
@@ -695,14 +745,15 @@
 
 
 def CheckDiscouragedFileNamePatterns(pkg_data, error_mgr, logger, messenger):
-  patterns = [(re.compile(x), y) for x, y in DISCOURAGED_FILE_PATTERNS]
+  patterns = [(x, re.compile(x), y) for x, y in DISCOURAGED_FILE_PATTERNS]
   for entry in pkg_data["pkgmap"]:
     if entry["path"]:
-      for pattern, msg in patterns:
-        if pattern.search(entry["path"]):
+      for pattern, pattern_re, msg in patterns:
+        if pattern_re.search(entry["path"]):
           error_mgr.ReportError("discouraged-path-in-pkgmap",
                                 entry["path"])
-          messenger.Message(msg)
+          messenger.OneTimeMessage(
+              "discouraged-path-in-pkgmap-%s" % pattern, msg)
 
 
 def CheckBadContent(pkg_data, error_mgr, logger, messenger):

Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py
===================================================================
--- csw/mgar/gar/v2/lib/python/package_checks_test.py	2010-07-19 00:49:07 UTC (rev 10540)
+++ csw/mgar/gar/v2/lib/python/package_checks_test.py	2010-07-19 08:39:22 UTC (rev 10541)
@@ -3,6 +3,7 @@
 # $Id$
 
 import copy
+import datetime
 import unittest
 import package_checks as pc
 import checkpkg
@@ -16,7 +17,11 @@
 import testdata.checkpkg_pkgs_data_minimal as td_2
 import testdata.rpaths
 from testdata.rsync_pkg_stats import pkgstats as rsync_stats
+from testdata.tree_stats import pkgstats as tree_stats
 from testdata.ivtools_stats import pkgstats as ivtools_stats
+from testdata.sudo_stats import pkgstats as sudo_stats
+from testdata.javasvn_stats import pkgstats as javasvn_stats
+from testdata import stubs
 
 DEFAULT_PKG_STATS = None
 DEFAULT_PKG_DATA = rsync_stats[0]
@@ -27,28 +32,17 @@
 
   def setUp(self):
     self.pkg_stats = DEFAULT_PKG_STATS
-    # self.pkg_data = self.pkg_stats.GetAllStats()
-    # This makes one of the test break. To be investigated.
     self.pkg_data = copy.deepcopy(DEFAULT_PKG_DATA)
     self.mocker = mox.Mox()
 
+  def SetMessenger(self):
+    self.messenger = stubs.MessengerStub()
+
   def testDefault(self):
-
-    class LoggerStub(object):
-      def debug(self, debug_s, *kwords):
-        pass
-      def info(self, debug_s, *kwords):
-        pass
-    class MessengerStub(object):
-      def Message(self, m):
-        pass
-      def SuggestGarLine(self, m):
-        pass
-    # self.logger_mock = self.mocker.CreateMock(logging.Logger)
-    self.logger_mock = LoggerStub()
+    self.logger_mock = stubs.LoggerStub()
     self.error_mgr_mock = self.mocker.CreateMock(
         checkpkg.IndividualCheckInterface)
-    self.messenger = MessengerStub()
+    self.SetMessenger()
     self.CheckpkgTest()
     self.mocker.ReplayAll()
     getattr(pc, self.FUNCTION_NAME)(self.pkg_data,
@@ -320,7 +314,14 @@
        u'/lib/sparcv9': [u'SUNWcslr'],
        u'/usr/lib': [u'SUNWcsl'],
        u'/usr/lib/sparcv9': [u'SUNWcsl']})
-    self.error_mgr_mock.ReportError('CSWdjvulibrert', 'missing-dependency', u'CSWiconv')
+    self.error_mgr_mock.GetPkgByPath(
+        '/opt/csw/lib').AndReturn([u"CSWcommon"])
+    self.error_mgr_mock.GetPkgByPath(
+        '/opt/csw/share/doc').AndReturn([u"CSWcommon"])
+    self.error_mgr_mock.GetPkgByPath(
+        '/opt/csw/lib/sparcv9').AndReturn([u"CSWcommon"])
+    self.error_mgr_mock.ReportError(
+        'CSWdjvulibrert', 'missing-dependency', u'CSWiconv')
 
 
 class TestCheckPstamp(CheckpkgUnitTestHelper, unittest.TestCase):
@@ -329,7 +330,8 @@
     self.pkg_data["pkginfo"]["PSTAMP"] = "build8s20090904191054"
     self.error_mgr_mock.ReportError(
         'pkginfo-pstamp-in-wrong-format', 'build8s20090904191054',
-        "It should be 'username at hostname-timestamp', but it's 'build8s20090904191054'.")
+        "It should be 'username at hostname-timestamp', but it's "
+        "'build8s20090904191054'.")
 
 
 class TestCheckRpath(CheckpkgUnitTestHelper, unittest.TestCase):
@@ -439,16 +441,27 @@
     binaries_dump_info = self.pkg_data["binaries_dump_info"]
     binaries_dump_info[0]["runpath"] = ("/opt/csw/lib",)
     binaries_dump_info[0]["needed sonames"] = ["libdb-4.7.so"]
-    self.pkg_data["depends"] = (("CSWfoo", None),)
+    self.pkg_data["depends"] = (("CSWfoo", None),(u"CSWcommon", ""))
     self.pkg_data["binaries_dump_info"] = binaries_dump_info[0:1]
     self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libdb-4.7.so').AndReturn({
        u'/opt/csw/lib': [u'CSWfoo'],
        u'/opt/csw/lib/sparcv9': [u'CSWfoo'],
     })
+    self.error_mgr_mock.GetPkgByPath(
+        '/opt/csw/share/man').AndReturn(["CSWcommon"])
+    self.error_mgr_mock.GetPkgByPath(
+        '/opt/csw/bin').AndReturn(["CSWcommon"])
+    self.error_mgr_mock.GetPkgByPath(
+        '/opt/csw/bin/sparcv8').AndReturn(["CSWcommon"])
+    self.error_mgr_mock.GetPkgByPath(
+        '/opt/csw/bin/sparcv9').AndReturn(["CSWcommon"])
+    self.error_mgr_mock.GetPkgByPath(
+        '/opt/csw/share/doc').AndReturn(["CSWcommon"])
     self.error_mgr_mock.ReportError(
         'CSWrsync',
         'deprecated-library',
-        u'opt/csw/bin/sparcv8/rsync Deprecated Berkeley DB location /opt/csw/lib/libdb-4.7.so')
+        u'opt/csw/bin/sparcv8/rsync Deprecated Berkeley DB location '
+        u'/opt/csw/lib/libdb-4.7.so')
     self.pkg_data = [self.pkg_data]
 
 
@@ -524,6 +537,42 @@
     self.pkg_data = [self.CSWbar_DATA, self.CSWlibfoo_DATA]
 
 
+class TestSharedLibsOnlyIsalist(CheckpkgUnitTestHelper,
+                                            unittest.TestCase):
+  """/opt/csw/lib/$ISALIST in RPATH without the bare /opt/csw/lib."""
+  FUNCTION_NAME = 'SetCheckLibraries'
+  # Contains only necessary bits.  The data listed in full.
+  CSWbar_DATA = {
+        'basic_stats': {'catalogname': 'bar',
+                        'pkgname': 'CSWbar',
+                        'stats_version': 1},
+        'binaries_dump_info': [
+                               {'base_name': 'bar',
+                                'needed sonames': ['libfoo.so.1'],
+                                'path': 'opt/csw/bin/bar',
+                                'runpath': ('/opt/csw/lib/$ISALIST',),
+                               },
+                               {'base_name': 'libfoo.so.1',
+                                'needed sonames': (),
+                                'path': 'opt/csw/lib/libfoo.so.1',
+                                'runpath': ('/opt/csw/lib/$ISALIST',),
+                               },
+                              ],
+        # 'depends': (),
+        'depends': ((u"CSWcommon", ""),),
+        'isalist': ('foo'),
+        'pkgmap': [
+          { 'path': '/opt/csw/lib/libfoo.so.1', },
+          { 'path': '/opt/csw/bin/bar', },
+                  ],
+        }
+  def CheckpkgTest(self):
+    self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libfoo.so.1').AndReturn({})
+    self.error_mgr_mock.GetPkgByPath('/opt/csw/lib').AndReturn([u"CSWcommon"])
+    self.error_mgr_mock.GetPkgByPath('/opt/csw/bin').AndReturn([u"CSWcommon"])
+    self.pkg_data = [self.CSWbar_DATA]
+
+
 class TestCheckLibrariesDlopenLibs_1(CheckpkgUnitTestHelper, unittest.TestCase):
   """For dlopen-style shared libraries, libraries from /opt/csw/lib should be
   counted as dependencies.  It's only a heuristic though."""
@@ -533,12 +582,22 @@
     binaries_dump_info[0]["runpath"] = ()
     binaries_dump_info[0]["needed sonames"] = ["libbar.so"]
     binaries_dump_info[0]["path"] = 'opt/csw/lib/python/site-packages/foo.so'
-    self.pkg_data["depends"] = tuple()
+    self.pkg_data["depends"] = ((u"CSWcommon", "This one provides directories"),)
     self.pkg_data["binaries_dump_info"] = binaries_dump_info[0:1]
     self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libbar.so').AndReturn({
        u'/opt/csw/lib': [u'CSWlibbar'],
        u'/opt/csw/lib/sparcv9': [u'CSWlibbar'],
     })
+    self.error_mgr_mock.GetPkgByPath(
+        '/opt/csw/share/man').AndReturn(["CSWcommon"])
+    self.error_mgr_mock.GetPkgByPath(
+        '/opt/csw/bin').AndReturn(["CSWcommon"])
+    self.error_mgr_mock.GetPkgByPath(
+        '/opt/csw/bin/sparcv8').AndReturn(["CSWcommon"])

@@ 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 theferret at users.sourceforge.net  Mon Jul 19 18:18:20 2010
From: theferret at users.sourceforge.net (theferret at users.sourceforge.net)
Date: Mon, 19 Jul 2010 16:18:20 +0000
Subject: [csw-devel] SF.net SVN: gar:[10542] csw/mgar/pkg
Message-ID: <E1Oat2q-0001oV-JU@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 10542
          http://gar.svn.sourceforge.net/gar/?rev=10542&view=rev
Author:   theferret
Date:     2010-07-19 16:18:20 +0000 (Mon, 19 Jul 2010)

Log Message:
-----------
gtk_chtheme: new package

Added Paths:
-----------
    csw/mgar/pkg/gtk_chtheme/
    csw/mgar/pkg/gtk_chtheme/Makefile
    csw/mgar/pkg/gtk_chtheme/trunk/
    csw/mgar/pkg/gtk_chtheme/trunk/Makefile
    csw/mgar/pkg/gtk_chtheme/trunk/copyright
    csw/mgar/pkg/gtk_chtheme/trunk/depend
    csw/mgar/pkg/gtk_chtheme/trunk/patchfile.preconf
    csw/mgar/pkg/gtk_chtheme/trunk/pkginfo
    csw/mgar/pkg/gtk_chtheme/trunk/prototype

Added: csw/mgar/pkg/gtk_chtheme/Makefile
===================================================================
--- csw/mgar/pkg/gtk_chtheme/Makefile	                        (rev 0)
+++ csw/mgar/pkg/gtk_chtheme/Makefile	2010-07-19 16:18:20 UTC (rev 10542)
@@ -0,0 +1,15 @@
+
+# This is somewhat of a "stub" Makefile, for 
+# directories managed by the "createpkg" TEMPLATES.
+#
+# Not all of targets listed here may actualy be supported by
+# the subdir in question. But they are a goal
+
+DEFAULT_DIR=trunk
+
+
+# The -C means you must use gmake, unfortunately.
+
+all package build garchive extract configure clean distclean reallyclean :
+	@echo Going to make $@ in $(DEFAULT_DIR)
+	$(MAKE) -C  $(DEFAULT_DIR) $@


Property changes on: csw/mgar/pkg/gtk_chtheme/trunk
___________________________________________________________________
Added: svn:ignore
   + cookies
download
work
cswstage
build


Added: csw/mgar/pkg/gtk_chtheme/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gtk_chtheme/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/gtk_chtheme/trunk/Makefile	2010-07-19 16:18:20 UTC (rev 10542)
@@ -0,0 +1,161 @@
+# This file is from TEMPLATES/createpkg/Makefile.lib32
+# You MUST build this with gnu make, unfortunately.
+# Mainly just because of the ARCH expansion, but also for "?="
+
+# Customize your prototype file(s) as needed
+
+# Organization: variable defintions up top,
+# targets in second half.
+# Note that assignments with "?=" mean "assign if not already assigned.
+
+# Where do we keep local downloads of software src files
+ARCHIVEDIR ?= /home/src
+ARCHIVENAME ?= gtk-chtheme-0.3.1.tar.bz2
+EXTRACTPROG ?= /usr/sfw/bin/gtar jfx
+
+# Only use ONE here. The name is used for compat with 'gar'.
+MASTER_SITES ?= http://plasmasturm.org/code/gtk-chtheme
+
+ARCH := $(shell /bin/uname -p)
+
+LDFLAGS_COMMON :=
+
+SRCDIR= build/*
+
+# DO NOT specify the arch-64 stuff such as -m64 here.
+# the individual targets will do that.
+
+CFLAGS_COMMON   ?= -mt -xnorunpath -xO2
+CXXFLAGS_COMMON ?= -mt -norunpath  -xO2
+CFLAGS_sparc    ?= -xarch=v8
+CFLAGS_i386     ?= -xarch=386
+
+
+CREATEPKG=createpkg -b `pwd`/build/*/cswstage/opt/csw
+
+
+all:	$(ARCH)-32
+#all:	$(ARCH)-32 package
+
+# ARCH-XX handles configure, build, and stage for its own combo
+# 
+
+EXTRACTPROG ?= /bin/echo ERROR: need to set EXTRACTPROG ; exit 1 ;
+
+
+
+extract:	build/.extract.done
+
+build/.extract.done:
+	test -d build || mkdir build
+	@if test -f  $(ARCHIVEDIR)/$(ARCHIVENAME) ; then \
+		echo Extracting $(ARCHIVENAME) under build dir... ;\
+		( cd build && $(EXTRACTPROG) $(ARCHIVEDIR)/$(ARCHIVENAME) ) ; \
+	else echo Cannot extract - $(ARCHIVEDIR)/$(ARCHIVENAME) does not exist ;\
+		exit 1; \
+	fi
+	touch build/.extract.done
+	
+
+clean distclean:
+	@echo Calling $@ in $(SRCDIR)
+	$(MAKE) -C $(SRCDIR) $@
+
+
+reallyclean:	distclean
+	@echo Removing any milestone files in build as well...
+	@rm -f build/.??*
+	@echo '(However, leaving src tree intact, with any patches in it)'
+	@echo '(If you want, you could rm -r build, then make extract once more)'
+
+garchive:
+	@echo Call the fetch target instead: it does the same thing.
+
+
+# Downloads the source code to the common ARCHIVEDIR
+fetch:	$(ARCHIVEDIR)/$(ARCHIVENAME)
+	@echo fetch done
+
+$(ARCHIVEDIR)/$(ARCHIVENAME):
+	wget -P $(ARCHIVEDIR) $(MASTER_SITES)/$(ARCHIVENAME)
+
+patch:
+	@echo patch: patching is handled automatically as part of the configure phase.
+
+stage-preserved:
+	@if test -f preserve-$(ARCH).tar ; then \
+		echo Copying preserved arch-specific files; \
+		cat preserve-$(ARCH).tar |(cd $(SRCDIR)/cswstage && tar xvf -);\
+	fi
+	@if test -f preserve.tar ; then \
+		echo Copying preserved arch-neutral files; \
+		cat preserve.tar |(cd $(SRCDIR)/cswstage && tar xvf -);\
+	fi
+		
+package:	stage-preserved
+	$(CREATEPKG)
+
+
+# split out generic $(ARCH) sections to platform-specific sections if needed.
+# but it usually should not be neccessary
+
+
+$(ARCH)-32 ::   configure-$(ARCH)-32 build-$(ARCH)-32 stage-$(ARCH)-32
+	@echo Completed $(ARCH)-32 configure, build and stage
+	touch build/.$(ARCH)-32.done
+
+
+
+build/.$(ARCH)-32.done:	$(ARCH)-32
+
+# Since we share the same src tree, we should only need to
+# pre-configure patching one time for all.
+build/.patch-preconf.done:	build/.extract.done
+	if test -f patchfile.preconf ; then \
+	 gpatch -d $(SRCDIR) -p0  <patchfile.preconf ; fi
+	touch $@
+
+
+#Note: I WANT to use LDFLAGS=-R$$ORIGIN, but stupid libtool
+# wont allow it! so force it at build time
+build/.configure-$(ARCH)-32.done:	build/.patch-preconf.done
+	@echo handling $@ target
+	echo There is no ./configure for this program
+	if test -f patchfile.postconf ; then \
+	 gpatch -d $(SRCDIR) -p0  <patchfile.postconf ; fi
+	touch $@
+
+
+# I guess gtk should really set the -R for this. but for now.. hack it
+build/.build-$(ARCH)-32.done:
+	@echo handling $@ target
+	LD_OPTIONS='-R$$ORIGIN -R$$ORIGIN/../lib ' $(MAKE) -C $(SRCDIR) $(MFLAGS)
+	touch $@
+
+
+PATH := /opt/csw/gnu:$(PATH)
+
+## NOTE: This is a DESTRUCTIVE target build!!
+## 'stagepkg'  will destroy any prior "cswstage" directory!!!
+## So, we remove all 64bit milestones
+build/.stage-$(ARCH)-32.done:
+	@echo Handling stage of $(ARCH)-32
+	(cd $(SRCDIR) ; MAKE=gmake stagepkg -m)
+	(cd $(SRCDIR); cp COPYING cswstage/opt/csw)
+	@rm -f build/.*64.done
+	touch $@
+
+
+
+#These are the easy-to-type targets. They just trigger the real ones.
+configure-$(ARCH)-32:	build/.configure-$(ARCH)-32.done
+	@echo $@ done
+build-$(ARCH)-32:	build/.build-$(ARCH)-32.done
+	@echo $@ done
+stage-$(ARCH)-32:	build/.stage-$(ARCH)-32.done
+	@echo $@ done
+
+# manual targets
+pkgproto:
+	cat $(SRCDIR)/cswstage/prototype | sed 's/root root$$/root bin/'>prototype
+	echo 'f none share/doc/gtk_chtheme/COPYING=COPYING 0644 root bin' >>prototype

Added: csw/mgar/pkg/gtk_chtheme/trunk/copyright
===================================================================
--- csw/mgar/pkg/gtk_chtheme/trunk/copyright	                        (rev 0)
+++ csw/mgar/pkg/gtk_chtheme/trunk/copyright	2010-07-19 16:18:20 UTC (rev 10542)
@@ -0,0 +1,3 @@
+Please see /opt/csw/share/doc/gtk_chtheme/COPYING for full copyright
+notice (GPL 2)
+

Added: csw/mgar/pkg/gtk_chtheme/trunk/depend
===================================================================
--- csw/mgar/pkg/gtk_chtheme/trunk/depend	                        (rev 0)
+++ csw/mgar/pkg/gtk_chtheme/trunk/depend	2010-07-19 16:18:20 UTC (rev 10542)
@@ -0,0 +1,8 @@
+P	CSWfconfig
+P	CSWftype2
+P	CSWggettextrt
+P	CSWglib2
+P	CSWgtk2
+P	CSWlibatk
+P	CSWlibcairo
+P	CSWpango

Added: csw/mgar/pkg/gtk_chtheme/trunk/patchfile.preconf
===================================================================
--- csw/mgar/pkg/gtk_chtheme/trunk/patchfile.preconf	                        (rev 0)
+++ csw/mgar/pkg/gtk_chtheme/trunk/patchfile.preconf	2010-07-19 16:18:20 UTC (rev 10542)
@@ -0,0 +1,29 @@
+diff --git Makefile Makefile
+index 0113972..e400b89 100644
+--- Makefile
++++ Makefile
+@@ -3,8 +3,10 @@ include Metadata
+ CFLAGS := $(if $(RPM_OPT_FLAGS), $(RPM_OPT_FLAGS), $(CFLAGS))
+ 
+ LDFLAGS = $(shell pkg-config --libs gtk+-2.0)
+-CFLAGS += -Wall
+-CFLAGS += $(shell pkg-config --cflags gtk+-2.0) -DGTK_DISABLE_BROKEN -DGTK_DISABLE_DEPRECATED
++CFLAGS += 
++CFLAGS += $(shell pkg-config --cflags gtk+-2.0) 
++# Using these, makes it not even compile? why are they in here?!?
++#-DGTK_DISABLE_BROKEN -DGTK_DISABLE_DEPRECATED
+ CFLAGS += -DPROJNAME='"$(PROJNAME)"' -DVERSION='"$(VERSION)"'
+ CPPFLAGS =
+ CXXFLAGS =
+diff --git Metadata Metadata
+index f53ec09..e5510cc 100644
+--- Metadata
++++ Metadata
+@@ -11,6 +11,6 @@ The aim is to make theme preview and selection as slick as possible. Themes\
+ installed on the system are presented for selection and previewed on the fly.\
+ A large variety of widgets provides a comprehensive demonstration.
+ 
+-PREFIX = /usr
++PREFIX = /opt/csw
+ BINDIR = $(PREFIX)/bin
+ MANDIR = $(PREFIX)/share/man

Added: csw/mgar/pkg/gtk_chtheme/trunk/pkginfo
===================================================================
--- csw/mgar/pkg/gtk_chtheme/trunk/pkginfo	                        (rev 0)
+++ csw/mgar/pkg/gtk_chtheme/trunk/pkginfo	2010-07-19 16:18:20 UTC (rev 10542)
@@ -0,0 +1,8 @@
+PKG=CSWgtkchtheme
+NAME=gtk_chtheme - pure GTK2 based theme changer
+VERSION=0.3.1,REV=YYYY.MM.DD
+CATEGORY=application
+VENDOR=http://plasmasturm.org/code/gtk-chtheme/ packaged for CSW by Philip Brown
+HOTLINE=http://www.opencsw.org/bugtrack/
+EMAIL=phil at opencsw.org
+OPENCSW_REPOSITORY=https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/pkg/gtk_chtheme/trunk

Added: csw/mgar/pkg/gtk_chtheme/trunk/prototype
===================================================================
--- csw/mgar/pkg/gtk_chtheme/trunk/prototype	                        (rev 0)
+++ csw/mgar/pkg/gtk_chtheme/trunk/prototype	2010-07-19 16:18:20 UTC (rev 10542)
@@ -0,0 +1,10 @@
+i pkginfo
+i copyright
+i depend
+d none bin 0755 root bin
+f none bin/gtk-chtheme 0755 root bin
+d none share 0755 root bin
+d none share/man 0755 root bin
+d none share/man/man1 0755 root bin
+f none share/man/man1/gtk-chtheme.1 0755 root bin
+f none share/doc/gtk_chtheme/COPYING=COPYING 0644 root bin


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 Jul 20 09:32:52 2010
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Tue, 20 Jul 2010 07:32:52 +0000
Subject: [csw-devel] SF.net SVN: gar:[10543] csw/mgar/pkg
Message-ID: <E1Ob7Js-0004Xh-6y@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 10543
          http://gar.svn.sourceforge.net/gar/?rev=10543&view=rev
Author:   wahwah
Date:     2010-07-20 07:32:51 +0000 (Tue, 20 Jul 2010)

Log Message:
-----------
soappy: Initial commit

Modified Paths:
--------------
    csw/mgar/pkg/soappy/trunk/Makefile
    csw/mgar/pkg/soappy/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/soappy/

Modified: csw/mgar/pkg/soappy/trunk/Makefile
===================================================================
--- csw/mgar/pkg/template/trunk/Makefile	2010-07-11 14:03:10 UTC (rev 10496)
+++ csw/mgar/pkg/soappy/trunk/Makefile	2010-07-20 07:32:51 UTC (rev 10543)
@@ -2,184 +2,24 @@
 # 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
-##
-GARNAME = mypkg
-GARVERSION = 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 = <please fill in>
-##
-## A longer description of the package. This is only for descriptive purposes
-## inside the Makefile and is not used elsewhere.
+GARNAME = SOAPpy
+GARVERSION = 0.12.0
+CATEGORIES = python
+DESCRIPTION = SOAP library for Python
 define BLURB
-  <please fill in>
 endef
-##
-## Upstream URL that should show up in the VENDOR field as well as on
-## http://opencsw.org/packages/<packagename>.
-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 $(GARNAME). 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).
+SPKG_SOURCEURL = http://pywebsvcs.sourceforge.net/
+MASTER_SITES = $(SF_MIRRORS)
+# To get the patch from Ubuntu
+MASTER_SITES += http://archive.ubuntu.com/ubuntu/pool/universe/p/python-soappy/
+PACKAGES = CSWpy-soappy
+CATALOGNAME_CSWpy-soappy = py_soappy
+PATCHFILES += python-soappy_0.12.0-4.diff.gz
+SF_PROJ = pywebsvcs
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
-##
-## We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
-##
-## Catalog name is the name to be used with pkg{-get,util} -i <pkgname>.
-## 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 = <file containing an entry for /etc/services>
-## INETDCONF = <file containing an inetd.conf formatted entry>
-## 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)/$(GARNAME)-$(GARVERSION)
-##
-## 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
+ARCHALL_CSWpy-soappy = 1
+LICENSE = LICENSE
+TEST_SCRIPTS =
 
-#include gar/category.mk
+include gar/category.mk

Modified: csw/mgar/pkg/soappy/trunk/checksums
===================================================================
--- csw/mgar/pkg/template/trunk/checksums	2010-07-11 14:03:10 UTC (rev 10496)
+++ csw/mgar/pkg/soappy/trunk/checksums	2010-07-20 07:32:51 UTC (rev 10543)
@@ -0,0 +1,2 @@
+d0d29f9b6fb27bfadc69b64a36321e20  SOAPpy-0.12.0.tar.gz
+b7574745c985945c0532a6608822452f  python-soappy_0.12.0-4.diff.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  Tue Jul 20 12:31:49 2010
From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net)
Date: Tue, 20 Jul 2010 10:31:49 +0000
Subject: [csw-devel] SF.net SVN: gar:[10544] csw/mgar/pkg/bind/trunk
Message-ID: <E1ObA73-0008GP-Mu@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 10544
          http://gar.svn.sourceforge.net/gar/?rev=10544&view=rev
Author:   bonivart
Date:     2010-07-20 10:31:49 +0000 (Tue, 20 Jul 2010)

Log Message:
-----------
bind: update to 9.7.1-P2

Modified Paths:
--------------
    csw/mgar/pkg/bind/trunk/Makefile
    csw/mgar/pkg/bind/trunk/checksums

Modified: csw/mgar/pkg/bind/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bind/trunk/Makefile	2010-07-20 07:32:51 UTC (rev 10543)
+++ csw/mgar/pkg/bind/trunk/Makefile	2010-07-20 10:31:49 UTC (rev 10544)
@@ -3,11 +3,11 @@
 
 GARNAME = bind
 GARVERSION = 9.7.1
-#RELEASE = P2
-#DISTVERSION = $(GARVERSION)-$(RELEASE)
-#SPKG_VERSION = $(GARVERSION)$(RELEASE)
-#DISTNAME = $(GARNAME)-$(GARVERSION)-$(RELEASE)
-#WORKSRC = $(WORKDIR)/$(DISTNAME)
+RELEASE = P2
+DISTVERSION = $(GARVERSION)-$(RELEASE)
+SPKG_VERSION = $(GARVERSION)$(RELEASE)
+DISTNAME = $(GARNAME)-$(GARVERSION)-$(RELEASE)
+WORKSRC = $(WORKDIR)/$(DISTNAME)
 CATEGORIES = net
 
 DESCRIPTION = ISC BIND DNS reference implementation
@@ -18,10 +18,10 @@
   high-volume and high-reliability applications.
 endef
 
-#MASTER_SITES = http://ftp.isc.org/isc/bind9/$(GARVERSION)-$(RELEASE)/
-#DISTFILES  = $(DISTNAME).tar.gz
-MASTER_SITES = http://ftp.isc.org/isc/bind9/$(GARVERSION)/
-DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
+MASTER_SITES = http://ftp.isc.org/isc/bind9/$(GARVERSION)-$(RELEASE)/
+DISTFILES  = $(DISTNAME).tar.gz
+#MASTER_SITES = http://ftp.isc.org/isc/bind9/$(GARVERSION)/
+#DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
 DISTFILES += CSWbindchroot.postinstall
 
 PACKAGES = CSWbind CSWbinddevel CSWlibbind CSWbindutils CSWbindchroot

Modified: csw/mgar/pkg/bind/trunk/checksums
===================================================================
--- csw/mgar/pkg/bind/trunk/checksums	2010-07-20 07:32:51 UTC (rev 10543)
+++ csw/mgar/pkg/bind/trunk/checksums	2010-07-20 10:31:49 UTC (rev 10544)
@@ -1,2 +1,2 @@
 dbbc839888d11d22aad3ccb65942d2e5  CSWbindchroot.postinstall
-712c425e59cb4aa9309bc4716283742f  bind-9.7.1.tar.gz
+bd6be63cc910d04da39103d441871596  bind-9.7.1-P2.tar.gz


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From wahwah at users.sourceforge.net  Tue Jul 20 13:11:36 2010
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Tue, 20 Jul 2010 11:11:36 +0000
Subject: [csw-devel] SF.net SVN: gar:[10545] csw/mgar/gar/v2/lib/python
Message-ID: <E1ObAjY-0006Wj-OR@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10545
          http://gar.svn.sourceforge.net/gar/?rev=10545&view=rev
Author:   wahwah
Date:     2010-07-20 11:11:36 +0000 (Tue, 20 Jul 2010)

Log Message:
-----------
mGAR v2: checkpkg, checking architectures of binaries, allowing libm.so.2 (the x86 vs amd64 problem).

Modified Paths:
--------------
    csw/mgar/gar/v2/lib/python/checkpkg.py
    csw/mgar/gar/v2/lib/python/dependency_checks.py
    csw/mgar/gar/v2/lib/python/package_checks.py
    csw/mgar/gar/v2/lib/python/package_checks_test.py

Added Paths:
-----------
    csw/mgar/gar/v2/lib/python/testdata/neon_stats.py

Modified: csw/mgar/gar/v2/lib/python/checkpkg.py
===================================================================
--- csw/mgar/gar/v2/lib/python/checkpkg.py	2010-07-20 10:31:49 UTC (rev 10544)
+++ csw/mgar/gar/v2/lib/python/checkpkg.py	2010-07-20 11:11:36 UTC (rev 10545)
@@ -68,10 +68,6 @@
 
 CONTENT_PKG_RE = r"^\*?(CSW|SUNW)[0-9a-zA-Z\-]?[0-9a-z\-]+$"
 
-# This shared library is present on Solaris 10 on amd64, but it's missing on
-# Solaris 8 on i386.  It's okay if it's missing.
-ALLOWED_ORPHAN_SONAMES = set([u"libm.so.2"])
-
 REPORT_TMPL = u"""#if $missing_deps or $surplus_deps or $orphan_sonames
 Dependency issues of $pkgname:
 #end if

Modified: csw/mgar/gar/v2/lib/python/dependency_checks.py
===================================================================
--- csw/mgar/gar/v2/lib/python/dependency_checks.py	2010-07-20 10:31:49 UTC (rev 10544)
+++ csw/mgar/gar/v2/lib/python/dependency_checks.py	2010-07-20 11:11:36 UTC (rev 10545)
@@ -4,6 +4,10 @@
 import os.path
 import re
 
+# This shared library is present on Solaris 10 on amd64, but it's missing on
+# Solaris 8 on i386.  It's okay if it's missing.
+ALLOWED_ORPHAN_SONAMES = set([u"libm.so.2"])
+
 DEPRECATED_LIBRARY_LOCATIONS = (
     ("/opt/csw/lib", "libdb-4.7.so", "Deprecated Berkeley DB location"),
     ("/opt/csw/lib/mysql", "libmysqlclient_r.so.15",
@@ -105,9 +109,10 @@
             % (soname, binary_info["path"], runpath_tuple, runpath_history, path_msg))
   orphan_sonames = set(orphan_sonames)
   for soname, binary_path in orphan_sonames:
-    error_mgr.ReportError(
-        pkgname, "soname-not-found",
-        "%s is needed by %s" % (soname, binary_path))
+    if soname not in ALLOWED_ORPHAN_SONAMES:
+      error_mgr.ReportError(
+          pkgname, "soname-not-found",
+          "%s is needed by %s" % (soname, binary_path))
   # TODO: Report orphan sonames here
   return required_deps
 

Modified: csw/mgar/gar/v2/lib/python/package_checks.py
===================================================================
--- csw/mgar/gar/v2/lib/python/package_checks.py	2010-07-20 10:31:49 UTC (rev 10544)
+++ csw/mgar/gar/v2/lib/python/package_checks.py	2010-07-20 11:11:36 UTC (rev 10545)
@@ -968,3 +968,20 @@
             "http://www.opencsw.org/extend-it/contribute-packages/"
             "build-standards/"
             "architecture-optimization-using-isaexec-and-isalist/")
+
+
+def CheckWrongArchitecture(pkg_data, error_mgr, logger, messenger):
+  pkgname = pkg_data["basic_stats"]["pkgname"]
+  filename_arch = pkg_data["basic_stats"]["parsed_basename"]["arch"]
+  pkginfo_arch = pkg_data["pkginfo"]["ARCH"]
+  files_metadata = pkg_data["files_metadata"]
+  for file_metadata in files_metadata:
+    if opencsw.IsBinary(file_metadata):
+      machine = HACHOIR_MACHINES[file_metadata["machine_id"]]
+      if machine["type"] != pkginfo_arch:
+        error_mgr.ReportError(
+            "binary-wrong-architecture",
+            "file=%s pkginfo-says=%s actual-binary=%s" % (
+              file_metadata["path"],
+              pkginfo_arch,
+              machine["type"]))

Modified: csw/mgar/gar/v2/lib/python/package_checks_test.py
===================================================================
--- csw/mgar/gar/v2/lib/python/package_checks_test.py	2010-07-20 10:31:49 UTC (rev 10544)
+++ csw/mgar/gar/v2/lib/python/package_checks_test.py	2010-07-20 11:11:36 UTC (rev 10545)
@@ -21,6 +21,7 @@
 from testdata.ivtools_stats import pkgstats as ivtools_stats
 from testdata.sudo_stats import pkgstats as sudo_stats
 from testdata.javasvn_stats import pkgstats as javasvn_stats
+from testdata.neon_stats import pkgstats as neon_stats
 from testdata import stubs
 
 DEFAULT_PKG_STATS = None
@@ -465,6 +466,34 @@
     self.pkg_data = [self.pkg_data]
 
 
+class TestSetCheckLibmLinking(CheckpkgUnitTestHelper, unittest.TestCase):
+  FUNCTION_NAME = 'SetCheckLibraries'
+  def CheckpkgTest(self):
+    binaries_dump_info = self.pkg_data["binaries_dump_info"]
+    binaries_dump_info[0]["runpath"] = ("/opt/csw/lib",)
+    binaries_dump_info[0]["needed sonames"] = ["libm.so.2"]
+    self.pkg_data["depends"] = ((u"CSWcommon", ""),)
+    self.pkg_data["binaries_dump_info"] = binaries_dump_info[0:1]
+    self.error_mgr_mock.GetPathsAndPkgnamesByBasename('libm.so.2').AndReturn({
+    })
+    self.error_mgr_mock.GetPkgByPath(
+        '/opt/csw/share/man').AndReturn(["CSWcommon"])
+    self.error_mgr_mock.GetPkgByPath(
+        '/opt/csw/bin').AndReturn(["CSWcommon"])
+    self.error_mgr_mock.GetPkgByPath(
+        '/opt/csw/bin/sparcv8').AndReturn(["CSWcommon"])
+    self.error_mgr_mock.GetPkgByPath(
+        '/opt/csw/bin/sparcv9').AndReturn(["CSWcommon"])
+    self.error_mgr_mock.GetPkgByPath(
+        '/opt/csw/share/doc').AndReturn(["CSWcommon"])
+    # self.error_mgr_mock.ReportError(
+    #     'CSWrsync',
+    #     'deprecated-library',
+    #     u'opt/csw/bin/sparcv8/rsync Deprecated Berkeley DB location '
+    #     u'/opt/csw/lib/libdb-4.7.so')
+    self.pkg_data = [self.pkg_data]
+
+
 class TestRemovePackagesUnderInstallation(unittest.TestCase):
 
   def testRemoveNone(self):
@@ -1201,5 +1230,17 @@
     self.messenger.SuggestGarLine(u'RUNTIME_DEP_PKGS_CSWjavasvn += CSWiconv')
 
 
+class TestCheckWrongArchitecture(CheckpkgUnitTestHelper, unittest.TestCase):
+  FUNCTION_NAME = 'CheckWrongArchitecture'
+  def CheckpkgTest(self):
+    self.pkg_data = neon_stats[0]
+    self.error_mgr_mock.ReportError(
+        'binary-wrong-architecture',
+        'file=opt/csw/lib/sparcv9/libneon.so.27.2.0 pkginfo-says=i386 actual-binary=sparc')
+    self.error_mgr_mock.ReportError(
+        'binary-wrong-architecture',
+        'file=opt/csw/lib/sparcv9/libneon.so.26.0.4 pkginfo-says=i386 actual-binary=sparc')
+
+
 if __name__ == '__main__':
   unittest.main()

Added: csw/mgar/gar/v2/lib/python/testdata/neon_stats.py
===================================================================
--- csw/mgar/gar/v2/lib/python/testdata/neon_stats.py	                        (rev 0)
+++ csw/mgar/gar/v2/lib/python/testdata/neon_stats.py	2010-07-20 11:11:36 UTC (rev 10545)
@@ -0,0 +1,368 @@
+import datetime
+pkgstats = [{'bad_paths': {},
+  'basic_stats': {'catalogname': 'neon',
+                  'md5_sum': 'd74a2f65ef0caff0bdde7310007764a8',
+                  'parsed_basename': {'arch': 'i386',
+                                      'catalogname': 'neon',
+                                      'full_version_string': '0.29.0,REV=2009.09.14',
+                                      'osrel': 'SunOS5.8',
+                                      'revision_info': {'REV': '2009.09.14'},
+                                      'vendortag': 'CSW',
+                                      'version': '0.29.0',
+                                      'version_info': {'major version': '0',
+                                                       'minor version': '29',
+                                                       'patchlevel': '0'}},
+                  'pkg_basename': 'neon-0.29.0,REV=2009.09.14-SunOS5.8-i386-CSW.pkg.gz',
+                  'pkg_path': '/tmp/pkg_iId8vV/neon-0.29.0,REV=2009.09.14-SunOS5.8-i386-CSW.pkg.gz',
+                  'pkgname': 'CSWneon',
+                  'stats_version': 9L},
+  'binaries': ['opt/csw/lib/libneon.so.26.0.4',
+               'opt/csw/lib/libneon.so.27.2.0',
+               'opt/csw/lib/sparcv9/libneon.so.26.0.4',
+               'opt/csw/lib/sparcv9/libneon.so.27.2.0'],
+  'binaries_dump_info': [{'RPATH set': True,
+                          'RUNPATH RPATH the same': True,
+                          'RUNPATH set': True,
+                          'base_name': 'libneon.so.26.0.4',
+                          'needed sonames': ('libintl.so.8',
+                                             'libz.so',
+                                             'libssl.so.0.9.8',
+                                             'libcrypto.so.0.9.8',
+                                             'libdl.so.1',
+                                             'libgssapi_krb5.so.2',
+                                             'libkrb5.so.3',
+                                             'libk5crypto.so.3',
+                                             'libcom_err.so.3',
+                                             'libkrb5support.so.0',
+                                             'libresolv.so.2',
+                                             'libsocket.so.1',
+                                             'libnsl.so.1',
+                                             'libexpat.so.1',
+                                             'libc.so.1'),
+                          'path': 'opt/csw/lib/libneon.so.26.0.4',
+                          'runpath': ('/opt/csw/lib/$ISALIST',
+                                      '/opt/csw/lib',
+                                      '/opt/csw/lib',
+                                      '/opt/csw/lib/'),
+                          'soname': 'libneon.so.26'},
+                         {'RPATH set': True,
+                          'RUNPATH RPATH the same': True,
+                          'RUNPATH set': True,
+                          'base_name': 'libneon.so.27.2.0',
+                          'needed sonames': ('libintl.so.8',
+                                             'libz.so',
+                                             'libssl.so.0.9.8',
+                                             'libcrypto.so.0.9.8',
+                                             'libdl.so.1',
+                                             'libgssapi_krb5.so.2',
+                                             'libkrb5.so.3',
+                                             'libk5crypto.so.3',
+                                             'libcom_err.so.3',
+                                             'libkrb5support.so.0',
+                                             'libresolv.so.2',
+                                             'libsocket.so.1',
+                                             'libnsl.so.1',
+                                             'libexpat.so.1',
+                                             'libc.so.1'),
+                          'path': 'opt/csw/lib/libneon.so.27.2.0',
+                          'runpath': ('/opt/csw/lib/$ISALIST',
+                                      '/opt/csw/lib',
+                                      '/opt/csw/lib',
+                                      '/opt/csw/lib/'),
+                          'soname': 'libneon.so.27'},
+                         {'RPATH set': True,
+                          'RUNPATH RPATH the same': True,
+                          'RUNPATH set': True,
+                          'base_name': 'libneon.so.26.0.4',
+                          'needed sonames': ('libintl.so.8',
+                                             'libz.so',
+                                             'libssl.so.0.9.8',
+                                             'libcrypto.so.0.9.8',
+                                             'libsocket.so.1',
+                                             'libnsl.so.1',
+                                             'libdl.so.1',
+                                             'libexpat.so.1',
+                                             'libc.so.1'),
+                          'path': 'opt/csw/lib/sparcv9/libneon.so.26.0.4',
+                          'runpath': ('/opt/csw/lib/$ISALIST',
+                                      '/opt/csw/lib/64'),
+                          'soname': 'libneon.so.26'},
+                         {'RPATH set': True,
+                          'RUNPATH RPATH the same': True,
+                          'RUNPATH set': True,
+                          'base_name': 'libneon.so.27.2.0',
+                          'needed sonames': ('libintl.so.8',
+                                             'libz.so',
+                                             'libssl.so.0.9.8',
+                                             'libcrypto.so.0.9.8',
+                                             'libsocket.so.1',
+                                             'libnsl.so.1',
+                                             'libdl.so.1',
+                                             'libexpat.so.1',
+                                             'libc.so.1'),
+                          'path': 'opt/csw/lib/sparcv9/libneon.so.27.2.0',
+                          'runpath': ('/opt/csw/lib/$ISALIST',
+                                      '/opt/csw/lib/64'),
+                          'soname': 'libneon.so.27'}],
+  'depends': [('CSWexpat', 'CSWexpat expat - XML Parser Toolkit '),
+              ('CSWkrb5lib',
+               'CSWkrb5lib krb5_lib - MIT Kerberos 5 core libraries '),
+              ('CSWosslrt',
+               'CSWosslrt openssl_rt - Openssl runtime libraries '),
+              ('CSWzlib', 'CSWzlib zlib - Zlib Data Compression Library '),
+              ('CSWggettextrt',
+               'CSWggettextrt ggettextrt - GNU locale utilities '),
+              ('CSWcommon',
+               'CSWcommon common - common files and dirs for CSW packages ')],
+  'files_metadata': [{'mime_type': 'application/octet-stream; charset=binary',
+                      'path': 'opt/csw/share/locale/fr/LC_MESSAGES/neon.mo'},
+                     {'mime_type': 'application/octet-stream; charset=binary',
+                      'path': 'opt/csw/share/locale/cs/LC_MESSAGES/neon.mo'},
+                     {'mime_type': 'application/octet-stream; charset=binary',
+                      'path': 'opt/csw/share/locale/pl/LC_MESSAGES/neon.mo'},
+                     {'mime_type': 'application/octet-stream; charset=binary',
+                      'path': 'opt/csw/share/locale/tr/LC_MESSAGES/neon.mo'},
+                     {'mime_type': 'application/octet-stream; charset=binary',
+                      'path': 'opt/csw/share/locale/zh_CN/LC_MESSAGES/neon.mo'},
+                     {'mime_type': 'application/octet-stream; charset=binary',
+                      'path': 'opt/csw/share/locale/ru/LC_MESSAGES/neon.mo'},
+                     {'mime_type': 'application/octet-stream; charset=binary',
+                      'path': 'opt/csw/share/locale/ja/LC_MESSAGES/neon.mo'},
+                     {'mime_type': 'application/octet-stream; charset=binary',
+                      'path': 'opt/csw/share/locale/de/LC_MESSAGES/neon.mo'},
+                     {'mime_type': 'application/octet-stream; charset=binary',
+                      'path': 'opt/csw/share/locale/nn/LC_MESSAGES/neon.mo'},
+                     {'mime_type': 'text/plain; charset=us-ascii',
+                      'path': 'opt/csw/share/doc/neon/license'},
+                     {'endian': 'Little endian',
+                      'machine_id': 3,
+                      'mime_type': 'application/x-sharedlib; charset=binary',
+                      'mime_type_by_hachoir': u'application/x-executable',
+                      'path': 'opt/csw/lib/libneon.so.27.2.0'},
+                     {'endian': 'Little endian',
+                      'machine_id': 3,
+                      'mime_type': 'application/x-sharedlib; charset=binary',
+                      'mime_type_by_hachoir': u'application/x-executable',
+                      'path': 'opt/csw/lib/libneon.so.26.0.4'},
+                     {'endian': 'Big endian',
+                      'machine_id': 43,
+                      'mime_type': 'application/x-sharedlib; charset=binary',
+                      'mime_type_by_hachoir': u'application/x-executable',
+                      'path': 'opt/csw/lib/sparcv9/libneon.so.27.2.0'},
+                     {'endian': 'Big endian',
+                      'machine_id': 43,
+                      'mime_type': 'application/x-sharedlib; charset=binary',
+                      'mime_type_by_hachoir': u'application/x-executable',
+                      'path': 'opt/csw/lib/sparcv9/libneon.so.26.0.4'}],
+  'isalist': ('pentium_pro+mmx',
+              'pentium_pro',
+              'pentium+mmx',
+              'pentium',
+              'i486',
+              'i386',
+              'i86'),
+  'mtime': datetime.datetime(2009, 9, 23, 20, 21, 14),
+  'overrides': [],
+  'pkgchk': {'return_code': 0,
+             'stderr_lines': ['rm: Cannot remove any directory in the path of the current working directory',
+                              '/var/tmp/aaaG4aaGa/CSWneon'],
+             'stdout_lines': ['Checking uninstalled stream format package <CSWneon> from </tmp/pkg_iId8vV/neon-0.29.0,REV=2009.09.14-SunOS5.8-i386-CSW.pkg>',
+                              '## Checking control scripts.',
+                              '## Checking package objects.',
+                              '## Checking is complete.']},
+  'pkginfo': {'ARCH': 'i386',
+              'CATEGORY': 'application',
+              'CLASSES': 'none',
+              'EMAIL': 'dam at opencsw.org',
+              'HOTLINE': 'http://www.opencsw.org/bugtrack/',
+              'NAME': 'neon - Neon HTTP and WebDAV client library',
+              'OPENCSW_MODE64': '32/64',
+              'OPENCSW_REPOSITORY': 'https://gar.svn.sf.net/svnroot/gar/csw/mgar/pkg/neon/trunk at 6303',
+              'PKG': 'CSWneon',
+              'PSTAMP': 'dam at build8x-20090914121411',
+              'VENDOR': 'http://www.webdav.org/neon/ packaged for CSW by Dagobert Michelsen',
+              'VERSION': '0.29.0,REV=2009.09.14',
+              'WORKDIR_FIRSTMOD': '../build-isa-i386-garversion-0.26.4'},
+  'pkgmap': [{'class': None,
+              'group': None,
+              'line': ': 1 1763',
+              'mode': None,
+              'path': None,
+              'type': '1',
+              'user': None},
+             {'class': 'none',
+              'group': None,
+              'line': '1 s none /opt/csw/lib/libneon.so=libneon.so.27.2.0',
+              'mode': None,
+              'path': '/opt/csw/lib/libneon.so',
+              'type': 's',
+              'user': None},
+             {'class': 'none',
+              'group': None,
+              'line': '1 s none /opt/csw/lib/libneon.so.26=libneon.so.26.0.4',
+              'mode': None,
+              'path': '/opt/csw/lib/libneon.so.26',
+              'type': 's',
+              'user': None},
+             {'class': 'none',
+              'group': 'bin',
+              'line': '1 f none /opt/csw/lib/libneon.so.26.0.4 0755 root bin 168252 181 1252917142',
+              'mode': '0755',
+              'path': '/opt/csw/lib/libneon.so.26.0.4',
+              'type': 'f',
+              'user': 'root'},
+             {'class': 'none',
+              'group': None,
+              'line': '1 s none /opt/csw/lib/libneon.so.27=libneon.so.27.2.0',
+              'mode': None,
+              'path': '/opt/csw/lib/libneon.so.27',
+              'type': 's',
+              'user': None},
+             {'class': 'none',
+              'group': 'bin',
+              'line': '1 f none /opt/csw/lib/libneon.so.27.2.0 0755 root bin 204772 15212 1252917242',
+              'mode': '0755',
+              'path': '/opt/csw/lib/libneon.so.27.2.0',
+              'type': 'f',
+              'user': 'root'},
+             {'class': 'none',
+              'group': None,
+              'line': '1 s none /opt/csw/lib/sparcv9/libneon.so=libneon.so.27.2.0',
+              'mode': None,
+              'path': '/opt/csw/lib/sparcv9/libneon.so',
+              'type': 's',
+              'user': None},
+             {'class': 'none',
+              'group': None,
+              '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',
+              'type': 's',
+              'user': None},
+             {'class': 'none',
+              'group': 'bin',
+              'line': '1 f none /opt/csw/lib/sparcv9/libneon.so.26.0.4 0755 root bin 202616 50766 1252915624',
+              'mode': '0755',
+              'path': '/opt/csw/lib/sparcv9/libneon.so.26.0.4',
+              'type': 'f',
+              'user': 'root'},
+             {'class': 'none',
+              'group': None,
+              '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',
+              'type': 's',
+              'user': None},
+             {'class': 'none',
+              'group': 'bin',
+              'line': '1 f none /opt/csw/lib/sparcv9/libneon.so.27.2.0 0755 root bin 244248 40979 1252915763',
+              'mode': '0755',
+              'path': '/opt/csw/lib/sparcv9/libneon.so.27.2.0',
+              'type': 'f',
+              'user': 'root'},
+             {'class': 'none',
+              'group': 'bin',
+              'line': '1 d none /opt/csw/share/doc/neon 0755 root bin',
+              'mode': '0755',
+              'path': '/opt/csw/share/doc/neon',
+              'type': 'd',
+              'user': 'root'},
+             {'class': 'none',
+              'group': 'bin',
+              'line': '1 f none /opt/csw/share/doc/neon/license 0644 root bin 630 53497 1252923212',
+              'mode': '0644',
+              'path': '/opt/csw/share/doc/neon/license',
+              'type': 'f',
+              'user': 'root'},
+             {'class': 'none',
+              'group': 'bin',
+              'line': '1 f none /opt/csw/share/locale/cs/LC_MESSAGES/neon.mo 0644 root bin 1566 54451 1252917245',
+              'mode': '0644',
+              'path': '/opt/csw/share/locale/cs/LC_MESSAGES/neon.mo',
+              'type': 'f',
+              'user': 'root'},
+             {'class': 'none',
+              'group': 'bin',
+              'line': '1 f none /opt/csw/share/locale/de/LC_MESSAGES/neon.mo 0644 root bin 1712 61756 1252917245',
+              'mode': '0644',
+              'path': '/opt/csw/share/locale/de/LC_MESSAGES/neon.mo',
+              'type': 'f',
+              'user': 'root'},
+             {'class': 'none',
+              'group': 'bin',
+              'line': '1 f none /opt/csw/share/locale/fr/LC_MESSAGES/neon.mo 0644 root bin 387 27949 1252917245',
+              'mode': '0644',
+              'path': '/opt/csw/share/locale/fr/LC_MESSAGES/neon.mo',
+              'type': 'f',
+              'user': 'root'},
+             {'class': 'none',
+              'group': 'bin',
+              'line': '1 f none /opt/csw/share/locale/ja/LC_MESSAGES/neon.mo 0644 root bin 877 10980 1252917246',
+              'mode': '0644',
+              'path': '/opt/csw/share/locale/ja/LC_MESSAGES/neon.mo',
+              'type': 'f',
+              'user': 'root'},
+             {'class': 'none',
+              'group': 'bin',
+              'line': '1 f none /opt/csw/share/locale/nn/LC_MESSAGES/neon.mo 0644 root bin 1626 54801 1252917246',
+              'mode': '0644',
+              'path': '/opt/csw/share/locale/nn/LC_MESSAGES/neon.mo',
+              'type': 'f',
+              'user': 'root'},
+             {'class': 'none',
+              'group': 'bin',
+              'line': '1 f none /opt/csw/share/locale/pl/LC_MESSAGES/neon.mo 0644 root bin 13423 44594 1252917246',
+              'mode': '0644',
+              'path': '/opt/csw/share/locale/pl/LC_MESSAGES/neon.mo',
+              'type': 'f',
+              'user': 'root'},
+             {'class': 'none',
+              'group': 'bin',
+              'line': '1 f none /opt/csw/share/locale/ru/LC_MESSAGES/neon.mo 0644 root bin 383 27763 1252917246',
+              'mode': '0644',
+              'path': '/opt/csw/share/locale/ru/LC_MESSAGES/neon.mo',
+              'type': 'f',
+              'user': 'root'},
+             {'class': 'none',
+              'group': 'bin',
+              'line': '1 f none /opt/csw/share/locale/tr/LC_MESSAGES/neon.mo 0644 root bin 1523 50355 1252917246',
+              'mode': '0644',
+              'path': '/opt/csw/share/locale/tr/LC_MESSAGES/neon.mo',
+              'type': 'f',
+              'user': 'root'},
+             {'class': 'none',
+              'group': 'bin',
+              'line': '1 d none /opt/csw/share/locale/zh_CN/LC_MESSAGES 0755 root bin',
+              'mode': '0755',
+              'path': '/opt/csw/share/locale/zh_CN/LC_MESSAGES',
+              'type': 'd',
+              'user': 'root'},
+             {'class': 'none',
+              'group': 'bin',
+              'line': '1 f none /opt/csw/share/locale/zh_CN/LC_MESSAGES/neon.mo 0644 root bin 8552 58772 1252917246',
+              'mode': '0644',
+              'path': '/opt/csw/share/locale/zh_CN/LC_MESSAGES/neon.mo',
+              'type': 'f',
+              'user': 'root'},
+             {'class': None,
+              'group': None,
+              'line': '1 i copyright 68 6357 1252923212',
+              'mode': None,
+              'path': None,
+              'type': 'i',
+              'user': None},
+             {'class': None,
+              'group': None,
+              'line': '1 i depend 300 26720 1252923256',
+              'mode': None,
+              'path': None,
+              'type': 'i',
+              'user': None},
+             {'class': None,
+              'group': None,
+              'line': '1 i pkginfo 462 37649 1252923258',
+              'mode': None,
+              'path': None,
+              'type': 'i',
+              'user': 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  Tue Jul 20 13:37:10 2010
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Tue, 20 Jul 2010 11:37:10 +0000
Subject: [csw-devel] SF.net SVN: gar:[10546]
	csw/mgar/gar/v2/lib/python/dependency_checks.py
Message-ID: <E1ObB8I-0006wR-HG@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10546
          http://gar.svn.sourceforge.net/gar/?rev=10546&view=rev
Author:   wahwah
Date:     2010-07-20 11:37:10 +0000 (Tue, 20 Jul 2010)

Log Message:
-----------
mGAR v2: checkpkg, turning messages about sonames that are OK to be missing (libm.so.2) off

Modified Paths:
--------------
    csw/mgar/gar/v2/lib/python/dependency_checks.py

Modified: csw/mgar/gar/v2/lib/python/dependency_checks.py
===================================================================
--- csw/mgar/gar/v2/lib/python/dependency_checks.py	2010-07-20 11:11:36 UTC (rev 10545)
+++ csw/mgar/gar/v2/lib/python/dependency_checks.py	2010-07-20 11:37:10 UTC (rev 10546)
@@ -103,10 +103,12 @@
         else:
           path_msg = ("was not present on the filesystem, "
                       "nor in the packages under examination.")
-        messenger.Message(
-            "%s could not be resolved for %s, with rpath %s, expanded to %s, "
-            "while the file %s"
-            % (soname, binary_info["path"], runpath_tuple, runpath_history, path_msg))
+        if soname not in ALLOWED_ORPHAN_SONAMES:
+          messenger.Message(
+              "%s could not be resolved for %s, with rpath %s, expanded to %s, "
+              "while the file %s"
+              % (soname, binary_info["path"],
+                 runpath_tuple, runpath_history, path_msg))
   orphan_sonames = set(orphan_sonames)
   for soname, binary_path in orphan_sonames:
     if soname not in ALLOWED_ORPHAN_SONAMES:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From bonivart at users.sourceforge.net  Tue Jul 20 13:38:23 2010
From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net)
Date: Tue, 20 Jul 2010 11:38:23 +0000
Subject: [csw-devel] SF.net SVN: gar:[10547] csw/mgar/pkg/dhcp/trunk
Message-ID: <E1ObB9T-0006xU-Ah@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10547
          http://gar.svn.sourceforge.net/gar/?rev=10547&view=rev
Author:   bonivart
Date:     2010-07-20 11:38:23 +0000 (Tue, 20 Jul 2010)

Log Message:
-----------
dhcp: update to 4.2.0

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	2010-07-20 11:37:10 UTC (rev 10546)
+++ csw/mgar/pkg/dhcp/trunk/Makefile	2010-07-20 11:38:23 UTC (rev 10547)
@@ -1,10 +1,10 @@
 GARNAME = dhcp
-GARVERSION = 4.1.1
-RELEASE = P1
-DISTVERSION = $(GARVERSION)-$(RELEASE)
-SPKG_VERSION = $(GARVERSION)$(RELEASE)
-DISTNAME = $(GARNAME)-$(GARVERSION)-$(RELEASE)
-WORKSRC = $(WORKDIR)/$(DISTNAME)
+GARVERSION = 4.2.0
+#RELEASE = P1
+#DISTVERSION = $(GARVERSION)-$(RELEASE)
+#SPKG_VERSION = $(GARVERSION)$(RELEASE)
+#DISTNAME = $(GARNAME)-$(GARVERSION)-$(RELEASE)
+#WORKSRC = $(WORKDIR)/$(DISTNAME)
 CATEGORIES = net
 
 DESCRIPTION = ISC DHCP reference implementation
@@ -16,8 +16,8 @@
 endef
 
 MASTER_SITES = http://ftp.isc.org/isc/dhcp/
-#DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
-DISTFILES  = $(DISTNAME).tar.gz
+DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
+#DISTFILES  = $(DISTNAME).tar.gz
 
 LICENSE = LICENSE
 

Modified: csw/mgar/pkg/dhcp/trunk/checksums
===================================================================
--- csw/mgar/pkg/dhcp/trunk/checksums	2010-07-20 11:37:10 UTC (rev 10546)
+++ csw/mgar/pkg/dhcp/trunk/checksums	2010-07-20 11:38:23 UTC (rev 10547)
@@ -1 +1 @@
-ee390a35687dd75dbfc32c856c0938d1  dhcp-4.1.1-P1.tar.gz
+83abd7c4f9c24d8dd024ca5a71380c0a  dhcp-4.2.0.tar.gz


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From wahwah at users.sourceforge.net  Tue Jul 20 16:28:52 2010
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Tue, 20 Jul 2010 14:28:52 +0000
Subject: [csw-devel] SF.net SVN: gar:[10548] csw/mgar/pkg/cswutils/trunk
Message-ID: <E1ObDoS-0005QG-SF@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 10548
          http://gar.svn.sourceforge.net/gar/?rev=10548&view=rev
Author:   wahwah
Date:     2010-07-20 14:28:52 +0000 (Tue, 20 Jul 2010)

Log Message:
-----------
cswutils: Adding a missing module.

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	2010-07-20 11:38:23 UTC (rev 10547)
+++ csw/mgar/pkg/cswutils/trunk/Makefile	2010-07-20 14:28:52 UTC (rev 10548)
@@ -19,7 +19,7 @@
 
 # these are pulled from gar/lib/python
 PYFILES = opencsw.py checkpkg.py submit_to_newpkgs.py package_checks.py
-PYFILES += dependency_checks.py
+PYFILES += dependency_checks.py overrides.py
 
 DISTFILES = COPYING
 DISTFILES += checkpkg checkpkg.8

Modified: csw/mgar/pkg/cswutils/trunk/checksums
===================================================================
--- csw/mgar/pkg/cswutils/trunk/checksums	2010-07-20 11:38:23 UTC (rev 10547)
+++ csw/mgar/pkg/cswutils/trunk/checksums	2010-07-20 14:28:52 UTC (rev 10548)
@@ -8,6 +8,7 @@
 a605598f30195f9ab1b29fc3944d3b31  createpkg.8
 ce94ddeb7c2eb4b1ffe0df7e1aed1f00  dependency_checks.py
 abcba01154fe286094d64557d0867b73  opencsw.py
+1d7f8e43d72679f690307e083b9096d9  overrides.py
 e80684a3e4e9b6c36db796789dd8fdbf  package_checks.py
 cd4496ee27bf86d5c8bc656c9c5974be  stagepkg
 8908a0a898aa07a7a928b2b8bd8384f0  stagepkg.8


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 Jul 20 16:32:21 2010
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Tue, 20 Jul 2010 14:32:21 +0000
Subject: [csw-devel] SF.net SVN: gar:[10549] csw/mgar/pkg/cswutils/trunk
Message-ID: <E1ObDrp-00029o-Ks@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 10549
          http://gar.svn.sourceforge.net/gar/?rev=10549&view=rev
Author:   wahwah
Date:     2010-07-20 14:32:21 +0000 (Tue, 20 Jul 2010)

Log Message:
-----------
cswutils: Adding configuration and tag modules.

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	2010-07-20 14:28:52 UTC (rev 10548)
+++ csw/mgar/pkg/cswutils/trunk/Makefile	2010-07-20 14:32:21 UTC (rev 10549)
@@ -19,7 +19,7 @@
 
 # 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
+PYFILES += dependency_checks.py overrides.py configuration.py tag.py
 
 DISTFILES = COPYING
 DISTFILES += checkpkg checkpkg.8

Modified: csw/mgar/pkg/cswutils/trunk/checksums
===================================================================
--- csw/mgar/pkg/cswutils/trunk/checksums	2010-07-20 14:28:52 UTC (rev 10548)
+++ csw/mgar/pkg/cswutils/trunk/checksums	2010-07-20 14:32:21 UTC (rev 10549)
@@ -3,6 +3,7 @@
 6ec3b6597e04714430987ccc199db3c4  checkpkg.8
 569fb6bb35e1c4b31e6574377d762803  checkpkg.py
 2b5e6e6219b9ad9e48bcd119bd8a5f39  compare_pkgs.py-r133
+3b39b38198465ada00a5e609ddb93fca  configuration.py
 9a637f6546cc50974159a987302d91c0  cpan2pkg
 68c82dcd6955c4031e89bb9c9a1a9988  createpkg
 a605598f30195f9ab1b29fc3944d3b31  createpkg.8
@@ -13,3 +14,4 @@
 cd4496ee27bf86d5c8bc656c9c5974be  stagepkg
 8908a0a898aa07a7a928b2b8bd8384f0  stagepkg.8
 a9da7bd75daa9e8bce5dfa6c1d4e534d  submit_to_newpkgs.py
+46d9b1dcc02cad223ec3323014f2fa54  tag.py


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 Jul 20 19:48:59 2010
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Tue, 20 Jul 2010 17:48:59 +0000
Subject: [csw-devel] SF.net SVN: gar:[10550] csw/mgar/pkg
Message-ID: <E1ObGw7-0004h1-UA@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10550
          http://gar.svn.sourceforge.net/gar/?rev=10550&view=rev
Author:   wahwah
Date:     2010-07-20 17:48:59 +0000 (Tue, 20 Jul 2010)

Log Message:
-----------
numpy: Initial commit

Modified Paths:
--------------
    csw/mgar/pkg/numpy/trunk/Makefile
    csw/mgar/pkg/numpy/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/numpy/

Modified: csw/mgar/pkg/numpy/trunk/Makefile
===================================================================
--- csw/mgar/pkg/template/trunk/Makefile	2010-07-11 14:03:10 UTC (rev 10496)
+++ csw/mgar/pkg/numpy/trunk/Makefile	2010-07-20 17:48:59 UTC (rev 10550)
@@ -2,184 +2,18 @@
 # 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
-##
-GARNAME = mypkg
-GARVERSION = 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 = <please fill in>
-##
-## A longer description of the package. This is only for descriptive purposes
-## inside the Makefile and is not used elsewhere.
+GARNAME = numpy
+GARVERSION = 1.4.1
+CATEGORIES = python
+DESCRIPTION = The fundamental package needed for scientific computing with Python
 define BLURB
-  <please fill in>
 endef
-##
-## Upstream URL that should show up in the VENDOR field as well as on
-## http://opencsw.org/packages/<packagename>.
-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 $(GARNAME). 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).
+SPKG_SOURCEURL = http://numpy.scipy.org/
+PACKAGES = CSWpy-numpy
+CATALOGNAME_CSWpy-numpy = py_numpy
+MASTER_SITES = $(SF_MIRRORS)
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
-##
-## We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
-##
-## Catalog name is the name to be used with pkg{-get,util} -i <pkgname>.
-## 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 = <file containing an entry for /etc/services>
-## INETDCONF = <file containing an inetd.conf formatted entry>
-## 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)/$(GARNAME)-$(GARVERSION)
-##
-## 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
+TEST_SCRIPTS =
+LICENSE = LICENSE.txt
+include gar/category.mk

Modified: csw/mgar/pkg/numpy/trunk/checksums
===================================================================
--- csw/mgar/pkg/template/trunk/checksums	2010-07-11 14:03:10 UTC (rev 10496)
+++ csw/mgar/pkg/numpy/trunk/checksums	2010-07-20 17:48:59 UTC (rev 10550)
@@ -0,0 +1 @@
+5c7b5349dc3161763f7f366ceb96516b  numpy-1.4.1.tar.gz


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From wahwah at users.sourceforge.net  Tue Jul 20 19:49:50 2010
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Tue, 20 Jul 2010 17:49:50 +0000
Subject: [csw-devel] SF.net SVN: gar:[10551] csw/mgar/pkg
Message-ID: <E1ObGww-0004hz-B2@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10551
          http://gar.svn.sourceforge.net/gar/?rev=10551&view=rev
Author:   wahwah
Date:     2010-07-20 17:49:50 +0000 (Tue, 20 Jul 2010)

Log Message:
-----------
fpconst: Initial commit

Modified Paths:
--------------
    csw/mgar/pkg/fpconst/trunk/Makefile
    csw/mgar/pkg/fpconst/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/fpconst/

Modified: csw/mgar/pkg/fpconst/trunk/Makefile
===================================================================
--- csw/mgar/pkg/template/trunk/Makefile	2010-07-11 14:03:10 UTC (rev 10496)
+++ csw/mgar/pkg/fpconst/trunk/Makefile	2010-07-20 17:49:50 UTC (rev 10551)
@@ -2,184 +2,19 @@
 # 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
-##
-GARNAME = mypkg
-GARVERSION = 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 = <please fill in>
-##
-## A longer description of the package. This is only for descriptive purposes
-## inside the Makefile and is not used elsewhere.
+GARNAME = fpconst
+GARVERSION = 0.7.2
+PACKAGES = CSWpy-fpconst
+CATALOGNAME_CSWpy-fpconst = py_fpconst
+CATEGORIES = python
+DESCRIPTION = Utilities for handling IEEE 754 floating point special values
 define BLURB
-  <please fill in>
 endef
-##
-## Upstream URL that should show up in the VENDOR field as well as on
-## http://opencsw.org/packages/<packagename>.
-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 $(GARNAME). 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).
+SPKG_SOURCEURL = http://pypi.python.org/pypi/fpconst
+MASTER_SITES = http://pypi.python.org/packages/source/f/$(GARNAME)/
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
-##
-## We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
-##
-## Catalog name is the name to be used with pkg{-get,util} -i <pkgname>.
-## 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 = <file containing an entry for /etc/services>
-## INETDCONF = <file containing an inetd.conf formatted entry>
-## 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)/$(GARNAME)-$(GARVERSION)
-##
-## 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
+TEST_SCRIPTS =
+ARCHALL_CSWpy-fpconst = 1
+LICENSE = README
+include gar/category.mk

Modified: csw/mgar/pkg/fpconst/trunk/checksums
===================================================================
--- csw/mgar/pkg/template/trunk/checksums	2010-07-11 14:03:10 UTC (rev 10496)
+++ csw/mgar/pkg/fpconst/trunk/checksums	2010-07-20 17:49:50 UTC (rev 10551)
@@ -0,0 +1 @@
+10ba9e04129af23108d24c22c3a698b1  fpconst-0.7.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  Tue Jul 20 20:02:13 2010
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Tue, 20 Jul 2010 18:02:13 +0000
Subject: [csw-devel] SF.net SVN: gar:[10552]
	csw/mgar/pkg/soappy/trunk/Makefile
Message-ID: <E1ObH8v-0004uI-0k@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10552
          http://gar.svn.sourceforge.net/gar/?rev=10552&view=rev
Author:   wahwah
Date:     2010-07-20 18:02:12 +0000 (Tue, 20 Jul 2010)

Log Message:
-----------
soappy: Adding the dependency on py_fpconst

Modified Paths:
--------------
    csw/mgar/pkg/soappy/trunk/Makefile

Modified: csw/mgar/pkg/soappy/trunk/Makefile
===================================================================
--- csw/mgar/pkg/soappy/trunk/Makefile	2010-07-20 17:49:50 UTC (rev 10551)
+++ csw/mgar/pkg/soappy/trunk/Makefile	2010-07-20 18:02:12 UTC (rev 10552)
@@ -21,5 +21,7 @@
 ARCHALL_CSWpy-soappy = 1
 LICENSE = LICENSE
 TEST_SCRIPTS =
+DEP_PKGS = CSWpy-fpconst
+CHECKPKG_OVERRIDES_CSWpy-soappy += surplus-dependency|CSWpy-fpconst
 
 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 Jul 20 20:07:32 2010
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Tue, 20 Jul 2010 18:07:32 +0000
Subject: [csw-devel] SF.net SVN: gar:[10553]
	csw/mgar/pkg/soappy/trunk/Makefile
Message-ID: <E1ObHE4-000503-8e@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10553
          http://gar.svn.sourceforge.net/gar/?rev=10553&view=rev
Author:   wahwah
Date:     2010-07-20 18:07:32 +0000 (Tue, 20 Jul 2010)

Log Message:
-----------
soappy: Turns out, fpconst is already packaged, but it's named CSWpyfpconst instead of CSWpy-fpconst.

Modified Paths:
--------------
    csw/mgar/pkg/soappy/trunk/Makefile

Modified: csw/mgar/pkg/soappy/trunk/Makefile
===================================================================
--- csw/mgar/pkg/soappy/trunk/Makefile	2010-07-20 18:02:12 UTC (rev 10552)
+++ csw/mgar/pkg/soappy/trunk/Makefile	2010-07-20 18:07:32 UTC (rev 10553)
@@ -21,7 +21,7 @@
 ARCHALL_CSWpy-soappy = 1
 LICENSE = LICENSE
 TEST_SCRIPTS =
-DEP_PKGS = CSWpy-fpconst
-CHECKPKG_OVERRIDES_CSWpy-soappy += surplus-dependency|CSWpy-fpconst
+DEP_PKGS = CSWpyfpconst
+CHECKPKG_OVERRIDES_CSWpy-soappy += surplus-dependency|CSWpyfpconst
 
 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 Jul 20 20:18:14 2010
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Tue, 20 Jul 2010 18:18:14 +0000
Subject: [csw-devel] SF.net SVN: gar:[10554] csw/mgar/pkg
Message-ID: <E1ObHOQ-0005Bd-8S@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10554
          http://gar.svn.sourceforge.net/gar/?rev=10554&view=rev
Author:   wahwah
Date:     2010-07-20 18:18:14 +0000 (Tue, 20 Jul 2010)

Log Message:
-----------
fpconst: Merging Maciej's and Sebastian's builds.

Modified Paths:
--------------
    csw/mgar/pkg/pyfpconst/trunk/Makefile

Removed Paths:
-------------
    csw/mgar/pkg/fpconst/

Modified: csw/mgar/pkg/pyfpconst/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pyfpconst/trunk/Makefile	2010-07-20 18:07:32 UTC (rev 10553)
+++ csw/mgar/pkg/pyfpconst/trunk/Makefile	2010-07-20 18:18:14 UTC (rev 10554)
@@ -1,7 +1,12 @@
-GARNAME = pyfpconst
+# Copyright 2009 OpenCSW
+# Distributed under the terms of the GNU General Public License v2
+# $Id: Makefile 10551 2010-07-20 17:49:50Z wahwah $
+
+GARNAME = fpconst
 GARVERSION = 0.7.2
+PACKAGES = CSWpyfpconst
+CATALOGNAME_CSWpyfpconst = py_fpconst
 CATEGORIES = python
-
 DESCRIPTION = Utilities for handling IEEE 754 floating point special values
 define BLURB
   This python module implements constants and functions for working with
@@ -9,18 +14,13 @@
   Not-a-Number (NaN), Positive Infinity (PosInf), and Negative Infinity
   (NegInf), as well as functions to test for these values.
 endef
-
-MASTER_SITES = http://pypi.python.org/packages/source/f/fpconst/
-DISTNAME = fpconst-$(GARVERSION)
-DISTFILES = $(DISTNAME).tar.gz
 SPKG_SOURCEURL = http://pypi.python.org/pypi/fpconst/
-
-PACKAGES = CSWpyfpconst
-CATALOGNAME = py_fpconst
-ARCHALL = 1
-
-TEST_SCRIPTS = 
-
+MASTER_SITES = http://pypi.python.org/packages/source/f/$(GARNAME)/
+DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
+UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
+TEST_SCRIPTS =
+ARCHALL_CSWpy-fpconst = 1
+LICENSE = README
 include gar/category.mk
 
 post-install-modulated: DOCDEST=$(DESTDIR)$(docdir)/$(CATALOGNAME)


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 Jul 20 20:20:17 2010
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Tue, 20 Jul 2010 18:20:17 +0000
Subject: [csw-devel] SF.net SVN: gar:[10555]
	csw/mgar/pkg/pyfpconst/trunk/Makefile
Message-ID: <E1ObHQP-0005EH-CF@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10555
          http://gar.svn.sourceforge.net/gar/?rev=10555&view=rev
Author:   wahwah
Date:     2010-07-20 18:20:17 +0000 (Tue, 20 Jul 2010)

Log Message:
-----------
fpconst: Setting Id on the Makefile

Modified Paths:
--------------
    csw/mgar/pkg/pyfpconst/trunk/Makefile

Property Changed:
----------------
    csw/mgar/pkg/pyfpconst/trunk/Makefile

Modified: csw/mgar/pkg/pyfpconst/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pyfpconst/trunk/Makefile	2010-07-20 18:18:14 UTC (rev 10554)
+++ csw/mgar/pkg/pyfpconst/trunk/Makefile	2010-07-20 18:20:17 UTC (rev 10555)
@@ -1,6 +1,6 @@
 # Copyright 2009 OpenCSW
 # Distributed under the terms of the GNU General Public License v2
-# $Id: Makefile 10551 2010-07-20 17:49:50Z wahwah $
+# $Id$
 
 GARNAME = fpconst
 GARVERSION = 0.7.2


Property changes on: csw/mgar/pkg/pyfpconst/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 idogan23 at users.sourceforge.net  Wed Jul 21 09:39:25 2010
From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net)
Date: Wed, 21 Jul 2010 07:39:25 +0000
Subject: [csw-devel] SF.net SVN: gar:[10556] csw/mgar/pkg/unbound/trunk
Message-ID: <E1ObTtl-0000TR-Pa@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 10556
          http://gar.svn.sourceforge.net/gar/?rev=10556&view=rev
Author:   idogan23
Date:     2010-07-21 07:39:25 +0000 (Wed, 21 Jul 2010)

Log Message:
-----------
unbound: bump version to 1.4.5, use libevent

Modified Paths:
--------------
    csw/mgar/pkg/unbound/trunk/Makefile
    csw/mgar/pkg/unbound/trunk/checksums

Modified: csw/mgar/pkg/unbound/trunk/Makefile
===================================================================
--- csw/mgar/pkg/unbound/trunk/Makefile	2010-07-20 18:20:17 UTC (rev 10555)
+++ csw/mgar/pkg/unbound/trunk/Makefile	2010-07-21 07:39:25 UTC (rev 10556)
@@ -1,5 +1,5 @@
 GARNAME = unbound
-GARVERSION = 1.4.3
+GARVERSION = 1.4.5
 CATEGORIES = server
 
 DESCRIPTION = A validating, recursive, and caching DNS resolver

Modified: csw/mgar/pkg/unbound/trunk/checksums
===================================================================
--- csw/mgar/pkg/unbound/trunk/checksums	2010-07-20 18:20:17 UTC (rev 10555)
+++ csw/mgar/pkg/unbound/trunk/checksums	2010-07-21 07:39:25 UTC (rev 10556)
@@ -1,3 +1,3 @@
 75867432e238f5afd48dfe5d138097e9  cswunbound
 601effee1051487655f66790762b66fd  cswusergroup
-2dffdd42f94b8238447a41835439d129  unbound-1.4.3.tar.gz
+f1f6c97b90b15ca503a80b888c311d6c  unbound-1.4.5.tar.gz


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From wahwah at users.sourceforge.net  Wed Jul 21 11:33:03 2010
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Wed, 21 Jul 2010 09:33:03 +0000
Subject: [csw-devel] SF.net SVN: gar:[10557]
	csw/mgar/gar/v2/lib/python/README
Message-ID: <E1ObVfj-0003Cp-01@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 10557
          http://gar.svn.sourceforge.net/gar/?rev=10557&view=rev
Author:   wahwah
Date:     2010-07-21 09:33:02 +0000 (Wed, 21 Jul 2010)

Log Message:
-----------
mGAR v2: checkpkg, adding a README file with notes.

Added Paths:
-----------
    csw/mgar/gar/v2/lib/python/README

Added: csw/mgar/gar/v2/lib/python/README
===================================================================
--- csw/mgar/gar/v2/lib/python/README	                        (rev 0)
+++ csw/mgar/gar/v2/lib/python/README	2010-07-21 09:33:02 UTC (rev 10557)
@@ -0,0 +1,10 @@
+Python libraries, mostly related to checkpkg.
+
+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
+- 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
+- Restructure the error reporting, group them by errors.


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From idogan23 at users.sourceforge.net  Wed Jul 21 12:42:12 2010
From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net)
Date: Wed, 21 Jul 2010 10:42:12 +0000
Subject: [csw-devel] SF.net SVN: gar:[10558]
	csw/mgar/pkg/unbound/trunk/Makefile
Message-ID: <E1ObWke-0004T5-UQ@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 10558
          http://gar.svn.sourceforge.net/gar/?rev=10558&view=rev
Author:   idogan23
Date:     2010-07-21 10:42:12 +0000 (Wed, 21 Jul 2010)

Log Message:
-----------
unbound: minor packaging fixes

Modified Paths:
--------------
    csw/mgar/pkg/unbound/trunk/Makefile

Modified: csw/mgar/pkg/unbound/trunk/Makefile
===================================================================
--- csw/mgar/pkg/unbound/trunk/Makefile	2010-07-21 09:33:02 UTC (rev 10557)
+++ csw/mgar/pkg/unbound/trunk/Makefile	2010-07-21 10:42:12 UTC (rev 10558)
@@ -41,9 +41,18 @@
 STRIP_LIBTOOL = 0
 
 RUNTIME_DEP_PKGS += CSWosslrt
-RUNTIME_DEP_PKGS += CSWcswclassutils
 RUNTIME_DEP_PKGS += CSWldns
+RUNTIME_DEP_PKGS += CSWlibevent
 
+CHECKPKG_OVERRIDES_CSWunbound += binary-architecture-does-not-match-placement|file=opt/csw/lib/libunbound.so.2.5.0|arch_id=18|arch_name=sparcv8+
+CHECKPKG_OVERRIDES_CSWunbound += binary-architecture-does-not-match-placement|file=opt/csw/sbin/unbound|arch_id=18|arch_name=sparcv8+
+CHECKPKG_OVERRIDES_CSWunbound += binary-architecture-does-not-match-placement|file=opt/csw/sbin/unbound-host|arch_id=18|arch_name=sparcv8+
+CHECKPKG_OVERRIDES_CSWunbound += binary-architecture-does-not-match-placement|file=opt/csw/sbin/unbound-control|arch_id=18|arch_name=sparcv8+
+CHECKPKG_OVERRIDES_CSWunbound += binary-architecture-does-not-match-placement|file=opt/csw/sbin/unbound-checkconf|arch_id=18|arch_name=sparcv8+
+
+# make test doesn't work for the moment on Solaris
+SKIPTEST = 1
+
 post-install-modulated:
 	@ginstall -d $(DESTDIR)/etc/opt/csw/init.d
 	@ginstall -m 755 $(FILEDIR)/cswunbound $(DESTDIR)/etc/opt/csw/init.d/cswunbound


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 Jul 21 20:02:13 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Wed, 21 Jul 2010 18:02:13 +0000
Subject: [csw-devel] SF.net SVN: gar:[10559]
	csw/mgar/pkg/cswutils/trunk/checksums
Message-ID: <E1ObdcT-00056l-GF@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 10559
          http://gar.svn.sourceforge.net/gar/?rev=10559&view=rev
Author:   bdwalton
Date:     2010-07-21 18:02:13 +0000 (Wed, 21 Jul 2010)

Log Message:
-----------
cswutils: update makesums

Modified Paths:
--------------
    csw/mgar/pkg/cswutils/trunk/checksums

Modified: csw/mgar/pkg/cswutils/trunk/checksums
===================================================================
--- csw/mgar/pkg/cswutils/trunk/checksums	2010-07-21 10:42:12 UTC (rev 10558)
+++ csw/mgar/pkg/cswutils/trunk/checksums	2010-07-21 18:02:13 UTC (rev 10559)
@@ -1,16 +1,16 @@
 091b12575ebc0e45cf8c3d8b43d8b638  COPYING
 ab8a00cad3c3650318a3e552505e2715  checkpkg
 6ec3b6597e04714430987ccc199db3c4  checkpkg.8
-569fb6bb35e1c4b31e6574377d762803  checkpkg.py
+519e70aa36b68d6756636ab2b250455f  checkpkg.py
 2b5e6e6219b9ad9e48bcd119bd8a5f39  compare_pkgs.py-r133
 3b39b38198465ada00a5e609ddb93fca  configuration.py
 9a637f6546cc50974159a987302d91c0  cpan2pkg
 68c82dcd6955c4031e89bb9c9a1a9988  createpkg
 a605598f30195f9ab1b29fc3944d3b31  createpkg.8
-ce94ddeb7c2eb4b1ffe0df7e1aed1f00  dependency_checks.py
-abcba01154fe286094d64557d0867b73  opencsw.py
+e53cce5b895258fd59001305c3b5c366  dependency_checks.py
+d3742659a5968bf235ac4255188d1071  opencsw.py
 1d7f8e43d72679f690307e083b9096d9  overrides.py
-e80684a3e4e9b6c36db796789dd8fdbf  package_checks.py
+2666005c078d31371eaca2c12d0d9c60  package_checks.py
 cd4496ee27bf86d5c8bc656c9c5974be  stagepkg
 8908a0a898aa07a7a928b2b8bd8384f0  stagepkg.8
 a9da7bd75daa9e8bce5dfa6c1d4e534d  submit_to_newpkgs.py


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From bdwalton at users.sourceforge.net  Thu Jul 22 02:59:42 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Thu, 22 Jul 2010 00:59:42 +0000
Subject: [csw-devel] SF.net SVN: gar:[10560] csw/mgar/pkg/git/trunk/Makefile
Message-ID: <E1Obk8U-00036a-CX@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 10560
          http://gar.svn.sourceforge.net/gar/?rev=10560&view=rev
Author:   bdwalton
Date:     2010-07-22 00:59:41 +0000 (Thu, 22 Jul 2010)

Log Message:
-----------
git: 1.7.2 just released

Modified Paths:
--------------
    csw/mgar/pkg/git/trunk/Makefile

Modified: csw/mgar/pkg/git/trunk/Makefile
===================================================================
--- csw/mgar/pkg/git/trunk/Makefile	2010-07-21 18:02:13 UTC (rev 10559)
+++ csw/mgar/pkg/git/trunk/Makefile	2010-07-22 00:59:41 UTC (rev 10560)
@@ -1,6 +1,6 @@
 GARNAME = git
 GARVERSION = 1.7.2
-PATCHLEVEL = rc1
+#PATCHLEVEL = rc1
 CATEGORIES = devel
 
 VENDOR_URL = http://git-scm.org/


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 Jul 22 11:40:43 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 22 Jul 2010 09:40:43 +0000
Subject: [csw-devel] SF.net SVN: gar:[10561] csw/mgar/pkg/diffstat/trunk
Message-ID: <E1ObsGh-0003II-NZ@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10561
          http://gar.svn.sourceforge.net/gar/?rev=10561&view=rev
Author:   dmichelsen
Date:     2010-07-22 09:40:43 +0000 (Thu, 22 Jul 2010)

Log Message:
-----------
diffstat: Update to 1.53

Modified Paths:
--------------
    csw/mgar/pkg/diffstat/trunk/Makefile
    csw/mgar/pkg/diffstat/trunk/checksums

Modified: csw/mgar/pkg/diffstat/trunk/Makefile
===================================================================
--- csw/mgar/pkg/diffstat/trunk/Makefile	2010-07-22 00:59:41 UTC (rev 10560)
+++ csw/mgar/pkg/diffstat/trunk/Makefile	2010-07-22 09:40:43 UTC (rev 10561)
@@ -1,5 +1,5 @@
 GARNAME = diffstat
-GARVERSION = 1.51
+GARVERSION = 1.53
 CATEGORIES = utils
 
 DESCRIPTION = A utility which provides statistics based on the output of diff

Modified: csw/mgar/pkg/diffstat/trunk/checksums
===================================================================
--- csw/mgar/pkg/diffstat/trunk/checksums	2010-07-22 00:59:41 UTC (rev 10560)
+++ csw/mgar/pkg/diffstat/trunk/checksums	2010-07-22 09:40:43 UTC (rev 10561)
@@ -1 +1 @@
-a7d3fd1ba2a9a6c9e2b32e867b5e8792  diffstat-1.51.tgz
+0631010aa598a8011259749dd882936a  diffstat-1.53.tgz


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From rthurner at users.sourceforge.net  Thu Jul 22 12:36:32 2010
From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net)
Date: Thu, 22 Jul 2010 10:36:32 +0000
Subject: [csw-devel] SF.net SVN: gar:[10562]
	csw/mgar/pkg/bdb50/trunk/Makefile
Message-ID: <E1Obt8i-0004KK-EI@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 10562
          http://gar.svn.sourceforge.net/gar/?rev=10562&view=rev
Author:   rthurner
Date:     2010-07-22 10:36:31 +0000 (Thu, 22 Jul 2010)

Log Message:
-----------
bdb50  remove checkpkg warnings

Modified Paths:
--------------
    csw/mgar/pkg/bdb50/trunk/Makefile

Modified: csw/mgar/pkg/bdb50/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bdb50/trunk/Makefile	2010-07-22 09:40:43 UTC (rev 10561)
+++ csw/mgar/pkg/bdb50/trunk/Makefile	2010-07-22 10:36:31 UTC (rev 10562)
@@ -80,12 +80,6 @@
 CHECKPKG_OVERRIDES_CSWbdb50 += bad-rpath-entry|/opt/SUNWspro/lib|opt/csw/bdb50/lib/libdb_cxx-5.0.so
 CHECKPKG_OVERRIDES_CSWbdb50 += bad-rpath-entry|/opt/studio/SOS12/SUNWspro/lib|opt/csw/bdb50/lib/libdb_cxx-5.0.so
 CHECKPKG_OVERRIDES_CSWbdb50 += bad-rpath-entry|/opt/studio/SOS12/SUNWspro/lib/rw7|opt/csw/bdb50/lib/libdb_cxx-5.0.so
-CHECKPKG_OVERRIDES_CSWbdb50 += bad-rpath-entry|/opt/studio/SOS12/SUNWspro/lib/v8|opt/csw/bdb50/lib/libdb_cxx-5.0.so
-CHECKPKG_OVERRIDES_CSWbdb50 += bad-rpath-entry|/opt/SUNWspro/lib/v8|opt/csw/bdb50/lib/libdb_cxx-5.0.so
-CHECKPKG_OVERRIDES_CSWbdb50 += bad-rpath-entry|/lib/sparcv9|opt/csw/bdb50/lib/sparcv9/libdb_cxx-5.0.so
-CHECKPKG_OVERRIDES_CSWbdb50 += bad-rpath-entry|/opt/SUNWspro/lib/sparc/64|opt/csw/bdb50/lib/sparcv9/libdb_cxx-5.0.so
-CHECKPKG_OVERRIDES_CSWbdb50 += bad-rpath-entry|/opt/studio/SOS12/SUNWspro/lib/rw7/v9|opt/csw/bdb50/lib/sparcv9/libdb_cxx-5.0.so
-CHECKPKG_OVERRIDES_CSWbdb50 += bad-rpath-entry|/opt/studio/SOS12/SUNWspro/lib/sparc/64|opt/csw/bdb50/lib/sparcv9/libdb_cxx-5.0.so
 CHECKPKG_OVERRIDES_CSWbdb50 += bad-rpath-entry|/lib/64|opt/csw/bdb50/lib/amd64/libdb_cxx-5.0.so
 CHECKPKG_OVERRIDES_CSWbdb50 += bad-rpath-entry|/opt/studio/SOS12/SUNWspro/lib/amd64|opt/csw/bdb50/lib/amd64/libdb_cxx-5.0.so
 CHECKPKG_OVERRIDES_CSWbdb50 += bad-rpath-entry|/opt/studio/SOS12/SUNWspro/lib/rw7/amd64|opt/csw/bdb50/lib/amd64/libdb_cxx-5.0.so


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From rthurner at users.sourceforge.net  Thu Jul 22 12:49:22 2010
From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net)
Date: Thu, 22 Jul 2010 10:49:22 +0000
Subject: [csw-devel] SF.net SVN: gar:[10563]
	csw/mgar/pkg/subversion/trunk/Makefile
Message-ID: <E1ObtL8-0004AH-Uh@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 10563
          http://gar.svn.sourceforge.net/gar/?rev=10563&view=rev
Author:   rthurner
Date:     2010-07-22 10:49:22 +0000 (Thu, 22 Jul 2010)

Log Message:
-----------
svn: depend on apache, not only on apache2rt, see https://www.opencsw.org/mantis/view.php?id=4490

Modified Paths:
--------------
    csw/mgar/pkg/subversion/trunk/Makefile

Modified: csw/mgar/pkg/subversion/trunk/Makefile
===================================================================
--- csw/mgar/pkg/subversion/trunk/Makefile	2010-07-22 10:36:31 UTC (rev 10562)
+++ csw/mgar/pkg/subversion/trunk/Makefile	2010-07-22 10:49:22 UTC (rev 10563)
@@ -82,7 +82,7 @@
 SPKG_DESC_CSWap2svn           = Subversion Modules for Apache 2.2
 CATALOGNAME_CSWap2svn         = ap2_subversion
 RUNTIME_DEP_PKGS_CSWap2svn    = CSWsvn
-RUNTIME_DEP_PKGS_CSWap2svn   += CSWapache2rt
+RUNTIME_DEP_PKGS_CSWap2svn   += CSWapache2
 RUNTIME_DEP_PKGS_CSWap2svn   += CSWggettextrt
 RUNTIME_DEP_PKGS_CSWap2svn   += CSWiconv
 PKGFILES_CSWap2svn            = $(prefix)/apache2.*


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 Jul 22 13:10:52 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 22 Jul 2010 11:10:52 +0000
Subject: [csw-devel] SF.net SVN: gar:[10564]
	csw/mgar/pkg/lzlib/trunk/Makefile
Message-ID: <E1Obtfw-0004oo-O8@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10564
          http://gar.svn.sourceforge.net/gar/?rev=10564&view=rev
Author:   dmichelsen
Date:     2010-07-22 11:10:52 +0000 (Thu, 22 Jul 2010)

Log Message:
-----------
lzlib: Fix symlink

Modified Paths:
--------------
    csw/mgar/pkg/lzlib/trunk/Makefile

Modified: csw/mgar/pkg/lzlib/trunk/Makefile
===================================================================
--- csw/mgar/pkg/lzlib/trunk/Makefile	2010-07-22 10:49:22 UTC (rev 10563)
+++ csw/mgar/pkg/lzlib/trunk/Makefile	2010-07-22 11:10:52 UTC (rev 10564)
@@ -41,6 +41,6 @@
 include gar/category.mk
 
 post-install-modulated:
-	gln -s liblz.so.0 $(DESTDIR)$(libdir)/liblz.so
+	gln -s liblz.so.1 $(DESTDIR)$(libdir)/liblz.so
 	@$(MAKECOOKIE)
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From dmichelsen at users.sourceforge.net  Thu Jul 22 13:22:31 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 22 Jul 2010 11:22:31 +0000
Subject: [csw-devel] SF.net SVN: gar:[10565] csw/mgar/pkg/plzip/trunk
Message-ID: <E1ObtrD-00050T-82@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10565
          http://gar.svn.sourceforge.net/gar/?rev=10565&view=rev
Author:   dmichelsen
Date:     2010-07-22 11:22:30 +0000 (Thu, 22 Jul 2010)

Log Message:
-----------
plzip: Update to 0.6

Modified Paths:
--------------
    csw/mgar/pkg/plzip/trunk/Makefile
    csw/mgar/pkg/plzip/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/plzip/trunk/files/0001-Add-prototype-for-kill-2.patch

Removed Paths:
-------------
    csw/mgar/pkg/plzip/trunk/files/0001-Use-inttypes-instead-of-stdint.patch

Modified: csw/mgar/pkg/plzip/trunk/Makefile
===================================================================
--- csw/mgar/pkg/plzip/trunk/Makefile	2010-07-22 11:10:52 UTC (rev 10564)
+++ csw/mgar/pkg/plzip/trunk/Makefile	2010-07-22 11:22:30 UTC (rev 10565)
@@ -2,7 +2,7 @@
 GARVERSION = 0.6
 CATEGORIES = utils
 
-DESCRIPTION = plzip is a lossless data compressor based on the LZMA algorithm.
+DESCRIPTION = A lossless data compressor based on the LZMA algorithm
 define BLURB
   Lzip is a lossless data compressor based on the LZMA algorithm, with very safe
   integrity checking and a user interface similar to the one of gzip or bzip2. Lzip
@@ -14,7 +14,7 @@
 
 MASTER_SITES = http://download.savannah.gnu.org/releases/lzip/ 
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
-PATCHFILES  = 0001-Use-inttypes-instead-of-stdint.patch
+PATCHFILES  = 0001-Add-prototype-for-kill-2.patch
 PATCHFILES += 0002-Use-ucb-echo.patch
 
 # We define upstream file regex so we can be notifed of new upstream software release

Modified: csw/mgar/pkg/plzip/trunk/checksums
===================================================================
--- csw/mgar/pkg/plzip/trunk/checksums	2010-07-22 11:10:52 UTC (rev 10564)
+++ csw/mgar/pkg/plzip/trunk/checksums	2010-07-22 11:22:30 UTC (rev 10565)
@@ -1,3 +1,3 @@
-ac5eb1a5daa65a55d37b6bcde4c58fe7  0001-Use-inttypes-instead-of-stdint.patch
+179318ac88ff9ddda040640582f9b404  0001-Add-prototype-for-kill-2.patch
 690e11a488625fbb1f99e0ea411e28d4  0002-Use-ucb-echo.patch
 f452029b1e8232cbe837f4437613e1ed  plzip-0.6.tar.gz

Added: csw/mgar/pkg/plzip/trunk/files/0001-Add-prototype-for-kill-2.patch
===================================================================
--- csw/mgar/pkg/plzip/trunk/files/0001-Add-prototype-for-kill-2.patch	                        (rev 0)
+++ csw/mgar/pkg/plzip/trunk/files/0001-Add-prototype-for-kill-2.patch	2010-07-22 11:22:30 UTC (rev 10565)
@@ -0,0 +1,25 @@
+From 747070346a5031f612a09bf9a53953116c20030c Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Thu, 22 Jul 2010 11:29:22 +0200
+Subject: [PATCH] Add prototype for kill(2)
+
+---
+ main.cc |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/main.cc b/main.cc
+index 17ec3ee..9c56000 100644
+--- a/main.cc
++++ b/main.cc
+@@ -40,6 +40,8 @@
+ #include <utime.h>
+ #include <sys/stat.h>
+ #include <lzlib.h>
++#include <sys/types.h>
++#include <signal.h>
+ 
+ #include "arg_parser.h"
+ #include "plzip.h"
+-- 
+1.7.1
+

Deleted: csw/mgar/pkg/plzip/trunk/files/0001-Use-inttypes-instead-of-stdint.patch
===================================================================
--- csw/mgar/pkg/plzip/trunk/files/0001-Use-inttypes-instead-of-stdint.patch	2010-07-22 11:10:52 UTC (rev 10564)
+++ csw/mgar/pkg/plzip/trunk/files/0001-Use-inttypes-instead-of-stdint.patch	2010-07-22 11:22:30 UTC (rev 10565)
@@ -1,54 +0,0 @@
-From 4ab77d47d08780c9f97961c34c3228a290aeed2f Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Fri, 19 Feb 2010 11:51:24 +0100
-Subject: [PATCH] Use inttypes instead of stdint
-
----
- compress.cc   |    2 +-
- decompress.cc |    2 +-
- main.cc       |    3 ++-
- 3 files changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/compress.cc b/compress.cc
-index 3f5e143..2e3b843 100644
---- a/compress.cc
-+++ b/compress.cc
-@@ -29,7 +29,7 @@
- #include <string>
- #include <vector>
- #include <pthread.h>
--#include <stdint.h>
-+#include <inttypes.h>
- #include <unistd.h>
- #include <lzlib.h>
- 
-diff --git a/decompress.cc b/decompress.cc
-index 85baaf6..2264d1b 100644
---- a/decompress.cc
-+++ b/decompress.cc
-@@ -29,7 +29,7 @@
- #include <string>
- #include <vector>
- #include <pthread.h>
--#include <stdint.h>
-+#include <inttypes.h>
- #include <unistd.h>
- #include <lzlib.h>
- 
-diff --git a/main.cc b/main.cc
-index dc21a9a..d9bc0ab 100644
---- a/main.cc
-+++ b/main.cc
-@@ -35,7 +35,8 @@
- #include <vector>
- #include <fcntl.h>
- #include <pthread.h>
--#include <stdint.h>
-+#include <inttypes.h>
-+#include <signal.h>
- #include <unistd.h>
- #include <utime.h>
- #include <sys/stat.h>
--- 
-1.6.5.1
-


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From rthurner at users.sourceforge.net  Thu Jul 22 15:48:15 2010
From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net)
Date: Thu, 22 Jul 2010 13:48:15 +0000
Subject: [csw-devel] SF.net SVN: gar:[10566]
	csw/mgar/pkg/apr-util/trunk/Makefile
Message-ID: <E1Obw8F-00065L-JL@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 10566
          http://gar.svn.sourceforge.net/gar/?rev=10566&view=rev
Author:   rthurner
Date:     2010-07-22 13:48:15 +0000 (Thu, 22 Jul 2010)

Log Message:
-----------
apr-util: remove 64-bit build for the moment ...

Modified Paths:
--------------
    csw/mgar/pkg/apr-util/trunk/Makefile

Modified: csw/mgar/pkg/apr-util/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apr-util/trunk/Makefile	2010-07-22 11:22:30 UTC (rev 10565)
+++ csw/mgar/pkg/apr-util/trunk/Makefile	2010-07-22 13:48:15 UTC (rev 10566)
@@ -15,23 +15,18 @@
 CATALOGNAME = apr_util
 
 RUNTIME_DEP_PKGS = CSWapr CSWiconv CSWsqlite3rt CSWunixodbc CSWexpat
-RUNTIME_DEP_PKGS += CSWbdb48 CSWoldaprt
+RUNTIME_DEP_PKGS += CSWbdb47 CSWoldaprt
 
-CHECKPKG_OVERRIDES_CSWapr-util += binary-disallowed-placement|file=opt/csw/lib/sparcv9/libaprutil-1.so.0.3.9|arch_id=2|arch_name=sparcv8|bad_path=sparcv9
-CHECKPKG_OVERRIDES_CSWapr-util += binary-disallowed-placement|file=opt/csw/lib/sparcv9/apr-util-1/apr_dbd_sqlite3-1.so|arch_id=2|arch_name=sparcv8|bad_path=sparcv9
-CHECKPKG_OVERRIDES_CSWapr-util += binary-disallowed-placement|file=opt/csw/lib/sparcv9/apr-util-1/apr_ldap-1.so|arch_id=2|arch_name=sparcv8|bad_path=sparcv9
-CHECKPKG_OVERRIDES_CSWapr-util += binary-disallowed-placement|file=opt/csw/lib/sparcv9/apr-util-1/apr_dbd_odbc-1.so|arch_id=2|arch_name=sparcv8|bad_path=sparcv9
-
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --with-apr=$(prefix)/bin/apr-1-config
 CONFIGURE_ARGS += --with-ldap
-CONFIGURE_ARGS += --with-berkeley-db=db.h:/opt/csw/bdb48/include:/opt/csw/bdb48/lib:db
+CONFIGURE_ARGS += --with-berkeley-db=/opt/csw/bdb47
 CONFIGURE_ARGS += --without-freetds --without-sqlite2
 
-BUILD64 = 1
+#BUILD64 = 1
 STRIP_LIBTOOL = 1
 
 include gar/category.mk


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From bonivart at users.sourceforge.net  Thu Jul 22 20:21:38 2010
From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net)
Date: Thu, 22 Jul 2010 18:21:38 +0000
Subject: [csw-devel] SF.net SVN: gar:[10567] csw/mgar/pkg/namebench/trunk
Message-ID: <E1Oc0Oo-0001US-Kq@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 10567
          http://gar.svn.sourceforge.net/gar/?rev=10567&view=rev
Author:   bonivart
Date:     2010-07-22 18:21:38 +0000 (Thu, 22 Jul 2010)

Log Message:
-----------
namebench: update to 1.3.1

Modified Paths:
--------------
    csw/mgar/pkg/namebench/trunk/Makefile
    csw/mgar/pkg/namebench/trunk/checksums

Modified: csw/mgar/pkg/namebench/trunk/Makefile
===================================================================
--- csw/mgar/pkg/namebench/trunk/Makefile	2010-07-22 13:48:15 UTC (rev 10566)
+++ csw/mgar/pkg/namebench/trunk/Makefile	2010-07-22 18:21:38 UTC (rev 10567)
@@ -1,5 +1,5 @@
 GARNAME = namebench
-GARVERSION = 1.3
+GARVERSION = 1.3.1
 CATEGORIES = python
 
 DESCRIPTION = DNS benchmark utility

Modified: csw/mgar/pkg/namebench/trunk/checksums
===================================================================
--- csw/mgar/pkg/namebench/trunk/checksums	2010-07-22 13:48:15 UTC (rev 10566)
+++ csw/mgar/pkg/namebench/trunk/checksums	2010-07-22 18:21:38 UTC (rev 10567)
@@ -1 +1 @@
-24bfbae12ed0f737562931439dd89ff5  namebench-1.3-source.tgz
+34e74eac37d6747592f8d5085f03ee4f  namebench-1.3.1-source.tgz


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From theferret at users.sourceforge.net  Thu Jul 22 20:33:34 2010
From: theferret at users.sourceforge.net (theferret at users.sourceforge.net)
Date: Thu, 22 Jul 2010 18:33:34 +0000
Subject: [csw-devel] SF.net SVN: gar:[10568] csw/mgar/pkg/fbpanel/trunk
Message-ID: <E1Oc0aM-0001pU-34@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 10568
          http://gar.svn.sourceforge.net/gar/?rev=10568&view=rev
Author:   theferret
Date:     2010-07-22 18:33:33 +0000 (Thu, 22 Jul 2010)

Log Message:
-----------
fbpanel: compiles better now. but still has some runtime "issues"

Modified Paths:
--------------
    csw/mgar/pkg/fbpanel/trunk/Makefile
    csw/mgar/pkg/fbpanel/trunk/README
    csw/mgar/pkg/fbpanel/trunk/pkginfo

Added Paths:
-----------
    csw/mgar/pkg/fbpanel/trunk/patchfile.postconf
    csw/mgar/pkg/fbpanel/trunk/patchfile.preconf

Removed Paths:
-------------
    csw/mgar/pkg/fbpanel/trunk/patchfile.post-conf

Modified: csw/mgar/pkg/fbpanel/trunk/Makefile
===================================================================
--- csw/mgar/pkg/fbpanel/trunk/Makefile	2010-07-22 18:21:38 UTC (rev 10567)
+++ csw/mgar/pkg/fbpanel/trunk/Makefile	2010-07-22 18:33:33 UTC (rev 10568)
@@ -16,26 +16,34 @@
 # Only use ONE here. The name is used for compat with 'gar'.
 MASTER_SITES ?= http://sourceforge.net/projects/fbpanel/files/fbpanel/6.0/
 
+PATH := /opt/csw/gnu:/opt/csw/gcc4/bin:$(PATH)
+
 ARCH := $(shell /bin/uname -p)
 
 LDFLAGS_COMMON :=
 
 SRCDIR= build/*
 
-# DO NOT specify the arch-64 stuff such as -m64 here.
-# the individual targets will do that.
-
+CC=cc
 CFLAGS_COMMON   ?= -mt -xnorunpath -xO2
 CXXFLAGS_COMMON ?= -mt -norunpath  -xO2
 CFLAGS_sparc    ?= -xarch=v8
 CFLAGS_i386     ?= -xarch=386
 
-# Keep this arch-neutral if possible. add arch-specific tweaks
-# to arch-specific target
-CONFIGURE=./configure --prefix=/opt/csw
+#CC=gcc
+#CFLAGS_sparc    ?= -mcpu=v8
+#CFLAGS_i386     ?= -xarch=386
 
+# WARNING: this is NOT a GNU-standard autoconfig
+#  This is W.i.e.r.d.
 
+BUILD_ENV = CFLAGS="$(CFLAGS_COMMON) $(CFLAGS_$(ARCH))" \
+	CPPFLAGS="-I/opt/csw/include" CC=$(CC)
 
+CONFIGURE=bash ./configure  --prefix=/opt/csw
+
+
+
 CREATEPKG=createpkg -r `pwd`/build/*/cswstage
 
 
@@ -111,14 +119,13 @@
 	touch $@
 
 
-#Note: I WANT to use LDFLAGS=-R$$ORIGIN, but stupid libtool
-# wont allow it! so force it at build time
+#Note: I WANT to use LDFLAGS=-R$$ORIGIN, etc. but 
+# their wierd build system wont allow it! so force it at build time
+# Note also.. this is NOT the "normal" GNU autoconf !!
 build/.configure-$(ARCH)-32.done:	build/.patch-preconf.done
 	@echo handling $@ target
 	(cd $(SRCDIR) ; \
-	  CFLAGS="$(CFLAGS_COMMON) $(CFLAGS_$(ARCH))" \
-	  CXXFLAGS="$(CXXFLAGS_COMMON)" \
-	  LDFLAGS='-R/opt/csw/lib -L/opt/csw/lib' \
+	  $(BUILD_ENV) \
 	  $(CONFIGURE) )
 	if test -f patchfile.postconf ; then \
 	 gpatch -d $(SRCDIR) -p0  <patchfile.postconf ; fi
@@ -126,9 +133,13 @@
 
 
 # See note about LDFLAGS and ORIGIN, higher up	
+# Also note that since fbpanel comes with 'modules', using
+# $ORIGIN wont work as desired. 
+#  AAAND.. it has a custom "rules.mk", so it tends to ignore
+# the normally-set configure-time CFLAGS and so on. arg.
 build/.build-$(ARCH)-32.done:
 	@echo handling $@ target
-	LD_OPTIONS='-R$$ORIGIN' $(MAKE) -C $(SRCDIR) $(MFLAGS)
+	LD_OPTIONS='-R/opt/csw/lib' $(BUILD_ENV) $(MAKE) -C $(SRCDIR) $(MFLAGS)
 	touch $@
 
 

Modified: csw/mgar/pkg/fbpanel/trunk/README
===================================================================
--- csw/mgar/pkg/fbpanel/trunk/README	2010-07-22 18:21:38 UTC (rev 10567)
+++ csw/mgar/pkg/fbpanel/trunk/README	2010-07-22 18:33:33 UTC (rev 10568)
@@ -4,20 +4,12 @@
  But I'm keeping my work in svn
  (and a package in experimental)
 
-0.  configuration is WEEERID.and very nonportable.
-  takes GNU autoconf,and makes it dumber.
-  It breaks gmake MFLAGS=-j, among other things.
+it has a few problems. Problems first, Notes, lower down.
 
-1.   Have to have /opt/csw/gnu first in path.
+PROBLEMS:
 
-2. have to run configure with bash -x.
-   its already #!/bin/bash but that dont work?!?!?
 
-3. CC=gcc. its just got too many gnuisms.
-
-4. need to set cpu type in there somehow too...
-
-5. It uses /usr/share/icons/hicolor/*  as its icons path
+*. It uses /usr/share/icons/hicolor/*  as its icons path
    So that means it technically depends on 
    SUNWgnome-themes-share
    We COULD get it to depend on CSWxfceiconthemes.
@@ -32,9 +24,28 @@
 
   THen need to set theme_engine or something...
 
-   gtk_icon_theme_load_icon() is at fault
 
 
+*. Need to FIX PLUGINS!! (net, cpu, mem)
+ (which requires porting. See patches to xfce_systemtray for
+  that sort of thing)
 
 
- 6. Need to FIX PLUGINS!! (net, cpu, mem)
+NOTES:
+
+*.  configuration is WEEERID.and very nonportable.
+  takes GNU autoconf,and makes it dumber.
+  It breaks gmake MFLAGS=-j, among other things.
+
+*.   Have to have /opt/csw/gnu first in path.. fixed in makefile
+
+*. have to run configure with bash.
+   its already #!/bin/bash but that dont work?!?!?
+
+*.   It has some kind of WEIIIIERD "rfs-scripts-xxxx" wrappers
+     aroung things like pkg-config. Arrg.
+     And it does it by hacking configure, to do
+     "source scripts/custom.sh"
+
+     Now provide own custom.sh
+

Deleted: csw/mgar/pkg/fbpanel/trunk/patchfile.post-conf
===================================================================
--- csw/mgar/pkg/fbpanel/trunk/patchfile.post-conf	2010-07-22 18:21:38 UTC (rev 10567)
+++ csw/mgar/pkg/fbpanel/trunk/patchfile.post-conf	2010-07-22 18:33:33 UTC (rev 10568)
@@ -1,11 +0,0 @@
---- panel/Makefile.in.orig	2010-06-22 02:25:29.676465806 +0200
-+++ panel/Makefile.in	2010-06-22 02:25:37.159948629 +0200
-@@ -5,7 +5,7 @@
- #SRCS += configurator.c 
- 
- BINTARGET = fbpanel
--LDFLAGS += $(GMODULE_LIBS)
-+LDFLAGS += $(GMODULE_LIBS) -lX11
- 
- ifeq (enabled,$(STATIC_BUILD))
- OBJS += $(wildcard $(TOPDIR)/plugins/*/*.o)

Added: csw/mgar/pkg/fbpanel/trunk/patchfile.postconf
===================================================================
--- csw/mgar/pkg/fbpanel/trunk/patchfile.postconf	                        (rev 0)
+++ csw/mgar/pkg/fbpanel/trunk/patchfile.postconf	2010-07-22 18:33:33 UTC (rev 10568)
@@ -0,0 +1,11 @@
+--- panel/Makefile.in.orig	2010-06-22 02:25:29.676465806 +0200
++++ panel/Makefile.in	2010-06-22 02:25:37.159948629 +0200
+@@ -5,7 +5,7 @@
+ #SRCS += configurator.c 
+ 
+ BINTARGET = fbpanel
+-LDFLAGS += $(GMODULE_LIBS)
++LDFLAGS += $(GMODULE_LIBS) -lX11
+ 
+ ifeq (enabled,$(STATIC_BUILD))
+ OBJS += $(wildcard $(TOPDIR)/plugins/*/*.o)

Added: csw/mgar/pkg/fbpanel/trunk/patchfile.preconf
===================================================================
--- csw/mgar/pkg/fbpanel/trunk/patchfile.preconf	                        (rev 0)
+++ csw/mgar/pkg/fbpanel/trunk/patchfile.preconf	2010-07-22 18:33:33 UTC (rev 10568)
@@ -0,0 +1,56 @@
+--- scripts/custom.sh.orig	Sun Feb 21 11:05:12 2010
++++ scripts/custom.sh	Mon Jul 19 19:49:30 2010
+@@ -17,15 +17,15 @@
+ # Custom
+ add_feature dependency "disable dependency tracking" disabled
+ 
+-add_var glib_cflags "glib cflags" '`RFS=$rfs scripts/rfs-pkg-config --cflags glib-2.0`'
+-add_var gtk_cflags "gtk cflags" '`RFS=$rfs scripts/rfs-pkg-config --cflags gtk+-2.0`'
++add_var glib_cflags "glib cflags" '`pkg-config --cflags glib-2.0`'
++add_var gtk_cflags "gtk cflags" '`pkg-config --cflags gtk+-2.0`'
+ 
+-add_var glib_libs "glib libs" '`RFS=$rfs scripts/rfs-pkg-config --libs glib-2.0`'
+-add_var gtk_libs "gtk libs" '`RFS=$rfs scripts/rfs-pkg-config --libs gtk+-2.0`'
++add_var glib_libs "glib libs" '`pkg-config --libs glib-2.0`'
++add_var gtk_libs "gtk libs" '`pkg-config --libs gtk+-2.0`'
+ 
+ add_var cflagsx "C flags" '-I$topdir/panel $glib_cflags $gtk_cflags -fPIC'
+ add_var ldflagsx "linker flags" '$glib_libs $gtk_libs'
+ 
+-add_var gmodule_libs "gmodule libs" '`scripts/rfs-pkg-config --libs gmodule-2.0`'
++add_var gmodule_libs "gmodule libs" '`pkg-config --libs gmodule-2.0`'
+ 
+-add_feature static_build "build all pluginis into main binary" disabled
++#add_feature static_build "build all pluginis into main binary" disabled
+--- rules.mk.orig	Thu Jul 22 20:09:19 2010
++++ rules.mk	Thu Jul 22 20:09:43 2010
+@@ -35,12 +35,12 @@
+ ##
+ # if CFLAGS wasn't set by package builder set it to -O2
+ # warnings on, and path to #include <config.h>
+-ifeq ($(DEBUG),enabled)
+-	override CFLAGS = -Wall -I$(TOPDIR) -g -Werror 
+-else
+-	CFLAGS += -O2 -Wall -I$(TOPDIR) 
+-endif
+-
++#ifeq ($(DEBUG),enabled)
++#	override CFLAGS = -Wall -I$(TOPDIR) -g -Werror 
++#else
++#	CFLAGS += -O2 -Wall -I$(TOPDIR) 
++#endif
++	CFLAGS += -I$(TOPDIR) 
+  
+ T := $(subst $(TOPDIR)/,,$(CURDIR)/)
+ T := $(subst /, ,$(T))
+--- dbg.h.orig	Thu Jul 22 20:16:35 2010
++++ dbg.h	Thu Jul 22 20:22:59 2010
+@@ -1,5 +1,8 @@
+ #include <stdio.h>
+ 
++#ifdef __SUNPRO_C 
++#define __FUNCTION__ __func__
++#endif
+ #define ERR(fmt, args...) fprintf(stderr, fmt, ## args)
+ #define DBG2(fmt, args...) fprintf(stderr, "%s:%s:%-5d: " fmt, __FILE__,  __FUNCTION__, __LINE__, ## args)
+ #define DBGE2(fmt, args...)       fprintf(stderr, fmt, ## args)

Modified: csw/mgar/pkg/fbpanel/trunk/pkginfo
===================================================================
--- csw/mgar/pkg/fbpanel/trunk/pkginfo	2010-07-22 18:21:38 UTC (rev 10567)
+++ csw/mgar/pkg/fbpanel/trunk/pkginfo	2010-07-22 18:33:33 UTC (rev 10568)
@@ -1,6 +1,6 @@
 PKG=CSWfbpanel
 NAME=fbpanel - GUI panel for NETWM compliant window managers
-VERSION=6.0,REV=2010.06.22
+VERSION=6.0,REV=YYYY.MM.DD
 CATEGORY=application
 VENDOR=http://fbpanel.sourceforge.net/ packaged for CSW by Philip Brown
 HOTLINE=http://www.opencsw.org/bugtrack/


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From bdwalton at users.sourceforge.net  Fri Jul 23 02:11:28 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Fri, 23 Jul 2010 00:11:28 +0000
Subject: [csw-devel] SF.net SVN: gar:[10569] csw/mgar/pkg/asciidoc/trunk
Message-ID: <E1Oc5rM-0004R2-8l@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 10569
          http://gar.svn.sourceforge.net/gar/?rev=10569&view=rev
Author:   bdwalton
Date:     2010-07-23 00:11:28 +0000 (Fri, 23 Jul 2010)

Log Message:
-----------
asciidoc: version bump

Modified Paths:
--------------
    csw/mgar/pkg/asciidoc/trunk/Makefile
    csw/mgar/pkg/asciidoc/trunk/checksums

Modified: csw/mgar/pkg/asciidoc/trunk/Makefile
===================================================================
--- csw/mgar/pkg/asciidoc/trunk/Makefile	2010-07-22 18:33:33 UTC (rev 10568)
+++ csw/mgar/pkg/asciidoc/trunk/Makefile	2010-07-23 00:11:28 UTC (rev 10569)
@@ -1,5 +1,5 @@
 GARNAME = asciidoc
-GARVERSION = 8.5.2
+GARVERSION = 8.5.3
 CATEGORIES = utils
 
 DESCRIPTION = An Documentation Generator

Modified: csw/mgar/pkg/asciidoc/trunk/checksums
===================================================================
--- csw/mgar/pkg/asciidoc/trunk/checksums	2010-07-22 18:33:33 UTC (rev 10568)
+++ csw/mgar/pkg/asciidoc/trunk/checksums	2010-07-23 00:11:28 UTC (rev 10569)
@@ -1,3 +1,3 @@
 0f4502395f72632388628d3720bdfd42  add-csw-gnu-path-to-a2x.patch
-3ed69184645b233b83a52f8a722d1461  asciidoc-8.5.2.tar.gz
+7377872275c2a575151655b19ac6dd3e  asciidoc-8.5.3.tar.gz
 ec48eeea1eafdaa7e507bc11327f6eae  handle-csw-etc-paths.patch


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From bdwalton at users.sourceforge.net  Fri Jul 23 02:18:15 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Fri, 23 Jul 2010 00:18:15 +0000
Subject: [csw-devel] SF.net SVN: gar:[10570] csw/mgar/pkg/asciidoc/trunk
Message-ID: <E1Oc5xv-0004aH-Ot@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 10570
          http://gar.svn.sourceforge.net/gar/?rev=10570&view=rev
Author:   bdwalton
Date:     2010-07-23 00:18:15 +0000 (Fri, 23 Jul 2010)

Log Message:
-----------
asciidoc: update patch (strip out some junk included in the last one)

Modified Paths:
--------------
    csw/mgar/pkg/asciidoc/trunk/Makefile
    csw/mgar/pkg/asciidoc/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/asciidoc/trunk/files/0002-Add-opt-csw-gnu-bin-to-PATH-in-a2x.py.patch

Removed Paths:
-------------
    csw/mgar/pkg/asciidoc/trunk/files/add-csw-gnu-path-to-a2x.patch

Modified: csw/mgar/pkg/asciidoc/trunk/Makefile
===================================================================
--- csw/mgar/pkg/asciidoc/trunk/Makefile	2010-07-23 00:11:28 UTC (rev 10569)
+++ csw/mgar/pkg/asciidoc/trunk/Makefile	2010-07-23 00:18:15 UTC (rev 10570)
@@ -25,7 +25,7 @@
 DISTFILES += $(AUTOFILES)
 
 PATCHFILES = handle-csw-etc-paths.patch
-PATCHFILES += add-csw-gnu-path-to-a2x.patch
+PATCHFILES += 0002-Add-opt-csw-gnu-bin-to-PATH-in-a2x.py.patch
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=67797

Modified: csw/mgar/pkg/asciidoc/trunk/checksums
===================================================================
--- csw/mgar/pkg/asciidoc/trunk/checksums	2010-07-23 00:11:28 UTC (rev 10569)
+++ csw/mgar/pkg/asciidoc/trunk/checksums	2010-07-23 00:18:15 UTC (rev 10570)
@@ -1,3 +1,3 @@
-0f4502395f72632388628d3720bdfd42  add-csw-gnu-path-to-a2x.patch
+2eb00364bbc7660438507e630d5a5ac9  0002-Add-opt-csw-gnu-bin-to-PATH-in-a2x.py.patch
 7377872275c2a575151655b19ac6dd3e  asciidoc-8.5.3.tar.gz
 ec48eeea1eafdaa7e507bc11327f6eae  handle-csw-etc-paths.patch

Added: csw/mgar/pkg/asciidoc/trunk/files/0002-Add-opt-csw-gnu-bin-to-PATH-in-a2x.py.patch
===================================================================
--- csw/mgar/pkg/asciidoc/trunk/files/0002-Add-opt-csw-gnu-bin-to-PATH-in-a2x.py.patch	                        (rev 0)
+++ csw/mgar/pkg/asciidoc/trunk/files/0002-Add-opt-csw-gnu-bin-to-PATH-in-a2x.py.patch	2010-07-23 00:18:15 UTC (rev 10570)
@@ -0,0 +1,30 @@
+From 5f2985d65ac801a12e44f0054543a476dc783f97 Mon Sep 17 00:00:00 2001
+From: Ben Walton <bwalton at opencsw.org>
+Date: Fri, 23 Jul 2010 02:14:34 +0200
+Subject: [PATCH] Add /opt/csw/{gnu,bin} to PATH in a2x.py
+
+This allows us to leverage the gnu tools which is what the app was
+written against.  It prevents blowups when non-gnu tools get gnu
+options passed.
+
+Signed-off-by: Ben Walton <bwalton at opencsw.org>
+---
+ a2x.py |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/a2x.py b/a2x.py
+index 186ccdf..d117086 100755
+--- a/a2x.py
++++ b/a2x.py
+@@ -63,6 +63,8 @@ XSLTPROC_OPTS = ''
+ 
+ OPTIONS = None  # These functions read verbose and dry_run command options.
+ 
++os.environ["PATH"] = "/opt/csw/gnu:/opt/csw/bin:" + os.environ["PATH"]
++
+ def errmsg(msg):
+     sys.stderr.write('%s: %s\n' % (PROG,msg))
+ 
+-- 
+1.7.1
+

Deleted: csw/mgar/pkg/asciidoc/trunk/files/add-csw-gnu-path-to-a2x.patch
===================================================================
--- csw/mgar/pkg/asciidoc/trunk/files/add-csw-gnu-path-to-a2x.patch	2010-07-23 00:11:28 UTC (rev 10569)
+++ csw/mgar/pkg/asciidoc/trunk/files/add-csw-gnu-path-to-a2x.patch	2010-07-23 00:18:15 UTC (rev 10570)
@@ -1,12 +0,0 @@
-diff -ru asciidoc-8.5.2.orig/a2x.py asciidoc-8.5.2/a2x.py
---- asciidoc-8.5.2.orig/a2x.py	2010-01-06 01:42:35.549886234 +0100
-+++ asciidoc-8.5.2/a2x.py	2010-01-06 01:53:47.076069410 +0100
-@@ -57,6 +57,8 @@
- 
- OPTIONS = None  # These functions read verbose and dry_run command options.
- 
-+os.environ["PATH"] = "/opt/csw/gnu:/opt/csw/bin:" + os.environ["PATH"]
-+
- def errmsg(msg):
-     sys.stderr.write('%s: %s\n' % (PROG,msg))
- 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From bdwalton at users.sourceforge.net  Fri Jul 23 02:26:58 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Fri, 23 Jul 2010 00:26:58 +0000
Subject: [csw-devel] SF.net SVN: gar:[10571]
	csw/mgar/pkg/asciidoc/trunk/Makefile
Message-ID: <E1Oc66M-000282-57@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 10571
          http://gar.svn.sourceforge.net/gar/?rev=10571&view=rev
Author:   bdwalton
Date:     2010-07-23 00:26:57 +0000 (Fri, 23 Jul 2010)

Log Message:
-----------
asciidoc: we do in fact need deps on these "soft" packages

Modified Paths:
--------------
    csw/mgar/pkg/asciidoc/trunk/Makefile

Modified: csw/mgar/pkg/asciidoc/trunk/Makefile
===================================================================
--- csw/mgar/pkg/asciidoc/trunk/Makefile	2010-07-23 00:18:15 UTC (rev 10570)
+++ csw/mgar/pkg/asciidoc/trunk/Makefile	2010-07-23 00:26:57 UTC (rev 10571)
@@ -38,6 +38,9 @@
 
 INSTALL_ARGS = vimdir=/opt/csw/etc/vim
 
+CHECKPKG_OVERRIDES_CSWasciidoc += surplus-dependency|CSWggetopt
+CHECKPKG_OVERRIDES_CSWasciidoc += surplus-dependency|CSWgnulinks
+
 include gar/category.mk
 
 # until the autoconf stuff is included upstream, we'll maintain and import our


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From bdwalton at users.sourceforge.net  Fri Jul 23 02:57:37 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Fri, 23 Jul 2010 00:57:37 +0000
Subject: [csw-devel] SF.net SVN: gar:[10572] csw/mgar/pkg
Message-ID: <E1Oc6a1-0002lm-7g@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 10572
          http://gar.svn.sourceforge.net/gar/?rev=10572&view=rev
Author:   bdwalton
Date:     2010-07-23 00:57:36 +0000 (Fri, 23 Jul 2010)

Log Message:
-----------
rb-mysql: first attempt at gem packages; the start of a wip

Added Paths:
-----------
    csw/mgar/pkg/rb-mysql/
    csw/mgar/pkg/rb-mysql/branches/
    csw/mgar/pkg/rb-mysql/tags/
    csw/mgar/pkg/rb-mysql/trunk/
    csw/mgar/pkg/rb-mysql/trunk/Makefile
    csw/mgar/pkg/rb-mysql/trunk/checksums
    csw/mgar/pkg/rb-mysql/trunk/files/


Property changes on: csw/mgar/pkg/rb-mysql/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/rb-mysql/trunk/Makefile
===================================================================
--- csw/mgar/pkg/rb-mysql/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/rb-mysql/trunk/Makefile	2010-07-23 00:57:36 UTC (rev 10572)
@@ -0,0 +1,18 @@
+GARNAME = rb-mysql
+GARVERSION = 2.8.1
+CATEGORIES = lang
+
+DESCRIPTION = Mysql Bindings for Fuby
+
+MASTER_SITES = http://rubygems.org/downloads/
+DISTFILES  = mysql-$(GARVERSION).gem
+
+# We define upstream file regex so we can be notifed of new upstream software release
+UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
+
+
+CONFIGURE_SCRIPT = 
+TEST_SCRIPT = 
+
+
+include gar/category.mk

Added: csw/mgar/pkg/rb-mysql/trunk/checksums
===================================================================
--- csw/mgar/pkg/rb-mysql/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/rb-mysql/trunk/checksums	2010-07-23 00:57:36 UTC (rev 10572)
@@ -0,0 +1 @@
+81f2b50b1135e53a526e07bb21e16a4e  mysql-2.8.1.gem


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From bdwalton at users.sourceforge.net  Fri Jul 23 03:01:19 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Fri, 23 Jul 2010 01:01:19 +0000
Subject: [csw-devel] SF.net SVN: gar:[10573]
	csw/mgar/pkg/rb-mysql/trunk/Makefile
Message-ID: <E1Oc6db-0005PS-9r@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 10573
          http://gar.svn.sourceforge.net/gar/?rev=10573&view=rev
Author:   bdwalton
Date:     2010-07-23 01:01:18 +0000 (Fri, 23 Jul 2010)

Log Message:
-----------
rb-mysql: fix config and test variables to skip those steps

Modified Paths:
--------------
    csw/mgar/pkg/rb-mysql/trunk/Makefile

Modified: csw/mgar/pkg/rb-mysql/trunk/Makefile
===================================================================
--- csw/mgar/pkg/rb-mysql/trunk/Makefile	2010-07-23 00:57:36 UTC (rev 10572)
+++ csw/mgar/pkg/rb-mysql/trunk/Makefile	2010-07-23 01:01:18 UTC (rev 10573)
@@ -11,8 +11,8 @@
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
 
-CONFIGURE_SCRIPT = 
-TEST_SCRIPT = 
+CONFIGURE_SCRIPTS = 
+TEST_SCRIPTS = 
 
 
 include gar/category.mk


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From dmichelsen at users.sourceforge.net  Fri Jul 23 11:43:12 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Fri, 23 Jul 2010 09:43:12 +0000
Subject: [csw-devel] SF.net SVN: gar:[10574] csw/mgar/pkg/tmux/tags/tmux-1.2,
	REV=2010.05.17/
Message-ID: <E1OcEme-0002hA-Ei@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 10574
          http://gar.svn.sourceforge.net/gar/?rev=10574&view=rev
Author:   dmichelsen
Date:     2010-07-23 09:43:11 +0000 (Fri, 23 Jul 2010)

Log Message:
-----------
tmux: Tag 1.2,REV=2010.05.17

Added Paths:
-----------
    csw/mgar/pkg/tmux/tags/tmux-1.2,REV=2010.05.17/


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 Jul 23 11:43:47 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Fri, 23 Jul 2010 09:43:47 +0000
Subject: [csw-devel] SF.net SVN: gar:[10575] csw/mgar/pkg/tmux/trunk
Message-ID: <E1OcEnD-0002hm-NS@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 10575
          http://gar.svn.sourceforge.net/gar/?rev=10575&view=rev
Author:   dmichelsen
Date:     2010-07-23 09:43:47 +0000 (Fri, 23 Jul 2010)

Log Message:
-----------
tmux: Update to 1.3

Modified Paths:
--------------
    csw/mgar/pkg/tmux/trunk/Makefile
    csw/mgar/pkg/tmux/trunk/checksums
    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

Added Paths:
-----------
    csw/mgar/pkg/tmux/trunk/files/0003-Add-fix-for-missing-MAXHOSTNAMELEN.patch

Removed Paths:
-------------
    csw/mgar/pkg/tmux/trunk/files/0001-Add-Solaris-fixes.patch

Modified: csw/mgar/pkg/tmux/trunk/Makefile
===================================================================
--- csw/mgar/pkg/tmux/trunk/Makefile	2010-07-23 09:43:11 UTC (rev 10574)
+++ csw/mgar/pkg/tmux/trunk/Makefile	2010-07-23 09:43:47 UTC (rev 10575)
@@ -1,5 +1,5 @@
 GARNAME = tmux
-GARVERSION = 1.2
+GARVERSION = 1.3
 CATEGORIES = apps
 
 DESCRIPTION = Terminal Multiplexer
@@ -8,9 +8,10 @@
 MASTER_SITES = $(SF_MIRRORS)
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
 DISTFILES += COPYING
+
 PATCHFILES  = 0001-old-style-patch-0000-stdint.patch
 PATCHFILES += 0002-Fix-one-more-inttypes.h.patch
-PATCHFILES += 0001-Add-Solaris-fixes.patch
+PATCHFILES += 0003-Add-fix-for-missing-MAXHOSTNAMELEN.patch
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = -(\d+(?:\.\d+)*).tar.gz

Modified: csw/mgar/pkg/tmux/trunk/checksums
===================================================================
--- csw/mgar/pkg/tmux/trunk/checksums	2010-07-23 09:43:11 UTC (rev 10574)
+++ csw/mgar/pkg/tmux/trunk/checksums	2010-07-23 09:43:47 UTC (rev 10575)
@@ -1,5 +1,5 @@
-13c90823861d90f79620de09cd5ff0a5  0001-Add-Solaris-fixes.patch
-eb2b06cbb9c101e1687caf727e747c68  0001-old-style-patch-0000-stdint.patch
-3a7d0d4c2610a3c0fb418d1db40be856  0002-Fix-one-more-inttypes.h.patch
+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
-748fbe7bb5f86812e19bd6005ff21a5a  tmux-1.2.tar.gz
+96e60cb206de2db0610b9fb6a64c2251  tmux-1.3.tar.gz

Deleted: csw/mgar/pkg/tmux/trunk/files/0001-Add-Solaris-fixes.patch
===================================================================
--- csw/mgar/pkg/tmux/trunk/files/0001-Add-Solaris-fixes.patch	2010-07-23 09:43:11 UTC (rev 10574)
+++ csw/mgar/pkg/tmux/trunk/files/0001-Add-Solaris-fixes.patch	2010-07-23 09:43:47 UTC (rev 10575)
@@ -1,114 +0,0 @@
-From cc90c6fa3786e7ef68ef87fd8a8c84e32149f38c Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Fri, 14 May 2010 15:05:03 +0200
-Subject: [PATCH] Add Solaris fixes
-
----
- compat.h        |   22 ++++++++++++++++++++++
- compat/setenv.c |   46 ++++++++++++++++++++++++++++++++++++++++++++++
- configure       |    3 ++-
- 3 files changed, 70 insertions(+), 1 deletions(-)
- create mode 100644 compat/setenv.c
-
-diff --git a/compat.h b/compat.h
-index b7a1d58..321b0ac 100644
---- a/compat.h
-+++ b/compat.h
-@@ -92,6 +92,28 @@ typedef uint64_t u_int64_t;
- 	    (struct cmsghdr *)NULL)
- #endif
- 
-+/*
-+ * CMSG_ALIGN, CMS_SPACE and CMSG_LEN definitions are missing on Solaris.
-+ * The substitutes have been taken from
-+ *   http://mailman.videolan.org/pipermail/vlc-devel/2006-May/024402.html
-+ */
-+
-+#ifndef CMSG_ALIGN
-+#   ifdef __sun__
-+#       define CMSG_ALIGN _CMSG_DATA_ALIGN
-+#   else
-+#       define CMSG_ALIGN(len) (((len)+sizeof(long)-1) & ~(sizeof(long)-1))
-+#   endif
-+#endif
-+
-+#ifndef CMSG_SPACE
-+#   define CMSG_SPACE(len) (CMSG_ALIGN(sizeof(struct cmsghdr))+CMSG_ALIGN(len))
-+#endif
-+
-+#ifndef CMSG_LEN
-+#   define CMSG_LEN(len) (CMSG_ALIGN(sizeof(struct cmsghdr))+(len))
-+#endif
-+
- #ifndef INFTIM
- #define INFTIM -1
- #endif
-diff --git a/compat/setenv.c b/compat/setenv.c
-new file mode 100644
-index 0000000..1b3d2fd
---- /dev/null
-+++ b/compat/setenv.c
-@@ -0,0 +1,46 @@
-+/* $Id$ /*
-+
-+/*
-+ * Copyright (c) 2004 Nicholas Marriott <nicm at users.sourceforge.net>
-+ *
-+ * Permission to use, copy, modify, and distribute this software for any
-+ * purpose with or without fee is hereby granted, provided that the above
-+ * copyright notice and this permission notice appear in all copies.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-+ * WHATSOEVER RESULTING FROM LOSS OF MIND, 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.
-+ */
-+
-+#include <stdlib.h>
-+
-+#include "tmux.h"
-+
-+void
-+setenv(char *n, char *v, int x)
-+{
-+	char	buf[256];
-+
-+	snprintf(buf, sizeof(buf), "%s=%s", n, v);
-+	putenv(buf);
-+}
-+
-+void
-+unsetenv(char *env_name)
-+{
-+	extern char	**environ;
-+	char		**cc;
-+	int		l;
-+
-+	l = strlen(env_name);
-+	for (cc=environ; *cc != NULL; cc++) {
-+		if (strncmp(env_name, *cc, l) == 0 && ((*cc)[l] == '=' || (*cc)[l] == '\0'))
-+			break;
-+		}
-+		for (; *cc != NULL; cc++)
-+			*cc = cc[1];
-+	}
-diff --git a/configure b/configure
-index 5d3c3b1..8f30560 100755
---- a/configure
-+++ b/configure
-@@ -164,7 +164,8 @@ SRCS+= osdep-sunos.c \
- 	compat/vis.c \
- 	compat/unvis.c \
- 	compat/imsg-buffer.c \
--	compat/imsg.c
-+	compat/imsg.c \
-+	compat/setenv.c
- EOF
- 	;;
- # ------------------------------------------------------------------------------
--- 
-1.7.0
-

Modified: 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	2010-07-23 09:43:11 UTC (rev 10574)
+++ csw/mgar/pkg/tmux/trunk/files/0001-old-style-patch-0000-stdint.patch	2010-07-23 09:43:47 UTC (rev 10575)
@@ -1,16 +1,15 @@
-From aa5dc9009a7a677c50d1205b69bbcd6191e3adf3 Mon Sep 17 00:00:00 2001
+From a2255d651e3a64c0133d56533d934260b71d1cc5 Mon Sep 17 00:00:00 2001
 From: Dagobert Michelsen <dam at opencsw.org>
 Date: Wed, 12 May 2010 10:21:45 +0200
 Subject: [PATCH 1/3] old style patch: 0000-stdint.patch
 
 ---
  input-keys.c    |    2 +-
- input.c         |    2 +-
  osdep-freebsd.c |    2 +-
  tmux.h          |    2 +-
  window.c        |    2 +-
  xmalloc.c       |    2 +-
- 6 files changed, 6 insertions(+), 6 deletions(-)
+ 5 files changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/input-keys.c b/input-keys.c
 index 1e2b18e..afcecaa 100644
@@ -25,19 +24,6 @@
  #include <stdlib.h>
  #include <string.h>
  
-diff --git a/input.c b/input.c
-index 0928195..180bb96 100644
---- a/input.c
-+++ b/input.c
-@@ -18,7 +18,7 @@
- 
- #include <sys/types.h>
- 
--#include <stdint.h>
-+#include <sys/inttypes.h>
- #include <stdlib.h>
- #include <string.h>
- 
 diff --git a/osdep-freebsd.c b/osdep-freebsd.c
 index ddd865e..4dad659 100644
 --- a/osdep-freebsd.c
@@ -52,7 +38,7 @@
  #include <string.h>
  #include <unistd.h>
 diff --git a/tmux.h b/tmux.h
-index 1f7c010..918aba5 100644
+index c8b48f3..d78b46e 100644
 --- a/tmux.h
 +++ b/tmux.h
 @@ -31,7 +31,7 @@
@@ -65,7 +51,7 @@
  #include <termios.h>
  
 diff --git a/window.c b/window.c
-index 8629943..a8668db 100644
+index 13439c9..e1506a5 100644
 --- a/window.c
 +++ b/window.c
 @@ -24,7 +24,7 @@
@@ -91,5 +77,5 @@
  #include <string.h>
  
 -- 
-1.7.0
+1.7.1
 

Modified: 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	2010-07-23 09:43:11 UTC (rev 10574)
+++ csw/mgar/pkg/tmux/trunk/files/0002-Fix-one-more-inttypes.h.patch	2010-07-23 09:43:47 UTC (rev 10575)
@@ -1,4 +1,4 @@
-From e64811a62b8fefe02d0fbc6c406e629c35d93f7a Mon Sep 17 00:00:00 2001
+From 5b87d0623c11043f670ec4e2d11197a9030edda1 Mon Sep 17 00:00:00 2001
 From: Dagobert Michelsen <dam at opencsw.org>
 Date: Wed, 12 May 2010 14:38:28 +0200
 Subject: [PATCH 2/3] Fix one more inttypes.h
@@ -21,5 +21,5 @@
  
  #include "tmux.h"
 -- 
-1.7.0
+1.7.1
 

Added: 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	                        (rev 0)
+++ csw/mgar/pkg/tmux/trunk/files/0003-Add-fix-for-missing-MAXHOSTNAMELEN.patch	2010-07-23 09:43:47 UTC (rev 10575)
@@ -0,0 +1,26 @@
+From 374b542205a8ebee89c123f203600c627a1bdd45 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+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 <string.h>
+ #include <unistd.h>
+ 
++/* For MAXHOSTNAMELEN */
++#include <netdb.h>
++
+ #include "tmux.h"
+ 
+ void	screen_resize_x(struct screen *, u_int);
+-- 
+1.7.1
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From dmichelsen at users.sourceforge.net  Fri Jul 23 12:31:00 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Fri, 23 Jul 2010 10:31:00 +0000
Subject: [csw-devel] SF.net SVN: gar:[10576] csw/mgar/pkg
Message-ID: <E1OcFWu-0003x6-QN@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10576
          http://gar.svn.sourceforge.net/gar/?rev=10576&view=rev
Author:   dmichelsen
Date:     2010-07-23 10:31:00 +0000 (Fri, 23 Jul 2010)

Log Message:
-----------
ffcall: Initial commit

Added Paths:
-----------
    csw/mgar/pkg/ffcall/
    csw/mgar/pkg/ffcall/branches/
    csw/mgar/pkg/ffcall/tags/
    csw/mgar/pkg/ffcall/trunk/
    csw/mgar/pkg/ffcall/trunk/Makefile
    csw/mgar/pkg/ffcall/trunk/checksums
    csw/mgar/pkg/ffcall/trunk/files/


Property changes on: csw/mgar/pkg/ffcall/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/ffcall/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ffcall/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/ffcall/trunk/Makefile	2010-07-23 10:31:00 UTC (rev 10576)
@@ -0,0 +1,27 @@
+# $Id$
+GARNAME = ffcall
+GARVERSION = 1.10
+CATEGORIES = lib
+
+DESCRIPTION = Foreign function call libraries
+define BLURB
+  This is a collection of four libraries which can be used to build foreign function call interfaces in embedded interpreters.
+endef
+
+MASTER_SITES = http://www.haible.de/bruno/gnu/
+DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
+
+# File name regex to get notifications about upstream software releases
+UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
+
+VENDOR_URL = http://www.haible.de/bruno/packages-ffcall.html
+
+CONFIGURE_ARGS = $(DIRPATHS)
+
+TEST_TARGET = check
+
+include gar/category.mk
+
+pre-install-modulated:
+	ginstall -d $(DESTDIR)$(bindir)
+	ginstall -d $(DESTDIR)$(mandir)


Property changes on: csw/mgar/pkg/ffcall/trunk/Makefile
___________________________________________________________________
Added: svn:keywords
   + Id

Added: csw/mgar/pkg/ffcall/trunk/checksums
===================================================================
--- csw/mgar/pkg/ffcall/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/ffcall/trunk/checksums	2010-07-23 10:31:00 UTC (rev 10576)
@@ -0,0 +1 @@
+2db95007e901f3bc2ae7e5a9fe9ebea4  ffcall-1.10.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 Jul 23 14:39:23 2010
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Fri, 23 Jul 2010 12:39:23 +0000
Subject: [csw-devel] SF.net SVN: gar:[10577]
	csw/mgar/gar/v2/bin/checkpkg_inspect_stats.py
Message-ID: <E1OcHX9-00019x-OO@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 10577
          http://gar.svn.sourceforge.net/gar/?rev=10577&view=rev
Author:   wahwah
Date:     2010-07-23 12:39:23 +0000 (Fri, 23 Jul 2010)

Log Message:
-----------
mGAR v2: checkpkg_inspect_stats.py, allowing to pass md5 sums and displaying a progress bar.

Modified Paths:
--------------
    csw/mgar/gar/v2/bin/checkpkg_inspect_stats.py

Modified: csw/mgar/gar/v2/bin/checkpkg_inspect_stats.py
===================================================================
--- csw/mgar/gar/v2/bin/checkpkg_inspect_stats.py	2010-07-23 10:31:00 UTC (rev 10576)
+++ csw/mgar/gar/v2/bin/checkpkg_inspect_stats.py	2010-07-23 12:39:23 UTC (rev 10577)
@@ -2,11 +2,14 @@
 # coding=utf-8
 
 import code
+import itertools
 import logging
 import optparse
 import os
 import pprint
 import sys
+import re
+import progressbar
 
 # The following bit of code sets the correct path to Python libraries
 # distributed with GAR.
@@ -17,7 +20,8 @@
 import opencsw
 
 def main():
-  parser = optparse.OptionParser()
+  usage = "Usage: %prog [ options ] file | md5 [ file | md5 [ ... ] ]"
+  parser = optparse.OptionParser(usage)
   parser.add_option("-d", "--debug", dest="debug",
                     default=False, action="store_true",
                     help="Turn on debugging messages")
@@ -29,14 +33,40 @@
   else:
     logging.basicConfig(level=logging.INFO)
   logging.debug("Collecting statistics about given package files.")
-  filenames = args
+  filenames = []
+  md5s = []
+  md5_re = re.compile(r"[0123456789abcdef]{32}")
+  for arg in args:
+    if md5_re.match(arg):
+      md5s.append(arg)
+    else:
+      filenames.append(arg)
   srv4_pkgs = [opencsw.CswSrv4File(x) for x in filenames]
-  pkgstats = [checkpkg.PackageStats(x) for x in srv4_pkgs]
-  pkgstats = [x.GetAllStats() for x in pkgstats]
+  pkgstat_objs = []
+  bar = progressbar.ProgressBar()
+  bar.maxval = len(md5s) + len(srv4_pkgs)
+  bar.start()
+  counter = itertools.count()
+  for pkg in srv4_pkgs:
+    pkgstat_objs.append(checkpkg.PackageStats(x, debug=options.debug))
+    bar.update(counter.next())
+  for md5 in md5s:
+    pkgstat_objs.append(checkpkg.PackageStats(None, md5sum=md5, debug=options.debug))
+    bar.update(counter.next())
+  bar.finish()
+  bar = progressbar.ProgressBar()
+  bar.maxval = len(pkgstat_objs)
+  bar.start()
+  counter = itertools.count()
+  pkgstats = []
+  for pkgstat in pkgstat_objs:
+    pkgstats.append(pkgstat.GetAllStats())
+    bar.update(counter.next())
+  bar.finish()
   if options.print_stats:
     print "import datetime"
-    print "pkgstats = ",
-    pprint.pprint(pkgstats)
+    print "pkgstat_objs = ",
+    pprint.pprint(pkgstat_objs)
   else:
     code.interact(local=locals())
 


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 Jul 23 14:40:36 2010
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Fri, 23 Jul 2010 12:40:36 +0000
Subject: [csw-devel] SF.net SVN: gar:[10578]
	csw/mgar/gar/v2/lib/python/README
Message-ID: <E1OcHYK-0001BA-E0@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 10578
          http://gar.svn.sourceforge.net/gar/?rev=10578&view=rev
Author:   wahwah
Date:     2010-07-23 12:40:36 +0000 (Fri, 23 Jul 2010)

Log Message:
-----------
mGAR v2: checkpkg, updates to the README file, known problems.

Modified Paths:
--------------
    csw/mgar/gar/v2/lib/python/README

Modified: csw/mgar/gar/v2/lib/python/README
===================================================================
--- csw/mgar/gar/v2/lib/python/README	2010-07-23 12:39:23 UTC (rev 10577)
+++ csw/mgar/gar/v2/lib/python/README	2010-07-23 12:40:36 UTC (rev 10578)
@@ -6,5 +6,10 @@
 	speed up checking if stats are already collected)
 - Store run history and 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
+- Move the set check stats outside of checking functions, remove the special
+	status of dependency checking functions; add a progress bar for it.
 - Restructure the error reporting, group them by errors.
+
+
+Known problems:
+- libmagic fails sometimes when processing the whole catalog


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 Jul 23 16:11:46 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Fri, 23 Jul 2010 14:11:46 +0000
Subject: [csw-devel] SF.net SVN: gar:[10579]
	csw/mgar/pkg/cpan/GD/trunk/Makefile
Message-ID: <E1OcIyY-0007XC-Ke@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 10579
          http://gar.svn.sourceforge.net/gar/?rev=10579&view=rev
Author:   dmichelsen
Date:     2010-07-23 14:11:46 +0000 (Fri, 23 Jul 2010)

Log Message:
-----------
cpan/GD: Do not build against CSW X11 any more

Modified Paths:
--------------
    csw/mgar/pkg/cpan/GD/trunk/Makefile

Modified: csw/mgar/pkg/cpan/GD/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cpan/GD/trunk/Makefile	2010-07-23 12:40:36 UTC (rev 10578)
+++ csw/mgar/pkg/cpan/GD/trunk/Makefile	2010-07-23 14:11:46 UTC (rev 10579)
@@ -20,24 +20,26 @@
 
 LICENSE = LICENSE
 
-DEP_PKGS = CSWftype2 CSWgd CSWiconv CSWjpeg CSWpng
-DEP_PKGS += CSWzlib CSWlibxpm CSWlibx11 CSWfconfig
+RUNTIME_DEP_PKGS = CSWftype2 CSWgd CSWiconv CSWjpeg CSWpng
+RUNTIME_DEP_PKGS += CSWzlib CSWfconfig CSWxpm
 
+BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS) CSWlibxpmdevel
+
 # These don't actually do anything as the pathes are already confgured
 CONFIGURE_ARGS  = lib_gd_path $(libdir)
 CONFIGURE_ARGS += lib_ft_path $(libdir)
 CONFIGURE_ARGS += lib_png_path $(libdir)
 CONFIGURE_ARGS += lib_jpeg_path $(libdir)
-CONFIGURE_ARGS += lib_xpm_path /usr/openwin/lib
+# This does not work due to different inclusion pathes
+# CONFIGURE_ARGS += lib_xpm_path /usr/openwin/lib
+CONFIGURE_ARGS += lib_xpm_path $(libdir)
 CONFIGURE_ARGS += lib_zlib_path $(libdir)
 
 NOISALIST = 1
-EXTRA_LIB = $(prefix)/X11/lib
 
-BUILD_OVERRIDE_VARS = CCFLAGS LD
+# BUILD_OVERRIDE_VARS = CCFLAGS LD
+BUILD_OVERRIDE_VARS = CCFLAGS
 # Don't use hardcoded -Wformat=0
 BUILD_OVERRIDE_VAR_CCFLAGS =
-# Force hardcode binding to OpenCSW X11
-BUILD_OVERRIDE_VAR_LD = $(CC) -L$(prefix)/X11/lib
 
 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  Mon Jul 26 11:09:07 2010
From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net)
Date: Mon, 26 Jul 2010 09:09:07 +0000
Subject: [csw-devel] SF.net SVN: gar:[10580] csw/mgar/pkg/pkgutil/trunk
Message-ID: <E1OdJgJ-0003D5-4m@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10580
          http://gar.svn.sourceforge.net/gar/?rev=10580&view=rev
Author:   bonivart
Date:     2010-07-26 09:09:06 +0000 (Mon, 26 Jul 2010)

Log Message:
-----------
pkgutil: 2.1 beta 2

Modified Paths:
--------------
    csw/mgar/pkg/pkgutil/trunk/Makefile
    csw/mgar/pkg/pkgutil/trunk/checksums

Modified: csw/mgar/pkg/pkgutil/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pkgutil/trunk/Makefile	2010-07-23 14:11:46 UTC (rev 10579)
+++ csw/mgar/pkg/pkgutil/trunk/Makefile	2010-07-26 09:09:06 UTC (rev 10580)
@@ -1,5 +1,5 @@
 GARNAME = pkgutil
-GARVERSION = 2.1b1
+GARVERSION = 2.1b2
 CATEGORIES = utils
 
 DESCRIPTION = Installs Solaris packages easily

Modified: csw/mgar/pkg/pkgutil/trunk/checksums
===================================================================
--- csw/mgar/pkg/pkgutil/trunk/checksums	2010-07-23 14:11:46 UTC (rev 10579)
+++ csw/mgar/pkg/pkgutil/trunk/checksums	2010-07-26 09:09:06 UTC (rev 10580)
@@ -5,4 +5,4 @@
 b5fffa0be100ddbb7262ce3a0a4e3bb7  build_sun_catalog.py
 7ad27336f90e73da3254a61d91025ee5  cswcatalog
 3a6b789b3d5e05f41d2363dd26a92acf  opencsw.py
-098debdae1a6e215cc99ed64f4234da8  pkgutil-2.1b1.zip
+b34650798f9bb4a999b38fe5396719c0  pkgutil-2.1b2.zip


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 Jul 26 11:09:07 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 26 Jul 2010 09:09:07 +0000
Subject: [csw-devel] SF.net SVN: gar:[10581] csw/mgar/pkg/autoconf/trunk
Message-ID: <E1OdJgJ-0003D6-5E@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10581
          http://gar.svn.sourceforge.net/gar/?rev=10581&view=rev
Author:   dmichelsen
Date:     2010-07-26 09:09:06 +0000 (Mon, 26 Jul 2010)

Log Message:
-----------
autoconf: Apply patches from https://trac.macports.org/changeset/69401

Modified Paths:
--------------
    csw/mgar/pkg/autoconf/trunk/Makefile
    csw/mgar/pkg/autoconf/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/autoconf/trunk/files/0002-Add-patches-from-https-trac.macports.org-changeset-6.patch

Modified: csw/mgar/pkg/autoconf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/autoconf/trunk/Makefile	2010-07-26 09:09:06 UTC (rev 10580)
+++ csw/mgar/pkg/autoconf/trunk/Makefile	2010-07-26 09:09:06 UTC (rev 10581)
@@ -17,6 +17,9 @@
 
 PATCHFILES = 0001-Prefer-CSW-tools.patch
 
+# Unified patches From https://trac.macports.org/changeset/69401
+PATCHFILES += 0002-Add-patches-from-https-trac.macports.org-changeset-6.patch
+
 BUILD_DEP_PKGS = CSWhelp2man
 RUNTIME_DEP_PKGS = CSWgawk CSWgm4 CSWperl
 

Modified: csw/mgar/pkg/autoconf/trunk/checksums
===================================================================
--- csw/mgar/pkg/autoconf/trunk/checksums	2010-07-26 09:09:06 UTC (rev 10580)
+++ csw/mgar/pkg/autoconf/trunk/checksums	2010-07-26 09:09:06 UTC (rev 10581)
@@ -1,2 +1,3 @@
 ac233d38923d5bebe91a64d68983c3c0  0001-Prefer-CSW-tools.patch
+c342d7f0533a6a18f7c3d7c3e4c47af6  0002-Add-patches-from-https-trac.macports.org-changeset-6.patch
 fb00d77cbc468994c55919298af1ff02  autoconf-2.66.tar.gz

Added: csw/mgar/pkg/autoconf/trunk/files/0002-Add-patches-from-https-trac.macports.org-changeset-6.patch
===================================================================
--- csw/mgar/pkg/autoconf/trunk/files/0002-Add-patches-from-https-trac.macports.org-changeset-6.patch	                        (rev 0)
+++ csw/mgar/pkg/autoconf/trunk/files/0002-Add-patches-from-https-trac.macports.org-changeset-6.patch	2010-07-26 09:09:06 UTC (rev 10581)
@@ -0,0 +1,39 @@
+From 941b4239da457a3a285cdca3e18c90056b2ba629 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Mon, 26 Jul 2010 11:03:50 +0200
+Subject: [PATCH] Add patches from https://trac.macports.org/changeset/69401
+
+---
+ lib/autoconf/status.m4 |    2 +-
+ lib/autoconf/types.m4  |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lib/autoconf/status.m4 b/lib/autoconf/status.m4
+index 52b7a3d..b9e7026 100644
+--- a/lib/autoconf/status.m4
++++ b/lib/autoconf/status.m4
+@@ -1102,7 +1102,7 @@ AC_DEFUN([AC_CONFIG_SUBDIRS],
+   _AC_CONFIG_COMPUTE_DEST(], [))])]dnl
+ [m4_append([_AC_LIST_SUBDIRS], [$1], [
+ ])]dnl
+-[AS_LITERAL_WORD_IF([$1], [],
++[AS_LITERAL_IF([$1], [],
+ 	       [AC_DIAGNOSE([syntax], [$0: you should use literals])])]dnl
+ [AC_SUBST([subdirs], ["$subdirs m4_normalize([$1])"])])
+ 
+diff --git a/lib/autoconf/types.m4 b/lib/autoconf/types.m4
+index ee07148..9f482da 100644
+--- a/lib/autoconf/types.m4
++++ b/lib/autoconf/types.m4
+@@ -763,7 +763,7 @@ Remove this warning and the `AC_CACHE_CHECK' when you adjust the code.])
+ # AC_CHECK_SIZEOF(TYPE, [IGNORED], [INCLUDES = DEFAULT-INCLUDES])
+ # ---------------------------------------------------------------
+ AC_DEFUN([AC_CHECK_SIZEOF],
+-[AS_LITERAL_IF([$1], [],
++[AS_LITERAL_IF(m4_translit([[$1]], [*], [p]), [],
+ 	       [m4_fatal([$0: requires literal arguments])])]dnl
+ [# The cast to long int works around a bug in the HP C Compiler
+ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+-- 
+1.7.1
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From dmichelsen at users.sourceforge.net  Mon Jul 26 11:21:51 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 26 Jul 2010 09:21:51 +0000
Subject: [csw-devel] SF.net SVN: gar:[10582] csw/mgar/pkg/multitail/trunk
Message-ID: <E1OdJsd-0008Cu-76@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 10582
          http://gar.svn.sourceforge.net/gar/?rev=10582&view=rev
Author:   dmichelsen
Date:     2010-07-26 09:21:50 +0000 (Mon, 26 Jul 2010)

Log Message:
-----------
multitail: Update to 5.2.6 and migrate from /opt/csw/etc to /etc/opt/csw

Modified Paths:
--------------
    csw/mgar/pkg/multitail/trunk/Makefile
    csw/mgar/pkg/multitail/trunk/checksums
    csw/mgar/pkg/multitail/trunk/files/patch-CSW.diff

Modified: csw/mgar/pkg/multitail/trunk/Makefile
===================================================================
--- csw/mgar/pkg/multitail/trunk/Makefile	2010-07-26 09:09:06 UTC (rev 10581)
+++ csw/mgar/pkg/multitail/trunk/Makefile	2010-07-26 09:21:50 UTC (rev 10582)
@@ -1,5 +1,5 @@
 GARNAME = multitail
-GARVERSION = 5.2.2
+GARVERSION = 5.2.6
 CATEGORIES = utils
 
 DESCRIPTION = View one or multiple files like the original tail program
@@ -19,10 +19,8 @@
 DISTFILES = $(GARNAME)-$(GARVERSION).tgz
 LICENSE = license.txt
 
-SPKG_CLASSES = none cswcpsampleconf
+RUNTIME_DEP_PKGS = CSWncurses
 
-RUNTIME_DEP_PKGS = CSWncurses CSWcswclassutils
-
 CONFIGURE_SCRIPTS = 
 TEST_SCRIPTS =
 INSTALL_SCRIPTS = custom
@@ -30,13 +28,16 @@
 # Adjust path to configuration file and compiler options
 PATCHFILES = patch-CSW.diff
 
+sysconfdir = /etc/opt/csw
+
 # Use provided Solaris Makefile
 BUILD_ARGS  = -f makefile.solaris_sunwspro
 
-PROTOTYPE_FILTER  = awk '\
-	$$$$3 ~ /multitail.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } \
-	 { print }'
+PRESERVECONF = .*/multitail\.conf\.CSW
+MIGRATE_FILES = multitail.conf
 
+CHECKPKG_OVERRIDES_CSWmultitail += missing-dependency|CSWperl
+
 include gar/category.mk
 
 install-custom: EXTRA_DOCS = readme.txt thanks.txt manual.html

Modified: csw/mgar/pkg/multitail/trunk/checksums
===================================================================
--- csw/mgar/pkg/multitail/trunk/checksums	2010-07-26 09:09:06 UTC (rev 10581)
+++ csw/mgar/pkg/multitail/trunk/checksums	2010-07-26 09:21:50 UTC (rev 10582)
@@ -1,2 +1,2 @@
-ab2c198381e9ff6271ce56bdcb06f963  download/multitail-5.2.2.tgz
-6aed798703781c95a917699f9968f454  download/patch-CSW.diff
+6496b3d78660ff8d11c743a0d03cca34  multitail-5.2.6.tgz
+bc0570a9338aec684a8789056ac598a3  patch-CSW.diff

Modified: csw/mgar/pkg/multitail/trunk/files/patch-CSW.diff
===================================================================
--- csw/mgar/pkg/multitail/trunk/files/patch-CSW.diff	2010-07-26 09:09:06 UTC (rev 10581)
+++ csw/mgar/pkg/multitail/trunk/files/patch-CSW.diff	2010-07-26 09:21:50 UTC (rev 10582)
@@ -7,7 +7,7 @@
  		"the MultiTail configurationfile which is located",
 -		"in /etc/multitail.conf. The keybindings only",
 -		"work in the main screen.",
-+		"in /opt/csw/etc/multitail.conf. The keybindings",
++		"in /etc/opt/csw/multitail.conf. The keybindings",
 +		"only work in the main screen.",
  		"In this screen, you can press the followking",
  		"keys:",
@@ -38,7 +38,7 @@
  from multitail.conf. In multitail.conf you set by entering regular
  expressions what color to use for what "patterns". By default, MultiTail
 -looks for multitail.conf in the current directory and in the /etc directory.
-+looks for multitail.conf in the /opt/csw/etc directory.
++looks for multitail.conf in the /etc/opt/csw directory.
  With the '-z' parameter you can explicitly define what file it should use.<BR>
  An example:
  <PRE>
@@ -50,7 +50,7 @@
  			printf("your mailfile): mail-check is disabled.\n");
  			printf("You can prevent this message by adding the line 'check_mail:0' ");
 -			printf("in /etc/multitail.conf or in .multitailrc in your home-directory.\n\n");
-+			printf("in /opt/csw/etc/multitail.conf or in .multitailrc in your home-directory.\n\n");
++			printf("in /etc/opt/csw/multitail.conf or in .multitailrc in your home-directory.\n\n");
  			printf("Press enter to continue...");
  			fflush(NULL);
  			getchar();


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 Jul 26 13:07:07 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 26 Jul 2010 11:07:07 +0000
Subject: [csw-devel] SF.net SVN: gar:[10584] csw/mgar/pkg/libsigsegv/trunk
Message-ID: <E1OdLWV-0001Dr-BF@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 10584
          http://gar.svn.sourceforge.net/gar/?rev=10584&view=rev
Author:   dmichelsen
Date:     2010-07-26 11:07:07 +0000 (Mon, 26 Jul 2010)

Log Message:
-----------
libsigsegv: Add version modulation for .so.0 and .so.2

Modified Paths:
--------------
    csw/mgar/pkg/libsigsegv/trunk/Makefile
    csw/mgar/pkg/libsigsegv/trunk/checksums

Modified: csw/mgar/pkg/libsigsegv/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libsigsegv/trunk/Makefile	2010-07-26 09:26:23 UTC (rev 10583)
+++ csw/mgar/pkg/libsigsegv/trunk/Makefile	2010-07-26 11:07:07 UTC (rev 10584)
@@ -1,6 +1,8 @@
 GARNAME = libsigsegv
 GARVERSION = 2.8
 CATEGORIES = lib
+EXTRA_MODULATORS = GARVERSION
+MODULATIONS_GARVERSION = 2.6 2.8
 
 DESCRIPTION = A library for catching and handling segmentation faults
 define BLURB
@@ -11,6 +13,10 @@
 MASTER_SITES = $(GNU_MIRROR)
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
 
+SOURCEFILES = $(foreach VERSION,$(MODULATIONS_GARVERSION),$(GARNAME)-$(VERSION).tar.gz)
+DISTFILES = $(SOURCEFILES)
+NOEXTRACT = $(filter-out $(GARNAME)-$(GARVERSION).tar.gz, $(SOURCEFILES))
+
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
@@ -22,4 +28,13 @@
 
 TEST_TARGET = check
 
+MERGE_SCRIPTS_isa-default-garversion-2.6 = copy-only
+MERGE_DIRS_isa-default-garversion-2.6 = $(libdir)
+MERGE_SCRIPTS_isa-default64-garversion-2.6 = copy-relocated-only
+MERGE_DIRS_isa-default64-garversion-2.6 = $(libdir)
+
+MERGE_SCRIPTS_isa-default-garversion-2.8 = copy-all
+MERGE_SCRIPTS_isa-default64-garversion-2.8 = copy-relocated-only
+MERGE_DIRS_isa-default64-garversion-2.8 = $(bindir) $(sbindir) $(libexecdir) $(libdir)
+
 include gar/category.mk

Modified: csw/mgar/pkg/libsigsegv/trunk/checksums
===================================================================
--- csw/mgar/pkg/libsigsegv/trunk/checksums	2010-07-26 09:26:23 UTC (rev 10583)
+++ csw/mgar/pkg/libsigsegv/trunk/checksums	2010-07-26 11:07:07 UTC (rev 10584)
@@ -1 +1,2 @@
+7e24993730649d13c6eabc28bd24de35  libsigsegv-2.6.tar.gz
 ebe554e26870d8bc200ef3e3539ffd7c  libsigsegv-2.8.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 Jul 26 14:09:40 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 26 Jul 2010 12:09:40 +0000
Subject: [csw-devel] SF.net SVN: gar:[10585] csw/mgar/gar
Message-ID: <E1OdMV2-0006b4-Da@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 10585
          http://gar.svn.sourceforge.net/gar/?rev=10585&view=rev
Author:   dmichelsen
Date:     2010-07-26 12:09:40 +0000 (Mon, 26 Jul 2010)

Log Message:
-----------
mGAR v2: Make new branch for package-internal checkpkg override

Modified Paths:
--------------
    csw/mgar/gar/v2-checkpkg-override-relocation/gar.conf.mk
    csw/mgar/gar/v2-checkpkg-override-relocation/gar.pkg.mk

Added Paths:
-----------
    csw/mgar/gar/v2-checkpkg-override-relocation/

Modified: csw/mgar/gar/v2-checkpkg-override-relocation/gar.conf.mk
===================================================================
--- csw/mgar/gar/v2/gar.conf.mk	2010-07-26 11:07:07 UTC (rev 10584)
+++ csw/mgar/gar/v2-checkpkg-override-relocation/gar.conf.mk	2010-07-26 12:09:40 UTC (rev 10585)
@@ -31,6 +31,7 @@
 WORKROOTDIR ?= $(if $(GAR_PLATFORM),work/$(GAR_PLATFORM),work)
 WORKDIR ?= $(WORKROOTDIR)/build-$(MODULATION)
 WORKDIR_FIRSTMOD ?= $(WORKROOTDIR)/build-$(firstword $(MODULATIONS))
+WORKDIR_GLOBAL ?= $(WORKROOTDIR)/build-global
 DOWNLOADDIR ?= $(WORKROOTDIR)/download
 PARTIALDIR ?= $(DOWNLOADDIR)/partial
 COOKIEROOTDIR ?= $(WORKROOTDIR)/cookies
@@ -492,7 +493,7 @@
  SOS12U1_AS_FLAGS ?= $(EXTRA_SOS12U1_AS_FLAGS) $(EXTRA_SOS_AS_FLAGS) $(EXTRA_AS_FLAGS)
     GCC3_LD_FLAGS ?= -L$(GCC3_CC_HOME)/lib/$(MM_LIBDIR) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC3_LD_FLAGS) $(EXTRA_GCC_LD_FLAGS) $(EXTRA_LD_FLAGS)
     GCC4_LD_FLAGS ?= -L$(GCC4_CC_HOME)/lib/$(MM_LIBDIR) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_GCC4_LD_FLAGS) $(EXTRA_GCC_LD_FLAGS) $(EXTRA_LD_FLAGS)
-   SOS11_LD_FLAGS ?= $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS11_LD_FLAGS) $(EXTRA_SOS_LD_FLAGS) $(EXTRA_LD_FLAGS) -norunpath
+   SOS11_LD_FLAGS ?= $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS11_LD_FLAGS) $(EXTRA_SOS_LD_FLAGS) $(EXTRA_LD_FLAGS) -norunpath -xnorunpath
    SOS12_LD_FLAGS ?= $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12_LD_FLAGS) $(EXTRA_SOS_LD_FLAGS) $(EXTRA_LD_FLAGS) -norunpath
  SOS12U1_LD_FLAGS ?= $(ARCHFLAGS_$(GARCOMPILER)_$(ISA)) $(EXTRA_SOS12U1_LD_FLAGS) $(EXTRA_SOS_LD_FLAGS) $(EXTRA_LD_FLAGS) -norunpath
 

Modified: csw/mgar/gar/v2-checkpkg-override-relocation/gar.pkg.mk
===================================================================
--- csw/mgar/gar/v2/gar.pkg.mk	2010-07-26 11:07:07 UTC (rev 10584)
+++ csw/mgar/gar/v2-checkpkg-override-relocation/gar.pkg.mk	2010-07-26 12:09:40 UTC (rev 10585)
@@ -366,7 +366,10 @@
 		$$F[1] = "cswalternatives" if( $$F[2] =~ m,^/opt/csw/share/alternatives/[^/]+$$, );\
                 print join(" ", at F),"\n";'
 
+_PROTOTYPE_MODIFIERS += | ( cat; \
+		$(foreach SPEC,$(_PKG_SPECS),if test -f "$(WORKDIR_GLOBAL)/checkpkg_override.$(SPEC)";then echo "i checkpkg_override=checkpkg_override.$(SPEC)"; fi;))
 
+
 # This file contains all installed pathes. This can be used as a starting point
 # for distributing files to individual packages.
 PROTOTYPE = $(WORKDIR)/prototype
@@ -682,7 +685,7 @@
 	$(_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 );' \
-		> $(PKGROOT)/opt/csw/share/checkpkg/overrides/$(call catalogname,$*)
+		> $(WORKDIR_GLOBAL)/checkpkg_override.$*
 	@$(MAKECOOKIE)
 
 merge-checkpkgoverrides: $(foreach S,$(SPKG_SPECS),$(if $(or $(CHECKPKG_OVERRIDES_$S),$(CHECKPKG_OVERRIDES),$(_CATEGORY_CHECKPKG_OVERRIDES)),merge-checkpkgoverrides-$S))


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From dmichelsen at users.sourceforge.net  Mon Jul 26 14:09:55 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Mon, 26 Jul 2010 12:09:55 +0000
Subject: [csw-devel] SF.net SVN: gar:[10586]
	csw/mgar/pkg/apr-util/trunk/Makefile
Message-ID: <E1OdMVH-0005tT-IN@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10586
          http://gar.svn.sourceforge.net/gar/?rev=10586&view=rev
Author:   dmichelsen
Date:     2010-07-26 12:09:55 +0000 (Mon, 26 Jul 2010)

Log Message:
-----------
apr-util: Add necessary EXTRA_LIB to bdb47

Modified Paths:
--------------
    csw/mgar/pkg/apr-util/trunk/Makefile

Modified: csw/mgar/pkg/apr-util/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apr-util/trunk/Makefile	2010-07-26 12:09:40 UTC (rev 10585)
+++ csw/mgar/pkg/apr-util/trunk/Makefile	2010-07-26 12:09:55 UTC (rev 10586)
@@ -20,6 +20,9 @@
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
+# We need this to get bdb47/lib into the runpath
+EXTRA_LIB = $(prefix)/bdb47/lib
+
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --with-apr=$(prefix)/bin/apr-1-config
 CONFIGURE_ARGS += --with-ldap


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 Jul 26 17:28:22 2010
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Mon, 26 Jul 2010 15:28:22 +0000
Subject: [csw-devel] SF.net SVN: gar:[10587]
	csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw
Message-ID: <E1OdPbK-0000kj-KR@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10587
          http://gar.svn.sourceforge.net/gar/?rev=10587&view=rev
Author:   wahwah
Date:     2010-07-26 15:28:22 +0000 (Mon, 26 Jul 2010)

Log Message:
-----------
mysql5.1: Fixing a patch to apply to 5.1.

Modified Paths:
--------------
    csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/Makefile
    csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/checksums
    csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/files/0001-Use-libc-not-libcrypt.patch

Modified: csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/Makefile
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/Makefile	2010-07-26 12:09:55 UTC (rev 10586)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/Makefile	2010-07-26 15:28:22 UTC (rev 10587)
@@ -5,7 +5,7 @@
 PROJ_NAME = mysql
 GARNAME = $(PROJ_NAME)51
 BASE_VERSION = 5.1
-PATCHLEVEL = 44
+PATCHLEVEL = 49
 GARVERSION = $(BASE_VERSION).$(PATCHLEVEL)
 CATEGORIES = server
 
@@ -130,14 +130,11 @@
 RUNTIME_DEP_PKGS_CSW$(GARNAME)           += CSWzlib
 RUNTIME_DEP_PKGS_CSW$(GARNAME)rt          = CSWosslrt
 RUNTIME_DEP_PKGS_CSW$(GARNAME)rt         += CSWzlib
-RUNTIME_DEP_PKGS_CSW$(GARNAME)bench       = CSW$(GARNAME)
 RUNTIME_DEP_PKGS_CSW$(GARNAME)bench      += CSWperl
 RUNTIME_DEP_PKGS_CSW$(GARNAME)client      = CSW$(GARNAME)rt
 RUNTIME_DEP_PKGS_CSW$(GARNAME)client     += CSWosslrt
 RUNTIME_DEP_PKGS_CSW$(GARNAME)client     += CSWncurses
 RUNTIME_DEP_PKGS_CSW$(GARNAME)client     += CSWzlib
-RUNTIME_DEP_PKGS_CSW$(GARNAME)devel       = CSW$(GARNAME)rt
-RUNTIME_DEP_PKGS_CSW$(GARNAME)test        = CSW$(GARNAME)
 RUNTIME_DEP_PKGS_CSW$(GARNAME)test       += CSWperl
 
 MASTER_SITES = ftp://mirror.switch.ch/mirror/mysql/Downloads/MySQL-$(BASE_VERSION)/
@@ -200,26 +197,27 @@
 PROTOTYPE_PERMS_dbdir = 0700
 PROTOTYPE_CLASS_dbdir = ugfiles
 
+CHECKPKG_OVERRIDES_CSWmysql51 += surplus-dependency|CSWmysql51client
+CHECKPKG_OVERRIDES_CSWmysql51rt += bad-rpath-entry
+
 include gar/category.mk
 
 CFLAGS := $(filter-out -I%,$(CFLAGS))
 
-CHECKPKG_OVERRIDES_CSWmysql51devel += missing-dependency|CSWmysql51
-
 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
-	# libtool: definition of this LT_INIT comes from libtool 2.2.6b.
-	# libtool: You should recreate aclocal.m4 with macros from libtool 2.2.6
-	# http://lists.opencsw.org/pipermail/maintainers/2009-December/005066.html
-	cd $(WORKSRC) && autoreconf --force --install --symlink
-	@$(MAKECOOKIE)
+# pre-configure-modulated:
+# 	# To work around the following libtool version mismatch problem:
+# 	# libtool: Version mismatch error.  This is libtool 2.2.6, but the
+# 	# libtool: definition of this LT_INIT comes from libtool 2.2.6b.
+# 	# libtool: You should recreate aclocal.m4 with macros from libtool 2.2.6
+# 	# http://lists.opencsw.org/pipermail/maintainers/2009-December/005066.html
+# 	cd $(WORKSRC) && autoreconf --force --install --symlink
+# 	@$(MAKECOOKIE)
 
 post-merge:
 	ginstall -m 755 -d $(PKGROOT)$(localstatedir)

Modified: csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/checksums
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/checksums	2010-07-26 12:09:55 UTC (rev 10586)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/checksums	2010-07-26 15:28:22 UTC (rev 10587)
@@ -1,4 +1,4 @@
-a0b98a7320bce2da3e1f90da704d3c85  0001-Use-libc-not-libcrypt.patch
+8940e0673e599689932e94fec906aec9  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
@@ -8,5 +8,5 @@
 e42afb5ec1b1ab02d2ec3b46d0922636  README.CSW
 7124b641ff82ee17033ce8f573700c89  cswmysql51
 67228e1f096fe08a94f4267439a4ec36  cswusergroup
-a16fa6d6c7f40a963919cbc1c5e86111  mysql-5.1.44.tar.gz
+a90d87a71fa3c23dff6d78afc8e3184c  mysql-5.1.49.tar.gz
 90b7cfcd11ab56e021a195a6a085fa21  quick_start-csw

Modified: csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/files/0001-Use-libc-not-libcrypt.patch
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/files/0001-Use-libc-not-libcrypt.patch	2010-07-26 12:09:55 UTC (rev 10586)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x-optcsw/files/0001-Use-libc-not-libcrypt.patch	2010-07-26 15:28:22 UTC (rev 10587)
@@ -1,19 +1,19 @@
-From a527f284ef5646dbdd731af007aace3daee3e946 Mon Sep 17 00:00:00 2001
-From: =?utf-8?q?Maciej=20Blizi=C5=84ski?= <blizinski at google.com>
-Date: Wed, 16 Sep 2009 01:27:38 +0100
-Subject: [PATCH 1/4] Use libc, not libcrypt
+From 6925aace1b489a5ffb0265c7fdc7edc3def7d995 Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Mon, 26 Jul 2010 08:03:17 +0200
+Subject: [PATCH] Use libc not libcrypt
 
 ---
  configure.in |    5 ++++-
  1 files changed, 4 insertions(+), 1 deletions(-)
 
 diff --git a/configure.in b/configure.in
-index ec432e1..577cfe3 100644
+index 7374723..1c181c7 100644
 --- a/configure.in
 +++ b/configure.in
-@@ -891,7 +891,10 @@ AC_CHECK_FUNC(p2open, , AC_CHECK_LIB(gen, p2open))
+@@ -860,7 +860,10 @@ AC_SEARCH_LIBS(setsockopt, socket)
  # This may get things to compile even if bind-8 is installed
- AC_CHECK_FUNC(bind, , AC_CHECK_LIB(bind, bind))
+ AC_SEARCH_LIBS(bind, bind)
  # Check if crypt() exists in libc or libcrypt, sets LIBS if needed
 -AC_SEARCH_LIBS(crypt, crypt, AC_DEFINE(HAVE_CRYPT, 1, [crypt]))
 +## AC_SEARCH_LIBS(crypt, crypt, AC_DEFINE(HAVE_CRYPT, 1, [crypt]))
@@ -24,5 +24,5 @@
  AC_SEARCH_LIBS(inet_aton, [socket nsl resolv])
  
 -- 
-1.6.3.2
+1.7.1
 


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 Jul 26 18:52:50 2010
From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net)
Date: Mon, 26 Jul 2010 16:52:50 +0000
Subject: [csw-devel] SF.net SVN: gar:[10588]
	csw/mgar/pkg/apr-util/trunk/Makefile
Message-ID: <E1OdQv4-0002Kv-Ey@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 10588
          http://gar.svn.sourceforge.net/gar/?rev=10588&view=rev
Author:   rthurner
Date:     2010-07-26 16:52:50 +0000 (Mon, 26 Jul 2010)

Log Message:
-----------
apr-util: use newest bdb48, works with extra lib

Modified Paths:
--------------
    csw/mgar/pkg/apr-util/trunk/Makefile

Modified: csw/mgar/pkg/apr-util/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apr-util/trunk/Makefile	2010-07-26 15:28:22 UTC (rev 10587)
+++ csw/mgar/pkg/apr-util/trunk/Makefile	2010-07-26 16:52:50 UTC (rev 10588)
@@ -15,18 +15,18 @@
 CATALOGNAME = apr_util
 
 RUNTIME_DEP_PKGS = CSWapr CSWiconv CSWsqlite3rt CSWunixodbc CSWexpat
-RUNTIME_DEP_PKGS += CSWbdb47 CSWoldaprt
+RUNTIME_DEP_PKGS += CSWbdb48 CSWoldaprt
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
-# We need this to get bdb47/lib into the runpath
-EXTRA_LIB = $(prefix)/bdb47/lib
+# We need this to get bdb48/lib into the runpath
+EXTRA_LIB = $(prefix)/bdb48/lib
 
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --with-apr=$(prefix)/bin/apr-1-config
 CONFIGURE_ARGS += --with-ldap
-CONFIGURE_ARGS += --with-berkeley-db=/opt/csw/bdb47
+CONFIGURE_ARGS += --with-berkeley-db=/opt/csw/bdb48
 CONFIGURE_ARGS += --without-freetds --without-sqlite2
 
 #BUILD64 = 1


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 Jul 26 19:24:52 2010
From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net)
Date: Mon, 26 Jul 2010 17:24:52 +0000
Subject: [csw-devel] SF.net SVN: gar:[10589]
	csw/mgar/pkg/sqlite3/trunk/Makefile
Message-ID: <E1OdRQ4-0004NC-1i@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 10589
          http://gar.svn.sourceforge.net/gar/?rev=10589&view=rev
Author:   rthurner
Date:     2010-07-26 17:24:51 +0000 (Mon, 26 Jul 2010)

Log Message:
-----------
sqlite3: disable tcl until /opt/csw/lib/libtclstub8.4.a is corrected

Modified Paths:
--------------
    csw/mgar/pkg/sqlite3/trunk/Makefile

Modified: csw/mgar/pkg/sqlite3/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sqlite3/trunk/Makefile	2010-07-26 16:52:50 UTC (rev 10588)
+++ csw/mgar/pkg/sqlite3/trunk/Makefile	2010-07-26 17:24:51 UTC (rev 10589)
@@ -49,7 +49,7 @@
 
 # Make configure options
 CONFIGURE_ARGS = $(DIRPATHS)
-CONFIGURE_ARGS += --enable-threadsafe --disable-debug
+CONFIGURE_ARGS += --enable-threadsafe --disable-debug --disable-tcl  
 CONFIGURE_ARGS += --with-readline-inc="-I/opt/csw/include/readline"
 
 TEST_SCRIPTS =


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 Jul 26 19:25:54 2010
From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net)
Date: Mon, 26 Jul 2010 17:25:54 +0000
Subject: [csw-devel] SF.net SVN: gar:[10590]
	csw/mgar/pkg/apr-util/trunk/Makefile
Message-ID: <E1OdRR4-0004OX-Ge@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 10590
          http://gar.svn.sourceforge.net/gar/?rev=10590&view=rev
Author:   rthurner
Date:     2010-07-26 17:25:54 +0000 (Mon, 26 Jul 2010)

Log Message:
-----------
apr-util: enable 64 bit build again

Modified Paths:
--------------
    csw/mgar/pkg/apr-util/trunk/Makefile

Modified: csw/mgar/pkg/apr-util/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apr-util/trunk/Makefile	2010-07-26 17:24:51 UTC (rev 10589)
+++ csw/mgar/pkg/apr-util/trunk/Makefile	2010-07-26 17:25:54 UTC (rev 10590)
@@ -29,7 +29,7 @@
 CONFIGURE_ARGS += --with-berkeley-db=/opt/csw/bdb48
 CONFIGURE_ARGS += --without-freetds --without-sqlite2
 
-#BUILD64 = 1
+BUILD64 = 1
 STRIP_LIBTOOL = 1
 
 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 Jul 26 19:46:36 2010
From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net)
Date: Mon, 26 Jul 2010 17:46:36 +0000
Subject: [csw-devel] SF.net SVN: gar:[10591]
	csw/mgar/pkg/apr-util/trunk/Makefile
Message-ID: <E1OdRl6-0004qz-9n@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 10591
          http://gar.svn.sourceforge.net/gar/?rev=10591&view=rev
Author:   rthurner
Date:     2010-07-26 17:46:36 +0000 (Mon, 26 Jul 2010)

Log Message:
-----------
apr-util: switch off 64bit again ... does not work

Modified Paths:
--------------
    csw/mgar/pkg/apr-util/trunk/Makefile

Modified: csw/mgar/pkg/apr-util/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apr-util/trunk/Makefile	2010-07-26 17:25:54 UTC (rev 10590)
+++ csw/mgar/pkg/apr-util/trunk/Makefile	2010-07-26 17:46:36 UTC (rev 10591)
@@ -29,7 +29,11 @@
 CONFIGURE_ARGS += --with-berkeley-db=/opt/csw/bdb48
 CONFIGURE_ARGS += --without-freetds --without-sqlite2
 
-BUILD64 = 1
+#BUILD64 = 1
+#reason is that no sparcv9 binaries are built for some reason and checkpkg suggests:
+#CHECKPKG_OVERRIDES_CSWapr-util += binary-disallowed-placement|file=opt/csw/lib/sparcv9/libaprutil-1.so.0.3.9|arch_id=2|arch_name=sparcv8|bad_path=sparcv9
+
+
 STRIP_LIBTOOL = 1
 
 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  Mon Jul 26 22:40:54 2010
From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net)
Date: Mon, 26 Jul 2010 20:40:54 +0000
Subject: [csw-devel] SF.net SVN: gar:[10592] csw/mgar/pkg/pkgutil/trunk
Message-ID: <E1OdUTm-0000Ek-Ug@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 10592
          http://gar.svn.sourceforge.net/gar/?rev=10592&view=rev
Author:   bonivart
Date:     2010-07-26 20:40:54 +0000 (Mon, 26 Jul 2010)

Log Message:
-----------
pkgutil: 2.1 beta 3

Modified Paths:
--------------
    csw/mgar/pkg/pkgutil/trunk/Makefile
    csw/mgar/pkg/pkgutil/trunk/checksums

Modified: csw/mgar/pkg/pkgutil/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pkgutil/trunk/Makefile	2010-07-26 17:46:36 UTC (rev 10591)
+++ csw/mgar/pkg/pkgutil/trunk/Makefile	2010-07-26 20:40:54 UTC (rev 10592)
@@ -1,5 +1,5 @@
 GARNAME = pkgutil
-GARVERSION = 2.1b2
+GARVERSION = 2.1b3
 CATEGORIES = utils
 
 DESCRIPTION = Installs Solaris packages easily
@@ -34,22 +34,6 @@
 CHECKPKG_OVERRIDES_CSWpkgutil += disallowed-path|opt/csw/share/doc
 CHECKPKG_OVERRIDES_CSWpkgutil += disallowed-path|opt/csw/share/man
 CHECKPKG_OVERRIDES_CSWpkgutil += disallowed-path|var/opt/csw
-CHECKPKG_OVERRIDES_CSWpkgutil += disallowed-path|etc/opt/csw
-CHECKPKG_OVERRIDES_CSWpkgutil += disallowed-path|opt/csw
-CHECKPKG_OVERRIDES_CSWpkgutil += disallowed-path|opt/csw/bin
-CHECKPKG_OVERRIDES_CSWpkgutil += disallowed-path|opt/csw/etc
-CHECKPKG_OVERRIDES_CSWpkgutil += disallowed-path|opt/csw/share
-CHECKPKG_OVERRIDES_CSWpkgutil += disallowed-path|opt/csw/share/doc
-CHECKPKG_OVERRIDES_CSWpkgutil += disallowed-path|opt/csw/share/man
-CHECKPKG_OVERRIDES_CSWpkgutil += disallowed-path|var/opt/csw
-CHECKPKG_OVERRIDES_CSWpkgutil += disallowed-path|etc/opt/csw
-CHECKPKG_OVERRIDES_CSWpkgutil += disallowed-path|opt/csw
-CHECKPKG_OVERRIDES_CSWpkgutil += disallowed-path|opt/csw/bin
-CHECKPKG_OVERRIDES_CSWpkgutil += disallowed-path|opt/csw/etc
-CHECKPKG_OVERRIDES_CSWpkgutil += disallowed-path|opt/csw/share
-CHECKPKG_OVERRIDES_CSWpkgutil += disallowed-path|opt/csw/share/doc
-CHECKPKG_OVERRIDES_CSWpkgutil += disallowed-path|opt/csw/share/man
-CHECKPKG_OVERRIDES_CSWpkgutil += disallowed-path|var/opt/csw
 
 PACKAGES = CSWpkgutil CSWpkgutilplus
 

Modified: csw/mgar/pkg/pkgutil/trunk/checksums
===================================================================
--- csw/mgar/pkg/pkgutil/trunk/checksums	2010-07-26 17:46:36 UTC (rev 10591)
+++ csw/mgar/pkg/pkgutil/trunk/checksums	2010-07-26 20:40:54 UTC (rev 10592)
@@ -5,4 +5,4 @@
 b5fffa0be100ddbb7262ce3a0a4e3bb7  build_sun_catalog.py
 7ad27336f90e73da3254a61d91025ee5  cswcatalog
 3a6b789b3d5e05f41d2363dd26a92acf  opencsw.py
-b34650798f9bb4a999b38fe5396719c0  pkgutil-2.1b2.zip
+8ca685d6aadb1490d05b3a24baf2636c  pkgutil-2.1b3.zip


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 Jul 26 23:55:37 2010
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Mon, 26 Jul 2010 21:55:37 +0000
Subject: [csw-devel] SF.net SVN: gar:[10593] csw/mgar/pkg
Message-ID: <E1OdVe5-0007en-VN@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 10593
          http://gar.svn.sourceforge.net/gar/?rev=10593&view=rev
Author:   wahwah
Date:     2010-07-26 21:55:37 +0000 (Mon, 26 Jul 2010)

Log Message:
-----------
python-graph: Initial commit

Modified Paths:
--------------
    csw/mgar/pkg/python-graph/trunk/Makefile
    csw/mgar/pkg/python-graph/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/python-graph/

Modified: csw/mgar/pkg/python-graph/trunk/Makefile
===================================================================
--- csw/mgar/pkg/template/trunk/Makefile	2010-07-11 14:03:10 UTC (rev 10496)
+++ csw/mgar/pkg/python-graph/trunk/Makefile	2010-07-26 21:55:37 UTC (rev 10593)
@@ -2,184 +2,24 @@
 # 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
-##
-GARNAME = mypkg
-GARVERSION = 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 = <please fill in>
-##
-## A longer description of the package. This is only for descriptive purposes
-## inside the Makefile and is not used elsewhere.
+GARNAME = python-graph
+GARVERSION = 1.7.0
+CATEGORIES = python
+DESCRIPTION = A library for working with graphs in Python
 define BLURB
-  <please fill in>
 endef
-##
-## Upstream URL that should show up in the VENDOR field as well as on
-## http://opencsw.org/packages/<packagename>.
-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 $(GARNAME). 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  = $(GARNAME)-$(GARVERSION).tar.gz
-##
-## We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
-##
-## Catalog name is the name to be used with pkg{-get,util} -i <pkgname>.
-## 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 = <file containing an entry for /etc/services>
-## INETDCONF = <file containing an inetd.conf formatted entry>
-## 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)/$(GARNAME)-$(GARVERSION)
-##
-## 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://pypi.python.org/pypi/python-graph
+MASTER_SITES = $(GOOGLE_MIRROR)
+DISTFILES  = $(GARNAME)-$(GARVERSION).tar.bz2
+UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2
+PACKAGES = CSWpy-graph
+CATALOGNAME_CSWpy-graph = py_graph
+BUILD_SCRIPTS =
+# INSTALL_SCRIPTS = python-graph
+TEST_SCRIPTS =
+BUILD_SCRIPTS ?= $(WORKSRC)/core/setup.py
+INSTALL_SCRIPTS ?= $(WORKSRC)/core/setup.py
 
-#include gar/category.mk
+ARCHALL_CSWpy-graph = 1
+
+include gar/category.mk

Modified: csw/mgar/pkg/python-graph/trunk/checksums
===================================================================
--- csw/mgar/pkg/template/trunk/checksums	2010-07-11 14:03:10 UTC (rev 10496)
+++ csw/mgar/pkg/python-graph/trunk/checksums	2010-07-26 21:55:37 UTC (rev 10593)
@@ -0,0 +1 @@
+6268f6942e68c80cd2d5de6276cf4d07  python-graph-1.7.0.tar.bz2


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From wahwah at users.sourceforge.net  Tue Jul 27 10:32:41 2010
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Tue, 27 Jul 2010 08:32:41 +0000
Subject: [csw-devel] SF.net SVN: gar:[10594] csw/mgar/pkg/unixodbc/trunk
Message-ID: <E1Odfab-0001Rc-V1@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10594
          http://gar.svn.sourceforge.net/gar/?rev=10594&view=rev
Author:   wahwah
Date:     2010-07-27 08:32:41 +0000 (Tue, 27 Jul 2010)

Log Message:
-----------
unixodbc: Upgrade to 2.3.0

Modified Paths:
--------------
    csw/mgar/pkg/unixodbc/trunk/Makefile
    csw/mgar/pkg/unixodbc/trunk/checksums

Modified: csw/mgar/pkg/unixodbc/trunk/Makefile
===================================================================
--- csw/mgar/pkg/unixodbc/trunk/Makefile	2010-07-26 21:55:37 UTC (rev 10593)
+++ csw/mgar/pkg/unixodbc/trunk/Makefile	2010-07-27 08:32:41 UTC (rev 10594)
@@ -3,7 +3,7 @@
 # $Id$
 
 GARNAME = unixodbc
-GARVERSION = 2.2.14
+GARVERSION = 2.3.0
 CATEGORIES = lib
 
 DESCRIPTION = ODBC drivers for Unix systems
@@ -11,20 +11,24 @@
 endef
 DL_NAME = unixODBC
 MASTER_SITES = http://www.unixodbc.org/
-DISTFILES  = $(DL_NAME)-$(GARVERSION).tar.gz
+DISTNAME = $(DL_NAME)-$(GARVERSION)
+DISTFILES  = $(DISTNAME).tar.gz
 DISTFILES += cswmigrateconf
-WORKSRC = $(WORKDIR)/$(DL_NAME)-$(GARVERSION)
 UFILES_REGEX = $(DL_NAME)-(\d+(?:\.\d+)*).tar.gz
-RUNTIME_DEP_PKGS  = CSWiconv
-RUNTIME_DEP_PKGS += CSWreadline
-sysconfdir = /etc/opt/csw
-localstatedir = /var/opt/csw
+RUNTIME_DEP_PKGS_CSWunixodbc  = CSWiconv
+RUNTIME_DEP_PKGS_CSWunixodbc += CSWreadline
+RUNTIME_DEP_PKGS_CSWunixodbc += CSWlibtoolrt
+sysconfdir = /etc$(prefix)
+localstatedir = /var$(prefix)
 CONFIGURE_ARGS = $(DIRPATHS) --enable-gui=no
 BUILD64 = 1
 SAMPLECONF = \/etc\/opt\/csw\/odbc(inst|).ini
 MIGRATECONF = \/etc\/opt\/csw\/pkg\/$(GARNAME)\/cswmigrateconf
 TEST_SCRIPTS =
+LICENSE = COPYING
 
+include gar/category.mk
+
 post-install-modulated:
 	(cd $(DESTDIR)$(sysconfdir); \
 	for f in odbc.ini odbcinst.ini; do \
@@ -33,5 +37,3 @@
 	ginstall -d -m 755 $(DESTDIR)$(sysconfdir)/pkg/$(GARNAME)
 	ginstall -m 644 $(FILEDIR)/cswmigrateconf $(DESTDIR)$(sysconfdir)/pkg/$(GARNAME)
 	@$(MAKECOOKIE)
-
-include gar/category.mk

Modified: csw/mgar/pkg/unixodbc/trunk/checksums
===================================================================
--- csw/mgar/pkg/unixodbc/trunk/checksums	2010-07-26 21:55:37 UTC (rev 10593)
+++ csw/mgar/pkg/unixodbc/trunk/checksums	2010-07-27 08:32:41 UTC (rev 10594)
@@ -1,2 +1,2 @@
-fb47ac973383744b50cbd5af320a8dc2  cswmigrateconf
-f47c2efb28618ecf5f33319140a7acd0  unixODBC-2.2.14.tar.gz
+8359050c8b7b37641805301da4d230c2  cswmigrateconf
+f2ad22cbdffe836c58987ed2332c2e99  unixODBC-2.3.0.tar.gz


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From wahwah at users.sourceforge.net  Tue Jul 27 11:30:27 2010
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Tue, 27 Jul 2010 09:30:27 +0000
Subject: [csw-devel] SF.net SVN: gar:[10595] csw/mgar/pkg/unixodbc/trunk
Message-ID: <E1OdgUV-0007eP-ET@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 10595
          http://gar.svn.sourceforge.net/gar/?rev=10595&view=rev
Author:   wahwah
Date:     2010-07-27 09:30:27 +0000 (Tue, 27 Jul 2010)

Log Message:
-----------
unixodbc: Updating the checksum of cswmigrateconf file, updating the svn:externals value.

Modified Paths:
--------------
    csw/mgar/pkg/unixodbc/trunk/checksums

Property Changed:
----------------
    csw/mgar/pkg/unixodbc/trunk/


Property changes on: csw/mgar/pkg/unixodbc/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2-migrateconf

   + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2


Modified: csw/mgar/pkg/unixodbc/trunk/checksums
===================================================================
--- csw/mgar/pkg/unixodbc/trunk/checksums	2010-07-27 08:32:41 UTC (rev 10594)
+++ csw/mgar/pkg/unixodbc/trunk/checksums	2010-07-27 09:30:27 UTC (rev 10595)
@@ -1,2 +1,2 @@
-8359050c8b7b37641805301da4d230c2  cswmigrateconf
+fb47ac973383744b50cbd5af320a8dc2  cswmigrateconf
 f2ad22cbdffe836c58987ed2332c2e99  unixODBC-2.3.0.tar.gz


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From wahwah at users.sourceforge.net  Tue Jul 27 12:45:40 2010
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Tue, 27 Jul 2010 10:45:40 +0000
Subject: [csw-devel] SF.net SVN: gar:[10596]
	csw/mgar/pkg/sudo/branches/sudo-1.7.2x/
Message-ID: <E1OdhfI-00044h-OS@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10596
          http://gar.svn.sourceforge.net/gar/?rev=10596&view=rev
Author:   wahwah
Date:     2010-07-27 10:45:40 +0000 (Tue, 27 Jul 2010)

Log Message:
-----------
Making a branch for sudo-1.7.2x versions.

Added Paths:
-----------
    csw/mgar/pkg/sudo/branches/sudo-1.7.2x/


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 Jul 27 13:39:20 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Tue, 27 Jul 2010 11:39:20 +0000
Subject: [csw-devel] SF.net SVN: gar:[10597] csw/mgar/pkg/rubygems/trunk
Message-ID: <E1OdiVE-0007Uu-RE@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 10597
          http://gar.svn.sourceforge.net/gar/?rev=10597&view=rev
Author:   dmichelsen
Date:     2010-07-27 11:39:20 +0000 (Tue, 27 Jul 2010)

Log Message:
-----------
rubygems: Update to 1.3.7

Modified Paths:
--------------
    csw/mgar/pkg/rubygems/trunk/Makefile
    csw/mgar/pkg/rubygems/trunk/checksums

Modified: csw/mgar/pkg/rubygems/trunk/Makefile
===================================================================
--- csw/mgar/pkg/rubygems/trunk/Makefile	2010-07-27 10:45:40 UTC (rev 10596)
+++ csw/mgar/pkg/rubygems/trunk/Makefile	2010-07-27 11:39:20 UTC (rev 10597)
@@ -1,5 +1,5 @@
 GARNAME = rubygems
-GARVERSION = 1.3.5
+GARVERSION = 1.3.7
 CATEGORIES = xtra
 
 DESCRIPTION = Ruby package manager
@@ -10,7 +10,7 @@
 
 
 SPKG_SOURCEURL = http://rubyforge.org/projects/rubygems/
-MASTER_SITES   = http://rubyforge.org/frs/download.php/60718/
+MASTER_SITES   = http://rubyforge.org/frs/download.php/70696/
 
 DISTFILES  = $(GARNAME)-$(GARVERSION).tgz
 

Modified: csw/mgar/pkg/rubygems/trunk/checksums
===================================================================
--- csw/mgar/pkg/rubygems/trunk/checksums	2010-07-27 10:45:40 UTC (rev 10596)
+++ csw/mgar/pkg/rubygems/trunk/checksums	2010-07-27 11:39:20 UTC (rev 10597)
@@ -1 +1 @@
-6e317335898e73beab15623cdd5f8cff  download/rubygems-1.3.5.tgz
+e85cfadd025ff6ab689375adbf344bbe  rubygems-1.3.7.tgz


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From wahwah at users.sourceforge.net  Tue Jul 27 14:04:50 2010
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Tue, 27 Jul 2010 12:04:50 +0000
Subject: [csw-devel] SF.net SVN: gar:[10598]
	csw/mgar/pkg/sudo/branches/sudo-1.7.2x
Message-ID: <E1Oditu-0006kg-A7@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 10598
          http://gar.svn.sourceforge.net/gar/?rev=10598&view=rev
Author:   wahwah
Date:     2010-07-27 12:04:50 +0000 (Tue, 27 Jul 2010)

Log Message:
-----------
sudo: A build for 1.7.2p8, which seems to be working fine.

Modified Paths:
--------------
    csw/mgar/pkg/sudo/branches/sudo-1.7.2x/Makefile
    csw/mgar/pkg/sudo/branches/sudo-1.7.2x/checksums

Modified: csw/mgar/pkg/sudo/branches/sudo-1.7.2x/Makefile
===================================================================
--- csw/mgar/pkg/sudo/branches/sudo-1.7.2x/Makefile	2010-07-27 11:39:20 UTC (rev 10597)
+++ csw/mgar/pkg/sudo/branches/sudo-1.7.2x/Makefile	2010-07-27 12:04:50 UTC (rev 10598)
@@ -1,7 +1,7 @@
 # $Id$
 
 GARNAME = sudo
-GARVERSION = 1.7.3
+GARVERSION = 1.7.2p8
 CATEGORIES = utils
 
 DESCRIPTION = Provides limited super user privileges
@@ -33,8 +33,6 @@
 SPKG_DESC_CSWsudo-common = Common files for sudo
 SPKG_SOURCEURL_CSWsudo-common = http://www.sudo.ws
 RUNTIME_DEP_PKGS_CSWsudo-common = CSWggettextrt
-RUNTIME_DEP_PKGS_CSWsudo += CSWzlib
-RUNTIME_DEP_PKGS_CSWsudo-common += CSWzlib
 
 DISTFILES += CSWsudo-common.postinstall 
 

Modified: csw/mgar/pkg/sudo/branches/sudo-1.7.2x/checksums
===================================================================
--- csw/mgar/pkg/sudo/branches/sudo-1.7.2x/checksums	2010-07-27 11:39:20 UTC (rev 10597)
+++ csw/mgar/pkg/sudo/branches/sudo-1.7.2x/checksums	2010-07-27 12:04:50 UTC (rev 10598)
@@ -1,3 +1,3 @@
 955d99eda1432c7b7e00d98b91e35a79  CSWsudo-common.postinstall
 157b2e5e38ca54eb36e0364706bd0292  install.diff
-c22115b47cb2591bceedb914b673f031  sudo-1.7.3.tar.gz
+6fff2e06ada0c6b2503221c1158129a2  sudo-1.7.2p8.tar.gz


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From opk at users.sourceforge.net  Tue Jul 27 14:14:18 2010
From: opk at users.sourceforge.net (opk at users.sourceforge.net)
Date: Tue, 27 Jul 2010 12:14:18 +0000
Subject: [csw-devel] SF.net SVN: gar:[10599] csw/mgar/pkg/zsh/trunk
Message-ID: <E1Odj34-0008OR-2I@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 10599
          http://gar.svn.sourceforge.net/gar/?rev=10599&view=rev
Author:   opk
Date:     2010-07-27 12:14:17 +0000 (Tue, 27 Jul 2010)

Log Message:
-----------
minor updates

Modified Paths:
--------------
    csw/mgar/pkg/zsh/trunk/Makefile
    csw/mgar/pkg/zsh/trunk/files/_pkgutil

Modified: csw/mgar/pkg/zsh/trunk/Makefile
===================================================================
--- csw/mgar/pkg/zsh/trunk/Makefile	2010-07-27 12:04:50 UTC (rev 10598)
+++ csw/mgar/pkg/zsh/trunk/Makefile	2010-07-27 12:14:17 UTC (rev 10599)
@@ -13,7 +13,10 @@
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.bz2
 DISTFILES += $(call admfiles,CSWzsh,postinstall postremove)
 
+LICENSE = LICENCE
+
 RUNTIME_DEP_PKGS = CSWiconv CSWncurses CSWpcrert CSWgdbm
+BUILD_DEP_PKGS = CSWpcre
 
 SPKG_SOURCEURL = http://www.zsh.org
 
@@ -32,3 +35,6 @@
 # Use term.h from ncurses or we get compile errors
 #   http://www.zsh.org/mla/workers/2007/msg01236.html
 CPPFLAGS := -I$(includedir)/ncursesw $(CPPFLAGS)
+
+post-install:
+	cp -p files/_pkgutil $(DESTDIR)$(sharedstatedir)/$(GARNAME)/functions

Modified: csw/mgar/pkg/zsh/trunk/files/_pkgutil
===================================================================
--- csw/mgar/pkg/zsh/trunk/files/_pkgutil	2010-07-27 12:04:50 UTC (rev 10598)
+++ csw/mgar/pkg/zsh/trunk/files/_pkgutil	2010-07-27 12:14:17 UTC (rev 10599)
@@ -7,7 +7,7 @@
 local catalog
 catalog=( /var/opt/csw/pkgutil/catalog.*_`uname -p`_`uname -r`(N[1]) )
 
-_arguments \
+_arguments -S \
   "$opts"{-i,--install}'[install package]' \
   "$opts"{-u,--upgrade}'[upgrade package]' \
   "$opts"{-r,--remove}'[remove package]' \
@@ -39,7 +39,7 @@
     typeset -A pkgs
     pkgs=( ${(s: :)${${${${(f)"$(<$catalog)"[3,-1]}/(#b) [^ ]## ([^ ]##) */ ${match[1]}}:#\#*}[3,(i)-----BEGIN*]}[1,-2]} )
     if (( $+opt_args[-r] + $+opt_args[--remove] + $+opt_args[-u] + $+opt_args[--upgrade])); then
-      local old=\(${(j.|.)${${${${(f)"$(pkginfo)"}#[^ ]## ##}%% *}}}\)
+      local old=\(${(j.|.)${${${${(f)"$(_call_program commands pkginfo)"}#[^ ]## ##}%% *}}}\)
       _wanted packages expl package compadd ${(k)pkgs[(R)$~old]} && ret=0
     else
       _wanted packages expl package compadd -k pkgs && ret=0


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From bdwalton at users.sourceforge.net  Tue Jul 27 15:28:44 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Tue, 27 Jul 2010 13:28:44 +0000
Subject: [csw-devel] SF.net SVN: gar:[10600]
	csw/mgar/pkg/rb-mysql/trunk/Makefile
Message-ID: <E1OdkD6-0002no-A2@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 10600
          http://gar.svn.sourceforge.net/gar/?rev=10600&view=rev
Author:   bdwalton
Date:     2010-07-27 13:28:43 +0000 (Tue, 27 Jul 2010)

Log Message:
-----------
rb-mysql: a first cut at working on a ruby gem package for the mysql library

Modified Paths:
--------------
    csw/mgar/pkg/rb-mysql/trunk/Makefile

Modified: csw/mgar/pkg/rb-mysql/trunk/Makefile
===================================================================
--- csw/mgar/pkg/rb-mysql/trunk/Makefile	2010-07-27 12:14:17 UTC (rev 10599)
+++ csw/mgar/pkg/rb-mysql/trunk/Makefile	2010-07-27 13:28:43 UTC (rev 10600)
@@ -7,12 +7,21 @@
 MASTER_SITES = http://rubygems.org/downloads/
 DISTFILES  = mysql-$(GARVERSION).gem
 
+BUILD_DEP_PKGS = CSWrubygems
+RUNTIME_DEP_PKGS = CSWrubygems
+
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
 
 CONFIGURE_SCRIPTS = 
+BUILD_SCRIPTS = 
 TEST_SCRIPTS = 
 
+INSTALL_SCRIPTS = custom
 
 include gar/category.mk
+
+GEMDIR = /opt/csw/lib/ruby/gems/1.8
+install-custom:
+	( cd $(WORKSRC)/..; gem install --no-test --install-dir $(DESTDIR)$(GEMDIR) $(DISTFILES) )


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 Jul 27 15:32:48 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Tue, 27 Jul 2010 13:32:48 +0000
Subject: [csw-devel] SF.net SVN: gar:[10601] csw/mgar/pkg/pca/trunk
Message-ID: <E1OdkH2-0007X0-Gd@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10601
          http://gar.svn.sourceforge.net/gar/?rev=10601&view=rev
Author:   dmichelsen
Date:     2010-07-27 13:32:48 +0000 (Tue, 27 Jul 2010)

Log Message:
-----------
pca: Update to 20100727-01

Modified Paths:
--------------
    csw/mgar/pkg/pca/trunk/Makefile
    csw/mgar/pkg/pca/trunk/checksums

Modified: csw/mgar/pkg/pca/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pca/trunk/Makefile	2010-07-27 13:28:43 UTC (rev 10600)
+++ csw/mgar/pkg/pca/trunk/Makefile	2010-07-27 13:32:48 UTC (rev 10601)
@@ -1,5 +1,5 @@
 GARNAME = pca
-GARVERSION = 20100607-01
+GARVERSION = 20100727-01
 CATEGORIES = utils
 
 DESCRIPTION = Patch Check Advanced

Modified: csw/mgar/pkg/pca/trunk/checksums
===================================================================
--- csw/mgar/pkg/pca/trunk/checksums	2010-07-27 13:28:43 UTC (rev 10600)
+++ csw/mgar/pkg/pca/trunk/checksums	2010-07-27 13:32:48 UTC (rev 10601)
@@ -1,5 +1,5 @@
 4376789925fa9002d0567d739f717748  0001-prefer-opencsw-perl.diff
 fc014aaacd778fd17c212d4f0f60c8fb  0002-Add-etc-opt-csw-as-config-location.patch
 6f2f2376eba0a788795dd43d68ad32d1  COPYING
-f79380d3298af941e5a88d1bcb56137b  pca-20100607-01
+c9272b4888eea55d18bb2143fffb0bf1  pca-20100727-01
 12de68ff8f67b4bb8b095e5646402208  pca.conf


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From dmichelsen at users.sourceforge.net  Tue Jul 27 15:39:33 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Tue, 27 Jul 2010 13:39:33 +0000
Subject: [csw-devel] SF.net SVN: gar:[10602] csw/mgar/pkg/rake/trunk/Makefile
Message-ID: <E1OdkNZ-0003Bu-Ho@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 10602
          http://gar.svn.sourceforge.net/gar/?rev=10602&view=rev
Author:   dmichelsen
Date:     2010-07-27 13:39:33 +0000 (Tue, 27 Jul 2010)

Log Message:
-----------
rake: Add vendor URL

Modified Paths:
--------------
    csw/mgar/pkg/rake/trunk/Makefile

Modified: csw/mgar/pkg/rake/trunk/Makefile
===================================================================
--- csw/mgar/pkg/rake/trunk/Makefile	2010-07-27 13:32:48 UTC (rev 10601)
+++ csw/mgar/pkg/rake/trunk/Makefile	2010-07-27 13:39:33 UTC (rev 10602)
@@ -26,6 +26,8 @@
 CONFIGURE_SCRIPTS =
 INSTALL_SCRIPTS   = ruby
 
+VENDOR_URL = http://rake.rubyforge.org/
+
 include gar/category.mk
 
 install-ruby:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From opk at users.sourceforge.net  Tue Jul 27 15:51:37 2010
From: opk at users.sourceforge.net (opk at users.sourceforge.net)
Date: Tue, 27 Jul 2010 13:51:37 +0000
Subject: [csw-devel] SF.net SVN: gar:[10603]
	csw/mgar/pkg/pygobject/trunk/Makefile
Message-ID: <E1OdkZF-00026u-1t@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 10603
          http://gar.svn.sourceforge.net/gar/?rev=10603&view=rev
Author:   opk
Date:     2010-07-27 13:51:36 +0000 (Tue, 27 Jul 2010)

Log Message:
-----------
fix naming convention issues flagged by checkpkg

Modified Paths:
--------------
    csw/mgar/pkg/pygobject/trunk/Makefile

Modified: csw/mgar/pkg/pygobject/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pygobject/trunk/Makefile	2010-07-27 13:39:33 UTC (rev 10602)
+++ csw/mgar/pkg/pygobject/trunk/Makefile	2010-07-27 13:51:36 UTC (rev 10603)
@@ -13,11 +13,11 @@
 
 STRIP_LIBTOOL = 1
 
-PACKAGES = CSWpygobject
-RUNTIME_DEP_PKGS_CSWpygobject  = CSWpython CSWggettextrt CSWglib2
+PACKAGES = CSWpy-gobject
+RUNTIME_DEP_PKGS_CSWpy-gobject  = CSWpython CSWggettextrt CSWglib2
 
-CATALOGNAME_CSWpygobject = pygobject
-SPKG_DESC_CSWpygobject = pygobject support for Python
+CATALOGNAME_CSWpy-gobject = py_gobject
+SPKG_DESC_CSWpy-gobject = $(DESCRIPTION)
 PYCOMPILE = 1
 
 PATCHFILES = 0001-forcing-lglib-2.0.patch


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From dmichelsen at users.sourceforge.net  Tue Jul 27 16:30:09 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Tue, 27 Jul 2010 14:30:09 +0000
Subject: [csw-devel] SF.net SVN: gar:[10604] csw/mgar/gar/v2
Message-ID: <E1OdlAX-0007fu-JT@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 10604
          http://gar.svn.sourceforge.net/gar/?rev=10604&view=rev
Author:   dmichelsen
Date:     2010-07-27 14:30:09 +0000 (Tue, 27 Jul 2010)

Log Message:
-----------
mGAR v2: Add rbgems category

Modified Paths:
--------------
    csw/mgar/gar/v2/categories/rbgems/category.mk

Added Paths:
-----------
    csw/mgar/gar/v2/categories/rbgems/
    csw/mgar/gar/v2/pkglib/csw/depend.ruby
    csw/mgar/gar/v2/pkglib/csw_rbgems_dyngspec.gspec

Modified: csw/mgar/gar/v2/categories/rbgems/category.mk
===================================================================
--- csw/mgar/gar/v2/categories/cpan/category.mk	2010-07-27 13:28:43 UTC (rev 10600)
+++ csw/mgar/gar/v2/categories/rbgems/category.mk	2010-07-27 14:30:09 UTC (rev 10604)
@@ -1,107 +1,51 @@
 
 # Set the CPAN mirror in gar.conf.mk
-MASTER_SITES ?= $(CPAN_MIRRORS)
+MASTER_SITES ?= http://rubygems.org/downloads/
 
 # This is common to most modules - override in module makefile if different
-MODDIST   ?= $(GARNAME)-$(GARVERSION).tar.gz
+GEMNAME ?= $(GARNAME)
+GEMVERSION ?= $(GARVERSION)
+MODDIST   ?= $(GEMNAME)-$(GEMVERSION).gem
 DISTFILES += $(MODDIST)
-CHECKPATH ?= $(firstword $(CPAN_MIRRORS))
 
 # Tests are enabled by default, unless overridden at the test level
 ENABLE_TEST ?= 1
 
-# Every CPAN module depends on Perl
-#DEPENDS += lang/perl
+CONFIGURE_SCRIPTS ?=
 
-# Standard Perl module configuration script
-CONFIGURE_SCRIPTS ?= $(WORKSRC)/Makefile.PL
-
-# Calculate the CPAN author id
-GEN_AUTHOR_ID  = $(shell echo ${AUTHOR} | cut -c1)
-GEN_AUTHOR_ID := $(GEN_AUTHOR_ID)/$(shell echo ${AUTHOR} | cut -c1,2)
-GEN_AUTHOR_ID := $(GEN_AUTHOR_ID)/$(AUTHOR)
-AUTHOR_ID ?= $(GEN_AUTHOR_ID)
-
-# Source URL
-TOLOWER = $(shell echo $(1) | tr '[A-Z]' '[a-z]')
-SPKG_SOURCEURL  = http://search.cpan.org
-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 ?= $(GEMNAME)-(\d+(?:\.\d+)*).gem
 USTREAM_MASTER_SITE ?= $(SPKG_SOURCEURL)
 
-_CATEGORY_SPKG_DESC = $(GARNAME): $(SPKG_DESC)
-_CATEGORY_PKGINFO = echo "PERL_MODULE_NAME=$(GARNAME)";
+_CATEGORY_SPKG_DESC = $(GEMNAME): $(SPKG_DESC)
+_CATEGORY_PKGINFO = echo "RUBY_GEM_NAME=$(GEMNAME)";
 
-SPKG_SOURCEURL := $(SPKG_SOURCEURL)/$(GARNAME)
+# _MERGE_EXCLUDE_CATEGORY = .*/perllocal\.pod .*/\.packlist
+_CATEGORY_GSPEC_INCLUDE ?= csw_rbgems_dyngspec.gspec
 
-_MERGE_EXCLUDE_CATEGORY = .*/perllocal\.pod .*/\.packlist
-_CATEGORY_GSPEC_INCLUDE ?= csw_cpan_dyngspec.gspec
-
-# Perl module dependencies can not be properly tracked right now
+# Ruby module dependencies can not be properly tracked right now
 _CATEGORY_CHECKPKG_OVERRIDES = surplus-dependency
 
-include gar/gar.mk
+# gem specification actionmailer-2.3.8.gem
+# -> YAML for
+# - dependency generation
+# - link to rubyforge
 
-CONFIGURE_ENV += PERL5LIB=$(PERL5LIB)
-BUILD_ENV     += PERL5LIB=$(PERL5LIB)
-TEST_ENV      += PERL5LIB=$(PERL5LIB)
-INSTALL_ENV   += PERL5LIB=$(PERL5LIB)
+CONFIGURE_SCRIPTS ?=
+BUILD_SCRIPTS ?= 
+TEST_SCRIPTS ?= 
+INSTALL_SCRIPTS = rbgem
 
-# Configure a target using Makefile.PL
-_CATEGORY_LD_OPTIONS ?= -L$(libdir) -lperl
-PERL_CONFIGURE_ARGS ?= INSTALLDIRS=vendor $(EXTRA_PERL_CONFIGURE_ARGS)
-configure-%/Makefile.PL:
-	@echo " ==> Running Makefile.PL in $*"
-	( cd $* ; \
-	    $(CONFIGURE_ENV) perl Makefile.PL \
-	        $(CONFIGURE_ARGS) $(PERL_CONFIGURE_ARGS) )
-	@$(MAKECOOKIE)
+include gar/gar.mk
 
-PERLBUILD_CONFIGURE_ARGS ?= installdirs=vendor $(EXTRA_PERLBUILD_CONFIGURE_ARGS)
-configure-%/Build.PL:
-	@echo " ==> Running Build.PL in $*"
-	( cd $* ; \
-	    $(CONFIGURE_ENV) perl Build.PL \
-	        $(PERLBUILD_CONFIGURE_ARGS) $(CONFIGURE_ARGS) )
-	@$(MAKECOOKIE)
+GEMDIR ?= $(libdir)/ruby/gems/1.8
+install-rbgem:
+	( cd $(WORKSRC)/..; gem install --ignore-dependencies --local --no-test --install-dir $(DESTDIR)$(GEMDIR) $(DISTFILES) )
 
-build-%/Build:
-	@echo " ==> Running Build in $*"
-	( cd $* ; $(BUILD_ENV) ./Build )
-	@$(MAKECOOKIE)
-
-test-%/Build:
-	@echo " ==> Running Build test in $*"
-	@( cd $* ; $(TEST_ENV) ./Build test )
-	@$(MAKECOOKIE)
-
-PERLBUILD_INSTALL_ARGS ?= destdir=$(DESTDIR) $(EXTRA_PERLBUILD_INSTALL_ARGS)
-install-%/Build:
-	@echo " ==> Running Build install in $*"
-	( cd $* ; $(INSTALL_ENV) ./Build install $(PERLBUILD_INSTALL_ARGS) )
-	@$(MAKECOOKIE)
-
 # Check for a CPAN module version update
 update-check:
+	@# TBD!
 	@echo " ==> Update Check: $(GARNAME) $(GARVERSION)"
-	@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 $(GARNAME) IS DISABLED" ; \
 	fi
 	
-# Print HTML info for modules
-module-info:
-	@echo " ==> Generating module info for $(GARNAME) $(GARVERSION)"
-	@printf "<a href=\"http://search.cpan.org/" \
-		>> ../module_info.html
-	@printf "~$(shell echo $(AUTHOR) | tr '[A-Z]' '[a-z]')/" \
-		>> ../module_info.html
-	@printf "$(GARNAME)-$(GARVERSION)" \
-		>> ../module_info.html
-	@printf "\">$(GARNAME)-$(GARVERSION)</a><br/>\n" \
-		>> ../module_info.html
-

Copied: csw/mgar/gar/v2/pkglib/csw/depend.ruby (from rev 10600, csw/mgar/gar/v2/pkglib/csw/depend.perl)
===================================================================
--- csw/mgar/gar/v2/pkglib/csw/depend.ruby	                        (rev 0)
+++ csw/mgar/gar/v2/pkglib/csw/depend.ruby	2010-07-27 14:30:09 UTC (rev 10604)
@@ -0,0 +1 @@
+P CSWruby ruby - An object-oriented language for quick and easy programming

Copied: csw/mgar/gar/v2/pkglib/csw_rbgems_dyngspec.gspec (from rev 10600, csw/mgar/gar/v2/pkglib/csw_cpan_dyngspec.gspec)
===================================================================
--- csw/mgar/gar/v2/pkglib/csw_rbgems_dyngspec.gspec	                        (rev 0)
+++ csw/mgar/gar/v2/pkglib/csw_rbgems_dyngspec.gspec	2010-07-27 14:30:09 UTC (rev 10604)
@@ -0,0 +1,5 @@
+%include        url file://%{PKGLIB}/csw_vars.gspec
+%pkginfo        url file://%{PKGLIB}/csw/pkginfo
+%prototype      exec cswproto -s %{TIMESTAMP} -r %{DESTDIR} %{DESTDIR}
+%depend:merge   url file://%{PKGLIB}/csw/ruby.perl
+%depend         exec gawk '$1 ~ /f/{print $3}' %{prototype} | depmaker --root %{DESTDIR} --nodep %{pkgname} %{DEPMAKER_EXTRA_ARGS}


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 Jul 27 16:32:33 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Tue, 27 Jul 2010 14:32:33 +0000
Subject: [csw-devel] SF.net SVN: gar:[10605] csw/mgar/pkg
Message-ID: <E1OdlCr-0007lD-N7@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 10605
          http://gar.svn.sourceforge.net/gar/?rev=10605&view=rev
Author:   dmichelsen
Date:     2010-07-27 14:32:33 +0000 (Tue, 27 Jul 2010)

Log Message:
-----------
rbgems: Add new category directory

Added Paths:
-----------
    csw/mgar/pkg/rbgems/
    csw/mgar/pkg/rbgems/Makefile
    csw/mgar/pkg/rbgems/actionmailer/
    csw/mgar/pkg/rbgems/actionmailer/branches/
    csw/mgar/pkg/rbgems/actionmailer/tags/
    csw/mgar/pkg/rbgems/actionmailer/trunk/
    csw/mgar/pkg/rbgems/actionmailer/trunk/Makefile
    csw/mgar/pkg/rbgems/actionmailer/trunk/checksums
    csw/mgar/pkg/rbgems/actionmailer/trunk/files/

Copied: csw/mgar/pkg/rbgems/Makefile (from rev 10600, csw/mgar/pkg/cpan/Makefile)
===================================================================
--- csw/mgar/pkg/rbgems/Makefile	                        (rev 0)
+++ csw/mgar/pkg/rbgems/Makefile	2010-07-27 14:32:33 UTC (rev 10605)
@@ -0,0 +1,64 @@
+# Copyright 2009 OpenCSW
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+#
+# vim: ft=make ts=4 sw=4 noet
+# This makefile is to be included from Makefiles in each category
+# directory.
+
+default:
+	@echo "You are in the pkg/rbgems directory."
+
+%:
+	@for i in $(filter-out CVS/,$(wildcard */)) ; do \
+		$(MAKE) -C $$i $* ; \
+	done
+
+paranoid-%:
+	@for i in $(filter-out CVS/,$(wildcard */)) ; do \
+		$(MAKE) -C $$i $* || exit 2; \
+	done
+
+export BUILDLOG ?= $(shell pwd)/buildlog.txt
+
+report-%:
+	@for i in $(filter-out CVS/,$(wildcard */)) ; do \
+		$(MAKE) -C $$i $* || echo "	*** make $* in $$i failed ***" >> $(BUILDLOG); \
+	done
+
+lcase = $(shell echo $(1) | tr '[A-Z]' '[a-z]' ) 
+
+# You can either use "gmake newpkg-Perl-Module" or "gmake newpkg-Perl::Module".
+# Ideally this would also figure out the AUTHOR by querying CPAN. Alternatively
+# we might think about dropping the AUTHOR field and determine that on the fly
+# during the build. Ideas?
+newpkg-%: catalogname = $(shell echo $(call lcase,$*) | tr -d ':-' )
+newpkg-%: dir = $(subst ::,-,$*)
+newpkg-%:
+	@svn mkdir $(dir) $(dir)/tags $(dir)/branches $(dir)/trunk $(dir)/trunk/files
+	@(echo "GARNAME = $(dir)";                                \
+	echo "GARVERSION = 1.0";                                        \
+	echo "CATEGORIES = rbgems";                                       \
+	echo "AUTHOR = MYSELF";                                         \
+	echo "";                                                        \
+	echo "DESCRIPTION = Brief description";                         \
+	echo "define BLURB";                                            \
+	echo "  Long description";                                      \
+	echo "endef";                                                   \
+	echo "";                                                        \
+	echo "PACKAGES = CSW$(catalogname)";                                \
+	echo "CATALOGNAME = rb_$(catalogname)";                               \
+	echo "";                                                        \
+	echo "include gar/category.mk";                                 \
+	) > $(dir)/trunk/Makefile
+	@touch $(dir)/trunk/checksums
+	@svn add $(dir)/trunk/Makefile $(dir)/trunk/checksums
+	@echo "cookies\ndownload\nwork\n" | svn propset svn:ignore -F /dev/fd/0 $(dir)/trunk
+	@echo "gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2" | svn propset svn:externals -F /dev/fd/0 $(dir)/trunk
+	@if [ -d ../../gar/v2 ]; then \
+	  ln -s ../../../../gar/v2 $(dir)/trunk/gar; \
+	else \
+	  svn co https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2 $(dir)/trunk/gar; \
+	fi
+	@echo
+	@echo "Your package is set up for editing at $(dir)/trunk"


Property changes on: csw/mgar/pkg/rbgems/actionmailer/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/rbgems/actionmailer/trunk/Makefile
===================================================================
--- csw/mgar/pkg/rbgems/actionmailer/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/rbgems/actionmailer/trunk/Makefile	2010-07-27 14:32:33 UTC (rev 10605)
@@ -0,0 +1,12 @@
+GARNAME = actionmailer
+GARVERSION = 2.3.8
+CATEGORIES = rbgems
+
+DESCRIPTION = Test and deliver emails sent from a single service layer
+define BLURB
+endef
+
+PACKAGES = CSWactionmailer
+CATALOGNAME = rb_actionmailer
+
+include gar/category.mk

Added: csw/mgar/pkg/rbgems/actionmailer/trunk/checksums
===================================================================
--- csw/mgar/pkg/rbgems/actionmailer/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/rbgems/actionmailer/trunk/checksums	2010-07-27 14:32:33 UTC (rev 10605)
@@ -0,0 +1 @@
+6e4d123b144ae091be91ac761bf6087f  actionmailer-2.3.8.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  Tue Jul 27 16:40:09 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Tue, 27 Jul 2010 14:40:09 +0000
Subject: [csw-devel] SF.net SVN: gar:[10606]
	csw/mgar/gar/v2/pkglib/csw_rbgems_dyngspec.gspec
Message-ID: <E1OdlKD-0000Un-EO@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10606
          http://gar.svn.sourceforge.net/gar/?rev=10606&view=rev
Author:   dmichelsen
Date:     2010-07-27 14:40:09 +0000 (Tue, 27 Jul 2010)

Log Message:
-----------
mGAR v2: Fix typo for rbgems

Modified Paths:
--------------
    csw/mgar/gar/v2/pkglib/csw_rbgems_dyngspec.gspec

Modified: csw/mgar/gar/v2/pkglib/csw_rbgems_dyngspec.gspec
===================================================================
--- csw/mgar/gar/v2/pkglib/csw_rbgems_dyngspec.gspec	2010-07-27 14:32:33 UTC (rev 10605)
+++ csw/mgar/gar/v2/pkglib/csw_rbgems_dyngspec.gspec	2010-07-27 14:40:09 UTC (rev 10606)
@@ -1,5 +1,5 @@
 %include        url file://%{PKGLIB}/csw_vars.gspec
 %pkginfo        url file://%{PKGLIB}/csw/pkginfo
 %prototype      exec cswproto -s %{TIMESTAMP} -r %{DESTDIR} %{DESTDIR}
-%depend:merge   url file://%{PKGLIB}/csw/ruby.perl
+%depend:merge   url file://%{PKGLIB}/csw/depend.ruby
 %depend         exec gawk '$1 ~ /f/{print $3}' %{prototype} | depmaker --root %{DESTDIR} --nodep %{pkgname} %{DEPMAKER_EXTRA_ARGS}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From opk at users.sourceforge.net  Tue Jul 27 17:12:16 2010
From: opk at users.sourceforge.net (opk at users.sourceforge.net)
Date: Tue, 27 Jul 2010 15:12:16 +0000
Subject: [csw-devel] SF.net SVN: gar:[10607]
	csw/mgar/pkg/pygtk/trunk/Makefile
Message-ID: <E1OdlpI-0006Jh-MK@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 10607
          http://gar.svn.sourceforge.net/gar/?rev=10607&view=rev
Author:   opk
Date:     2010-07-27 15:12:16 +0000 (Tue, 27 Jul 2010)

Log Message:
-----------
correct issues raised by checkpkg

Modified Paths:
--------------
    csw/mgar/pkg/pygtk/trunk/Makefile

Modified: csw/mgar/pkg/pygtk/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pygtk/trunk/Makefile	2010-07-27 14:40:09 UTC (rev 10606)
+++ csw/mgar/pkg/pygtk/trunk/Makefile	2010-07-27 15:12:16 UTC (rev 10607)
@@ -3,7 +3,7 @@
 CATEGORIES = lang
 RELVER = $(shell echo $(GARVERSION) |gsed 's/\(^[0-9].*\.[0-9].*\)\.[0-9]*/\1/')
 
-DESCRIPTION = pygtk support for Python
+DESCRIPTION = Python bindings for the GTK library
 define BLURB
   This is a Python language binding for gobject.
 endef
@@ -12,14 +12,14 @@
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.bz2
 STRIP_LIBTOOL = 1
 
-PACKAGES = CSWpygtk
-BUILD_DEP_PKGS = CSWpkgconfig CSWpygobject CSWglib2devel CSWlibatkdevel CSWpangodevel CSWpycairo CSWlibcairodevel CSWlibxcbdevel
-RUNTIME_DEP_PKGS_CSWpygtk  = CSWpython CSWfconfig CSWftype2 CSWggettextrt
-RUNTIME_DEP_PKGS_CSWpygtk += CSWglib2 CSWgtk2 CSWlibatk CSWlibcairo
-RUNTIME_DEP_PKGS_CSWpygtk += CSWlibglade2 CSWlibxml2 CSWpango
+PACKAGES = CSWpy-gtk
+BUILD_DEP_PKGS = CSWpkgconfig CSWpy-gobject CSWglib2devel CSWlibatkdevel CSWpangodevel CSWpy-cairo CSWlibcairodevel CSWlibxcbdevel
+RUNTIME_DEP_PKGS_CSWpy-gtk  = CSWpython CSWfconfig CSWftype2 CSWggettextrt
+RUNTIME_DEP_PKGS_CSWpy-gtk += CSWglib2 CSWgtk2 CSWlibatk CSWlibcairo
+RUNTIME_DEP_PKGS_CSWpy-gtk += CSWlibglade2 CSWlibxml2 CSWpango
 
-CATALOGNAME_CSWpygtk = pygtk
-SPKG_DESC_CSWpygtk = pygtk support for Python
+CATALOGNAME_CSWpy-gtk = py_gtk
+SPKG_DESC_CSWpy-gtk = $(DESCRIPTION)
 
 EXTRA_MERGE_EXCLUDE_FILES = .*\.pyo .*\.pyc
 PROTOTYPE_FILTER = awk '$$$$3 ~ /.*\.py$$$$/ { $$$$2 = "cswpycompile" } { print }'


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 Jul 27 17:30:11 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Tue, 27 Jul 2010 15:30:11 +0000
Subject: [csw-devel] SF.net SVN: gar:[10608]
	csw/mgar/gar/v2/categories/rbgems/category.mk
Message-ID: <E1Odm6d-000738-3I@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 10608
          http://gar.svn.sourceforge.net/gar/?rev=10608&view=rev
Author:   dmichelsen
Date:     2010-07-27 15:30:10 +0000 (Tue, 27 Jul 2010)

Log Message:
-----------
mGAR v2: Add uncompression for gems

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	2010-07-27 15:12:16 UTC (rev 10607)
+++ csw/mgar/gar/v2/categories/rbgems/category.mk	2010-07-27 15:30:10 UTC (rev 10608)
@@ -5,8 +5,8 @@
 # This is common to most modules - override in module makefile if different
 GEMNAME ?= $(GARNAME)
 GEMVERSION ?= $(GARVERSION)
-MODDIST   ?= $(GEMNAME)-$(GEMVERSION).gem
-DISTFILES += $(MODDIST)
+GEMFILE   ?= $(GEMNAME)-$(GEMVERSION).gem
+DISTFILES += $(GEMFILE)
 
 # Tests are enabled by default, unless overridden at the test level
 ENABLE_TEST ?= 1
@@ -31,16 +31,30 @@
 # - dependency generation
 # - link to rubyforge
 
+LICENSE ?= MIT-LICENSE
+
 CONFIGURE_SCRIPTS ?=
 BUILD_SCRIPTS ?= 
 TEST_SCRIPTS ?= 
 INSTALL_SCRIPTS = rbgem
 
+# The description starts with the ruby gems name, it will often start with a lowercase character
+CHECKPKG_OVERRIDES_CSWactionmailer += pkginfo-description-not-starting-with-uppercase
+
+gem-extract-%:
+	@echo " ==> Decompressing $(DOWNLOADDIR)/$*"
+	@gem unpack $(DOWNLOADDIR)/$* --target $(WORKDIR)
+	@$(MAKECOOKIE)
+
+extract-archive-%.gem: gem-extract-%.gem
+	@$(MAKECOOKIE)
+
 include gar/gar.mk
 
 GEMDIR ?= $(libdir)/ruby/gems/1.8
 install-rbgem:
-	( cd $(WORKSRC)/..; gem install --ignore-dependencies --local --no-test --install-dir $(DESTDIR)$(GEMDIR) $(DISTFILES) )
+	gem install --ignore-dependencies --local --no-test --install-dir $(DESTDIR)$(GEMDIR) $(DOWNLOADDIR)/$(GEMFILE)
+	@$(MAKECOOKIE)
 
 # Check for a CPAN module version update
 update-check:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From dmichelsen at users.sourceforge.net  Tue Jul 27 17:30:40 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Tue, 27 Jul 2010 15:30:40 +0000
Subject: [csw-devel] SF.net SVN: gar:[10609]
	csw/mgar/pkg/rbgems/actionmailer/trunk/Makefile
Message-ID: <E1Odm76-0002TY-60@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 10609
          http://gar.svn.sourceforge.net/gar/?rev=10609&view=rev
Author:   dmichelsen
Date:     2010-07-27 15:30:39 +0000 (Tue, 27 Jul 2010)

Log Message:
-----------
rbgems/actionmailer: Add ARCHALL

Modified Paths:
--------------
    csw/mgar/pkg/rbgems/actionmailer/trunk/Makefile

Modified: csw/mgar/pkg/rbgems/actionmailer/trunk/Makefile
===================================================================
--- csw/mgar/pkg/rbgems/actionmailer/trunk/Makefile	2010-07-27 15:30:10 UTC (rev 10608)
+++ csw/mgar/pkg/rbgems/actionmailer/trunk/Makefile	2010-07-27 15:30:39 UTC (rev 10609)
@@ -9,4 +9,6 @@
 PACKAGES = CSWactionmailer
 CATALOGNAME = rb_actionmailer
 
+ARCHALL = 1
+
 include gar/category.mk


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From bdwalton at users.sourceforge.net  Wed Jul 28 03:14:18 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Wed, 28 Jul 2010 01:14:18 +0000
Subject: [csw-devel] SF.net SVN: gar:[10610]
	csw/mgar/gar/v2/categories/rbgems/category.mk
Message-ID: <E1OdvDu-00009y-2n@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 10610
          http://gar.svn.sourceforge.net/gar/?rev=10610&view=rev
Author:   bdwalton
Date:     2010-07-28 01:14:17 +0000 (Wed, 28 Jul 2010)

Log Message:
-----------
gar/v2: rbgems category will add deps on ruby and rubygems

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	2010-07-27 15:30:39 UTC (rev 10609)
+++ csw/mgar/gar/v2/categories/rbgems/category.mk	2010-07-28 01:14:17 UTC (rev 10610)
@@ -1,3 +1,5 @@
+# these packages will all depend on rubygems and ruby
+_EXTRA_GAR_PKGS += CSWrubygems CSWruby
 
 # Set the CPAN mirror in gar.conf.mk
 MASTER_SITES ?= http://rubygems.org/downloads/
@@ -62,4 +64,3 @@
 	@echo " ==> Update Check: $(GARNAME) $(GARVERSION)"
 	@echo " ==> AUTO UPDATE CHECK FOR $(GARNAME) IS DISABLED" ; \
 	fi
-	


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 Jul 28 03:51:34 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Wed, 28 Jul 2010 01:51:34 +0000
Subject: [csw-devel] SF.net SVN: gar:[10611]
	csw/mgar/gar/v2/pkglib/csw/depend.ruby
Message-ID: <E1Odvny-0004Jl-Tt@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 10611
          http://gar.svn.sourceforge.net/gar/?rev=10611&view=rev
Author:   bdwalton
Date:     2010-07-28 01:51:34 +0000 (Wed, 28 Jul 2010)

Log Message:
-----------
gar/v2: ruby dep file adds rubygems as a requirement automatically

Modified Paths:
--------------
    csw/mgar/gar/v2/pkglib/csw/depend.ruby

Modified: csw/mgar/gar/v2/pkglib/csw/depend.ruby
===================================================================
--- csw/mgar/gar/v2/pkglib/csw/depend.ruby	2010-07-28 01:14:17 UTC (rev 10610)
+++ csw/mgar/gar/v2/pkglib/csw/depend.ruby	2010-07-28 01:51:34 UTC (rev 10611)
@@ -1 +1,2 @@
 P CSWruby ruby - An object-oriented language for quick and easy programming
+P CSWrubygems rubygems - Ruby package manager


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 Jul 28 03:52:40 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Wed, 28 Jul 2010 01:52:40 +0000
Subject: [csw-devel] SF.net SVN: gar:[10612]
	csw/mgar/gar/v2/categories/rbgems/category.mk
Message-ID: <E1Odvp2-0008OO-MQ@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 10612
          http://gar.svn.sourceforge.net/gar/?rev=10612&view=rev
Author:   bdwalton
Date:     2010-07-28 01:52:40 +0000 (Wed, 28 Jul 2010)

Log Message:
-----------
gar/v2: switch _EXTRA_GAR_PKGS to DEF_BASE_PKGS to force a build dep on rubygems

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	2010-07-28 01:51:34 UTC (rev 10611)
+++ csw/mgar/gar/v2/categories/rbgems/category.mk	2010-07-28 01:52:40 UTC (rev 10612)
@@ -1,5 +1,5 @@
-# these packages will all depend on rubygems and ruby
-_EXTRA_GAR_PKGS += CSWrubygems CSWruby
+# We must have rubygems (and hence ruby) installed to package a gem.
+DEF_BASE_PKGS += CSWrubygems
 
 # Set the CPAN mirror in gar.conf.mk
 MASTER_SITES ?= http://rubygems.org/downloads/


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 Jul 28 04:09:15 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Wed, 28 Jul 2010 02:09:15 +0000
Subject: [csw-devel] SF.net SVN: gar:[10613]
	csw/mgar/gar/v2/categories/rbgems/category.mk
Message-ID: <E1Odw55-0004aY-Hi@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 10613
          http://gar.svn.sourceforge.net/gar/?rev=10613&view=rev
Author:   bdwalton
Date:     2010-07-28 02:09:15 +0000 (Wed, 28 Jul 2010)

Log Message:
-----------
gar/v2: dynamically grab GEMDIR for rbgems category

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	2010-07-28 01:52:40 UTC (rev 10612)
+++ csw/mgar/gar/v2/categories/rbgems/category.mk	2010-07-28 02:09:15 UTC (rev 10613)
@@ -13,8 +13,6 @@
 # Tests are enabled by default, unless overridden at the test level
 ENABLE_TEST ?= 1
 
-CONFIGURE_SCRIPTS ?=
-
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX ?= $(GEMNAME)-(\d+(?:\.\d+)*).gem
 USTREAM_MASTER_SITE ?= $(SPKG_SOURCEURL)
@@ -53,7 +51,7 @@
 
 include gar/gar.mk
 
-GEMDIR ?= $(libdir)/ruby/gems/1.8
+GEMDIR ?= $(shell ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
 install-rbgem:
 	gem install --ignore-dependencies --local --no-test --install-dir $(DESTDIR)$(GEMDIR) $(DOWNLOADDIR)/$(GEMFILE)
 	@$(MAKECOOKIE)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From bdwalton at users.sourceforge.net  Wed Jul 28 05:03:26 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Wed, 28 Jul 2010 03:03:26 +0000
Subject: [csw-devel] SF.net SVN: gar:[10614]
	csw/mgar/gar/v2/categories/rbgems/category.mk
Message-ID: <E1OdwvW-0001Pa-Aq@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 10614
          http://gar.svn.sourceforge.net/gar/?rev=10614&view=rev
Author:   bdwalton
Date:     2010-07-28 03:03:26 +0000 (Wed, 28 Jul 2010)

Log Message:
-----------
gar/v2: rbgems category -> set PACKAGES and CATALOGNAME conditionally, drop SPKG_DESC override, drop checkpkg_overrides

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	2010-07-28 02:09:15 UTC (rev 10613)
+++ csw/mgar/gar/v2/categories/rbgems/category.mk	2010-07-28 03:03:26 UTC (rev 10614)
@@ -10,6 +10,11 @@
 GEMFILE   ?= $(GEMNAME)-$(GEMVERSION).gem
 DISTFILES += $(GEMFILE)
 
+ifndef PACKAGES
+PACKAGES = CSWgem-$(GEMNAME)
+CATALOGNAME_$(PACKAGES) = gem_$(GEMNAME)
+endif
+
 # Tests are enabled by default, unless overridden at the test level
 ENABLE_TEST ?= 1
 
@@ -17,7 +22,6 @@
 UFILES_REGEX ?= $(GEMNAME)-(\d+(?:\.\d+)*).gem
 USTREAM_MASTER_SITE ?= $(SPKG_SOURCEURL)
 
-_CATEGORY_SPKG_DESC = $(GEMNAME): $(SPKG_DESC)
 _CATEGORY_PKGINFO = echo "RUBY_GEM_NAME=$(GEMNAME)";
 
 # _MERGE_EXCLUDE_CATEGORY = .*/perllocal\.pod .*/\.packlist
@@ -38,9 +42,6 @@
 TEST_SCRIPTS ?= 
 INSTALL_SCRIPTS = rbgem
 
-# The description starts with the ruby gems name, it will often start with a lowercase character
-CHECKPKG_OVERRIDES_CSWactionmailer += pkginfo-description-not-starting-with-uppercase
-
 gem-extract-%:
 	@echo " ==> Decompressing $(DOWNLOADDIR)/$*"
 	@gem unpack $(DOWNLOADDIR)/$* --target $(WORKDIR)


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 Jul 28 07:42:55 2010
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Wed, 28 Jul 2010 05:42:55 +0000
Subject: [csw-devel] SF.net SVN: gar:[10616]
	csw/mgar/pkg/pyyaml/trunk/Makefile
Message-ID: <E1OdzPr-0002Ki-So@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 10616
          http://gar.svn.sourceforge.net/gar/?rev=10616&view=rev
Author:   wahwah
Date:     2010-07-28 05:42:55 +0000 (Wed, 28 Jul 2010)

Log Message:
-----------
pyyaml: Added an override for a soft dependency.

Modified Paths:
--------------
    csw/mgar/pkg/pyyaml/trunk/Makefile

Modified: csw/mgar/pkg/pyyaml/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pyyaml/trunk/Makefile	2010-07-28 03:04:15 UTC (rev 10615)
+++ csw/mgar/pkg/pyyaml/trunk/Makefile	2010-07-28 05:42:55 UTC (rev 10616)
@@ -52,8 +52,10 @@
 
 BUILD_SCRIPTS = py-yaml
 
+CHECKPKG_OVERRIDES_CSWpy-yaml += surplus-dependency|CSWpy-yaml-rt
+
+include gar/category.mk
+
 build-py-yaml:
 	(cd $(WORKSRC); $(BUILD_ENV) python setup.py --with-libyaml build)
 	@$(MAKECOOKIE)
-
-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 Jul 28 10:06:10 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 28 Jul 2010 08:06:10 +0000
Subject: [csw-devel] SF.net SVN: gar:[10617] csw/mgar/pkg
Message-ID: <E1Oe1eU-00078r-FN@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 10617
          http://gar.svn.sourceforge.net/gar/?rev=10617&view=rev
Author:   dmichelsen
Date:     2010-07-28 08:06:10 +0000 (Wed, 28 Jul 2010)

Log Message:
-----------
gmake: Update to 3.82

Modified Paths:
--------------
    csw/mgar/pkg/gmake/trunk/Makefile
    csw/mgar/pkg/gmake/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/gmake/

Removed Paths:
-------------
    csw/mgar/pkg/make/

Property Changed:
----------------
    csw/mgar/pkg/gmake/trunk/


Property changes on: csw/mgar/pkg/gmake/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/gmake/trunk/Makefile
===================================================================
--- csw/mgar/pkg/make/trunk/Makefile	2010-07-28 03:04:15 UTC (rev 10615)
+++ csw/mgar/pkg/gmake/trunk/Makefile	2010-07-28 08:06:10 UTC (rev 10617)
@@ -1,5 +1,5 @@
 GARNAME = make
-GARVERSION = 3.80
+GARVERSION = 3.82
 CATEGORIES = devel
 
 DESCRIPTION = Controls generation of executables and other compile-related tasks
@@ -18,8 +18,22 @@
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
-CONFIGURE_ARGS = $(DIRPATHS)
+PACKAGES = CSWgmake
+CATALOGNAME = gmake
 
+VENDOR_URL = http://www.gnu.org/software/make/
+
+DEP_PKGS = CSWggettextrt
+
+CONFIGURE_ARGS  = $(DIRPATHS)
+CONFIGURE_ARGS += --program-prefix=g
+
 TEST_TARGET = check
 
 include gar/category.mk
+
+post-install-modulated:
+	ginstall -d $(DESTDIR)$(prefix)/gnu
+	$(foreach G,$(notdir $(wildcard $(DESTDIR)$(bindir)/*)),ln -s ../bin/$G $(DESTDIR)$(prefix)/gnu/$(patsubst g%,%,$G);)
+	@$(MAKECOOKIE)
+

Modified: csw/mgar/pkg/gmake/trunk/checksums
===================================================================
--- csw/mgar/pkg/make/trunk/checksums	2010-07-28 03:04:15 UTC (rev 10615)
+++ csw/mgar/pkg/gmake/trunk/checksums	2010-07-28 08:06:10 UTC (rev 10617)
@@ -1 +1 @@
-c68540da9302a48068d5cce1f0099477  download/make-3.80.tar.gz
+7f7c000e3b30c6840f2e9cf86b254fac  make-3.82.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 Jul 28 10:59:55 2010
From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net)
Date: Wed, 28 Jul 2010 08:59:55 +0000
Subject: [csw-devel] SF.net SVN: gar:[10618] csw/mgar/pkg/pkgutil/trunk
Message-ID: <E1Oe2UV-0005dJ-3Y@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 10618
          http://gar.svn.sourceforge.net/gar/?rev=10618&view=rev
Author:   bonivart
Date:     2010-07-28 08:59:54 +0000 (Wed, 28 Jul 2010)

Log Message:
-----------
pkgutil: 2.1

Modified Paths:
--------------
    csw/mgar/pkg/pkgutil/trunk/Makefile
    csw/mgar/pkg/pkgutil/trunk/checksums

Modified: csw/mgar/pkg/pkgutil/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pkgutil/trunk/Makefile	2010-07-28 08:06:10 UTC (rev 10617)
+++ csw/mgar/pkg/pkgutil/trunk/Makefile	2010-07-28 08:59:54 UTC (rev 10618)
@@ -1,5 +1,5 @@
 GARNAME = pkgutil
-GARVERSION = 2.1b3
+GARVERSION = 2.1
 CATEGORIES = utils
 
 DESCRIPTION = Installs Solaris packages easily

Modified: csw/mgar/pkg/pkgutil/trunk/checksums
===================================================================
--- csw/mgar/pkg/pkgutil/trunk/checksums	2010-07-28 08:06:10 UTC (rev 10617)
+++ csw/mgar/pkg/pkgutil/trunk/checksums	2010-07-28 08:59:54 UTC (rev 10618)
@@ -5,4 +5,4 @@
 b5fffa0be100ddbb7262ce3a0a4e3bb7  build_sun_catalog.py
 7ad27336f90e73da3254a61d91025ee5  cswcatalog
 3a6b789b3d5e05f41d2363dd26a92acf  opencsw.py
-8ca685d6aadb1490d05b3a24baf2636c  pkgutil-2.1b3.zip
+8f4e1003a53426d1aba1e253acda2a0b  pkgutil-2.1.zip


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 Jul 28 12:32:50 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 28 Jul 2010 10:32:50 +0000
Subject: [csw-devel] SF.net SVN: gar:[10619] csw/mgar/pkg/libfaad2/trunk
Message-ID: <E1Oe3wQ-0007Km-Ku@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 10619
          http://gar.svn.sourceforge.net/gar/?rev=10619&view=rev
Author:   dmichelsen
Date:     2010-07-28 10:32:50 +0000 (Wed, 28 Jul 2010)

Log Message:
-----------
libfaad2: Some more fixed, now only .so.0 is missing

Modified Paths:
--------------
    csw/mgar/pkg/libfaad2/trunk/Makefile
    csw/mgar/pkg/libfaad2/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/libfaad2/trunk/files/0004-Remove-Wall-from-xmms-plugin.patch

Modified: csw/mgar/pkg/libfaad2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libfaad2/trunk/Makefile	2010-07-28 08:59:54 UTC (rev 10618)
+++ csw/mgar/pkg/libfaad2/trunk/Makefile	2010-07-28 10:32:50 UTC (rev 10619)
@@ -14,24 +14,45 @@
 PATCHFILES  = 0001-Remove-iquote-from-CFLAGS-unknown-to-SS.patch
 PATCHFILES += 0002-Use-inline-suitable-for-SS.patch
 PATCHFILES += 0003-Use-inttypes-instead-of-stdint.patch
+PATCHFILES += 0004-Remove-Wall-from-xmms-plugin.patch
 
-PACKAGES = CSWfaad2
-CATALOGNAME = faad2
-
-SPKG_SOURCEURL = http://www.audiocoding.com/
-
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(SF_PROJ)-(\d+(?:\.\d+)*).tar.bz2
 
-# TBD:
-# DEP_PKGS = CSWmpeg4ip
+PACKAGES = CSWfaad2 CSWxmmsfaad2
+CATALOGNAME_CSWfaad2 = faad2
+CATALOGNAME_CSWxmmsfaad2 = xmms_faad2
 
+SPKG_DESC_CSWfaad2 = $(DESCRIPTION)
+SPKG_DESC_CSWxmmsfaad2 = AAC plugin for XMMS
+
+BUILD_DEP_PKGS = CSWxmms
+RUNTIME_DEP_PKGS_CSWfaad2 = 
+RUNTIME_DEP_PKGS_CSWxmmsfaad2 = CSWxmms CSWglib CSWgtk
+
+VENDOR_URL = http://www.audiocoding.com/faad2.html
+
+STRIP_LIBTOOL = 1
+
 BUILD64 = 1
 NOISAEXEC = 1
+
+CONFIGURE_ARGS-32 = --with-xmms
+CONFIGURE_ARGS-64 = 
+
 CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS += --with-drm
+CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL))
 
+# This is a hard package... add when ready.
+# CONFIGURE_ARGS += --with-mpeg4ip
+
 TEST_TARGET = check
 
 MERGE_DIRS_isa-extra = $(libdir)
 
+PKGFILES_CSWxmmsfaad2 = $(libdir)/xmms/.*
+
+CHECKPKG_OVERRIDES_CSWxmmsfaad2 += soname-not-found|libfaad.so.0|is|needed|by|opt/csw/lib/xmms/Input/libmp4.so
+
 include gar/category.mk

Modified: csw/mgar/pkg/libfaad2/trunk/checksums
===================================================================
--- csw/mgar/pkg/libfaad2/trunk/checksums	2010-07-28 08:59:54 UTC (rev 10618)
+++ csw/mgar/pkg/libfaad2/trunk/checksums	2010-07-28 10:32:50 UTC (rev 10619)
@@ -1,4 +1,5 @@
 03a038258ea594c90c9b58e8572a262b  0001-Remove-iquote-from-CFLAGS-unknown-to-SS.patch
 ea595fc8a7759c1ca424bcb226c52975  0002-Use-inline-suitable-for-SS.patch
 548781681ae7b3ad6e3ae9c2ff556f11  0003-Use-inttypes-instead-of-stdint.patch
+55549d920bf05c0b6ad3f36f10d450ff  0004-Remove-Wall-from-xmms-plugin.patch
 4c332fa23febc0e4648064685a3d4332  faad2-2.7.tar.bz2

Added: csw/mgar/pkg/libfaad2/trunk/files/0004-Remove-Wall-from-xmms-plugin.patch
===================================================================
--- csw/mgar/pkg/libfaad2/trunk/files/0004-Remove-Wall-from-xmms-plugin.patch	                        (rev 0)
+++ csw/mgar/pkg/libfaad2/trunk/files/0004-Remove-Wall-from-xmms-plugin.patch	2010-07-28 10:32:50 UTC (rev 10619)
@@ -0,0 +1,46 @@
+From 761b095edbd318055af35eaabe68fd1b9c213dec Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Wed, 28 Jul 2010 11:11:37 +0200
+Subject: [PATCH] Remove -Wall from xmms plugin
+
+---
+ plugins/xmms/src/Makefile.am |    4 ++--
+ plugins/xmms/src/Makefile.in |    4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/plugins/xmms/src/Makefile.am b/plugins/xmms/src/Makefile.am
+index 6249bb3..b373f39 100644
+--- a/plugins/xmms/src/Makefile.am
++++ b/plugins/xmms/src/Makefile.am
+@@ -1,9 +1,9 @@
+-local_CFLAGS=`$(XMMS_CONFIG) --cflags` -Wall
++local_CFLAGS=`$(XMMS_CONFIG) --cflags`
+ local_LDFLAGS=`$(XMMS_CONFIG) --libs`
+ libdir = `$(XMMS_CONFIG) --input-plugin-dir`
+ lib_LTLIBRARIES = libmp4.la
+ 
+-libmp4_la_CFLAGS = $(local_CFLAGS) -Wall \
++libmp4_la_CFLAGS = $(local_CFLAGS) \
+        -I$(top_srcdir)/include -I$(top_srcdir)/common/mp4ff
+ 
+ libmp4_la_LIBADD = $(top_builddir)/libfaad/libfaad.la \
+diff --git a/plugins/xmms/src/Makefile.in b/plugins/xmms/src/Makefile.in
+index 4d0b6c6..dfca4b0 100644
+--- a/plugins/xmms/src/Makefile.in
++++ b/plugins/xmms/src/Makefile.in
+@@ -186,10 +186,10 @@ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-local_CFLAGS = `$(XMMS_CONFIG) --cflags` -Wall
++local_CFLAGS = `$(XMMS_CONFIG) --cflags`
+ local_LDFLAGS = `$(XMMS_CONFIG) --libs`
+ lib_LTLIBRARIES = libmp4.la
+-libmp4_la_CFLAGS = $(local_CFLAGS) -Wall \
++libmp4_la_CFLAGS = $(local_CFLAGS) \
+        -I$(top_srcdir)/include -I$(top_srcdir)/common/mp4ff
+ 
+ libmp4_la_LIBADD = $(top_builddir)/libfaad/libfaad.la \
+-- 
+1.7.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 Jul 28 12:39:59 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 28 Jul 2010 10:39:59 +0000
Subject: [csw-devel] SF.net SVN: gar:[10620] csw/mgar/pkg/rbgems
Message-ID: <E1Oe43L-0007RO-Rx@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 10620
          http://gar.svn.sourceforge.net/gar/?rev=10620&view=rev
Author:   dmichelsen
Date:     2010-07-28 10:39:59 +0000 (Wed, 28 Jul 2010)

Log Message:
-----------
rbgems/activesupport: Initial commit

Added Paths:
-----------
    csw/mgar/pkg/rbgems/activesupport/
    csw/mgar/pkg/rbgems/activesupport/branches/
    csw/mgar/pkg/rbgems/activesupport/tags/
    csw/mgar/pkg/rbgems/activesupport/trunk/
    csw/mgar/pkg/rbgems/activesupport/trunk/Makefile
    csw/mgar/pkg/rbgems/activesupport/trunk/checksums
    csw/mgar/pkg/rbgems/activesupport/trunk/files/


Property changes on: csw/mgar/pkg/rbgems/activesupport/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/rbgems/activesupport/trunk/Makefile
===================================================================
--- csw/mgar/pkg/rbgems/activesupport/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/rbgems/activesupport/trunk/Makefile	2010-07-28 10:39:59 UTC (rev 10620)
@@ -0,0 +1,15 @@
+GARNAME = activesupport
+GARVERSION = 2.3.8
+CATEGORIES = rbgems
+
+DESCRIPTION = Utility library with commonly used stuff from the Rails framework
+define BLURB
+endef
+
+LICENSE = README
+
+GEMPKGNAME = activesup
+
+ARCHALL = 1
+
+include gar/category.mk

Added: csw/mgar/pkg/rbgems/activesupport/trunk/checksums
===================================================================
--- csw/mgar/pkg/rbgems/activesupport/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/rbgems/activesupport/trunk/checksums	2010-07-28 10:39:59 UTC (rev 10620)
@@ -0,0 +1 @@
+1211d35bb0489764fd1fcac19d081a47  activesupport-2.3.8.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 Jul 28 13:02:30 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 28 Jul 2010 11:02:30 +0000
Subject: [csw-devel] SF.net SVN: gar:[10621] csw/mgar/pkg/rbgems
Message-ID: <E1Oe4P8-0004Ci-H4@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 10621
          http://gar.svn.sourceforge.net/gar/?rev=10621&view=rev
Author:   dmichelsen
Date:     2010-07-28 11:02:30 +0000 (Wed, 28 Jul 2010)

Log Message:
-----------
rbgems/bacon: Initial commit

Added Paths:
-----------
    csw/mgar/pkg/rbgems/bacon/
    csw/mgar/pkg/rbgems/bacon/branches/
    csw/mgar/pkg/rbgems/bacon/tags/
    csw/mgar/pkg/rbgems/bacon/trunk/
    csw/mgar/pkg/rbgems/bacon/trunk/Makefile
    csw/mgar/pkg/rbgems/bacon/trunk/checksums
    csw/mgar/pkg/rbgems/bacon/trunk/files/


Property changes on: csw/mgar/pkg/rbgems/bacon/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/rbgems/bacon/trunk/Makefile
===================================================================
--- csw/mgar/pkg/rbgems/bacon/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/rbgems/bacon/trunk/Makefile	2010-07-28 11:02:30 UTC (rev 10621)
@@ -0,0 +1,18 @@
+GARNAME = bacon
+GARVERSION = 1.1.0
+CATEGORIES = rbgems
+
+DESCRIPTION = A small RSpec clone
+define BLURB
+  Bacon is a small RSpec clone weighing less than 350 LoC but nevertheless providing all essential features.
+  http://github.com/chneukirchen/bacon
+endef
+
+PACKAGES = CSWgem-bacon
+CATALOGNAME = gem_bacon
+
+LICENSE = COPYING
+
+ARCHALL = 1
+
+include gar/category.mk

Added: csw/mgar/pkg/rbgems/bacon/trunk/checksums
===================================================================
--- csw/mgar/pkg/rbgems/bacon/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/rbgems/bacon/trunk/checksums	2010-07-28 11:02:30 UTC (rev 10621)
@@ -0,0 +1 @@
+c47c4911567d771c906ff87357b60b83  bacon-1.1.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 Jul 28 13:03:20 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 28 Jul 2010 11:03:20 +0000
Subject: [csw-devel] SF.net SVN: gar:[10622] csw/mgar/pkg/rbgems
Message-ID: <E1Oe4Pw-0004Do-1a@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 10622
          http://gar.svn.sourceforge.net/gar/?rev=10622&view=rev
Author:   dmichelsen
Date:     2010-07-28 11:03:19 +0000 (Wed, 28 Jul 2010)

Log Message:
-----------
rbgems/daemons: Initial commit

Added Paths:
-----------
    csw/mgar/pkg/rbgems/daemons/
    csw/mgar/pkg/rbgems/daemons/branches/
    csw/mgar/pkg/rbgems/daemons/tags/
    csw/mgar/pkg/rbgems/daemons/trunk/
    csw/mgar/pkg/rbgems/daemons/trunk/Makefile
    csw/mgar/pkg/rbgems/daemons/trunk/checksums
    csw/mgar/pkg/rbgems/daemons/trunk/files/


Property changes on: csw/mgar/pkg/rbgems/daemons/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/rbgems/daemons/trunk/Makefile
===================================================================
--- csw/mgar/pkg/rbgems/daemons/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/rbgems/daemons/trunk/Makefile	2010-07-28 11:03:19 UTC (rev 10622)
@@ -0,0 +1,17 @@
+GARNAME = daemons
+GARVERSION = 1.1.0
+CATEGORIES = rbgems
+
+DESCRIPTION = Brief description
+define BLURB
+  Daemons provides an easy way to wrap existing ruby scripts (for example a self-written server) to be run as a daemon and to be controlled by simple start/stop/restart commands. You can also call blocks as daemons and control them from the parent or just daemonize the current process. Besides this basic functionality, daemons offers many advanced features like exception backtracing and logging (in case your ruby script crashes) and monitoring and automatic restarting of your processes if they crash.
+endef
+
+PACKAGES = CSWgem-daemons
+CATALOGNAME = gem_daemons
+
+LICENSE = LICENSE
+
+ARCHALL = 1
+
+include gar/category.mk

Added: csw/mgar/pkg/rbgems/daemons/trunk/checksums
===================================================================
--- csw/mgar/pkg/rbgems/daemons/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/rbgems/daemons/trunk/checksums	2010-07-28 11:03:19 UTC (rev 10622)
@@ -0,0 +1 @@
+6c50720bab6a19d88b401a98a79c49ce  daemons-1.1.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 Jul 28 13:25:13 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 28 Jul 2010 11:25:13 +0000
Subject: [csw-devel] SF.net SVN: gar:[10623] csw/mgar/pkg/rbgems
Message-ID: <E1Oe4l7-00057M-95@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10623
          http://gar.svn.sourceforge.net/gar/?rev=10623&view=rev
Author:   dmichelsen
Date:     2010-07-28 11:25:12 +0000 (Wed, 28 Jul 2010)

Log Message:
-----------
rbgems/rack: Initial commit

Added Paths:
-----------
    csw/mgar/pkg/rbgems/rack/
    csw/mgar/pkg/rbgems/rack/branches/
    csw/mgar/pkg/rbgems/rack/tags/
    csw/mgar/pkg/rbgems/rack/trunk/
    csw/mgar/pkg/rbgems/rack/trunk/Makefile
    csw/mgar/pkg/rbgems/rack/trunk/checksums
    csw/mgar/pkg/rbgems/rack/trunk/files/


Property changes on: csw/mgar/pkg/rbgems/rack/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/rbgems/rack/trunk/Makefile
===================================================================
--- csw/mgar/pkg/rbgems/rack/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/rbgems/rack/trunk/Makefile	2010-07-28 11:25:12 UTC (rev 10623)
@@ -0,0 +1,30 @@
+GARNAME = rack
+GARVERSION = 1.2.1
+CATEGORIES = rbgems
+
+DESCRIPTION = A minimal interface for developing web applications in Ruby
+define BLURB
+  Rack provides minimal, modular and adaptable interface for developing web applications in Ruby.
+  By wrapping HTTP requests and responses in the simplest way possible, it unifies and distills
+  the API for web servers, web frameworks, and software in between (the so-called middleware)
+  into a single method call. Also see http://rack.rubyforge.org.
+endef
+
+PACKAGES = CSWgem-rack
+CATALOGNAME = gem_rack
+
+LICENSE = COPYING
+
+ARCHALL = 1
+
+# These are all developer dependencies
+GEM_DEPS =
+# ==> Verifying installed package CSWgem-bacon: MISSING
+# ==> Verifying installed package CSWgem-rake: MISSING
+# ==> Verifying installed package CSWgem-fcgi: MISSING
+# ==> Verifying installed package CSWgem-memcache-client: MISSING
+# ==> Verifying installed package CSWgem-mongrel: MISSING
+# ==> Verifying installed package CSWgem-thin: MISSING
+
+
+include gar/category.mk

Added: csw/mgar/pkg/rbgems/rack/trunk/checksums
===================================================================
--- csw/mgar/pkg/rbgems/rack/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/rbgems/rack/trunk/checksums	2010-07-28 11:25:12 UTC (rev 10623)
@@ -0,0 +1 @@
+ad93c6bf876bb75af374b416593a4c08  rack-1.2.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  Wed Jul 28 13:27:29 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 28 Jul 2010 11:27:29 +0000
Subject: [csw-devel] SF.net SVN: gar:[10624]
	csw/mgar/pkg/rbgems/activesupport/trunk/Makefile
Message-ID: <E1Oe4nJ-0008I9-Dp@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 10624
          http://gar.svn.sourceforge.net/gar/?rev=10624&view=rev
Author:   dmichelsen
Date:     2010-07-28 11:27:29 +0000 (Wed, 28 Jul 2010)

Log Message:
-----------
rbgems/activesupport: Readjust package name

Modified Paths:
--------------
    csw/mgar/pkg/rbgems/activesupport/trunk/Makefile

Modified: csw/mgar/pkg/rbgems/activesupport/trunk/Makefile
===================================================================
--- csw/mgar/pkg/rbgems/activesupport/trunk/Makefile	2010-07-28 11:25:12 UTC (rev 10623)
+++ csw/mgar/pkg/rbgems/activesupport/trunk/Makefile	2010-07-28 11:27:29 UTC (rev 10624)
@@ -8,8 +8,6 @@
 
 LICENSE = README
 
-GEMPKGNAME = activesup
-
 ARCHALL = 1
 
 include gar/category.mk


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From dmichelsen at users.sourceforge.net  Wed Jul 28 13:41:10 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 28 Jul 2010 11:41:10 +0000
Subject: [csw-devel] SF.net SVN: gar:[10625] csw/mgar/gar/v2
Message-ID: <E1Oe50Y-0005Sg-TB@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10625
          http://gar.svn.sourceforge.net/gar/?rev=10625&view=rev
Author:   dmichelsen
Date:     2010-07-28 11:41:10 +0000 (Wed, 28 Jul 2010)

Log Message:
-----------
mGAR v2: Add GEM dependency detection

Modified Paths:
--------------
    csw/mgar/gar/v2/categories/rbgems/category.mk

Added Paths:
-----------
    csw/mgar/gar/v2/bin/gemdeps.rb

Added: csw/mgar/gar/v2/bin/gemdeps.rb
===================================================================
--- csw/mgar/gar/v2/bin/gemdeps.rb	                        (rev 0)
+++ csw/mgar/gar/v2/bin/gemdeps.rb	2010-07-28 11:41:10 UTC (rev 10625)
@@ -0,0 +1,7 @@
+#!/opt/csw/bin/ruby
+require 'yaml'
+require 'rubygems'
+spec = YAML::load(STDIN)
+spec.dependencies.each do |dep|
+  printf "%s\n", dep.name if dep.type == :runtime
+end


Property changes on: csw/mgar/gar/v2/bin/gemdeps.rb
___________________________________________________________________
Added: svn:executable
   + *

Modified: csw/mgar/gar/v2/categories/rbgems/category.mk
===================================================================
--- csw/mgar/gar/v2/categories/rbgems/category.mk	2010-07-28 11:27:29 UTC (rev 10624)
+++ csw/mgar/gar/v2/categories/rbgems/category.mk	2010-07-28 11:41:10 UTC (rev 10625)
@@ -1,7 +1,6 @@
 # We must have rubygems (and hence ruby) installed to package a gem.
 DEF_BASE_PKGS += CSWrubygems
 
-# Set the CPAN mirror in gar.conf.mk
 MASTER_SITES ?= http://rubygems.org/downloads/
 
 # This is common to most modules - override in module makefile if different
@@ -10,11 +9,20 @@
 GEMFILE   ?= $(GEMNAME)-$(GEMVERSION).gem
 DISTFILES += $(GEMFILE)
 
-ifndef PACKAGES
-PACKAGES = CSWgem-$(GEMNAME)
-CATALOGNAME_$(PACKAGES) = gem_$(GEMNAME)
-endif
+GEMPKGNAME ?= $(GEMNAME)
+GEMCATALOGNAME ?= $(GEMPKGNAME)
 
+# PACKAGES ?= CSWgem-$(GEMPKGNAME) CSWgem-$(GEMPKGNAME)-doc
+PACKAGES ?= CSWgem-$(GEMPKGNAME)
+CATALOGNAME_CSWgem-$(GEMPKGNAME) ?= gem_$(GEMCATALOGNAME)
+CATALOGNAME_CSWgem-$(GEMPKGNAME)-doc ?= gem_$(GEMCATALOGNAME)_doc
+
+SPKG_DESC_CSWgem-$(GEMPKGNAME)-doc ?= $(or $(SPKG_DESC_CSWgem-$(GEMPKGNAME)),$(SPKG_DESC)) documentation
+
+# RUNTIME_DEP_PKGS_CSWgem-$(GEMPKGNAME) ?= $(shell gem specification $(DOWNLOADDIR)/$(GEMFILE) | $(GARBIN)/gemdeps.rb)
+
+# GEM_DEPENDENCY_PKGS ?= $(RUNTIME_DEP_PKGS_CSWgem-$(GEMPKGNAME))
+
 # Tests are enabled by default, unless overridden at the test level
 ENABLE_TEST ?= 1
 
@@ -37,14 +45,19 @@
 
 LICENSE ?= MIT-LICENSE
 
-CONFIGURE_SCRIPTS ?=
+GEMDIR ?= $(shell ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
+
+CONFIGURE_SCRIPTS ?= check-gem-deps
 BUILD_SCRIPTS ?= 
 TEST_SCRIPTS ?= 
-INSTALL_SCRIPTS = rbgem
+INSTALL_SCRIPTS ?= rbgem
 
+# Allow splitting of documentation automatically
+PKGFILES_CSWgem-$(GEMPKGNAME)-doc ?= $(GEMDIR)/doc/.*
+
 gem-extract-%:
 	@echo " ==> Decompressing $(DOWNLOADDIR)/$*"
-	@gem unpack $(DOWNLOADDIR)/$* --target $(WORKDIR)
+	gem unpack $(DOWNLOADDIR)/$* --target $(WORKDIR)
 	@$(MAKECOOKIE)
 
 extract-archive-%.gem: gem-extract-%.gem
@@ -52,7 +65,13 @@
 
 include gar/gar.mk
 
-GEMDIR ?= $(shell ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
+# During the configure phase we check that all dependend modules are available
+configure-check-gem-deps: GEM_DEPS?=$(addprefix CSWgem-,$(shell gem specification $(DOWNLOADDIR)/$(GEMFILE) | $(GARBIN)/gemdeps.rb))
+configure-check-gem-deps:
+	@echo "=== Checking dependencies of GEM $(GEMFILE) ==="
+	@$(GARBIN)/check_for_deps $(GEM_DEPS)
+	@$(MAKECOOKIE)
+
 install-rbgem:
 	gem install --ignore-dependencies --local --no-test --install-dir $(DESTDIR)$(GEMDIR) $(DOWNLOADDIR)/$(GEMFILE)
 	@$(MAKECOOKIE)
@@ -61,5 +80,4 @@
 update-check:
 	@# TBD!
 	@echo " ==> Update Check: $(GARNAME) $(GARVERSION)"
-	@echo " ==> AUTO UPDATE CHECK FOR $(GARNAME) IS DISABLED" ; \
-	fi
+	@echo " ==> AUTO UPDATE CHECK FOR $(GARNAME) IS DISABLED"


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 Jul 28 13:47:59 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Wed, 28 Jul 2010 11:47:59 +0000
Subject: [csw-devel] SF.net SVN: gar:[10626]
	csw/mgar/pkg/gnulinks/trunk/Makefile
Message-ID: <E1Oe579-0000GC-8F@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 10626
          http://gar.svn.sourceforge.net/gar/?rev=10626&view=rev
Author:   bdwalton
Date:     2010-07-28 11:47:59 +0000 (Wed, 28 Jul 2010)

Log Message:
-----------
gnulinks: drop the gmake links as it provides them internally now

Modified Paths:
--------------
    csw/mgar/pkg/gnulinks/trunk/Makefile

Modified: csw/mgar/pkg/gnulinks/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gnulinks/trunk/Makefile	2010-07-28 11:41:10 UTC (rev 10625)
+++ csw/mgar/pkg/gnulinks/trunk/Makefile	2010-07-28 11:47:59 UTC (rev 10626)
@@ -5,8 +5,7 @@
 VENDOR_URL = http://opencsw.org
 
 GLINKPKGS =  CSWggettext CSWggettextrt CSWbison CSWbinutils
-GLINKPKGS += CSWgsed CSWggetopt CSWfindutils
-GLINKPKGS += CSWgmake CSWgwhois
+GLINKPKGS += CSWgsed CSWggetopt CSWfindutils CSWgwhois
 BUILD_DEP_PKGS = $(GLINKPKGS) CSWpkgutil CSWbash
 
 DESCRIPTION = Creates native symlinks for GNU tools in /opt/csw/gnu


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 Jul 28 13:55:10 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 28 Jul 2010 11:55:10 +0000
Subject: [csw-devel] SF.net SVN: gar:[10627] csw/mgar/pkg/rbgems
Message-ID: <E1Oe5E6-0005kQ-P1@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10627
          http://gar.svn.sourceforge.net/gar/?rev=10627&view=rev
Author:   dmichelsen
Date:     2010-07-28 11:55:10 +0000 (Wed, 28 Jul 2010)

Log Message:
-----------
rbgems/actionpack: Initial commit

Added Paths:
-----------
    csw/mgar/pkg/rbgems/actionpack/
    csw/mgar/pkg/rbgems/actionpack/branches/
    csw/mgar/pkg/rbgems/actionpack/tags/
    csw/mgar/pkg/rbgems/actionpack/trunk/
    csw/mgar/pkg/rbgems/actionpack/trunk/Makefile
    csw/mgar/pkg/rbgems/actionpack/trunk/checksums
    csw/mgar/pkg/rbgems/actionpack/trunk/files/


Property changes on: csw/mgar/pkg/rbgems/actionpack/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/rbgems/actionpack/trunk/Makefile
===================================================================
--- csw/mgar/pkg/rbgems/actionpack/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/rbgems/actionpack/trunk/Makefile	2010-07-28 11:55:10 UTC (rev 10627)
@@ -0,0 +1,18 @@
+GARNAME = actionpack
+GARVERSION = 2.3.8
+CATEGORIES = rbgems
+
+DESCRIPTION = Eases web-request routing, handling, and response as a half-way front, half-way page controller
+define BLURB
+  Eases web-request routing, handling, and response as a half-way front, half-way page controller.
+  Implemented with specific emphasis on enabling easy unit/integration testing that doesn't require a browser.
+endef
+
+PACKAGES = CSWgem-actionpack
+CATALOGNAME = gem_actionpack
+
+LICENSE = MIT-LICENSE
+
+GEM_DEPS = CSWgem-activesupport CSWgem-rack
+
+include gar/category.mk

Added: csw/mgar/pkg/rbgems/actionpack/trunk/checksums
===================================================================
--- csw/mgar/pkg/rbgems/actionpack/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/rbgems/actionpack/trunk/checksums	2010-07-28 11:55:10 UTC (rev 10627)
@@ -0,0 +1 @@
+75d7e35afa5a5bfaac5c8fe5f8967ed7  actionpack-2.3.8.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 Jul 28 13:58:43 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 28 Jul 2010 11:58:43 +0000
Subject: [csw-devel] SF.net SVN: gar:[10628]
	csw/mgar/pkg/rbgems/actionpack/trunk/Makefile
Message-ID: <E1Oe5HX-0000Sy-8y@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 10628
          http://gar.svn.sourceforge.net/gar/?rev=10628&view=rev
Author:   dmichelsen
Date:     2010-07-28 11:58:43 +0000 (Wed, 28 Jul 2010)

Log Message:
-----------
rbgems/actionpack: Add ARCHALL

Modified Paths:
--------------
    csw/mgar/pkg/rbgems/actionpack/trunk/Makefile

Modified: csw/mgar/pkg/rbgems/actionpack/trunk/Makefile
===================================================================
--- csw/mgar/pkg/rbgems/actionpack/trunk/Makefile	2010-07-28 11:55:10 UTC (rev 10627)
+++ csw/mgar/pkg/rbgems/actionpack/trunk/Makefile	2010-07-28 11:58:43 UTC (rev 10628)
@@ -15,4 +15,6 @@
 
 GEM_DEPS = CSWgem-activesupport CSWgem-rack
 
+ARCHALL = 1
+
 include gar/category.mk


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From dmichelsen at users.sourceforge.net  Wed Jul 28 14:04:11 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 28 Jul 2010 12:04:11 +0000
Subject: [csw-devel] SF.net SVN: gar:[10629] csw/mgar/pkg/rbgems
Message-ID: <E1Oe5Mp-0000ZH-G1@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 10629
          http://gar.svn.sourceforge.net/gar/?rev=10629&view=rev
Author:   dmichelsen
Date:     2010-07-28 12:04:11 +0000 (Wed, 28 Jul 2010)

Log Message:
-----------
rbgems/rake: Initial commit

Added Paths:
-----------
    csw/mgar/pkg/rbgems/rake/
    csw/mgar/pkg/rbgems/rake/branches/
    csw/mgar/pkg/rbgems/rake/tags/
    csw/mgar/pkg/rbgems/rake/trunk/
    csw/mgar/pkg/rbgems/rake/trunk/Makefile
    csw/mgar/pkg/rbgems/rake/trunk/checksums
    csw/mgar/pkg/rbgems/rake/trunk/files/


Property changes on: csw/mgar/pkg/rbgems/rake/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/rbgems/rake/trunk/Makefile
===================================================================
--- csw/mgar/pkg/rbgems/rake/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/rbgems/rake/trunk/Makefile	2010-07-28 12:04:11 UTC (rev 10629)
@@ -0,0 +1,17 @@
+GARNAME = rake
+GARVERSION = 0.8.7
+CATEGORIES = rbgems
+
+DESCRIPTION = Make-like program implemented in Ruby
+define BLURB
+  Rake is a Make-like program implemented in Ruby. Tasks and dependencies are specified in standard Ruby syntax.
+endef
+
+PACKAGES = CSWgem-rake
+CATALOGNAME = gem_rake
+
+LICENSE = MIT-LICENSE
+
+ARCHALL = 1
+
+include gar/category.mk

Added: csw/mgar/pkg/rbgems/rake/trunk/checksums
===================================================================
--- csw/mgar/pkg/rbgems/rake/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/rbgems/rake/trunk/checksums	2010-07-28 12:04:11 UTC (rev 10629)
@@ -0,0 +1 @@
+d9eb83525310ad1a0e8a3eeddfe3c65f  rake-0.8.7.gem


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 Jul 28 14:07:10 2010
From: bonivart at users.sourceforge.net (bonivart at users.sourceforge.net)
Date: Wed, 28 Jul 2010 12:07:10 +0000
Subject: [csw-devel] SF.net SVN: gar:[10630]
	csw/mgar/pkg/pkgutil/trunk/checksums
Message-ID: <E1Oe5Pi-0000cR-RW@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 10630
          http://gar.svn.sourceforge.net/gar/?rev=10630&view=rev
Author:   bonivart
Date:     2010-07-28 12:07:10 +0000 (Wed, 28 Jul 2010)

Log Message:
-----------
pkgutil: update bldcat for 2.1 release

Modified Paths:
--------------
    csw/mgar/pkg/pkgutil/trunk/checksums

Modified: csw/mgar/pkg/pkgutil/trunk/checksums
===================================================================
--- csw/mgar/pkg/pkgutil/trunk/checksums	2010-07-28 12:04:11 UTC (rev 10629)
+++ csw/mgar/pkg/pkgutil/trunk/checksums	2010-07-28 12:07:10 UTC (rev 10630)
@@ -5,4 +5,4 @@
 b5fffa0be100ddbb7262ce3a0a4e3bb7  build_sun_catalog.py
 7ad27336f90e73da3254a61d91025ee5  cswcatalog
 3a6b789b3d5e05f41d2363dd26a92acf  opencsw.py
-8f4e1003a53426d1aba1e253acda2a0b  pkgutil-2.1.zip
+8ed6eab5fbcd2e2f5c4d961c32c00e25  pkgutil-2.1.zip


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 Jul 28 14:19:47 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 28 Jul 2010 12:19:47 +0000
Subject: [csw-devel] SF.net SVN: gar:[10631] csw/mgar/pkg/rbgems
Message-ID: <E1Oe5bv-0000rN-Se@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 10631
          http://gar.svn.sourceforge.net/gar/?rev=10631&view=rev
Author:   dmichelsen
Date:     2010-07-28 12:19:47 +0000 (Wed, 28 Jul 2010)

Log Message:
-----------
rbgems/will_paginate: Initial commit

Added Paths:
-----------
    csw/mgar/pkg/rbgems/will_paginate/
    csw/mgar/pkg/rbgems/will_paginate/branches/
    csw/mgar/pkg/rbgems/will_paginate/tags/
    csw/mgar/pkg/rbgems/will_paginate/trunk/
    csw/mgar/pkg/rbgems/will_paginate/trunk/Makefile
    csw/mgar/pkg/rbgems/will_paginate/trunk/checksums
    csw/mgar/pkg/rbgems/will_paginate/trunk/files/


Property changes on: csw/mgar/pkg/rbgems/will_paginate/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/rbgems/will_paginate/trunk/Makefile
===================================================================
--- csw/mgar/pkg/rbgems/will_paginate/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/rbgems/will_paginate/trunk/Makefile	2010-07-28 12:19:47 UTC (rev 10631)
@@ -0,0 +1,16 @@
+GARNAME = will_paginate
+GARVERSION = 2.3.14
+CATEGORIES = rbgems
+
+DESCRIPTION = An API for ActiveRecord pagination
+define BLURB
+  The will_paginate library provides a simple, yet powerful and extensible API for ActiveRecord pagination and rendering of pagination links in ActionView templates.
+endef
+
+GEMPKGNAME = willpaginate
+
+LICENSE = LICENSE
+
+ARCHALL = 1
+
+include gar/category.mk

Added: csw/mgar/pkg/rbgems/will_paginate/trunk/checksums
===================================================================
--- csw/mgar/pkg/rbgems/will_paginate/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/rbgems/will_paginate/trunk/checksums	2010-07-28 12:19:47 UTC (rev 10631)
@@ -0,0 +1 @@
+8955808d2def87d7526185c57261fdc8  will_paginate-2.3.14.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 Jul 28 14:24:55 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 28 Jul 2010 12:24:55 +0000
Subject: [csw-devel] SF.net SVN: gar:[10632] csw/mgar/pkg/rbgems
Message-ID: <E1Oe5gt-0006IB-2D@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10632
          http://gar.svn.sourceforge.net/gar/?rev=10632&view=rev
Author:   dmichelsen
Date:     2010-07-28 12:24:54 +0000 (Wed, 28 Jul 2010)

Log Message:
-----------
rbgems/activerecord: Initial commit

Added Paths:
-----------
    csw/mgar/pkg/rbgems/activerecord/
    csw/mgar/pkg/rbgems/activerecord/branches/
    csw/mgar/pkg/rbgems/activerecord/tags/
    csw/mgar/pkg/rbgems/activerecord/trunk/
    csw/mgar/pkg/rbgems/activerecord/trunk/Makefile
    csw/mgar/pkg/rbgems/activerecord/trunk/checksums
    csw/mgar/pkg/rbgems/activerecord/trunk/files/
    csw/mgar/pkg/rbgems/activerecord/trunk/files/COPYING


Property changes on: csw/mgar/pkg/rbgems/activerecord/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/rbgems/activerecord/trunk/Makefile
===================================================================
--- csw/mgar/pkg/rbgems/activerecord/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/rbgems/activerecord/trunk/Makefile	2010-07-28 12:24:54 UTC (rev 10632)
@@ -0,0 +1,21 @@
+GARNAME = activerecord
+GARVERSION = 2.3.8
+CATEGORIES = rbgems
+
+DESCRIPTION = Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM
+define BLURB
+  Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM. It ties database tables and classes together for business objects, like Customer or Subscription, that can find, save, and destroy themselves without resorting to manual SQL.
+endef
+
+DISTFILES = COPYING
+
+PACKAGES = CSWgem-activerecord
+CATALOGNAME = gem_activerecord
+
+LICENSE = COPYING
+
+DEP_PKGS = CSWgem-activesupport
+
+ARCHALL = 1
+
+include gar/category.mk

Added: csw/mgar/pkg/rbgems/activerecord/trunk/checksums
===================================================================
--- csw/mgar/pkg/rbgems/activerecord/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/rbgems/activerecord/trunk/checksums	2010-07-28 12:24:54 UTC (rev 10632)
@@ -0,0 +1,2 @@
+ce0328fedbb7b8887ee7800a9d3cbe9e  COPYING
+16311c40a988bd9f8ffeb44799d9f488  activerecord-2.3.8.gem

Added: csw/mgar/pkg/rbgems/activerecord/trunk/files/COPYING
===================================================================
--- csw/mgar/pkg/rbgems/activerecord/trunk/files/COPYING	                        (rev 0)
+++ csw/mgar/pkg/rbgems/activerecord/trunk/files/COPYING	2010-07-28 12:24:54 UTC (rev 10632)
@@ -0,0 +1,4 @@
+== License
+
+Active Record is released under the MIT license.
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From bdwalton at users.sourceforge.net  Wed Jul 28 15:00:19 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Wed, 28 Jul 2010 13:00:19 +0000
Subject: [csw-devel] SF.net SVN: gar:[10633]
	csw/mgar/pkg/gnulinks/trunk/Makefile
Message-ID: <E1Oe6F9-0006zM-In@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10633
          http://gar.svn.sourceforge.net/gar/?rev=10633&view=rev
Author:   bdwalton
Date:     2010-07-28 13:00:19 +0000 (Wed, 28 Jul 2010)

Log Message:
-----------
gnulinks: bump version

Modified Paths:
--------------
    csw/mgar/pkg/gnulinks/trunk/Makefile

Modified: csw/mgar/pkg/gnulinks/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gnulinks/trunk/Makefile	2010-07-28 12:24:54 UTC (rev 10632)
+++ csw/mgar/pkg/gnulinks/trunk/Makefile	2010-07-28 13:00:19 UTC (rev 10633)
@@ -1,5 +1,5 @@
 GARNAME = gnulinks
-GARVERSION = 1.3
+GARVERSION = 1.4
 CATEGORIES = xtra
 
 VENDOR_URL = http://opencsw.org


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 Jul 28 15:16:17 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 28 Jul 2010 13:16:17 +0000
Subject: [csw-devel] SF.net SVN: gar:[10634] csw/mgar/pkg/rbgems
Message-ID: <E1Oe6Ub-0007HU-2g@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10634
          http://gar.svn.sourceforge.net/gar/?rev=10634&view=rev
Author:   dmichelsen
Date:     2010-07-28 13:16:16 +0000 (Wed, 28 Jul 2010)

Log Message:
-----------
rbgems/sqlite3-ruby: Initial commit

Added Paths:
-----------
    csw/mgar/pkg/rbgems/sqlite3-ruby/
    csw/mgar/pkg/rbgems/sqlite3-ruby/branches/
    csw/mgar/pkg/rbgems/sqlite3-ruby/tags/
    csw/mgar/pkg/rbgems/sqlite3-ruby/trunk/
    csw/mgar/pkg/rbgems/sqlite3-ruby/trunk/Makefile
    csw/mgar/pkg/rbgems/sqlite3-ruby/trunk/checksums
    csw/mgar/pkg/rbgems/sqlite3-ruby/trunk/files/
    csw/mgar/pkg/rbgems/sqlite3-ruby/trunk/files/0001-Remove-gcc-specific-flags.patch


Property changes on: csw/mgar/pkg/rbgems/sqlite3-ruby/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/rbgems/sqlite3-ruby/trunk/Makefile
===================================================================
--- csw/mgar/pkg/rbgems/sqlite3-ruby/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/rbgems/sqlite3-ruby/trunk/Makefile	2010-07-28 13:16:16 UTC (rev 10634)
@@ -0,0 +1,38 @@
+GARNAME = sqlite3-ruby
+GARVERSION = 1.3.1
+CATEGORIES = rbgems
+
+DESCRIPTION = Ruby interface to SQLite3
+define BLURB
+  This module allows Ruby programs to interface with the SQLite3 database engine (http://www.sqlite.org). You must have the SQLite engine installed in order to build this module. Note that this module is NOT compatible with SQLite 2.x.
+endef
+
+PATCHFILES = 0001-Remove-gcc-specific-flags.patch
+
+PACKAGES = CSWgem-sqlite3ruby
+CATALOGNAME = gem_sqlite3ruby
+
+BUILD_DEP_PKGS = CSWsqlite3devel
+RUNTIME_DEP_PKGS = CSWsqlite3rt
+
+LICENSE = LICENSE
+
+CONFIGURE_SCRIPTS = ruby-setup
+BUILD_SCRIPTS = ruby-setup
+INSTALL_SCRIPTS = ruby-setup
+
+include gar/category.mk
+
+configure-ruby-setup:
+	cd $(WORKSRC) && ruby setup.rb config
+	@$(MAKECOOKIE)
+
+build-ruby-setup:
+	cd $(WORKSRC) && ruby setup.rb setup
+	@$(MAKECOOKIE)
+
+install-ruby-setup:
+	cd $(WORKSRC) && ruby setup.rb install \
+		--prefix=$(DESTDIR)
+	@$(MAKECOOKIE)
+

Added: csw/mgar/pkg/rbgems/sqlite3-ruby/trunk/checksums
===================================================================
--- csw/mgar/pkg/rbgems/sqlite3-ruby/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/rbgems/sqlite3-ruby/trunk/checksums	2010-07-28 13:16:16 UTC (rev 10634)
@@ -0,0 +1,2 @@
+ac9fdaa9cac52ac85f9010dc23000edd  0001-Remove-gcc-specific-flags.patch
+4b79bb5feeb652a522f6fe5071a84ff9  sqlite3-ruby-1.3.1.gem

Added: csw/mgar/pkg/rbgems/sqlite3-ruby/trunk/files/0001-Remove-gcc-specific-flags.patch
===================================================================
--- csw/mgar/pkg/rbgems/sqlite3-ruby/trunk/files/0001-Remove-gcc-specific-flags.patch	                        (rev 0)
+++ csw/mgar/pkg/rbgems/sqlite3-ruby/trunk/files/0001-Remove-gcc-specific-flags.patch	2010-07-28 13:16:16 UTC (rev 10634)
@@ -0,0 +1,32 @@
+From be44bd9b7a143ec7fd737c1d67fdee19a2c17592 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Wed, 28 Jul 2010 14:40:01 +0200
+Subject: [PATCH] Remove gcc specific flags
+
+---
+ ext/sqlite3/extconf.rb |    5 ++---
+ 1 files changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/ext/sqlite3/extconf.rb b/ext/sqlite3/extconf.rb
+index 5898927..88bfc6c 100644
+--- a/ext/sqlite3/extconf.rb
++++ b/ext/sqlite3/extconf.rb
+@@ -6,13 +6,12 @@ require 'mkmf'
+ 
+ RbConfig::MAKEFILE_CONFIG['CC'] = ENV['CC'] if ENV['CC']
+ 
+-sqlite = dir_config('sqlite3', ['/usr/local', '/opt/local', '/usr'])
++sqlite = dir_config('sqlite3', ['/opt/csw'])
+ 
+ if RUBY_PLATFORM =~ /mswin/
+   $CFLAGS << ' -W3'
+ else
+-  $CFLAGS << ' -O3 -Wall -Wcast-qual -Wwrite-strings -Wconversion' <<
+-             ' -Wmissing-noreturn -Winline'
++  $CFLAGS << ''
+ end
+ 
+ def asplode missing
+-- 
+1.7.1
+


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 Jul 28 15:53:56 2010
From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net)
Date: Wed, 28 Jul 2010 13:53:56 +0000
Subject: [csw-devel] SF.net SVN: gar:[10635]
	csw/mgar/pkg/apache2/trunk/Makefile
Message-ID: <E1Oe752-0004s0-1m@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 10635
          http://gar.svn.sourceforge.net/gar/?rev=10635&view=rev
Author:   rthurner
Date:     2010-07-28 13:53:55 +0000 (Wed, 28 Jul 2010)

Log Message:
-----------
apache2: use apr-config instead of location

Modified Paths:
--------------
    csw/mgar/pkg/apache2/trunk/Makefile

Modified: csw/mgar/pkg/apache2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apache2/trunk/Makefile	2010-07-28 13:16:16 UTC (rev 10634)
+++ csw/mgar/pkg/apache2/trunk/Makefile	2010-07-28 13:53:55 UTC (rev 10635)
@@ -43,8 +43,8 @@
 	(cd $(WORKDIR)/$(GARNAME)-$(GARVERSION); ./buildconf)
 
 # Build Configuration
-CONFIGURE_ARGS += --with-apr=$(prefix)
-CONFIGURE_ARGS += --with-apr-util=$(prefix)
+CONFIGURE_ARGS += --with-apr=$(prefix)/bin/apr-1-config
+CONFIGURE_ARGS += --with-apr-util=$(prefix)/bin/apr-1-config
 CONFIGURE_ARGS += --with-mpm=prefork
 CONFIGURE_ARGS += --disable-static
 


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 Jul 28 15:58:47 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 28 Jul 2010 13:58:47 +0000
Subject: [csw-devel] SF.net SVN: gar:[10636] csw/mgar/pkg/rbgems
Message-ID: <E1Oe79j-0004wo-OV@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 10636
          http://gar.svn.sourceforge.net/gar/?rev=10636&view=rev
Author:   dmichelsen
Date:     2010-07-28 13:58:47 +0000 (Wed, 28 Jul 2010)

Log Message:
-----------
rbgems/activeresource: Initial commit

Added Paths:
-----------
    csw/mgar/pkg/rbgems/activeresource/
    csw/mgar/pkg/rbgems/activeresource/branches/
    csw/mgar/pkg/rbgems/activeresource/tags/
    csw/mgar/pkg/rbgems/activeresource/trunk/
    csw/mgar/pkg/rbgems/activeresource/trunk/Makefile
    csw/mgar/pkg/rbgems/activeresource/trunk/checksums
    csw/mgar/pkg/rbgems/activeresource/trunk/files/
    csw/mgar/pkg/rbgems/activeresource/trunk/files/COPYING


Property changes on: csw/mgar/pkg/rbgems/activeresource/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/rbgems/activeresource/trunk/Makefile
===================================================================
--- csw/mgar/pkg/rbgems/activeresource/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/rbgems/activeresource/trunk/Makefile	2010-07-28 13:58:47 UTC (rev 10636)
@@ -0,0 +1,20 @@
+GARNAME = activeresource
+GARVERSION = 2.3.8
+CATEGORIES = rbgems
+
+DESCRIPTION = Wraps web resources in model classes
+define BLURB
+  Wraps web resources in model classes that can be manipulated through XML over REST.
+endef
+
+DISTFILES = COPYING
+
+GEMPKGNAME = activeres
+
+DEP_PKGS = CSWgem-activesupport
+
+LICENSE = COPYING
+
+ARCHALL = 1
+
+include gar/category.mk

Added: csw/mgar/pkg/rbgems/activeresource/trunk/checksums
===================================================================
--- csw/mgar/pkg/rbgems/activeresource/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/rbgems/activeresource/trunk/checksums	2010-07-28 13:58:47 UTC (rev 10636)
@@ -0,0 +1,2 @@
+380ea08e7fe1b215a856331dc546b486  COPYING
+7318e7652bd17433e4fec17fe9a201b7  activeresource-2.3.8.gem

Added: csw/mgar/pkg/rbgems/activeresource/trunk/files/COPYING
===================================================================
--- csw/mgar/pkg/rbgems/activeresource/trunk/files/COPYING	                        (rev 0)
+++ csw/mgar/pkg/rbgems/activeresource/trunk/files/COPYING	2010-07-28 13:58:47 UTC (rev 10636)
@@ -0,0 +1,21 @@
+# Copyright (c) 2006 David Heinemeier Hansson
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+


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 Jul 28 16:08:33 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 28 Jul 2010 14:08:33 +0000
Subject: [csw-devel] SF.net SVN: gar:[10637]
	csw/mgar/pkg/rbgems/actionmailer/trunk/Makefile
Message-ID: <E1Oe7JB-0002n4-13@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 10637
          http://gar.svn.sourceforge.net/gar/?rev=10637&view=rev
Author:   dmichelsen
Date:     2010-07-28 14:08:32 +0000 (Wed, 28 Jul 2010)

Log Message:
-----------
rbgems/actionmailer: Add dependencies and license

Modified Paths:
--------------
    csw/mgar/pkg/rbgems/actionmailer/trunk/Makefile

Modified: csw/mgar/pkg/rbgems/actionmailer/trunk/Makefile
===================================================================
--- csw/mgar/pkg/rbgems/actionmailer/trunk/Makefile	2010-07-28 13:58:47 UTC (rev 10636)
+++ csw/mgar/pkg/rbgems/actionmailer/trunk/Makefile	2010-07-28 14:08:32 UTC (rev 10637)
@@ -6,9 +6,13 @@
 define BLURB
 endef
 
-PACKAGES = CSWactionmailer
-CATALOGNAME = rb_actionmailer
+PACKAGES = CSWgem-actionmailer
+CATALOGNAME = gem_actionmailer
 
+DEP_PKGS = CSWgem-actionpack
+
+LICENSE = MIT-LICENSE
+
 ARCHALL = 1
 
 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  Wed Jul 28 16:19:52 2010
From: rthurner at users.sourceforge.net (rthurner at users.sourceforge.net)
Date: Wed, 28 Jul 2010 14:19:52 +0000
Subject: [csw-devel] SF.net SVN: gar:[10638]
	csw/mgar/pkg/apache2/trunk/Makefile
Message-ID: <E1Oe7U8-0002zp-Sx@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 10638
          http://gar.svn.sourceforge.net/gar/?rev=10638&view=rev
Author:   rthurner
Date:     2010-07-28 14:19:52 +0000 (Wed, 28 Jul 2010)

Log Message:
-----------
apache2: use apr-util config

Modified Paths:
--------------
    csw/mgar/pkg/apache2/trunk/Makefile

Modified: csw/mgar/pkg/apache2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apache2/trunk/Makefile	2010-07-28 14:08:32 UTC (rev 10637)
+++ csw/mgar/pkg/apache2/trunk/Makefile	2010-07-28 14:19:52 UTC (rev 10638)
@@ -44,7 +44,7 @@
 
 # Build Configuration
 CONFIGURE_ARGS += --with-apr=$(prefix)/bin/apr-1-config
-CONFIGURE_ARGS += --with-apr-util=$(prefix)/bin/apr-1-config
+CONFIGURE_ARGS += --with-apr-util=$(prefix)/bin/apu-1-config
 CONFIGURE_ARGS += --with-mpm=prefork
 CONFIGURE_ARGS += --disable-static
 


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 Jul 28 16:22:41 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 28 Jul 2010 14:22:41 +0000
Subject: [csw-devel] SF.net SVN: gar:[10639] csw/mgar/pkg/rbgems
Message-ID: <E1Oe7Wr-00033W-FU@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 10639
          http://gar.svn.sourceforge.net/gar/?rev=10639&view=rev
Author:   dmichelsen
Date:     2010-07-28 14:22:41 +0000 (Wed, 28 Jul 2010)

Log Message:
-----------
rbgems/rails: Initial commit

Added Paths:
-----------
    csw/mgar/pkg/rbgems/rails/
    csw/mgar/pkg/rbgems/rails/branches/
    csw/mgar/pkg/rbgems/rails/tags/
    csw/mgar/pkg/rbgems/rails/trunk/
    csw/mgar/pkg/rbgems/rails/trunk/Makefile
    csw/mgar/pkg/rbgems/rails/trunk/checksums
    csw/mgar/pkg/rbgems/rails/trunk/files/


Property changes on: csw/mgar/pkg/rbgems/rails/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/rbgems/rails/trunk/Makefile
===================================================================
--- csw/mgar/pkg/rbgems/rails/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/rbgems/rails/trunk/Makefile	2010-07-28 14:22:41 UTC (rev 10639)
@@ -0,0 +1,18 @@
+GARNAME = rails
+GARVERSION = 2.3.8
+CATEGORIES = rbgems
+
+DESCRIPTION = A framework for building web-application
+define BLURB
+  Rails is a framework for building web-application using CGI, FCGI, mod_ruby, or WEBrick on top of either MySQL, PostgreSQL, SQLite, DB2, SQL Server, or Oracle with eRuby- or Builder-based templates.
+endef
+
+PACKAGES = CSWgem-rails
+CATALOGNAME = gem_rails
+
+GEM_DEPS = CSWgem-rake CSWgem-activesupport CSWgem-activerecord CSWgem-actionpack CSWgem-actionmailer CSWgem-activeres
+RUNTIME_DEP_PKGS = $(GEM_DEPS)
+
+ARCHALL = 1
+
+include gar/category.mk

Added: csw/mgar/pkg/rbgems/rails/trunk/checksums
===================================================================
--- csw/mgar/pkg/rbgems/rails/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/rbgems/rails/trunk/checksums	2010-07-28 14:22:41 UTC (rev 10639)
@@ -0,0 +1 @@
+a3061ceadf8877d9cdfd2a6d80387ae7  rails-2.3.8.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 Jul 28 16:43:00 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 28 Jul 2010 14:43:00 +0000
Subject: [csw-devel] SF.net SVN: gar:[10640] csw/mgar/pkg/rbgems
Message-ID: <E1Oe7qW-0005cJ-2s@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 10640
          http://gar.svn.sourceforge.net/gar/?rev=10640&view=rev
Author:   dmichelsen
Date:     2010-07-28 14:42:59 +0000 (Wed, 28 Jul 2010)

Log Message:
-----------
rbgems/fastthread: Initial commit

Added Paths:
-----------
    csw/mgar/pkg/rbgems/fastthread/
    csw/mgar/pkg/rbgems/fastthread/branches/
    csw/mgar/pkg/rbgems/fastthread/tags/
    csw/mgar/pkg/rbgems/fastthread/trunk/
    csw/mgar/pkg/rbgems/fastthread/trunk/Makefile
    csw/mgar/pkg/rbgems/fastthread/trunk/checksums
    csw/mgar/pkg/rbgems/fastthread/trunk/files/
    csw/mgar/pkg/rbgems/fastthread/trunk/files/COPYING


Property changes on: csw/mgar/pkg/rbgems/fastthread/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/rbgems/fastthread/trunk/Makefile
===================================================================
--- csw/mgar/pkg/rbgems/fastthread/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/rbgems/fastthread/trunk/Makefile	2010-07-28 14:42:59 UTC (rev 10640)
@@ -0,0 +1,17 @@
+GARNAME = fastthread
+GARVERSION = 1.0.7
+CATEGORIES = rbgems
+
+DESCRIPTION = Optimized replacement for thread.rb primitives
+define BLURB
+  Optimized replacement for thread.rb primitives
+endef
+
+DISTFILES = COPYING
+
+PACKAGES = CSWgem-fastthread
+CATALOGNAME = gem_fastthread
+
+LICENSE = COPYING
+
+include gar/category.mk

Added: csw/mgar/pkg/rbgems/fastthread/trunk/checksums
===================================================================
--- csw/mgar/pkg/rbgems/fastthread/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/rbgems/fastthread/trunk/checksums	2010-07-28 14:42:59 UTC (rev 10640)
@@ -0,0 +1,2 @@
+1e1b8e67c9eb5ab61312a46ebc6642ad  COPYING
+16eb06dc3661c89301de6c73c71bb16e  fastthread-1.0.7.gem

Added: csw/mgar/pkg/rbgems/fastthread/trunk/files/COPYING
===================================================================
--- csw/mgar/pkg/rbgems/fastthread/trunk/files/COPYING	                        (rev 0)
+++ csw/mgar/pkg/rbgems/fastthread/trunk/files/COPYING	2010-07-28 14:42:59 UTC (rev 10640)
@@ -0,0 +1,6 @@
+# Copyright (c) 2000-2005 Minero Aoki
+#
+# This program is free software.
+# You can distribute/modify this program under the terms of
+# the GNU LGPL, Lesser General Public License version 2.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 Jul 28 17:01:12 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 28 Jul 2010 15:01:12 +0000
Subject: [csw-devel] SF.net SVN: gar:[10641] csw/mgar/pkg/rbgems
Message-ID: <E1Oe888-0005xr-GB@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 10641
          http://gar.svn.sourceforge.net/gar/?rev=10641&view=rev
Author:   dmichelsen
Date:     2010-07-28 15:01:12 +0000 (Wed, 28 Jul 2010)

Log Message:
-----------
rbgems/rube-net-ldap: Initial commit

Added Paths:
-----------
    csw/mgar/pkg/rbgems/ruby-net-ldap/
    csw/mgar/pkg/rbgems/ruby-net-ldap/branches/
    csw/mgar/pkg/rbgems/ruby-net-ldap/tags/
    csw/mgar/pkg/rbgems/ruby-net-ldap/trunk/
    csw/mgar/pkg/rbgems/ruby-net-ldap/trunk/Makefile
    csw/mgar/pkg/rbgems/ruby-net-ldap/trunk/checksums
    csw/mgar/pkg/rbgems/ruby-net-ldap/trunk/files/


Property changes on: csw/mgar/pkg/rbgems/ruby-net-ldap/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/rbgems/ruby-net-ldap/trunk/Makefile
===================================================================
--- csw/mgar/pkg/rbgems/ruby-net-ldap/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/rbgems/ruby-net-ldap/trunk/Makefile	2010-07-28 15:01:12 UTC (rev 10641)
@@ -0,0 +1,17 @@
+GARNAME = ruby-net-ldap
+GARVERSION = 0.0.4
+CATEGORIES = rbgems
+
+DESCRIPTION = An LDAP support library written in pure Ruby
+define BLURB
+  Net::LDAP is an LDAP support library written in pure Ruby. It supports all LDAP client features, and a subset of server features as well.
+endef
+
+PACKAGES = CSWgem-rubynetldap
+CATALOGNAME = gem_rubynetldap
+
+LICENSE = LICENCE
+
+ARCHALL = 1
+
+include gar/category.mk

Added: csw/mgar/pkg/rbgems/ruby-net-ldap/trunk/checksums
===================================================================
--- csw/mgar/pkg/rbgems/ruby-net-ldap/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/rbgems/ruby-net-ldap/trunk/checksums	2010-07-28 15:01:12 UTC (rev 10641)
@@ -0,0 +1 @@
+4182f470cef1f8c6de30703d52526626  ruby-net-ldap-0.0.4.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 Jul 28 17:13:41 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 28 Jul 2010 15:13:41 +0000
Subject: [csw-devel] SF.net SVN: gar:[10642] csw/mgar/pkg/rbgems
Message-ID: <E1Oe8KD-0003xq-Ty@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 10642
          http://gar.svn.sourceforge.net/gar/?rev=10642&view=rev
Author:   dmichelsen
Date:     2010-07-28 15:13:41 +0000 (Wed, 28 Jul 2010)

Log Message:
-----------
rbgems/meta_programming: Initial commit

Added Paths:
-----------
    csw/mgar/pkg/rbgems/meta_programming/
    csw/mgar/pkg/rbgems/meta_programming/branches/
    csw/mgar/pkg/rbgems/meta_programming/tags/
    csw/mgar/pkg/rbgems/meta_programming/trunk/
    csw/mgar/pkg/rbgems/meta_programming/trunk/Makefile
    csw/mgar/pkg/rbgems/meta_programming/trunk/checksums
    csw/mgar/pkg/rbgems/meta_programming/trunk/files/


Property changes on: csw/mgar/pkg/rbgems/meta_programming/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/rbgems/meta_programming/trunk/Makefile
===================================================================
--- csw/mgar/pkg/rbgems/meta_programming/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/rbgems/meta_programming/trunk/Makefile	2010-07-28 15:13:41 UTC (rev 10642)
@@ -0,0 +1,17 @@
+GARNAME = meta_programming
+GARVERSION = 0.2.2
+CATEGORIES = rbgems
+
+DESCRIPTION = Collection of meta-programming methods for Ruby
+define BLURB
+  Collection of meta-programming methods for Ruby.
+endef
+
+PACKAGES = CSWgem-metaprogr
+CATALOGNAME = gem_metaprogr
+
+LICENSE = LICENSE
+
+ARCHALL = 1
+
+include gar/category.mk

Added: csw/mgar/pkg/rbgems/meta_programming/trunk/checksums
===================================================================
--- csw/mgar/pkg/rbgems/meta_programming/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/rbgems/meta_programming/trunk/checksums	2010-07-28 15:13:41 UTC (rev 10642)
@@ -0,0 +1 @@
+0e0db05aac65ceef85708b1e633bc7e2  meta_programming-0.2.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 Jul 28 17:16:27 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 28 Jul 2010 15:16:27 +0000
Subject: [csw-devel] SF.net SVN: gar:[10643] csw/mgar/pkg/rbgems
Message-ID: <E1Oe8Mt-00040n-Ni@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 10643
          http://gar.svn.sourceforge.net/gar/?rev=10643&view=rev
Author:   dmichelsen
Date:     2010-07-28 15:16:27 +0000 (Wed, 28 Jul 2010)

Log Message:
-----------
rbgems/passenger: Initial commit

Added Paths:
-----------
    csw/mgar/pkg/rbgems/passenger/
    csw/mgar/pkg/rbgems/passenger/branches/
    csw/mgar/pkg/rbgems/passenger/tags/
    csw/mgar/pkg/rbgems/passenger/trunk/
    csw/mgar/pkg/rbgems/passenger/trunk/Makefile
    csw/mgar/pkg/rbgems/passenger/trunk/checksums
    csw/mgar/pkg/rbgems/passenger/trunk/files/


Property changes on: csw/mgar/pkg/rbgems/passenger/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/rbgems/passenger/trunk/Makefile
===================================================================
--- csw/mgar/pkg/rbgems/passenger/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/rbgems/passenger/trunk/Makefile	2010-07-28 15:16:27 UTC (rev 10643)
@@ -0,0 +1,27 @@
+GARNAME = passenger
+GARVERSION = 2.2.15
+CATEGORIES = rbgems
+
+DESCRIPTION = Passenger is an Apache module for Ruby on Rails support
+define BLURB
+  Passenger is an Apache module for Ruby on Rails support.
+endef
+
+PACKAGES = CSWgem-passenger
+CATALOGNAME = gem_passenger
+
+LICENSE = LICENSE
+
+CHECKPKG_OVERRIDES_CSWgem-passenger += discouraged-path-in-pkgmap|/opt/csw/lib/ruby/gems/1.8/gems/passenger-2.2.15/test/stub/wsgi/passenger_wsgi.pyc
+CHECKPKG_OVERRIDES_CSWgem-passenger += missing-dependency|CSWpython
+
+include gar/category.mk
+
+post-install-modulated:
+	cd $(DESTDIR); find . -name "* *" | \
+		while read F; do \
+			N=`echo $$F | tr ' ' '_'`; \
+			mv "$$F" $$N; \
+		done;
+
+

Added: csw/mgar/pkg/rbgems/passenger/trunk/checksums
===================================================================
--- csw/mgar/pkg/rbgems/passenger/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/rbgems/passenger/trunk/checksums	2010-07-28 15:16:27 UTC (rev 10643)
@@ -0,0 +1 @@
+fd0e1a0ebcf97af7e238c405a6b70235  passenger-2.2.15.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 Jul 28 17:19:40 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 28 Jul 2010 15:19:40 +0000
Subject: [csw-devel] SF.net SVN: gar:[10644] csw/mgar/pkg/rbgems
Message-ID: <E1Oe8Q0-00044I-6r@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 10644
          http://gar.svn.sourceforge.net/gar/?rev=10644&view=rev
Author:   dmichelsen
Date:     2010-07-28 15:19:39 +0000 (Wed, 28 Jul 2010)

Log Message:
-----------
rbgems/haml: Initial commit

Added Paths:
-----------
    csw/mgar/pkg/rbgems/haml/
    csw/mgar/pkg/rbgems/haml/branches/
    csw/mgar/pkg/rbgems/haml/tags/
    csw/mgar/pkg/rbgems/haml/trunk/
    csw/mgar/pkg/rbgems/haml/trunk/Makefile
    csw/mgar/pkg/rbgems/haml/trunk/checksums
    csw/mgar/pkg/rbgems/haml/trunk/files/


Property changes on: csw/mgar/pkg/rbgems/haml/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/rbgems/haml/trunk/Makefile
===================================================================
--- csw/mgar/pkg/rbgems/haml/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/rbgems/haml/trunk/Makefile	2010-07-28 15:19:39 UTC (rev 10644)
@@ -0,0 +1,18 @@
+GARNAME = haml
+GARVERSION = 3.0.15
+CATEGORIES = rbgems
+
+DESCRIPTION = HTML Abstraction Markup Language
+define BLURB
+  Haml (HTML Abstraction Markup Language) is a layer on top of XHTML or XML that's designed to express the structure of XHTML or XML documents in a non-repetitive, elegant, easy way, using indentation rather than closing tags and allowing Ruby to be embedded with ease. It was originally envisioned as a plugin for Ruby on Rails, but it can function as a stand-alone templating engine.
+endef
+
+PACKAGES = CSWgem-haml
+CATALOGNAME = gem_haml
+
+ARCHALL = 1
+
+# This is just one file with an emacs mode
+CHECKPKG_OVERRIDES_CSWgem-haml += missing-dependency|CSWemacscommon
+
+include gar/category.mk

Added: csw/mgar/pkg/rbgems/haml/trunk/checksums
===================================================================
--- csw/mgar/pkg/rbgems/haml/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/rbgems/haml/trunk/checksums	2010-07-28 15:19:39 UTC (rev 10644)
@@ -0,0 +1 @@
+ebbe1f6430d86978ff731c2a701c8eab  haml-3.0.15.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 Jul 28 17:33:38 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Wed, 28 Jul 2010 15:33:38 +0000
Subject: [csw-devel] SF.net SVN: gar:[10645] csw/mgar/pkg/rbgems
Message-ID: <E1Oe8dW-0004Kv-I0@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 10645
          http://gar.svn.sourceforge.net/gar/?rev=10645&view=rev
Author:   dmichelsen
Date:     2010-07-28 15:33:38 +0000 (Wed, 28 Jul 2010)

Log Message:
-----------
rbgems/formtastic: Initial commit

Added Paths:
-----------
    csw/mgar/pkg/rbgems/formtastic/
    csw/mgar/pkg/rbgems/formtastic/branches/
    csw/mgar/pkg/rbgems/formtastic/tags/
    csw/mgar/pkg/rbgems/formtastic/trunk/
    csw/mgar/pkg/rbgems/formtastic/trunk/Makefile
    csw/mgar/pkg/rbgems/formtastic/trunk/checksums
    csw/mgar/pkg/rbgems/formtastic/trunk/files/


Property changes on: csw/mgar/pkg/rbgems/formtastic/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/rbgems/formtastic/trunk/Makefile
===================================================================
--- csw/mgar/pkg/rbgems/formtastic/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/rbgems/formtastic/trunk/Makefile	2010-07-28 15:33:38 UTC (rev 10645)
@@ -0,0 +1,17 @@
+GARNAME = formtastic
+GARVERSION = 0.9.10
+CATEGORIES = rbgems
+
+DESCRIPTION = A Rails form builder plugin
+define BLURB
+  A Rails form builder plugin/gem with semantically rich and accessible markup.
+endef
+
+PACKAGES = CSWgem-formtastic
+CATALOGNAME = gem_formtastic
+
+DEP_PKGS = CSWgem-actionpack CSWgem-activesupport
+
+ARCHALL = 1
+
+include gar/category.mk

Added: csw/mgar/pkg/rbgems/formtastic/trunk/checksums
===================================================================
--- csw/mgar/pkg/rbgems/formtastic/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/rbgems/formtastic/trunk/checksums	2010-07-28 15:33:38 UTC (rev 10645)
@@ -0,0 +1 @@
+6443dd9b7ab22c7a495cfe1f96c0d65b  formtastic-0.9.10.gem


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From skayser at users.sourceforge.net  Thu Jul 29 00:11:38 2010
From: skayser at users.sourceforge.net (skayser at users.sourceforge.net)
Date: Wed, 28 Jul 2010 22:11:38 +0000
Subject: [csw-devel] SF.net SVN: gar:[10646] csw/mgar/pkg/mbuffer/trunk
Message-ID: <E1OeEqf-0005Ej-W4@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 10646
          http://gar.svn.sourceforge.net/gar/?rev=10646&view=rev
Author:   skayser
Date:     2010-07-28 22:11:37 +0000 (Wed, 28 Jul 2010)

Log Message:
-----------
mbuffer: version bump to 20100526

Modified Paths:
--------------
    csw/mgar/pkg/mbuffer/trunk/Makefile
    csw/mgar/pkg/mbuffer/trunk/checksums
    csw/mgar/pkg/mbuffer/trunk/files/changelog.CSW

Modified: csw/mgar/pkg/mbuffer/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mbuffer/trunk/Makefile	2010-07-28 15:33:38 UTC (rev 10645)
+++ csw/mgar/pkg/mbuffer/trunk/Makefile	2010-07-28 22:11:37 UTC (rev 10646)
@@ -1,5 +1,5 @@
 GARNAME = mbuffer
-GARVERSION = 20100327
+GARVERSION = 20100526
 CATEGORIES = utils
 
 DESCRIPTION = A tool for buffering data streams

Modified: csw/mgar/pkg/mbuffer/trunk/checksums
===================================================================
--- csw/mgar/pkg/mbuffer/trunk/checksums	2010-07-28 15:33:38 UTC (rev 10645)
+++ csw/mgar/pkg/mbuffer/trunk/checksums	2010-07-28 22:11:37 UTC (rev 10646)
@@ -1 +1 @@
-65398a9f05cec0cd71b98e152276c02b  mbuffer-20100327.tgz
+e947c2d29064e2c87e96533e85517ad1  mbuffer-20100526.tgz

Modified: csw/mgar/pkg/mbuffer/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/mbuffer/trunk/files/changelog.CSW	2010-07-28 15:33:38 UTC (rev 10645)
+++ csw/mgar/pkg/mbuffer/trunk/files/changelog.CSW	2010-07-28 22:11:37 UTC (rev 10646)
@@ -1,8 +1,8 @@
-mbuffer (20100327,REV=2010.05.18)
+mbuffer (20100526,REV=2010.07.28)
 
-  * Version update to 20100327 (Closes #4407).
+  * Version update to 20100526 (Closes #4407).
 
- -- Sebastian Kayser <skayser at opencsw.org>  Tue, 18 May 2010 21:58:05 +0200
+ -- Sebastian Kayser <skayser at opencsw.org>  Wed, 28 Jul 2010 23:34:54 +0200
 
 mbuffer (20091227,REV=2010.01.06)
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From skayser at users.sourceforge.net  Thu Jul 29 00:31:13 2010
From: skayser at users.sourceforge.net (skayser at users.sourceforge.net)
Date: Wed, 28 Jul 2010 22:31:13 +0000
Subject: [csw-devel] SF.net SVN: gar:[10647] csw/mgar/pkg/stunnel/trunk
Message-ID: <E1OeF9d-0005e5-Hd@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 10647
          http://gar.svn.sourceforge.net/gar/?rev=10647&view=rev
Author:   skayser
Date:     2010-07-28 22:31:13 +0000 (Wed, 28 Jul 2010)

Log Message:
-----------
stunnel: working towards 4.27

Modified Paths:
--------------
    csw/mgar/pkg/stunnel/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/stunnel/trunk/files/0001-Make-stunnel.conf-sample.in-honor-sysconfdir-localst.patch

Removed Paths:
-------------
    csw/mgar/pkg/stunnel/trunk/files/gar-base.diff

Modified: csw/mgar/pkg/stunnel/trunk/Makefile
===================================================================
--- csw/mgar/pkg/stunnel/trunk/Makefile	2010-07-28 22:11:37 UTC (rev 10646)
+++ csw/mgar/pkg/stunnel/trunk/Makefile	2010-07-28 22:31:13 UTC (rev 10647)
@@ -17,19 +17,15 @@
   the daemon's code. 
 endef
 
+VENDOR_URL   = http://www.stunnel.org
 MASTER_SITES = http://www.stunnel.org/download/stunnel/src/
-DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
+DISTFILES    = $(GARNAME)-$(GARVERSION).tar.gz
+UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
-SPKG_SOURCEURL = http://www.stunnel.org
-SPKG_CLASSES = none cswcpsampleconf cswinitsmf
-
 RUNTIME_DEP_PKGS = CSWzlib CSWosslrt CSWtcpwrap CSWcswclassutils
 
-# We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
-
 # Make stunnel.conf-sample.in honor $localstatedir adjustments
-PATCHFILES = gar-base.diff
+PATCHFILES = 0001-Make-stunnel.conf-sample.in-honor-sysconfdir-localst.patch
 
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --with-ssl=/opt/csw
@@ -40,12 +36,17 @@
 # No test target available
 TEST_SCRIPTS =
 
-PROTOTYPE_FILTER  = awk '\
-	$$$$3 ~ /cswstunnel$$$$/ { $$$$2 = "cswinitsmf" } \
-	$$$$3 ~ /stunnel.pem.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } \
-	$$$$3 ~ /\/var\/opt\/csw\/lib\/stunnel/ { $$$$5 = "nobody"; $$$$6 = "nogroup" } \
-	{ print }'
+sysconfdir=/etc/opt/csw
+localstatedir=/var/opt/csw
 
+INITSMF = $(sysconfdir)/init.d/cswstunnel
+SAMPLECONF = $(sysconfdir)/stunnel.pem
+
+PROTOTYPE_MODIFIERS = restrict
+PROTOTYPE_FILES_restrict = $(localstatedir)/lib/stunnel.*
+PROTOTYPE_USER_restrict  = nobody
+PROTOTYPE_GROUP_restrict = nobody
+
 include gar/category.mk
 
 # 1) Suppress prompts for openssl sample cert generation (-batch)
@@ -61,19 +62,17 @@
 post-install-modulated: DOCS=AUTHORS BUGS CREDITS ChangeLog TODO
 post-install-modulated: DOCS+= doc/stunnel.*html
 post-install-modulated:
-	@ginstall -d $(DESTDIR)/etc/opt/csw/init.d
-	@ginstall -m 755 $(FILEDIR)/CSWstunnel.cswstunnel \
-		$(DESTDIR)/etc/opt/csw/init.d/cswstunnel
-	@mv $(DESTDIR)$(sysconfdir)/stunnel/stunnel.pem \
-		$(DESTDIR)$(sysconfdir)/stunnel/stunnel.pem.CSW
+	ginstall -d $(DESTDIR)$(sysconfdir)/init.d
+	ginstall -m 755 $(FILEDIR)/CSWstunnel.cswstunnel \
+		$(DESTDIR)$(sysconfdir)/init.d/cswstunnel
 
 	# create pidfile directory
-	@ginstall -d $(DESTDIR)/var/opt/csw/run/stunnel
+	ginstall -d $(DESTDIR)/var/opt/csw/run/stunnel
 
 	# stunnel installs several random sample scripts, cgi scripts, and
 	# a .spec file with unadjusted paths. Leave them out for now and
 	# only include specific files
-	@rm -rf $(DOCDEST)/*
-	@$(foreach D,$(DOCS),cp $(WORKSRC)/$(D) $(DOCDEST);)
-	@cp $(FILEDIR)/changelog.CSW $(DOCDEST)
+	rm -rf $(DOCDEST)/*
+	$(foreach D,$(DOCS),cp $(WORKSRC)/$(D) $(DOCDEST);)
+	cp $(FILEDIR)/changelog.CSW $(DOCDEST)
 	@$(MAKECOOKIE)

Added: csw/mgar/pkg/stunnel/trunk/files/0001-Make-stunnel.conf-sample.in-honor-sysconfdir-localst.patch
===================================================================
--- csw/mgar/pkg/stunnel/trunk/files/0001-Make-stunnel.conf-sample.in-honor-sysconfdir-localst.patch	                        (rev 0)
+++ csw/mgar/pkg/stunnel/trunk/files/0001-Make-stunnel.conf-sample.in-honor-sysconfdir-localst.patch	2010-07-28 22:31:13 UTC (rev 10647)
@@ -0,0 +1,53 @@
+From afc5fc671d32cb128ef08bfb8b044b45d653e104 Mon Sep 17 00:00:00 2001
+From: Sebastian Kayser <skayser at opencsw.org>
+Date: Tue, 20 Jul 2010 01:13:20 +0200
+Subject: [PATCH] Make stunnel.conf-sample.in honor --sysconfdir, --localstatedir
+
+In case someone ./configured with a --sysconfdir or --localstatedir
+rooted elsewhere than prefix, stunnel.conf-sample.in would have
+disregarded it, because it only honors --prefix. This patch
+introduces handling for the more specific --sysconfdir/--localstatedir.
+---
+ tools/stunnel.conf-sample.in |   10 +++++-----
+ 1 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/tools/stunnel.conf-sample.in b/tools/stunnel.conf-sample.in
+index 29acdfc..8791f69 100644
+--- a/tools/stunnel.conf-sample.in
++++ b/tools/stunnel.conf-sample.in
+@@ -3,14 +3,14 @@
+ ; Please make sure you understand them (especially the effect of the chroot jail)
+ 
+ ; Certificate/key is needed in server mode and optional in client mode
+-cert = @prefix@/etc/stunnel/mail.pem
+-;key = @prefix@/etc/stunnel/mail.pem
++cert = @sysconfdir@/stunnel/mail.pem
++;key = @sysconfdir@/stunnel/mail.pem
+ 
+ ; Protocol version (all, SSLv2, SSLv3, TLSv1)
+ sslVersion = SSLv3
+ 
+ ; Some security enhancements for UNIX systems - comment them out on Win32
+-chroot = @prefix@/var/lib/stunnel/
++chroot = @localstatedir@/lib/stunnel/
+ setuid = nobody
+ setgid = @DEFAULT_GROUP@
+ ; PID is created inside the chroot jail
+@@ -30,12 +30,12 @@ socket = r:TCP_NODELAY=1
+ ; CApath is located inside chroot jail
+ ;CApath = /certs
+ ; It's often easier to use CAfile
+-;CAfile = @prefix@/etc/stunnel/certs.pem
++;CAfile = @sysconfdir@/stunnel/certs.pem
+ ; Don't forget to c_rehash CRLpath
+ ; CRLpath is located inside chroot jail
+ ;CRLpath = /crls
+ ; Alternatively you can use CRLfile
+-;CRLfile = @prefix@/etc/stunnel/crls.pem
++;CRLfile = @sysconfdir@/stunnel/crls.pem
+ 
+ ; Some debugging stuff useful for troubleshooting
+ ;debug = 7
+-- 
+1.7.1
+

Deleted: csw/mgar/pkg/stunnel/trunk/files/gar-base.diff
===================================================================
--- csw/mgar/pkg/stunnel/trunk/files/gar-base.diff	2010-07-28 22:11:37 UTC (rev 10646)
+++ csw/mgar/pkg/stunnel/trunk/files/gar-base.diff	2010-07-28 22:31:13 UTC (rev 10647)
@@ -1,36 +0,0 @@
-diff --speed-large-files --minimal -Nru stunnel-4.27.orig/tools/stunnel.conf-sample.in stunnel-4.27/tools/stunnel.conf-sample.in
---- stunnel-4.27.orig/tools/stunnel.conf-sample.in	2009-04-16 11:10:09.000000000 +0200
-+++ stunnel-4.27/tools/stunnel.conf-sample.in	2009-05-17 12:19:56.297735281 +0200
-@@ -3,14 +3,14 @@
- ; Please make sure you understand them (especially the effect of the chroot jail)
- 
- ; Certificate/key is needed in server mode and optional in client mode
--cert = @prefix@/etc/stunnel/mail.pem
--;key = @prefix@/etc/stunnel/mail.pem
-+cert = @sysconfdir@/stunnel/mail.pem
-+;key = @sysconfdir@/stunnel/mail.pem
- 
- ; Protocol version (all, SSLv2, SSLv3, TLSv1)
- sslVersion = SSLv3
- 
- ; Some security enhancements for UNIX systems - comment them out on Win32
--chroot = @prefix@/var/lib/stunnel/
-+chroot = @localstatedir@/lib/stunnel/
- setuid = nobody
- setgid = @DEFAULT_GROUP@
- ; PID is created inside the chroot jail
-@@ -30,12 +30,12 @@
- ; CApath is located inside chroot jail
- ;CApath = /certs
- ; It's often easier to use CAfile
--;CAfile = @prefix@/etc/stunnel/certs.pem
-+;CAfile = @sysconfdir@/stunnel/certs.pem
- ; Don't forget to c_rehash CRLpath
- ; CRLpath is located inside chroot jail
- ;CRLpath = /crls
- ; Alternatively you can use CRLfile
--;CRLfile = @prefix@/etc/stunnel/crls.pem
-+;CRLfile = @sysconfdir@/stunnel/crls.pem
- 
- ; Some debugging stuff useful for troubleshooting
- ;debug = 7


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From skayser at users.sourceforge.net  Thu Jul 29 00:38:35 2010
From: skayser at users.sourceforge.net (skayser at users.sourceforge.net)
Date: Wed, 28 Jul 2010 22:38:35 +0000
Subject: [csw-devel] SF.net SVN: gar:[10648] csw/mgar/pkg/stunnel/trunk
Message-ID: <E1OeFGl-0008SW-Ql@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10648
          http://gar.svn.sourceforge.net/gar/?rev=10648&view=rev
Author:   skayser
Date:     2010-07-28 22:38:35 +0000 (Wed, 28 Jul 2010)

Log Message:
-----------
stunnel: work towards 4.33 ... not 4.27

Modified Paths:
--------------
    csw/mgar/pkg/stunnel/trunk/Makefile
    csw/mgar/pkg/stunnel/trunk/checksums
    csw/mgar/pkg/stunnel/trunk/files/0001-Make-stunnel.conf-sample.in-honor-sysconfdir-localst.patch

Modified: csw/mgar/pkg/stunnel/trunk/Makefile
===================================================================
--- csw/mgar/pkg/stunnel/trunk/Makefile	2010-07-28 22:31:13 UTC (rev 10647)
+++ csw/mgar/pkg/stunnel/trunk/Makefile	2010-07-28 22:38:35 UTC (rev 10648)
@@ -5,7 +5,7 @@
 #       to pthreads .. truss doesn't show /dev/zero usage on Solaris 10
 #       Test on Solaris 8 / 9 for comparison
 GARNAME = stunnel
-GARVERSION = 4.27
+GARVERSION = 4.33
 CATEGORIES = net
 
 DESCRIPTION = Universal SSL Wrapper
@@ -25,7 +25,7 @@
 RUNTIME_DEP_PKGS = CSWzlib CSWosslrt CSWtcpwrap CSWcswclassutils
 
 # Make stunnel.conf-sample.in honor $localstatedir adjustments
-PATCHFILES = 0001-Make-stunnel.conf-sample.in-honor-sysconfdir-localst.patch
+#PATCHFILES = 0001-Make-stunnel.conf-sample.in-honor-sysconfdir-localst.patch
 
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --with-ssl=/opt/csw

Modified: csw/mgar/pkg/stunnel/trunk/checksums
===================================================================
--- csw/mgar/pkg/stunnel/trunk/checksums	2010-07-28 22:31:13 UTC (rev 10647)
+++ csw/mgar/pkg/stunnel/trunk/checksums	2010-07-28 22:38:35 UTC (rev 10648)
@@ -1,2 +1,2 @@
-8d6730bd87af222c3ff66547e82d8d7f  download/gar-base.diff
-3c655d815576f50046a1c28744b88681  download/stunnel-4.27.tar.gz
+c8d5c69008fef019b86d743207309524  0001-Make-stunnel.conf-sample.in-honor-sysconfdir-localst.patch
+559a864066d8cc4afd8a97682c90d41c  stunnel-4.33.tar.gz

Modified: csw/mgar/pkg/stunnel/trunk/files/0001-Make-stunnel.conf-sample.in-honor-sysconfdir-localst.patch
===================================================================
--- csw/mgar/pkg/stunnel/trunk/files/0001-Make-stunnel.conf-sample.in-honor-sysconfdir-localst.patch	2010-07-28 22:31:13 UTC (rev 10647)
+++ csw/mgar/pkg/stunnel/trunk/files/0001-Make-stunnel.conf-sample.in-honor-sysconfdir-localst.patch	2010-07-28 22:38:35 UTC (rev 10648)
@@ -1,6 +1,6 @@
-From afc5fc671d32cb128ef08bfb8b044b45d653e104 Mon Sep 17 00:00:00 2001
+From 9873796410fa51fdb686bd5ce72e906bc60280e2 Mon Sep 17 00:00:00 2001
 From: Sebastian Kayser <skayser at opencsw.org>
-Date: Tue, 20 Jul 2010 01:13:20 +0200
+Date: Thu, 29 Jul 2010 00:37:23 +0200
 Subject: [PATCH] Make stunnel.conf-sample.in honor --sysconfdir, --localstatedir
 
 In case someone ./configured with a --sysconfdir or --localstatedir
@@ -12,41 +12,42 @@
  1 files changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/tools/stunnel.conf-sample.in b/tools/stunnel.conf-sample.in
-index 29acdfc..8791f69 100644
+index c231eec..201c60f 100644
 --- a/tools/stunnel.conf-sample.in
 +++ b/tools/stunnel.conf-sample.in
-@@ -3,14 +3,14 @@
- ; Please make sure you understand them (especially the effect of the chroot jail)
+@@ -4,15 +4,15 @@
+ ; please read the manual and make sure you understand them
  
- ; Certificate/key is needed in server mode and optional in client mode
+ ; certificate/key is needed in server mode and optional in client mode
 -cert = @prefix@/etc/stunnel/mail.pem
 -;key = @prefix@/etc/stunnel/mail.pem
 +cert = @sysconfdir@/stunnel/mail.pem
 +;key = @sysconfdir@/stunnel/mail.pem
  
- ; Protocol version (all, SSLv2, SSLv3, TLSv1)
+ ; protocol version (all, SSLv2, SSLv3, TLSv1)
  sslVersion = SSLv3
  
- ; Some security enhancements for UNIX systems - comment them out on Win32
+ ; security enhancements for UNIX systems - comment them out on Win32
+ ; for chroot a copy of some devices and files is needed within the jail
 -chroot = @prefix@/var/lib/stunnel/
 +chroot = @localstatedir@/lib/stunnel/
  setuid = nobody
  setgid = @DEFAULT_GROUP@
  ; PID is created inside the chroot jail
-@@ -30,12 +30,12 @@ socket = r:TCP_NODELAY=1
+@@ -33,12 +33,12 @@ socket = r:TCP_NODELAY=1
  ; CApath is located inside chroot jail
  ;CApath = /certs
- ; It's often easier to use CAfile
+ ; it's often easier to use CAfile
 -;CAfile = @prefix@/etc/stunnel/certs.pem
 +;CAfile = @sysconfdir@/stunnel/certs.pem
- ; Don't forget to c_rehash CRLpath
+ ; don't forget to c_rehash CRLpath
  ; CRLpath is located inside chroot jail
  ;CRLpath = /crls
- ; Alternatively you can use CRLfile
+ ; alternatively CRLfile can be used
 -;CRLfile = @prefix@/etc/stunnel/crls.pem
 +;CRLfile = @sysconfdir@/stunnel/crls.pem
  
- ; Some debugging stuff useful for troubleshooting
+ ; debugging stuff (may useful for troubleshooting)
  ;debug = 7
 -- 
 1.7.1


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From wahwah at users.sourceforge.net  Thu Jul 29 00:55:21 2010
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Wed, 28 Jul 2010 22:55:21 +0000
Subject: [csw-devel] SF.net SVN: gar:[10649]
	csw/mgar/pkg/mysql5/branches/mysql-5.1.x
Message-ID: <E1OeFWz-00065M-4h@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 10649
          http://gar.svn.sourceforge.net/gar/?rev=10649&view=rev
Author:   wahwah
Date:     2010-07-28 22:55:20 +0000 (Wed, 28 Jul 2010)

Log Message:
-----------
mysql-5.1: Committing working changes, package needs more work.

Modified Paths:
--------------
    csw/mgar/pkg/mysql5/branches/mysql-5.1.x/Makefile
    csw/mgar/pkg/mysql5/branches/mysql-5.1.x/checksums
    csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/0001-Use-libc-not-libcrypt.patch

Added Paths:
-----------
    csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/CSWmysql51.postinstall
    csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/CSWmysql51.preinstall
    csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/cswmysql51

Removed Paths:
-------------
    csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/CSWmysql5.postinstall
    csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/CSWmysql5.preinstall
    csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/cswmysql5

Modified: csw/mgar/pkg/mysql5/branches/mysql-5.1.x/Makefile
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.1.x/Makefile	2010-07-28 22:38:35 UTC (rev 10648)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x/Makefile	2010-07-28 22:55:20 UTC (rev 10649)
@@ -2,14 +2,15 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-GARNAME = mysql5
+PROJ_NAME = mysql
+GARNAME = $(PROJ_NAME)51
 BASE_VERSION = 5.1
-PATCHLEVEL = 40
+PATCHLEVEL = 49
 GARVERSION = $(BASE_VERSION).$(PATCHLEVEL)
 CATEGORIES = server
 
 # Useful when making a series of builds on the same day
-GARFLAVOR ?= DBG
+# GARFLAVOR ?= DBG
 
 DISTNAME = mysql-$(GARVERSION)
 SPKG_SOURCEURL = http://www.mysql.com/
@@ -20,73 +21,73 @@
   (Structured Query Language) database server.
 endef
 
-# Change prefix to /opt/csw/mysql5
-prefix = /opt/csw/mysql5
-localstatedir = /var/opt/csw/mysql5
-sysconfdir = /etc/opt/csw/mysql5
+prefix = /opt/csw/$(GARNAME)
+localstatedir = /var$(prefix)
+sysconfdir = /etc$(prefix)
 
 # Where to put the init script
-global_sysconfdir = /etc/opt/csw
+global_sysconfdir = $(sysconfdir)
 # Where to link the binaries
 global_bindir = /opt/csw/bin
 
-INITSMF = $(global_sysconfdir)/init\.d/cswmysql-$(BASE_VERSION)
+INITSMF = $(global_sysconfdir)/init\.d/csw$(GARNAME)
 
-PACKAGES  = CSWmysql5 CSWmysql5bench CSWmysql5client CSWmysql5devel
-PACKAGES += CSWmysql5rt CSWmysql5test
+PACKAGES  = CSW$(GARNAME)
+PACKAGES += CSW$(GARNAME)bench
+PACKAGES += CSW$(GARNAME)client
+PACKAGES += CSW$(GARNAME)devel
+PACKAGES += CSW$(GARNAME)rt
+PACKAGES += CSW$(GARNAME)test
 
 PATCHFILES  = 0001-Use-libc-not-libcrypt.patch
 PATCHFILES += 0002-cast-user_info-pw_gid-to-gid_t.patch
 PATCHFILES += 0003-OpenCSW-perl-for-tests.patch
 PATCHFILES += 0004-basedir-and-datadir-in-the-cnf-files.patch
 
-SPKG_DESC_CSWmysql5       = Multithreaded SQL database
-SPKG_DESC_CSWmysql5bench  = MySQL 5 benchmarking
-SPKG_DESC_CSWmysql5client = MySQL 5 client binaries
-SPKG_DESC_CSWmysql5devel  = MySQL 5 header files
-SPKG_DESC_CSWmysql5rt     = MySQL 5 runtime files
-SPKG_DESC_CSWmysql5test   = MySQL 5 testing files
+SPKG_DESC_CSW$(GARNAME)       = Multithreaded SQL database
+SPKG_DESC_CSW$(GARNAME)bench  = MySQL $(BASE_VERSION) benchmarking
+SPKG_DESC_CSW$(GARNAME)client = MySQL $(BASE_VERSION) client binaries
+SPKG_DESC_CSW$(GARNAME)devel  = MySQL $(BASE_VERSION) header files
+SPKG_DESC_CSW$(GARNAME)rt     = MySQL $(BASE_VERSION) runtime files
+SPKG_DESC_CSW$(GARNAME)test   = MySQL $(BASE_VERSION) testing files
 
-CATALOGNAME_CSWmysql5       = $(GARNAME)
-CATALOGNAME_CSWmysql5bench  = $(GARNAME)bench
-CATALOGNAME_CSWmysql5client = $(GARNAME)client
-CATALOGNAME_CSWmysql5devel  = $(GARNAME)devel
-CATALOGNAME_CSWmysql5rt     = $(GARNAME)rt
-CATALOGNAME_CSWmysql5test   = $(GARNAME)test
+CATALOGNAME_CSW$(GARNAME)       = $(GARNAME)
+CATALOGNAME_CSW$(GARNAME)bench  = $(GARNAME)bench
+CATALOGNAME_CSW$(GARNAME)client = $(GARNAME)client
+CATALOGNAME_CSW$(GARNAME)devel  = $(GARNAME)devel
+CATALOGNAME_CSW$(GARNAME)rt     = $(GARNAME)rt
+CATALOGNAME_CSW$(GARNAME)test   = $(GARNAME)test
 
-INCOMPATIBLE_PKGS_CSWmysql5bench  = CSWmysql4bench
-INCOMPATIBLE_PKGS_CSWmysql5client = CSWmysql4client
-INCOMPATIBLE_PKGS_CSWmysql5       = CSWmysql4
-INCOMPATIBLE_PKGS_CSWmysql5devel  = CSWmysql4devel
-INCOMPATIBLE_PKGS_CSWmysql5test   = CSWmysql4test
 
+ARCHALL_CSW$(GARNAME)bench = 1
+
 # Defining the client programs, which are going to pick up the 32- and 64-bit
 # binaries, symbolic links, isaexec stuff and man pages.
-CSWmysql5client_programs  = myisamlog
-CSWmysql5client_programs += myisampack
-CSWmysql5client_programs += mysql
-CSWmysql5client_programs += mysqlaccess
-CSWmysql5client_programs += mysqladmin
-CSWmysql5client_programs += mysqlbin
-CSWmysql5client_programs += mysqlbinlog
-CSWmysql5client_programs += mysqlcheck
-CSWmysql5client_programs += mysql_client_test
-CSWmysql5client_programs += mysqldump
-CSWmysql5client_programs += mysqlhotcopy
-CSWmysql5client_programs += mysqlimport
-CSWmysql5client_programs += mysqlshow
-CSWmysql5client_programs += mysql_zap
-CSWmysql5client_programs += perror
-CSWmysql5client_programs += replace
+CSW$(GARNAME)client_programs  = myisamlog
+CSW$(GARNAME)client_programs += myisampack
+CSW$(GARNAME)client_programs += mysql
+CSW$(GARNAME)client_programs += mysqlaccess
+CSW$(GARNAME)client_programs += mysqladmin
+CSW$(GARNAME)client_programs += mysqlbin
+CSW$(GARNAME)client_programs += mysqlbinlog
+CSW$(GARNAME)client_programs += mysqlcheck
+CSW$(GARNAME)client_programs += mysql_client_test
+CSW$(GARNAME)client_programs += mysqldump
+CSW$(GARNAME)client_programs += mysqlhotcopy
+CSW$(GARNAME)client_programs += mysqlimport
+CSW$(GARNAME)client_programs += mysqlshow
+CSW$(GARNAME)client_programs += mysql_zap
+CSW$(GARNAME)client_programs += perror
+CSW$(GARNAME)client_programs += replace
 
 # Without this EXTRA_LD_OPTIONS setting, /opt/csw/bin/mysql fails with a shared
 # library not found.  EXTRA_LIB was tried too, but did not work, as the -R path
 # ended up with having two $ISALIST tokens.
 #
 # Without this setting it looks for:
-# /opt/csw/mysql5/lib/amd64/libmysqlclient.so.15
+# /opt/csw/$(GARNAME)/lib/amd64/libmysqlclient.so.15
 # The library is at:
-# /opt/csw/mysql5/lib/amd64/mysql/libmysqlclient.so.15
+# /opt/csw/$(GARNAME)/lib/amd64/mysql/libmysqlclient.so.15
 EXTRA_LD_OPTIONS  = -R$(libdir)/\$$ISALIST/mysql
 
 COMMON_CFLAGS = -mt -fsimple=1 -ftrap=%none -xbuiltin=%all -xlibmil -xlibmopt
@@ -100,49 +101,65 @@
 EXTRA_CXXFLAGS_i386 = -xO3 -nofstore -xregs=no%frameptr $(COMMON_CFLAGS)
 
 
-CSWmysql5devel_programs += mysql_config
+CSW$(GARNAME)devel_programs += mysql_config
 
 # Enable 64 bits build
 BUILD64 = 1
 
-PKGFILES_CSWmysql5bench   = $(prefix)/sql-bench.*
-PKGFILES_CSWmysql5client  = $(bindir)
-PKGFILES_CSWmysql5client += $(foreach bin_name,$(CSWmysql5client_programs),$(call baseisadirs,$(bindir),$(bin_name)))
-PKGFILES_CSWmysql5client += $(foreach bin_name,$(CSWmysql5client_programs),$(mandir)/man1/$(bin_name)\.1)
-PKGFILES_CSWmysql5client += $(foreach bin_name,$(CSWmysql5client_programs),/opt/csw/bin/$(bin_name))
-PKGFILES_CSWmysql5client += $(foreach bin_name,$(CSWmysql5client_programs),/opt/csw/sbin/$(bin_name))
-PKGFILES_CSWmysql5devel  += $(foreach bin_name,$(CSWmysql5devel_programs),$(call baseisadirs,$(bindir),$(bin_name)))
-PKGFILES_CSWmysql5devel  += $(foreach bin_name,$(CSWmysql5devel_programs),$(mandir)/man1/$(bin_name)\.1)
-PKGFILES_CSWmysql5devel  += $(foreach bin_name,$(CSWmysql5devel_programs),/opt/csw/bin/$(bin_name))
-PKGFILES_CSWmysql5devel  += $(foreach bin_name,$(CSWmysql5devel_programs),/opt/csw/sbin/$(bin_name))
-PKGFILES_CSWmysql5devel  += $(mandir)/man1/mysql_config\.1
-PKGFILES_CSWmysql5devel  += $(prefix)/include.*
-PKGFILES_CSWmysql5devel  += /opt/csw/include/mysql
+PKGFILES_CSW$(GARNAME)bench   = $(prefix)/sql-bench.*
+PKGFILES_CSW$(GARNAME)client  = $(bindir)
+PKGFILES_CSW$(GARNAME)client += $(foreach bin_name,$(CSW$(GARNAME)client_programs),$(call baseisadirs,$(bindir),$(bin_name)))
+PKGFILES_CSW$(GARNAME)client += $(foreach bin_name,$(CSW$(GARNAME)client_programs),$(mandir)/man1/$(bin_name)\.1)
+PKGFILES_CSW$(GARNAME)client += $(foreach bin_name,$(CSW$(GARNAME)client_programs),/opt/csw/bin/$(bin_name))
+PKGFILES_CSW$(GARNAME)client += $(foreach bin_name,$(CSW$(GARNAME)client_programs),/opt/csw/sbin/$(bin_name))
+PKGFILES_CSW$(GARNAME)devel  += $(foreach bin_name,$(CSW$(GARNAME)devel_programs),$(call baseisadirs,$(bindir),$(bin_name)))
+PKGFILES_CSW$(GARNAME)devel  += $(foreach bin_name,$(CSW$(GARNAME)devel_programs),$(mandir)/man1/$(bin_name)\.1)
+PKGFILES_CSW$(GARNAME)devel  += $(foreach bin_name,$(CSW$(GARNAME)devel_programs),/opt/csw/bin/$(bin_name))
+PKGFILES_CSW$(GARNAME)devel  += $(foreach bin_name,$(CSW$(GARNAME)devel_programs),/opt/csw/sbin/$(bin_name))
+PKGFILES_CSW$(GARNAME)devel  += $(mandir)/man1/mysql_config\.1
+PKGFILES_CSW$(GARNAME)devel  += $(prefix)/include.*
+PKGFILES_CSW$(GARNAME)devel  += /opt/csw/include/mysql
 
-PKGFILES_CSWmysql5rt      = $(prefix)/lib/.*\.so.*
-PKGFILES_CSWmysql5test    = $(prefix)/mysql-test.*
+PKGFILES_CSW$(GARNAME)rt      = $(libdir)
+PKGFILES_CSW$(GARNAME)rt     += $(libdir)/.*
+PKGFILES_CSW$(GARNAME)test    = $(prefix)/mysql-test.*
 
-RUNTIME_DEP_PKGS_CSWmysql5bench       = CSWmysql5
-RUNTIME_DEP_PKGS_CSWmysql5client      = CSWmysql5rt
-RUNTIME_DEP_PKGS_CSWmysql5            = CSWmysql5client CSWmysql5rt
-RUNTIME_DEP_PKGS_CSWmysql5devel       = CSWmysql5
-RUNTIME_DEP_PKGS_CSWmysql5test        = CSWmysql5 CSWperl
+RUNTIME_DEP_PKGS_CSW$(GARNAME)           += CSW$(GARNAME)client
+RUNTIME_DEP_PKGS_CSW$(GARNAME)           += CSW$(GARNAME)rt
+RUNTIME_DEP_PKGS_CSW$(GARNAME)           += CSWosslrt
+RUNTIME_DEP_PKGS_CSW$(GARNAME)           += CSWtcpwrap
+RUNTIME_DEP_PKGS_CSW$(GARNAME)           += CSWzlib
+RUNTIME_DEP_PKGS_CSW$(GARNAME)rt         += CSWosslrt
+RUNTIME_DEP_PKGS_CSW$(GARNAME)rt         += CSWzlib
+RUNTIME_DEP_PKGS_CSW$(GARNAME)bench      += CSWperl
+RUNTIME_DEP_PKGS_CSW$(GARNAME)client     += CSW$(GARNAME)rt
+RUNTIME_DEP_PKGS_CSW$(GARNAME)client     += CSWosslrt
+RUNTIME_DEP_PKGS_CSW$(GARNAME)client     += CSWncurses
+RUNTIME_DEP_PKGS_CSW$(GARNAME)client     += CSWzlib
+RUNTIME_DEP_PKGS_CSW$(GARNAME)test       += CSWperl
 
 MASTER_SITES = ftp://mirror.switch.ch/mirror/mysql/Downloads/MySQL-$(BASE_VERSION)/
 DISTFILES  = mysql-$(GARVERSION).tar.gz
-DISTFILES += cswmysql5 quick_start-csw README.CSW ChangeLog
-DISTFILES += CSWmysql5.preinstall
-DISTFILES += CSWmysql5.postinstall
+DISTFILES += csw$(GARNAME) quick_start-csw README.CSW ChangeLog
+DISTFILES += CSW$(GARNAME).preinstall
+DISTFILES += CSW$(GARNAME).postinstall
 DISTFILES += cswusergroup
 
 UFILES_REGEX = mysql-(\d+(?:\.\d+)*).tar.gz
 
-RUNTIME_DEP_PKGS = CSWncurses CSWzlib
+# TODO: Do the proper prerequsite pkgs.
 BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS)
 
 # MySQL-5.1.40 doesn't compile without setting EXTRA_INC.
 EXTRA_INC = /opt/csw/include
 EXTRA_LIB = /opt/csw/lib
+
+# We're building on Solaris 9 now.
+# # The following EXTRA_CFLAGS are necessary to compile on Solaris 8. Otherwise
+# # the following problem occurs:
+# #
+# # "handler/i_s.cc", line 159: Error: The function "localtime_r" must have a
+# # prototype.
 # EXTRA_CFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__
 # EXTRA_CXXFLAGS = -mt -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__
 
@@ -152,15 +169,18 @@
 # Why not have a docs package?
 # CONFIGURE_ARGS += --without-docs
 CONFIGURE_ARGS += --enable-local-infile
-#CONFIGURE_ARGS += --with-extra-charsets=all
-CONFIGURE_ARGS += --with-extra-charsets=complex
+CONFIGURE_ARGS += --with-charset=utf8
+CONFIGURE_ARGS += --with-extra-charsets=all
 CONFIGURE_ARGS += --with-low-memory
 CONFIGURE_ARGS += --with-pthread
 CONFIGURE_ARGS += --with-readline
 CONFIGURE_ARGS += --with-zlib-dir=/opt/csw
 CONFIGURE_ARGS += --with-ssl=/opt/csw
 CONFIGURE_ARGS += --with-plugins=max-no-ndb
-CONFIGURE_ARGS += --with-comment
+CONFIGURE_ARGS += --with-comment="(OpenCSW)"
+CONFIGURE_ARGS += --with-mysqld-user=mysql
+CONFIGURE_ARGS += --with-fast-mutexes
+CONFIGURE_ARGS += --with-libwrap
 CONFIGURE_ARGS += --with-mysqld-libs=-lmtmalloc
 CONFIGURE_ARGS += --with-big-tables
 CONFIGURE_ARGS += --enable-thread-safe-client
@@ -173,7 +193,7 @@
 TEST_TARGETS = check
 
 
-USERGROUP = /etc/opt/csw/pkg/CSWmysql5/cswusergroup
+USERGROUP = /etc/opt/csw/pkg/CSW$(GARNAME)/cswusergroup
 
 PROTOTYPE_MODIFIERS = dbdir
 PROTOTYPE_FILES_dbdir = $(localstatedir)
@@ -182,18 +202,31 @@
 PROTOTYPE_PERMS_dbdir = 0700
 PROTOTYPE_CLASS_dbdir = ugfiles
 
-SPKG_CLASSES = none ugfiles
+CHECKPKG_OVERRIDES_CSWmysql51 += surplus-dependency|CSWmysql51client
+CHECKPKG_OVERRIDES_CSWmysql51rt += bad-rpath-entry
 
+# CHECKPKG_OVERRIDES_CSWmysql51 += init-file-missing-cswinitsmf-class|/etc/opt/csw/init.d/cswmysql51|class=none
+# CHECKPKG_OVERRIDES_CSWmysql51 += surplus-dependency|CSWmysql51client
+
+
 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/
+	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 libtool version mismatch problem.
+	# To work around the following libtool version mismatch problem:
+	# libtool: Version mismatch error.  This is libtool 2.2.6, but the
+	# libtool: definition of this LT_INIT comes from libtool 2.2.6b.
+	# libtool: You should recreate aclocal.m4 with macros from libtool 2.2.6
+	# http://lists.opencsw.org/pipermail/maintainers/2009-December/005066.html
 	cd $(WORKSRC) && autoreconf --force --install --symlink
+	@$(MAKECOOKIE)
 
 post-merge:
 	ginstall -m 755 -d $(PKGROOT)$(localstatedir)
@@ -201,22 +234,31 @@
 	ginstall -m 644 $(FILEDIR)/ChangeLog $(PKGROOT)$(datadir)/mysql/doc
 	ginstall -m 644 $(FILEDIR)/README.CSW $(PKGROOT)$(datadir)/mysql/doc
 	ginstall -m 755 -d $(PKGROOT)/opt/csw/share/mysql/doc
-	ln -sf ../../../mysql5/share/mysql/doc/README.CSW \
+	ln -sf ../../../$(GARNAME)/share/mysql/doc/README.CSW \
 		$(PKGROOT)/opt/csw/share/mysql/doc/README.CSW
-	ginstall -m 755 -d $(PKGROOT)/etc/opt/csw/init.d
-	ginstall -m 755 $(FILEDIR)/cswmysql5 $(PKGROOT)/etc/opt/csw/init.d
+	ginstall -m 755 -d $(PKGROOT)$(global_sysconfdir)/init.d
+	ginstall -m 755 $(FILEDIR)/csw$(GARNAME) $(PKGROOT)$(global_sysconfdir)/init.d
 	ginstall -m 755 $(FILEDIR)/quick_start-csw $(PKGROOT)$(datadir)/mysql
-	ginstall -m 755 -d $(PKGROOT)$(global_sysconfdir)/pkg/CSWmysql5
+	ginstall -m 755 -d $(PKGROOT)$(global_sysconfdir)/pkg/CSW$(GARNAME)
 	ginstall -m 644 $(FILEDIR)/cswusergroup \
-		        $(PKGROOT)$(global_sysconfdir)/pkg/CSWmysql5
+						$(PKGROOT)$(global_sysconfdir)/pkg/CSW$(GARNAME)
 	# A symlink for mysql5 include files
 	ginstall -m 755 -d $(PKGROOT)/opt/csw/include
-	ln -s ../mysql5/include/mysql $(PKGROOT)/opt/csw/include/mysql
+	ln -s ../$(GARNAME)/include/mysql $(PKGROOT)/opt/csw/include/mysql
 	# Create symlinks to binaries
 	ginstall -m 755 -d $(PKGROOT)$(global_bindir)
 	for f in $(PKGROOT)$(bindir)/*; do \
-		ln -s ../mysql5/bin/`basename $$f` \
+		if echo $$f | grep amd64$$; then continue; fi; \
+		if echo $$f | grep sparcv9$$; then continue; fi; \
+		ln -s ../$(GARNAME)/bin/`basename $$f` \
 		      $(PKGROOT)$(global_bindir)/`basename $$f`; \
 	done
+	# /opt/csw/$(GARNAME)/lib/sparc9/mysql -- by GAR, it's logical
+	# /opt/csw/$(GARNAME)/lib/mysql/sparcv9 -- expected by other packages
+	gln -s ../$(ISA_DEFAULT64)/mysql $(PKGROOT)$(libdir)/mysql/$(ISA_DEFAULT64)
+	# For other applications to link against
 	gln -s $(ISA_DEFAULT64) $(PKGROOT)$(libdir)/64
+	gln -s $(ISA_DEFAULT64) $(PKGROOT)$(libdir)/mysql/64
+	gln -s . $(PKGROOT)$(libdir)/$(ISA_DEFAULT)
+	gln -s . $(PKGROOT)$(libdir)/mysql/$(ISA_DEFAULT)
 	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/mysql5/branches/mysql-5.1.x/checksums
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.1.x/checksums	2010-07-28 22:38:35 UTC (rev 10648)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x/checksums	2010-07-28 22:55:20 UTC (rev 10649)
@@ -1,12 +1,12 @@
-a0b98a7320bce2da3e1f90da704d3c85  0001-Use-libc-not-libcrypt.patch
+8940e0673e599689932e94fec906aec9  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
-747637bc4be42207974ae845d832ae65  CSWmysql5.postinstall
-60162ea667507a6a487027e7c389ca55  CSWmysql5.preinstall
+c8c2ef6365a9bd9b71fac6198d3eeef8  CSWmysql51.postinstall
+a652ccff001c328178f4b0ed9bfebbd6  CSWmysql51.preinstall
 e691b0cf00a3925ac55c1844045d6e30  ChangeLog
 e42afb5ec1b1ab02d2ec3b46d0922636  README.CSW
-aaca748fc044834e71ad544ab293c494  cswmysql5
+0974c28c048437612c6a0ace93460d3b  cswmysql51
 67228e1f096fe08a94f4267439a4ec36  cswusergroup
-32e7373c16271606007374396e6742ad  mysql-5.1.40.tar.gz
+a90d87a71fa3c23dff6d78afc8e3184c  mysql-5.1.49.tar.gz
 90b7cfcd11ab56e021a195a6a085fa21  quick_start-csw

Modified: csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/0001-Use-libc-not-libcrypt.patch
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/0001-Use-libc-not-libcrypt.patch	2010-07-28 22:38:35 UTC (rev 10648)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/0001-Use-libc-not-libcrypt.patch	2010-07-28 22:55:20 UTC (rev 10649)
@@ -1,19 +1,19 @@
-From a527f284ef5646dbdd731af007aace3daee3e946 Mon Sep 17 00:00:00 2001
-From: =?utf-8?q?Maciej=20Blizi=C5=84ski?= <blizinski at google.com>
-Date: Wed, 16 Sep 2009 01:27:38 +0100
-Subject: [PATCH 1/4] Use libc, not libcrypt
+From 6925aace1b489a5ffb0265c7fdc7edc3def7d995 Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Mon, 26 Jul 2010 08:03:17 +0200
+Subject: [PATCH] Use libc not libcrypt
 
 ---
  configure.in |    5 ++++-
  1 files changed, 4 insertions(+), 1 deletions(-)
 
 diff --git a/configure.in b/configure.in
-index ec432e1..577cfe3 100644
+index 7374723..1c181c7 100644
 --- a/configure.in
 +++ b/configure.in
-@@ -891,7 +891,10 @@ AC_CHECK_FUNC(p2open, , AC_CHECK_LIB(gen, p2open))
+@@ -860,7 +860,10 @@ AC_SEARCH_LIBS(setsockopt, socket)
  # This may get things to compile even if bind-8 is installed
- AC_CHECK_FUNC(bind, , AC_CHECK_LIB(bind, bind))
+ AC_SEARCH_LIBS(bind, bind)
  # Check if crypt() exists in libc or libcrypt, sets LIBS if needed
 -AC_SEARCH_LIBS(crypt, crypt, AC_DEFINE(HAVE_CRYPT, 1, [crypt]))
 +## AC_SEARCH_LIBS(crypt, crypt, AC_DEFINE(HAVE_CRYPT, 1, [crypt]))
@@ -24,5 +24,5 @@
  AC_SEARCH_LIBS(inet_aton, [socket nsl resolv])
  
 -- 
-1.6.3.2
+1.7.1
 

Deleted: csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/CSWmysql5.postinstall
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/CSWmysql5.postinstall	2010-07-28 22:38:35 UTC (rev 10648)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/CSWmysql5.postinstall	2010-07-28 22:55:20 UTC (rev 10649)
@@ -1,15 +0,0 @@
-#!/bin/sh
-#
-# $Id$
-#
-
-MYSQLDATADIR=/var/opt/csw/mysql5
-if [ ! -d "${MYSQLDATADIR}/mysql" ] ; then
-  echo "No database directory found in the default location:"
-  echo "${MYSQLDATADIR}/mysql"
-  echo "If you need to build the initial database directory,"
-  echo "  see /opt/csw/mysql5/share/mysql/quick_start-csw"
-  echo "If you are using a non-default database directory location,"
-  echo "  please start mysql manually."
-  exit 0
-fi

Deleted: csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/CSWmysql5.preinstall
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/CSWmysql5.preinstall	2010-07-28 22:38:35 UTC (rev 10648)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/CSWmysql5.preinstall	2010-07-28 22:55:20 UTC (rev 10649)
@@ -1,40 +0,0 @@
-#!/bin/sh
-# vim:set sw=2 ts=2 sts=2 expandtab:
-#
-# $Id$
-#
-
-obsolete_directories="/opt/csw/mysql5/var:/var/opt/csw/mysql5"
-
-obsolete_dir_information="
-This directory is obsolete.  Files in this directory are going to be ignored.
-Please move your data to the new location.
-
-Feel free to remove this file afterwards.
-"
-obsolete_dir_file_name="README.THIS_DIRECTORY_IS_OBSOLETE"
-
-for dirpair in ${obsolete_directories}; do
-  obsolete_dir=`echo ${dirpair} | cut -d: -f1`
-  new_dir=`echo ${dirpair} | cut -d: -f2`
-  if [ -d "${PKG_INSTALL_ROOT}${obsolete_dir}" ]; then
-    echo
-    echo "*******************************************************************"
-    echo "* The old configuration directory ${obsolete_dir} still exists.    "
-    echo "* Please move your configuration to ${new_dir}.                    "
-    echo "*                                                                  "
-    echo "*       Installation will continue in 10 seconds.                  "
-    echo "*         Press CTRL+C if you want to stop now.                    "
-    echo "*******************************************************************"
-    echo
-    sleep 10
-
-    # Leaving a note for the sysadmin if the they proceed with the installation.
-    fn="${PKG_INSTALL_ROOT}${obsolete_dir}/${obsolete_dir_file_name}"
-    if touch "${fn}" 2>/dev/null; then
-      echo "${obsolete_dir_information}" > "${fn}"
-    fi
-  fi
-done
-
-exit 0

Copied: csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/CSWmysql51.postinstall (from rev 10496, csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/CSWmysql5.postinstall)
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/CSWmysql51.postinstall	                        (rev 0)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/CSWmysql51.postinstall	2010-07-28 22:55:20 UTC (rev 10649)
@@ -0,0 +1,15 @@
+#!/bin/sh
+#
+# $Id$
+#
+
+MYSQLDATADIR=/var/opt/csw/mysql5
+if [ ! -d "${MYSQLDATADIR}/mysql" ] ; then
+  echo "No database directory found in the default location:"
+  echo "${MYSQLDATADIR}/mysql"
+  echo "If you need to build the initial database directory,"
+  echo "  see /opt/csw/mysql5/share/mysql/quick_start-csw"
+  echo "If you are using a non-default database directory location,"
+  echo "  please start mysql manually."
+  exit 0
+fi

Copied: csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/CSWmysql51.preinstall (from rev 10496, csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/CSWmysql5.preinstall)
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/CSWmysql51.preinstall	                        (rev 0)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/CSWmysql51.preinstall	2010-07-28 22:55:20 UTC (rev 10649)
@@ -0,0 +1,40 @@
+#!/bin/sh
+# vim:set sw=2 ts=2 sts=2 expandtab:
+#
+# $Id$
+#
+
+obsolete_directories="/opt/csw/mysql5/var:/var/opt/csw/mysql5"
+
+obsolete_dir_information="
+This directory is obsolete.  Files in this directory are going to be ignored.
+Please move your data to the new location.
+
+Feel free to remove this file afterwards.
+"
+obsolete_dir_file_name="README.THIS_DIRECTORY_IS_OBSOLETE"
+
+for dirpair in ${obsolete_directories}; do
+  obsolete_dir=`echo ${dirpair} | cut -d: -f1`
+  new_dir=`echo ${dirpair} | cut -d: -f2`
+  if [ -d "${PKG_INSTALL_ROOT}${obsolete_dir}" ]; then
+    echo
+    echo "*******************************************************************"
+    echo "* The old configuration directory ${obsolete_dir} still exists.    "
+    echo "* Please move your configuration to ${new_dir}.                    "
+    echo "*                                                                  "
+    echo "*       Installation will continue in 10 seconds.                  "
+    echo "*         Press CTRL+C if you want to stop now.                    "
+    echo "*******************************************************************"
+    echo
+    sleep 10
+
+    # Leaving a note for the sysadmin if the they proceed with the installation.
+    fn="${PKG_INSTALL_ROOT}${obsolete_dir}/${obsolete_dir_file_name}"
+    if touch "${fn}" 2>/dev/null; then
+      echo "${obsolete_dir_information}" > "${fn}"
+    fi
+  fi
+done
+
+exit 0

Deleted: csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/cswmysql5
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/cswmysql5	2010-07-28 22:38:35 UTC (rev 10648)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/cswmysql5	2010-07-28 22:55:20 UTC (rev 10649)
@@ -1,183 +0,0 @@
-#!/bin/sh
-#
-# $Id$
-# Start script for MySQL database.
-#
-# NOTE: Make sure DB_DIR is owned BY the mysql user and group and chmod
-# 700.
-#
-# First time installation can use quick_start-csw in
-#   /opt/csw/mysql5/share/mysql to build the mysql database for the
-#   grant tables.  Or create the initial database yourself.
-#
-# Use my.cnf for startup options.  See MySQL documention
-#   for 'Using Option Files'.
-# Support for mysql5rc still remains in this startup script.
-#
-
-RETVAL=0
-MYSQLHOME=/opt/csw/mysql5
-MYSQL_VAR=/var/opt/csw/mysql5
-MYSQLD_DATADIR=$MYSQL_VAR
-MYSQLD_PID_FILE=$MYSQL_VAR/mysql.pid
-CONFFILE=$MYSQL_VAR/my.cnf
-
-#
-# Source configuration
-[ -r /opt/csw/mysql5/etc/mysql5rc ] && . /opt/csw/mysql5/etc/mysql5rc
-[ -r /etc/opt/csw/mysql5rc ] && . /etc/opt/csw/mysql5rc
-
-# To get started quickly, copy a sample configuration file from
-#   $MYSQLHOME/share/mysql
-# For example,
-#  cp /opt/csw/mysql5/share/mysql/my-medium.cnf /opt/csw/mysql5/var/my.cnf
-#
-# Or, manually follow the database creation steps below, and have
-# mysql just use defaults for everything.
-
-# 2006-03-11 Changed to only look for the grant tables database
-# 2006-04-16 Changed again.  Look for either the grant tables database
-#            or the options file.
-# 2006-12-28 Fix problem.  Look for either the grant tables database in
-#            the default location or the default options file.
-if [ ! -d "$MYSQLD_DATADIR/mysql" -a ! -f "$CONFFILE" ] ; then
-    exit 0
-fi
-
-# If CONFFILE is the server default file, unset CONFFILE
-if [ x"$CONFFILE" = x"$MYSQL_VAR/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
-    MYSQLD_DATADIR=
-fi
-
-# Make sure required vars are set
-MYSQLD_PID_FILE=${MYSQLD_PID_FILE:=$MYSQL_VAR/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.
-
-start_it() {
-    if test -r $MYSQLD_PID_FILE ; then
-        if kill -0 `cat $MYSQLD_PID_FILE` > /dev/null 2>&1 ; then
-            echo "mysqld (`cat $MYSQLD_PID_FILE`) seems to be running."
-            return 1
-        fi
-    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 "$MYSQLHOME/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
-#    fi
-
-# 2006-04-16  --defaults-file is changed to --defaults-extra-file
-    $MYSQLHOME/bin/mysqld_safe \
-        `[ -n "$CONFFILE" ] && echo "--defaults-extra-file=$CONFFILE"` \
-        --pid-file=$MYSQLD_PID_FILE \
-        `[ -n "$MYSQLD_PROG" ] && echo "--mysqld=$MYSQLD_PROG"` \
-        `[ -n "$MYSQLD_ANSI" ] && echo "--ansi"` \
-        `[ -n "$MYSQLD_BASEDIR" ] && echo "--basedir=$MYSQLD_BASEDIR"` \
-        `[ -n "$MYSQLD_BIG_TABLES" ] && echo "--big-tables"` \
-        `[ -n "$MYSQLD_BIND_ADDRESS" ] && echo "--bind-address=$MYSQLD_BIND_ADDRESS"` \
-        `[ -n "$MYSQLD_CHARACTER_SETS" ] && echo "--character-sets-dir=$MYSQLD_CHARACTER_SETS"` \
-        `[ -n "$MYSQLD_CHROOT" ] && echo "--chroot=$MYSQLD_CHROOT"` \
-        `[ -n "$MYSQLD_DATADIR" ] && echo "--datadir=$MYSQLD_DATADIR"` \
-        `[ -n "$MYSQLD_DEFAULT_CHARSET" ] && echo "--default-character-set=$MYSQLD_DEFAULT_CHARSET"` \
-        `[ -n "$MYSQLD_DEFAULT_TABLE_TYPE" ] && echo "--default-table-type=$MYSQLD_DEFAULT_TABLE_TYPE"` \
-        `[ -n "$MYSQLD_DELAY_KEY_WRITE_TABLES" ] && echo "--delay-key-write-for-all-tables"` \
-        `[ -n "$MYSQLD_ENABLE_LOCKING" ] && echo "--enable-locking"` \
-        `[ -n "$MYSQLD_EXIT_INFO" ] && echo "--exit-info"` \
-        `[ -n "$MYSQLD_FLUSH" ] && echo "--flush"` \
-        `[ -n "$MYSQLD_INIT_FILE" ] && echo "--init-file=$MYSQLD_INIT_FILE"` \
-        `[ -n "$MYSQLD_LANGUAGE" ] && echo "--language=$MYSQLD_LANGUAGE"` \
-        `[ -n "$MYSQLD_LOG" ] && echo "--log=$MYSQLD_LOG"` \
-        `[ -n "$MYSQLD_LOG_ISAM" ] && echo "--log-isam=$MYSQLD_LOG_ISAM"` \
-        `[ -n "$MYSQLD_LOG_SLOW_QUERIES" ] && echo "--log-slow-queries=$MYSQLD_LOG_SLOW_QUERIES"` \
-        `[ -n "$MYSQLD_LOG_UPDATE" ] && echo "--log-update=$MYSQLD_LOG_UPDATE"` \
-        `[ -n "$MYSQLD_LOG_LONG_FORMAT" ] && echo "--log-long-format"` \
-        `[ -n "$MYSQLD_LOW_PRIORITY_UPDATES" ] && echo "--low-priority-updates"` \
-        `[ -n "$MYSQLD_MEMLOCK" ] && echo "--memlock"` \
-        `[ -n "$MYSQLD_MYISAM_RECOVER" ] && echo "--myisam-recover=$MYSQLD_MYISAM_RECOVER"` \
-        `[ -n "$MYSQLD_PORT" ] && echo "--port=$MYSQLD_PORT"` \
-        `[ -n "$MYSQLD_OLD_PROTOCOL" ] && echo "--old-protocol"` \
-        `[ -n "$MYSQLD_ONE_THREAD" ] && echo "--one-thread"` \
-        `[ -n "$MYSQLD_SET_VARIABLE" ] && echo "--set-variablevar=$MYSQLD_SET_VARIABLE"` \
-        `[ -n "$MYSQLD_SKIP_GRANT_TABLES" ] && echo "--skip-grant-tables"` \
-        `[ -n "$MYSQLD_SAFE_MODE" ] && echo "--safe-mode"` \
-        `[ -n "$MYSQLD_SECURE" ] && echo "--secure"` \
-        `[ -n "$MYSQLD_SKIP_CONCURRENT_INSERT" ] && echo "--skip-concurrent-insert"` \
-        `[ -n "$MYSQLD_SKIP_DELAY_KEY_WRITE" ] && echo "--skip-delay-key-write"` \
-        `[ -n "$MYSQLD_SKIP_LOCKING" ] && echo "--skip-locking"` \
-        `[ -n "$MYSQLD_SKIP_NAME_RESOLVE" ] && echo "--skip-name-resolve"` \
-        `[ -n "$MYSQLD_SKIP_NETWORKING" ] && echo "--skip-networking"` \
-        `[ -n "$MYSQLD_SKIP_NEW" ] && echo "--skip-new"` \
-        `[ -n "$MYSQLD_SKIP_HOST_CACHE" ] && echo "--skip-host-cache"` \
-        `[ -n "$MYSQLD_SKIP_SHOW_DATABASE" ] && echo "--skip-show-database"` \
-        `[ -n "$MYSQLD_SKIP_THREAD_PRIORITY" ] && echo "--skip-thread-priority"` \
-        `[ -n "$MYSQLD_SOCKET" ] && echo "--socket=$MYSQLD_SOCKET"` \
-        `[ -n "$MYSQLD_TMPDIR" ] && echo "--tmpdir=$MYSQLD_TMPDIR"` \
-        `[ -n "$MYSQLD_USER" ] && echo "--user=$MYSQLD_USER"` \
-        & >/dev/null 2>&1
-    RETVAL=$?
-    if [ $RETVAL = 0 ] ; then
-        echo "[  OK  ]"
-    else
-        echo "[FAILED]"
-        return 1
-    fi
-    return 0
-}
-
-stop_it() {
-
-    printf "%-60s" "Shutting down mysqld: "
-    if test -f "$MYSQLD_PID_FILE" ; then
-        pkill mysqld_safe >/dev/null 2>&1
-        kill `cat $MYSQLD_PID_FILE` >/dev/null 2>&1
-        RETVAL=$?
-    else
-        RETVAL=1
-    fi
-    if [ $RETVAL = 0 ] ; then
-        echo "[  OK  ]"
-    else
-        echo "[FAILED]"
-    fi
-    echo ""
-    return 0
-}
-
-case $1 in
-    start)
-    start_it
-    ;;
-
-    stop)
-    stop_it
-    ;;
-
-    restart)
-    stop_it
-    while pgrep mysqld > /dev/null
-      do
-      sleep 1
-    done
-    start_it
-    ;;
-
-    *)
-    echo "Usage: $0  { start | stop | restart } "
-    ;;
-esac
-
-exit $RETVAL

Copied: csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/cswmysql51 (from rev 10496, csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/cswmysql5)
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/cswmysql51	                        (rev 0)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x/files/cswmysql51	2010-07-28 22:55:20 UTC (rev 10649)
@@ -0,0 +1,183 @@
+#!/bin/sh
+#
+# $Id$
+# Start script for MySQL database.
+#
+# NOTE: Make sure DB_DIR is owned BY the mysql user and group and chmod
+# 700.
+#
+# First time installation can use quick_start-csw in
+#   /opt/csw/mysql5/share/mysql to build the mysql database for the
+#   grant tables.  Or create the initial database yourself.
+#
+# Use my.cnf for startup options.  See MySQL documention
+#   for 'Using Option Files'.
+# Support for mysql5rc still remains in this startup script.
+#
+
+RETVAL=0
+MYSQLHOME=/opt/csw/mysql5
+MYSQL_VAR=/var/opt/csw/mysql5
+MYSQLD_DATADIR=$MYSQL_VAR
+MYSQLD_PID_FILE=$MYSQL_VAR/mysql.pid
+CONFFILE=$MYSQL_VAR/my.cnf
+
+#
+# Source configuration
+[ -r /opt/csw/mysql5/etc/mysql5rc ] && . /opt/csw/mysql5/etc/mysql5rc
+[ -r /etc/opt/csw/mysql5rc ] && . /etc/opt/csw/mysql5rc
+
+# To get started quickly, copy a sample configuration file from
+#   $MYSQLHOME/share/mysql
+# For example,
+#  cp /opt/csw/mysql5/share/mysql/my-medium.cnf /opt/csw/mysql5/var/my.cnf
+#
+# Or, manually follow the database creation steps below, and have
+# mysql just use defaults for everything.
+
+# 2006-03-11 Changed to only look for the grant tables database
+# 2006-04-16 Changed again.  Look for either the grant tables database
+#            or the options file.
+# 2006-12-28 Fix problem.  Look for either the grant tables database in
+#            the default location or the default options file.
+if [ ! -d "$MYSQLD_DATADIR/mysql" -a ! -f "$CONFFILE" ] ; then
+    exit 0
+fi
+
+# If CONFFILE is the server default file, unset CONFFILE
+if [ x"$CONFFILE" = x"$MYSQL_VAR/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
+    MYSQLD_DATADIR=
+fi
+
+# Make sure required vars are set
+MYSQLD_PID_FILE=${MYSQLD_PID_FILE:=$MYSQL_VAR/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.
+
+start_it() {
+    if test -r $MYSQLD_PID_FILE ; then
+        if kill -0 `cat $MYSQLD_PID_FILE` > /dev/null 2>&1 ; then
+            echo "mysqld (`cat $MYSQLD_PID_FILE`) seems to be running."
+            return 1
+        fi
+    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 "$MYSQLHOME/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
+#    fi
+
+# 2006-04-16  --defaults-file is changed to --defaults-extra-file
+    $MYSQLHOME/bin/mysqld_safe \
+        `[ -n "$CONFFILE" ] && echo "--defaults-extra-file=$CONFFILE"` \
+        --pid-file=$MYSQLD_PID_FILE \
+        `[ -n "$MYSQLD_PROG" ] && echo "--mysqld=$MYSQLD_PROG"` \
+        `[ -n "$MYSQLD_ANSI" ] && echo "--ansi"` \
+        `[ -n "$MYSQLD_BASEDIR" ] && echo "--basedir=$MYSQLD_BASEDIR"` \
+        `[ -n "$MYSQLD_BIG_TABLES" ] && echo "--big-tables"` \
+        `[ -n "$MYSQLD_BIND_ADDRESS" ] && echo "--bind-address=$MYSQLD_BIND_ADDRESS"` \
+        `[ -n "$MYSQLD_CHARACTER_SETS" ] && echo "--character-sets-dir=$MYSQLD_CHARACTER_SETS"` \
+        `[ -n "$MYSQLD_CHROOT" ] && echo "--chroot=$MYSQLD_CHROOT"` \
+        `[ -n "$MYSQLD_DATADIR" ] && echo "--datadir=$MYSQLD_DATADIR"` \
+        `[ -n "$MYSQLD_DEFAULT_CHARSET" ] && echo "--default-character-set=$MYSQLD_DEFAULT_CHARSET"` \
+        `[ -n "$MYSQLD_DEFAULT_TABLE_TYPE" ] && echo "--default-table-type=$MYSQLD_DEFAULT_TABLE_TYPE"` \
+        `[ -n "$MYSQLD_DELAY_KEY_WRITE_TABLES" ] && echo "--delay-key-write-for-all-tables"` \
+        `[ -n "$MYSQLD_ENABLE_LOCKING" ] && echo "--enable-locking"` \
+        `[ -n "$MYSQLD_EXIT_INFO" ] && echo "--exit-info"` \
+        `[ -n "$MYSQLD_FLUSH" ] && echo "--flush"` \
+        `[ -n "$MYSQLD_INIT_FILE" ] && echo "--init-file=$MYSQLD_INIT_FILE"` \
+        `[ -n "$MYSQLD_LANGUAGE" ] && echo "--language=$MYSQLD_LANGUAGE"` \
+        `[ -n "$MYSQLD_LOG" ] && echo "--log=$MYSQLD_LOG"` \
+        `[ -n "$MYSQLD_LOG_ISAM" ] && echo "--log-isam=$MYSQLD_LOG_ISAM"` \
+        `[ -n "$MYSQLD_LOG_SLOW_QUERIES" ] && echo "--log-slow-queries=$MYSQLD_LOG_SLOW_QUERIES"` \
+        `[ -n "$MYSQLD_LOG_UPDATE" ] && echo "--log-update=$MYSQLD_LOG_UPDATE"` \
+        `[ -n "$MYSQLD_LOG_LONG_FORMAT" ] && echo "--log-long-format"` \
+        `[ -n "$MYSQLD_LOW_PRIORITY_UPDATES" ] && echo "--low-priority-updates"` \
+        `[ -n "$MYSQLD_MEMLOCK" ] && echo "--memlock"` \
+        `[ -n "$MYSQLD_MYISAM_RECOVER" ] && echo "--myisam-recover=$MYSQLD_MYISAM_RECOVER"` \
+        `[ -n "$MYSQLD_PORT" ] && echo "--port=$MYSQLD_PORT"` \
+        `[ -n "$MYSQLD_OLD_PROTOCOL" ] && echo "--old-protocol"` \
+        `[ -n "$MYSQLD_ONE_THREAD" ] && echo "--one-thread"` \
+        `[ -n "$MYSQLD_SET_VARIABLE" ] && echo "--set-variablevar=$MYSQLD_SET_VARIABLE"` \
+        `[ -n "$MYSQLD_SKIP_GRANT_TABLES" ] && echo "--skip-grant-tables"` \
+        `[ -n "$MYSQLD_SAFE_MODE" ] && echo "--safe-mode"` \
+        `[ -n "$MYSQLD_SECURE" ] && echo "--secure"` \
+        `[ -n "$MYSQLD_SKIP_CONCURRENT_INSERT" ] && echo "--skip-concurrent-insert"` \
+        `[ -n "$MYSQLD_SKIP_DELAY_KEY_WRITE" ] && echo "--skip-delay-key-write"` \
+        `[ -n "$MYSQLD_SKIP_LOCKING" ] && echo "--skip-locking"` \
+        `[ -n "$MYSQLD_SKIP_NAME_RESOLVE" ] && echo "--skip-name-resolve"` \
+        `[ -n "$MYSQLD_SKIP_NETWORKING" ] && echo "--skip-networking"` \
+        `[ -n "$MYSQLD_SKIP_NEW" ] && echo "--skip-new"` \
+        `[ -n "$MYSQLD_SKIP_HOST_CACHE" ] && echo "--skip-host-cache"` \
+        `[ -n "$MYSQLD_SKIP_SHOW_DATABASE" ] && echo "--skip-show-database"` \
+        `[ -n "$MYSQLD_SKIP_THREAD_PRIORITY" ] && echo "--skip-thread-priority"` \
+        `[ -n "$MYSQLD_SOCKET" ] && echo "--socket=$MYSQLD_SOCKET"` \
+        `[ -n "$MYSQLD_TMPDIR" ] && echo "--tmpdir=$MYSQLD_TMPDIR"` \
+        `[ -n "$MYSQLD_USER" ] && echo "--user=$MYSQLD_USER"` \
+        & >/dev/null 2>&1
+    RETVAL=$?
+    if [ $RETVAL = 0 ] ; then
+        echo "[  OK  ]"
+    else
+        echo "[FAILED]"
+        return 1
+    fi
+    return 0
+}
+
+stop_it() {
+
+    printf "%-60s" "Shutting down mysqld: "
+    if test -f "$MYSQLD_PID_FILE" ; then
+        pkill mysqld_safe >/dev/null 2>&1
+        kill `cat $MYSQLD_PID_FILE` >/dev/null 2>&1
+        RETVAL=$?
+    else
+        RETVAL=1
+    fi
+    if [ $RETVAL = 0 ] ; then
+        echo "[  OK  ]"
+    else
+        echo "[FAILED]"
+    fi
+    echo ""
+    return 0
+}
+
+case $1 in
+    start)
+    start_it
+    ;;
+
+    stop)
+    stop_it
+    ;;
+
+    restart)
+    stop_it
+    while pgrep mysqld > /dev/null
+      do
+      sleep 1
+    done
+    start_it
+    ;;
+
+    *)
+    echo "Usage: $0  { start | stop | restart } "
+    ;;
+esac
+
+exit $RETVAL


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 Jul 29 00:56:13 2010
From: wahwah at users.sourceforge.net (wahwah at users.sourceforge.net)
Date: Wed, 28 Jul 2010 22:56:13 +0000
Subject: [csw-devel] SF.net SVN: gar:[10650]
	csw/mgar/pkg/mysql5/branches/mysql-5.1.x/checksums
Message-ID: <E1OeFXp-0000Ji-Ae@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10650
          http://gar.svn.sourceforge.net/gar/?rev=10650&view=rev
Author:   wahwah
Date:     2010-07-28 22:56:13 +0000 (Wed, 28 Jul 2010)

Log Message:
-----------
mysql-5.1: Checksums for files with the $Id$ tag.

Modified Paths:
--------------
    csw/mgar/pkg/mysql5/branches/mysql-5.1.x/checksums

Modified: csw/mgar/pkg/mysql5/branches/mysql-5.1.x/checksums
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.1.x/checksums	2010-07-28 22:55:20 UTC (rev 10649)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.1.x/checksums	2010-07-28 22:56:13 UTC (rev 10650)
@@ -2,11 +2,11 @@
 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
-c8c2ef6365a9bd9b71fac6198d3eeef8  CSWmysql51.postinstall
-a652ccff001c328178f4b0ed9bfebbd6  CSWmysql51.preinstall
+16ec677592108d1eec22ca4f9f3d09e2  CSWmysql51.postinstall
+615c16877afb48ce809a849c1c5dbc35  CSWmysql51.preinstall
 e691b0cf00a3925ac55c1844045d6e30  ChangeLog
 e42afb5ec1b1ab02d2ec3b46d0922636  README.CSW
-0974c28c048437612c6a0ace93460d3b  cswmysql51
+ac9af0e13c6e075ac87f19fdf171776d  cswmysql51
 67228e1f096fe08a94f4267439a4ec36  cswusergroup
 a90d87a71fa3c23dff6d78afc8e3184c  mysql-5.1.49.tar.gz
 90b7cfcd11ab56e021a195a6a085fa21  quick_start-csw


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From skayser at users.sourceforge.net  Thu Jul 29 01:05:26 2010
From: skayser at users.sourceforge.net (skayser at users.sourceforge.net)
Date: Wed, 28 Jul 2010 23:05:26 +0000
Subject: [csw-devel] SF.net SVN: gar:[10651] csw/mgar/pkg/stunnel/trunk
Message-ID: <E1OeFgk-0000SW-C5@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10651
          http://gar.svn.sourceforge.net/gar/?rev=10651&view=rev
Author:   skayser
Date:     2010-07-28 23:05:26 +0000 (Wed, 28 Jul 2010)

Log Message:
-----------
stunnel: fix checkpkg dep catch, re-add sample conf patchfile, standardize changelog file name

Modified Paths:
--------------
    csw/mgar/pkg/stunnel/trunk/Makefile
    csw/mgar/pkg/stunnel/trunk/checksums

Modified: csw/mgar/pkg/stunnel/trunk/Makefile
===================================================================
--- csw/mgar/pkg/stunnel/trunk/Makefile	2010-07-28 22:56:13 UTC (rev 10650)
+++ csw/mgar/pkg/stunnel/trunk/Makefile	2010-07-28 23:05:26 UTC (rev 10651)
@@ -22,10 +22,10 @@
 DISTFILES    = $(GARNAME)-$(GARVERSION).tar.gz
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
-RUNTIME_DEP_PKGS = CSWzlib CSWosslrt CSWtcpwrap CSWcswclassutils
+RUNTIME_DEP_PKGS = CSWzlib CSWosslrt CSWtcpwrap
 
 # Make stunnel.conf-sample.in honor $localstatedir adjustments
-#PATCHFILES = 0001-Make-stunnel.conf-sample.in-honor-sysconfdir-localst.patch
+PATCHFILES = 0001-Make-stunnel.conf-sample.in-honor-sysconfdir-localst.patch
 
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --with-ssl=/opt/csw
@@ -47,6 +47,8 @@
 PROTOTYPE_USER_restrict  = nobody
 PROTOTYPE_GROUP_restrict = nobody
 
+EXTRA_PAX_ARGS = '-s,ChangeLog$$,changelog,p'
+
 include gar/category.mk
 
 # 1) Suppress prompts for openssl sample cert generation (-batch)

Modified: csw/mgar/pkg/stunnel/trunk/checksums
===================================================================
--- csw/mgar/pkg/stunnel/trunk/checksums	2010-07-28 22:56:13 UTC (rev 10650)
+++ csw/mgar/pkg/stunnel/trunk/checksums	2010-07-28 23:05:26 UTC (rev 10651)
@@ -1,2 +1,2 @@
-c8d5c69008fef019b86d743207309524  0001-Make-stunnel.conf-sample.in-honor-sysconfdir-localst.patch
+0915b192dcbe816490ed88770bb771d0  0001-Make-stunnel.conf-sample.in-honor-sysconfdir-localst.patch
 559a864066d8cc4afd8a97682c90d41c  stunnel-4.33.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 Jul 29 09:55:55 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 29 Jul 2010 07:55:55 +0000
Subject: [csw-devel] SF.net SVN: gar:[10652]
	csw/mgar/pkg/diffutils/trunk/Makefile
Message-ID: <E1OeNy7-000131-Ny@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10652
          http://gar.svn.sourceforge.net/gar/?rev=10652&view=rev
Author:   dmichelsen
Date:     2010-07-29 07:55:55 +0000 (Thu, 29 Jul 2010)

Log Message:
-----------
diffutils: Remove build dependency to textutils

Modified Paths:
--------------
    csw/mgar/pkg/diffutils/trunk/Makefile

Modified: csw/mgar/pkg/diffutils/trunk/Makefile
===================================================================
--- csw/mgar/pkg/diffutils/trunk/Makefile	2010-07-28 23:05:26 UTC (rev 10651)
+++ csw/mgar/pkg/diffutils/trunk/Makefile	2010-07-29 07:55:55 UTC (rev 10652)
@@ -14,8 +14,10 @@
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
 RUNTIME_DEP_PKGS = CSWggettextrt CSWiconv CSWlibsigsegv
-BUILD_DEP_PKGS = CSWtextutils CSWggettext CSWiconv CSWlibsigsegv
+BUILD_DEP_PKGS = CSWggettext CSWiconv CSWlibsigsegv
 
+VENDOR_URL = http://www.gnu.org/software/diffutils/
+
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --program-prefix=g
 


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 Jul 29 09:57:42 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 29 Jul 2010 07:57:42 +0000
Subject: [csw-devel] SF.net SVN: gar:[10653] csw/mgar/pkg/m4/trunk/Makefile
Message-ID: <E1OeNzq-0006ug-Dt@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 10653
          http://gar.svn.sourceforge.net/gar/?rev=10653&view=rev
Author:   dmichelsen
Date:     2010-07-29 07:57:42 +0000 (Thu, 29 Jul 2010)

Log Message:
-----------
m4: Make libsigsegv also buildtime dependency

Modified Paths:
--------------
    csw/mgar/pkg/m4/trunk/Makefile

Modified: csw/mgar/pkg/m4/trunk/Makefile
===================================================================
--- csw/mgar/pkg/m4/trunk/Makefile	2010-07-29 07:55:55 UTC (rev 10652)
+++ csw/mgar/pkg/m4/trunk/Makefile	2010-07-29 07:57:42 UTC (rev 10653)
@@ -20,7 +20,7 @@
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
-RUNTIME_DEP_PKGS = CSWlibsigsegv
+DEP_PKGS = CSWlibsigsegv
 
 CONFIGURE_ARGS = $(DIRPATHS) --program-prefix=g
 TEST_SCRIPTS =


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From dmichelsen at users.sourceforge.net  Thu Jul 29 11:26:42 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 29 Jul 2010 09:26:42 +0000
Subject: [csw-devel] SF.net SVN: gar:[10654] csw/mgar/pkg/rbgems
Message-ID: <E1OePNy-0007JO-RS@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 10654
          http://gar.svn.sourceforge.net/gar/?rev=10654&view=rev
Author:   dmichelsen
Date:     2010-07-29 09:26:42 +0000 (Thu, 29 Jul 2010)

Log Message:
-----------
rbgems/bundler: Initial commit

Added Paths:
-----------
    csw/mgar/pkg/rbgems/bundler/
    csw/mgar/pkg/rbgems/bundler/branches/
    csw/mgar/pkg/rbgems/bundler/tags/
    csw/mgar/pkg/rbgems/bundler/trunk/
    csw/mgar/pkg/rbgems/bundler/trunk/Makefile
    csw/mgar/pkg/rbgems/bundler/trunk/checksums
    csw/mgar/pkg/rbgems/bundler/trunk/files/


Property changes on: csw/mgar/pkg/rbgems/bundler/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/rbgems/bundler/trunk/Makefile
===================================================================
--- csw/mgar/pkg/rbgems/bundler/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/rbgems/bundler/trunk/Makefile	2010-07-29 09:26:42 UTC (rev 10654)
@@ -0,0 +1,17 @@
+GARNAME = bundler
+GARVERSION = 0.9.26
+CATEGORIES = rbgems
+
+DESCRIPTION = Manages an application's dependencies through its entire life,
+define BLURB
+  Bundler manages an application's dependencies through its entire life, across many machines, systematically and repeatably
+endef
+
+PACKAGES = CSWgem-bundler
+CATALOGNAME = gem_bundler
+
+LICENSE = LICENSE
+
+ARCHALL = 1
+
+include gar/category.mk

Added: csw/mgar/pkg/rbgems/bundler/trunk/checksums
===================================================================
--- csw/mgar/pkg/rbgems/bundler/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/rbgems/bundler/trunk/checksums	2010-07-29 09:26:42 UTC (rev 10654)
@@ -0,0 +1 @@
+f74627d17d20b8ba491f9507ad551827  bundler-0.9.26.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 Jul 29 12:36:12 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 29 Jul 2010 10:36:12 +0000
Subject: [csw-devel] SF.net SVN: gar:[10655] csw/mgar/pkg/rbgems/rack/trunk
Message-ID: <E1OeQTE-00089D-Kg@sfp-svn-4.v30.ch3.sourceforge.com>

Revision: 10655
          http://gar.svn.sourceforge.net/gar/?rev=10655&view=rev
Author:   dmichelsen
Date:     2010-07-29 10:36:12 +0000 (Thu, 29 Jul 2010)

Log Message:
-----------
rack: Downgrade to 1.1.0

Modified Paths:
--------------
    csw/mgar/pkg/rbgems/rack/trunk/Makefile
    csw/mgar/pkg/rbgems/rack/trunk/checksums

Modified: csw/mgar/pkg/rbgems/rack/trunk/Makefile
===================================================================
--- csw/mgar/pkg/rbgems/rack/trunk/Makefile	2010-07-29 09:26:42 UTC (rev 10654)
+++ csw/mgar/pkg/rbgems/rack/trunk/Makefile	2010-07-29 10:36:12 UTC (rev 10655)
@@ -1,5 +1,5 @@
 GARNAME = rack
-GARVERSION = 1.2.1
+GARVERSION = 1.1.0
 CATEGORIES = rbgems
 
 DESCRIPTION = A minimal interface for developing web applications in Ruby

Modified: csw/mgar/pkg/rbgems/rack/trunk/checksums
===================================================================
--- csw/mgar/pkg/rbgems/rack/trunk/checksums	2010-07-29 09:26:42 UTC (rev 10654)
+++ csw/mgar/pkg/rbgems/rack/trunk/checksums	2010-07-29 10:36:12 UTC (rev 10655)
@@ -1 +1 @@
-ad93c6bf876bb75af374b416593a4c08  rack-1.2.1.gem
+f5ff2d6d348f41bb3833847223f792ce  rack-1.1.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  Thu Jul 29 14:01:41 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 29 Jul 2010 12:01:41 +0000
Subject: [csw-devel] SF.net SVN: gar:[10656] csw/mgar/pkg/rbgems
Message-ID: <E1OeRnx-0001Cb-EU@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 10656
          http://gar.svn.sourceforge.net/gar/?rev=10656&view=rev
Author:   dmichelsen
Date:     2010-07-29 12:01:41 +0000 (Thu, 29 Jul 2010)

Log Message:
-----------
rbgems/rbdoc: Initial commit, does not package cleanly

Added Paths:
-----------
    csw/mgar/pkg/rbgems/rdoc/
    csw/mgar/pkg/rbgems/rdoc/branches/
    csw/mgar/pkg/rbgems/rdoc/tags/
    csw/mgar/pkg/rbgems/rdoc/trunk/
    csw/mgar/pkg/rbgems/rdoc/trunk/Makefile
    csw/mgar/pkg/rbgems/rdoc/trunk/checksums
    csw/mgar/pkg/rbgems/rdoc/trunk/files/


Property changes on: csw/mgar/pkg/rbgems/rdoc/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/rbgems/rdoc/trunk/Makefile
===================================================================
--- csw/mgar/pkg/rbgems/rdoc/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/rbgems/rdoc/trunk/Makefile	2010-07-29 12:01:41 UTC (rev 10656)
@@ -0,0 +1,15 @@
+GARNAME = rdoc
+GARVERSION = 2.5.9
+CATEGORIES = rbgems
+
+DESCRIPTION = Produce documentation for one or more Ruby source files
+define BLURB
+  RDoc is an application that produces documentation for one or more Ruby source files. RDoc includes the +rdoc+ and +ri+ tools for generating and displaying online documentation. At this point in time, RDoc 2.x is a work in progress and may incur further API changes beyond what has been made to RDoc 1.0.1. Command-line tools are largely unaffected, but internal APIs may shift rapidly. See RDoc for a description of RDoc's markup and basic use.
+endef
+
+PACKAGES = CSWgem-rdoc
+CATALOGNAME = gem_rdoc
+
+ARCHALL = 1
+
+include gar/category.mk

Added: csw/mgar/pkg/rbgems/rdoc/trunk/checksums
===================================================================
--- csw/mgar/pkg/rbgems/rdoc/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/rbgems/rdoc/trunk/checksums	2010-07-29 12:01:41 UTC (rev 10656)
@@ -0,0 +1 @@
+eb6f3b2eaf2a5d9b2b6ff817c09b775c  rdoc-2.5.9.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 Jul 29 14:38:07 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 29 Jul 2010 12:38:07 +0000
Subject: [csw-devel] SF.net SVN: gar:[10657]
	csw/mgar/pkg/rbgems/rdoc/trunk/Makefile
Message-ID: <E1OeSND-000059-K2@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 10657
          http://gar.svn.sourceforge.net/gar/?rev=10657&view=rev
Author:   dmichelsen
Date:     2010-07-29 12:38:07 +0000 (Thu, 29 Jul 2010)

Log Message:
-----------
rbgems/rdoc: Add license

Modified Paths:
--------------
    csw/mgar/pkg/rbgems/rdoc/trunk/Makefile

Modified: csw/mgar/pkg/rbgems/rdoc/trunk/Makefile
===================================================================
--- csw/mgar/pkg/rbgems/rdoc/trunk/Makefile	2010-07-29 12:01:41 UTC (rev 10656)
+++ csw/mgar/pkg/rbgems/rdoc/trunk/Makefile	2010-07-29 12:38:07 UTC (rev 10657)
@@ -10,6 +10,10 @@
 PACKAGES = CSWgem-rdoc
 CATALOGNAME = gem_rdoc
 
+LICENSE = LICENSE.txt
+
 ARCHALL = 1
 
+EXTRA_GEM_INSTALL_ARGS = --no-rdoc --no-ri
+
 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 Jul 29 14:39:23 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 29 Jul 2010 12:39:23 +0000
Subject: [csw-devel] SF.net SVN: gar:[10658] csw/mgar/pkg/rbgems
Message-ID: <E1OeSOR-00006U-Fm@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 10658
          http://gar.svn.sourceforge.net/gar/?rev=10658&view=rev
Author:   dmichelsen
Date:     2010-07-29 12:39:23 +0000 (Thu, 29 Jul 2010)

Log Message:
-----------
rbgems/rake-compiler: Initial commit

Added Paths:
-----------
    csw/mgar/pkg/rbgems/rake-compiler/
    csw/mgar/pkg/rbgems/rake-compiler/branches/
    csw/mgar/pkg/rbgems/rake-compiler/tags/
    csw/mgar/pkg/rbgems/rake-compiler/trunk/
    csw/mgar/pkg/rbgems/rake-compiler/trunk/Makefile
    csw/mgar/pkg/rbgems/rake-compiler/trunk/checksums
    csw/mgar/pkg/rbgems/rake-compiler/trunk/files/


Property changes on: csw/mgar/pkg/rbgems/rake-compiler/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/rbgems/rake-compiler/trunk/Makefile
===================================================================
--- csw/mgar/pkg/rbgems/rake-compiler/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/rbgems/rake-compiler/trunk/Makefile	2010-07-29 12:39:23 UTC (rev 10658)
@@ -0,0 +1,17 @@
+GARNAME = rake-compiler
+GARVERSION = 0.7.0
+CATEGORIES = rbgems
+
+DESCRIPTION = Build and package Ruby extensions in C and Java
+define BLURB
+  Provide a standard and simplified way to build and package Ruby extensions (C, Java) using Rake as glue.
+endef
+
+PACKAGES = CSWgem-rakecompiler
+CATALOGNAME = gem_rakecompiler
+
+LICENSE = LICENSE.txt
+
+ARCHALL = 1
+
+include gar/category.mk

Added: csw/mgar/pkg/rbgems/rake-compiler/trunk/checksums
===================================================================
--- csw/mgar/pkg/rbgems/rake-compiler/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/rbgems/rake-compiler/trunk/checksums	2010-07-29 12:39:23 UTC (rev 10658)
@@ -0,0 +1 @@
+bc8dbdadac79b6a30cf3aa702a3a1ead  rake-compiler-0.7.0.gem


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From idogan23 at users.sourceforge.net  Thu Jul 29 15:33:46 2010
From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net)
Date: Thu, 29 Jul 2010 13:33:46 +0000
Subject: [csw-devel] SF.net SVN: gar:[10659] csw/mgar/pkg
Message-ID: <E1OeTF4-0007Ei-KC@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10659
          http://gar.svn.sourceforge.net/gar/?rev=10659&view=rev
Author:   idogan23
Date:     2010-07-29 13:33:46 +0000 (Thu, 29 Jul 2010)

Log Message:
-----------
powerdns: initial commit

Added Paths:
-----------
    csw/mgar/pkg/powerdns/
    csw/mgar/pkg/powerdns/branches/
    csw/mgar/pkg/powerdns/tags/
    csw/mgar/pkg/powerdns/trunk/
    csw/mgar/pkg/powerdns/trunk/Makefile
    csw/mgar/pkg/powerdns/trunk/checksums
    csw/mgar/pkg/powerdns/trunk/files/
    csw/mgar/pkg/powerdns/trunk/files/0001-stdint.h-patch.patch
    csw/mgar/pkg/powerdns/trunk/files/LICENSE
    csw/mgar/pkg/powerdns/trunk/files/cswpdns
    csw/mgar/pkg/powerdns/trunk/gar
    csw/mgar/pkg/powerdns/trunk/work/

Added: csw/mgar/pkg/powerdns/trunk/Makefile
===================================================================
--- csw/mgar/pkg/powerdns/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/powerdns/trunk/Makefile	2010-07-29 13:33:46 UTC (rev 10659)
@@ -0,0 +1,54 @@
+GARNAME = pdns
+GARVERSION = 2.9.22
+CATEGORIES = server
+
+DESCRIPTION = An advanced DNS server with multiple backends
+define BLURB
+  PowerDNS is an advanced DNS server, which allows for several different
+  backends. Current backends include MySQL, PostgreSQL, bind, etc.
+endef
+
+MASTER_SITES = http://downloads.powerdns.com/releases/
+SPKG_SOURCEURL = http://www.powerdns.com/
+DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
+DISTFILES += LICENSE
+DISTFILES += cswpdns
+PATCHFILES += 0001-stdint.h-patch.patch
+
+# File name regex to get notifications about upstream software releases
+UFILES_REGEX = $(GARNAME)-(\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 = 
+
+CATALOGNAME = powerdns
+LICENSE = $(FILEDIR)/LICENSE
+
+GARCOMPILER = GCC3
+PACKAGING_PLATFORMS +=  solaris9-sparc solaris9-i386
+PACKAGING_PLATFORMS +=  solaris10-sparc solaris10-i386
+SKIPTEST = 1
+EXTRA_LD_OPTIONS = -R/opt/csw/mysql5/lib/mysql
+
+CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS += --sysconfdir=/etc/opt/csw/pdns
+CONFIGURE_ARGS += --with-mysql=/opt/csw/mysql5
+
+RUNTIME_DEP_PKGS_CSWpdns += CSWzlib
+RUNTIME_DEP_PKGS_CSWpdns += CSWgcc3core
+RUNTIME_DEP_PKGS_CSWpdns += CSWgcc3g++
+RUNTIME_DEP_PKGS_CSWpdns += CSWmysql5rt
+
+INITSMF = /etc/opt/csw/init.d/cswpdns
+PRESERVECONF = /etc/opt/csw/pdns/pdns.conf
+
+post-install-modulated:
+	@echo " ==> Installing Init Script"
+	@ginstall -d $(DESTDIR)/etc/opt/csw/init.d
+	@ginstall -m 755 $(FILEDIR)/cswpdns $(DESTDIR)/etc/opt/csw/init.d/cswpdns
+	@echo " ==> Moving config file"
+	@mv $(DESTDIR)/etc/opt/csw/pdns/pdns.conf-dist $(DESTDIR)/etc/opt/csw/pdns/pdns.conf
+	@$(MAKECOOKIE)
+
+include gar/category.mk

Added: csw/mgar/pkg/powerdns/trunk/checksums
===================================================================
--- csw/mgar/pkg/powerdns/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/powerdns/trunk/checksums	2010-07-29 13:33:46 UTC (rev 10659)
@@ -0,0 +1,4 @@
+532949f5046c424fc6e8970e0e269d24  0001-stdint.h-patch.patch
+b234ee4d69f5fce4486a80fdaf4a4263  LICENSE
+8bf1c6c58ca47f3accb98b71e9af8024  cswpdns
+8a6ff842733aca885577eb54e983a1ff  pdns-2.9.22.tar.gz

Added: csw/mgar/pkg/powerdns/trunk/files/0001-stdint.h-patch.patch
===================================================================
--- csw/mgar/pkg/powerdns/trunk/files/0001-stdint.h-patch.patch	                        (rev 0)
+++ csw/mgar/pkg/powerdns/trunk/files/0001-stdint.h-patch.patch	2010-07-29 13:33:46 UTC (rev 10659)
@@ -0,0 +1,109 @@
+From fffc4da5956c09a85d9b2f749c015af973212488 Mon Sep 17 00:00:00 2001
+From: Ihsan Dogan <ihsan at opencsw.org>
+Date: Wed, 14 Jul 2010 10:27:42 +0200
+Subject: [PATCH] stdint.h patch
+
+---
+ modules/geobackend/ippreftree.hh |    2 +-
+ pdns/aes/brg_types.h             |    2 +-
+ pdns/dnspbench.cc                |    2 +-
+ pdns/dnswriter.hh                |    2 +-
+ pdns/misc.hh                     |    2 +-
+ pdns/rcpgenerator.hh             |    2 +-
+ pdns/rec_channel.hh              |    2 +-
+ 7 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/modules/geobackend/ippreftree.hh b/modules/geobackend/ippreftree.hh
+index d1196c1..d4f970a 100644
+--- a/modules/geobackend/ippreftree.hh
++++ b/modules/geobackend/ippreftree.hh
+@@ -8,7 +8,7 @@
+ #include <string>
+ #include <sys/types.h>
+ #include <cstdlib>
+-#include <stdint.h>
++#include <sys/inttypes.h>
+ 
+ using namespace std;
+ 
+diff --git a/pdns/aes/brg_types.h b/pdns/aes/brg_types.h
+index 5911581..755b3e8 100644
+--- a/pdns/aes/brg_types.h
++++ b/pdns/aes/brg_types.h
+@@ -47,7 +47,7 @@ extern "C" {
+ #  include <stddef.h>
+ #  define ptrint_t intptr_t
+ #elif defined( __GNUC__ ) && ( __GNUC__ >= 3 )
+-#  include <stdint.h>
++#include <sys/inttypes.h>
+ #  define ptrint_t intptr_t
+ #else
+ #  define ptrint_t int
+diff --git a/pdns/dnspbench.cc b/pdns/dnspbench.cc
+index ae62fe3..c422c31 100644
+--- a/pdns/dnspbench.cc
++++ b/pdns/dnspbench.cc
+@@ -8,7 +8,7 @@ Logger L("dnspbench");
+ #include "dnsrecords.hh"
+ 
+ #include "statbag.hh"
+-#include <stdint.h>
++#include <sys/inttypes.h>
+ #include <set>
+ 
+ using namespace boost;
+diff --git a/pdns/dnswriter.hh b/pdns/dnswriter.hh
+index e5d418d..a041cea 100644
+--- a/pdns/dnswriter.hh
++++ b/pdns/dnswriter.hh
+@@ -5,7 +5,7 @@
+ #include <vector>
+ #include <map>
+ #if !defined SOLARIS8 && !defined WIN32
+-#include <stdint.h>
++#include <sys/inttypes.h>
+ #elif defined WIN32
+ #include "utility.hh"
+ #endif
+diff --git a/pdns/misc.hh b/pdns/misc.hh
+index f04787a..4f38a4c 100644
+--- a/pdns/misc.hh
++++ b/pdns/misc.hh
+@@ -18,7 +18,7 @@
+ */
+ #ifndef MISC_HH
+ #define MISC_HH
+-#include <stdint.h>
++#include <sys/inttypes.h>
+ #include <cstring>
+ 
+ #if 0
+diff --git a/pdns/rcpgenerator.hh b/pdns/rcpgenerator.hh
+index 3651830..35c5334 100644
+--- a/pdns/rcpgenerator.hh
++++ b/pdns/rcpgenerator.hh
+@@ -23,7 +23,7 @@
+ #include <string>
+ #include <stdexcept>
+ #if !defined SOLARIS8 && !defined WIN32
+-# include <stdint.h>
++#include <sys/inttypes.h>
+ #elif defined WIN32
+ # include "utility.hh"
+ #endif
+diff --git a/pdns/rec_channel.hh b/pdns/rec_channel.hh
+index 4a381a5..7b62082 100644
+--- a/pdns/rec_channel.hh
++++ b/pdns/rec_channel.hh
+@@ -3,7 +3,7 @@
+ #include <string>
+ #include <map>
+ #if !defined SOLARIS8 && !defined WIN32
+-#include <stdint.h>
++#include <sys/inttypes.h>
+ #elif defined WIN32
+ #include "utility.hh"
+ #endif
+-- 
+1.7.1
+

Added: csw/mgar/pkg/powerdns/trunk/files/LICENSE
===================================================================
--- csw/mgar/pkg/powerdns/trunk/files/LICENSE	                        (rev 0)
+++ csw/mgar/pkg/powerdns/trunk/files/LICENSE	2010-07-29 13:33:46 UTC (rev 10659)
@@ -0,0 +1,339 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                            NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.

Added: csw/mgar/pkg/powerdns/trunk/files/cswpdns
===================================================================
--- csw/mgar/pkg/powerdns/trunk/files/cswpdns	                        (rev 0)
+++ csw/mgar/pkg/powerdns/trunk/files/cswpdns	2010-07-29 13:33:46 UTC (rev 10659)
@@ -0,0 +1,187 @@
+#!/bin/sh
+################################################################################
+# rc script for PowerDNS, Solaris-style  |  fernando at secret.org                #
+################################################################################
+
+prefix=/opt/csw
+exec_prefix=${prefix}
+BINARYPATH=${exec_prefix}/bin
+SBINARYPATH=${exec_prefix}/sbin
+SOCKETPATH=/var/run
+
+cd $SOCKETPATH
+
+suffix=`/bin/basename $0 | /bin/awk -F- '{print $2}'`
+
+if [ $suffix ]
+then
+	EXTRAOPTS=--config-name=$suffix
+	PROGNAME=pdns-$suffix
+else
+	PROGNAME=$0
+fi
+
+pdns_server="$SBINARYPATH/pdns_server $EXTRAOPTS"
+
+doPC()
+{
+	ret=`$BINARYPATH/pdns_control $EXTRAOPTS $1 $2 2> /dev/null`
+}
+
+doPC ping
+NOTRUNNING=$?
+
+case "$1" in
+	status)
+		/bin/echo "$PROGNAME: \c"
+
+		if test "$NOTRUNNING" = "0"
+		then
+			doPC status
+			/bin/echo $ret
+		else
+			/bin/echo "not running"
+		fi
+	;;
+
+	stop)
+		/bin/echo "$PROGNAME: \c"
+
+		if test "$NOTRUNNING" = "0"
+		then
+			doPC quit
+			/bin/echo $ret
+		else
+			/bin/echo "not running"
+		fi
+	;;
+
+	force-stop)
+		/bin/echo "$PROGNAME: \c"
+
+		/bin/pkill -v -9 pdns_server
+
+		/bin/echo "force-stopped"
+	;;
+
+	start)
+		/bin/echo "$PROGNAME: \c"
+
+		if test "$NOTRUNNING" = "0"
+		then
+			/bin/echo "already running"
+		else
+			$pdns_server --daemon --guardian=yes
+			if test "$?" = "0"
+			then
+				/bin/echo "started"
+			fi
+		fi
+	;;
+
+	force-reload | restart)
+		/bin/echo "$PROGNAME: \c"
+
+		/bin/echo "stopping and waiting\c"
+		doPC quit
+		sleep 3
+		/bin/echo
+		$0 start
+	;;
+
+	reload)
+		/bin/echo "$PROGNAME: \c"
+
+		if test "$NOTRUNNING" = "0"
+		then
+			doPC cycle
+			/bin/echo requested reload
+		else
+			/bin/echo not running yet
+			$0 start
+		fi
+	;;
+		
+	monitor)
+		/bin/echo "$PROGNAME: \c"
+
+		if test "$NOTRUNNING" = "0"
+		then
+			/bin/echo "already running"
+		else
+			$pdns_server --daemon=no --guardian=no --control-console --loglevel=9
+		fi
+	;;
+
+	dump)
+		/bin/echo "$PROGNAME: \c"
+
+		if test "$NOTRUNNING" = "0"
+		then
+			doPC list
+			/bin/echo $ret
+		else
+			/bin/echo "not running"
+		fi
+	;;
+
+	show)
+		/bin/echo "$PROGNAME: \c"
+
+		if [ $# -lt 2 ]
+		then
+			/bin/echo Insufficient parameters
+			exit
+		fi
+		if test "$NOTRUNNING" = "0"
+		then
+			/bin/echo -n "$2="
+			doPC show $2 ; /bin/echo $ret
+		else
+			/bin/echo "not running"
+		fi
+	;;
+
+	mrtg)
+		if [ $# -lt 2 ]
+		then
+			/bin/echo Insufficient parameters
+			exit
+		fi
+		if test "$NOTRUNNING" = "0"
+		then
+			doPC show $2 ; /bin/echo $ret
+			if [ "$3x" != "x" ]
+			then
+				doPC show $3 ; /bin/echo $ret
+			else
+				/bin/echo 0
+			fi
+			doPC uptime ; /bin/echo $ret
+			/bin/echo PowerDNS daemon
+		else
+			/bin/echo "not running"
+		fi
+	
+	;;
+
+	cricket)
+		if [ $# -lt 2 ]
+		then
+			/bin/echo Insufficient parameters
+			exit
+		fi
+		if test "$NOTRUNNING" = "0"
+		then
+			doPC show $2 ; /bin/echo $ret
+		else
+			/bin/echo "not running"
+		fi
+	;;
+
+	*)
+		/bin/echo "Usage: $0 { start | stop | force-reload | restart | status | dump | show | mrtg | cricket | monitor }"
+		exit 1
+	;;
+esac
+exit 0

Added: csw/mgar/pkg/powerdns/trunk/gar
===================================================================
--- csw/mgar/pkg/powerdns/trunk/gar	                        (rev 0)
+++ csw/mgar/pkg/powerdns/trunk/gar	2010-07-29 13:33:46 UTC (rev 10659)
@@ -0,0 +1 @@
+link /home/ihsan/mgar/gar/v2
\ No newline at end of file


Property changes on: csw/mgar/pkg/powerdns/trunk/gar
___________________________________________________________________
Added: svn:special
   + *


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From idogan23 at users.sourceforge.net  Thu Jul 29 15:38:57 2010
From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net)
Date: Thu, 29 Jul 2010 13:38:57 +0000
Subject: [csw-devel] SF.net SVN: gar:[10660] csw/mgar/pkg/powerdns/trunk
Message-ID: <E1OeTK5-0003rL-4t@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 10660
          http://gar.svn.sourceforge.net/gar/?rev=10660&view=rev
Author:   idogan23
Date:     2010-07-29 13:38:56 +0000 (Thu, 29 Jul 2010)

Log Message:
-----------
gar 2 ....

Removed Paths:
-------------
    csw/mgar/pkg/powerdns/trunk/gar

Property Changed:
----------------
    csw/mgar/pkg/powerdns/trunk/


Property changes on: csw/mgar/pkg/powerdns/trunk
___________________________________________________________________
Added: svn:externals
   + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2


Deleted: csw/mgar/pkg/powerdns/trunk/gar
===================================================================
--- csw/mgar/pkg/powerdns/trunk/gar	2010-07-29 13:33:46 UTC (rev 10659)
+++ csw/mgar/pkg/powerdns/trunk/gar	2010-07-29 13:38:56 UTC (rev 10660)
@@ -1 +0,0 @@
-link /home/ihsan/mgar/gar/v2
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From dmichelsen at users.sourceforge.net  Thu Jul 29 15:46:49 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 29 Jul 2010 13:46:49 +0000
Subject: [csw-devel] SF.net SVN: gar:[10661] csw/mgar/pkg/rbgems
Message-ID: <E1OeTRh-00043c-LV@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 10661
          http://gar.svn.sourceforge.net/gar/?rev=10661&view=rev
Author:   dmichelsen
Date:     2010-07-29 13:46:49 +0000 (Thu, 29 Jul 2010)

Log Message:
-----------
rbgems/json_pure: Initial commit

Added Paths:
-----------
    csw/mgar/pkg/rbgems/json_pure/
    csw/mgar/pkg/rbgems/json_pure/branches/
    csw/mgar/pkg/rbgems/json_pure/tags/
    csw/mgar/pkg/rbgems/json_pure/trunk/
    csw/mgar/pkg/rbgems/json_pure/trunk/Makefile
    csw/mgar/pkg/rbgems/json_pure/trunk/checksums
    csw/mgar/pkg/rbgems/json_pure/trunk/files/


Property changes on: csw/mgar/pkg/rbgems/json_pure/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/rbgems/json_pure/trunk/Makefile
===================================================================
--- csw/mgar/pkg/rbgems/json_pure/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/rbgems/json_pure/trunk/Makefile	2010-07-29 13:46:49 UTC (rev 10661)
@@ -0,0 +1,17 @@
+GARNAME = json_pure
+GARVERSION = 1.4.3
+CATEGORIES = rbgems
+
+DESCRIPTION = This is a JSON implementation in pure Ruby
+define BLURB
+  This is a JSON implementation in pure Ruby.
+endef
+
+PACKAGES = CSWgem-jsonpure
+CATALOGNAME = gem_jsonpure
+
+LICENSE = GPL
+
+ARCHALL = 1
+
+include gar/category.mk

Added: csw/mgar/pkg/rbgems/json_pure/trunk/checksums
===================================================================
--- csw/mgar/pkg/rbgems/json_pure/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/rbgems/json_pure/trunk/checksums	2010-07-29 13:46:49 UTC (rev 10661)
@@ -0,0 +1 @@
+39377483ce9e2d3a64dc4e22531fe841  json_pure-1.4.3.gem


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From idogan23 at users.sourceforge.net  Thu Jul 29 15:49:28 2010
From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net)
Date: Thu, 29 Jul 2010 13:49:28 +0000
Subject: [csw-devel] SF.net SVN: gar:[10662] csw/mgar/pkg/powerdns/oracle/
Message-ID: <E1OeTUG-000490-Qi@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 10662
          http://gar.svn.sourceforge.net/gar/?rev=10662&view=rev
Author:   idogan23
Date:     2010-07-29 13:49:28 +0000 (Thu, 29 Jul 2010)

Log Message:
-----------
powerdns: created oracle branch

Added Paths:
-----------
    csw/mgar/pkg/powerdns/oracle/


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 Jul 29 15:57:53 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 29 Jul 2010 13:57:53 +0000
Subject: [csw-devel] SF.net SVN: gar:[10663] csw/mgar/pkg/rbgems
Message-ID: <E1OeTcP-0004LN-Tc@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 10663
          http://gar.svn.sourceforge.net/gar/?rev=10663&view=rev
Author:   dmichelsen
Date:     2010-07-29 13:57:53 +0000 (Thu, 29 Jul 2010)

Log Message:
-----------
rbgems/rubyforge: Initial commit

Added Paths:
-----------
    csw/mgar/pkg/rbgems/rubyforge/
    csw/mgar/pkg/rbgems/rubyforge/branches/
    csw/mgar/pkg/rbgems/rubyforge/tags/
    csw/mgar/pkg/rbgems/rubyforge/trunk/
    csw/mgar/pkg/rbgems/rubyforge/trunk/Makefile
    csw/mgar/pkg/rbgems/rubyforge/trunk/checksums
    csw/mgar/pkg/rbgems/rubyforge/trunk/files/


Property changes on: csw/mgar/pkg/rbgems/rubyforge/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/rbgems/rubyforge/trunk/Makefile
===================================================================
--- csw/mgar/pkg/rbgems/rubyforge/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/rbgems/rubyforge/trunk/Makefile	2010-07-29 13:57:53 UTC (rev 10663)
@@ -0,0 +1,19 @@
+GARNAME = rubyforge
+GARVERSION = 2.0.4
+CATEGORIES = rbgems
+
+DESCRIPTION = A script which automates a limited set of rubyforge operations
+define BLURB
+  A script which automates a limited set of rubyforge operations. * Run 'rubyforge help' for complete usage. * Setup: For first time users AND upgrades to 0.4.0: * rubyforge setup (deletes your username and password, so run sparingly!) * edit ~/.rubyforge/user-config.yml * rubyforge config * For all rubyforge upgrades, run 'rubyforge config' to ensure you have latest.
+endef
+
+PACKAGES = CSWgem-rubyforge
+CATALOGNAME = gem_rubyforge
+
+LICENSE = README.txt
+
+GEM_DEPS = CSWgem-jsonpure
+
+ARCHALL = 1
+
+include gar/category.mk

Added: csw/mgar/pkg/rbgems/rubyforge/trunk/checksums
===================================================================
--- csw/mgar/pkg/rbgems/rubyforge/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/rbgems/rubyforge/trunk/checksums	2010-07-29 13:57:53 UTC (rev 10663)
@@ -0,0 +1 @@
+c1793a26ba6cbe3dfdf6d9fa242f2428  rubyforge-2.0.4.gem


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From idogan23 at users.sourceforge.net  Thu Jul 29 16:00:47 2010
From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net)
Date: Thu, 29 Jul 2010 14:00:47 +0000
Subject: [csw-devel] SF.net SVN: gar:[10664] csw/mgar/pkg/powerdns/oracle/
Message-ID: <E1OeTfD-0004QX-Qt@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 10664
          http://gar.svn.sourceforge.net/gar/?rev=10664&view=rev
Author:   idogan23
Date:     2010-07-29 14:00:47 +0000 (Thu, 29 Jul 2010)

Log Message:
-----------
fixing the mistake of the previous commit

Removed Paths:
-------------
    csw/mgar/pkg/powerdns/oracle/


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 Jul 29 16:13:09 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 29 Jul 2010 14:13:09 +0000
Subject: [csw-devel] SF.net SVN: gar:[10665] csw/mgar/pkg/rbgems
Message-ID: <E1OeTrB-0007s8-7D@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10665
          http://gar.svn.sourceforge.net/gar/?rev=10665&view=rev
Author:   dmichelsen
Date:     2010-07-29 14:13:08 +0000 (Thu, 29 Jul 2010)

Log Message:
-----------
rbgems/hoe: Initial commit

Added Paths:
-----------
    csw/mgar/pkg/rbgems/hoe/
    csw/mgar/pkg/rbgems/hoe/branches/
    csw/mgar/pkg/rbgems/hoe/tags/
    csw/mgar/pkg/rbgems/hoe/trunk/
    csw/mgar/pkg/rbgems/hoe/trunk/Makefile
    csw/mgar/pkg/rbgems/hoe/trunk/checksums
    csw/mgar/pkg/rbgems/hoe/trunk/files/
    csw/mgar/pkg/rbgems/hoe/trunk/files/COPYING


Property changes on: csw/mgar/pkg/rbgems/hoe/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/rbgems/hoe/trunk/Makefile
===================================================================
--- csw/mgar/pkg/rbgems/hoe/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/rbgems/hoe/trunk/Makefile	2010-07-29 14:13:08 UTC (rev 10665)
@@ -0,0 +1,19 @@
+GARNAME = hoe
+GARVERSION = 2.6.1
+CATEGORIES = rbgems
+
+DESCRIPTION = A rake/rubygems helper for project Rakefiles
+define BLURB
+  Hoe is a rake/rubygems helper for project Rakefiles. It helps you manage and maintain, and release your project and includes a dynamic plug-in system allowing for easy extensibility. Hoe ships with plug-ins for all your usual project tasks including rdoc generation, testing, packaging, and deployment. See class rdoc for help. Hint: `ri Hoe` or any of the plugins listed below. For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf
+endef
+
+DISTFILES = COPYING
+
+PACKAGES = CSWgem-hoe
+CATALOGNAME = gem_hoe
+
+LICENSE = COPYING
+
+ARCHALL = 1
+
+include gar/category.mk

Added: csw/mgar/pkg/rbgems/hoe/trunk/checksums
===================================================================
--- csw/mgar/pkg/rbgems/hoe/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/rbgems/hoe/trunk/checksums	2010-07-29 14:13:08 UTC (rev 10665)
@@ -0,0 +1,2 @@
+a9a8782b097873b779e4631de8c14175  COPYING
+658cea3f4151ab493fb6a2063cdf470d  hoe-2.6.1.gem

Added: csw/mgar/pkg/rbgems/hoe/trunk/files/COPYING
===================================================================
--- csw/mgar/pkg/rbgems/hoe/trunk/files/COPYING	                        (rev 0)
+++ csw/mgar/pkg/rbgems/hoe/trunk/files/COPYING	2010-07-29 14:13:08 UTC (rev 10665)
@@ -0,0 +1,25 @@
+== LICENSE:
+
+(The MIT License)
+
+Copyright (c) Ryan Davis, Seattle.rb
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+


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 Jul 29 16:26:59 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 29 Jul 2010 14:26:59 +0000
Subject: [csw-devel] SF.net SVN: gar:[10666]
	csw/mgar/pkg/rbgems/sqlite3-ruby/trunk/Makefile
Message-ID: <E1OeU4Z-00056E-Pk@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 10666
          http://gar.svn.sourceforge.net/gar/?rev=10666&view=rev
Author:   dmichelsen
Date:     2010-07-29 14:26:59 +0000 (Thu, 29 Jul 2010)

Log Message:
-----------
rbgems/sqlite3-ruby: Add re-gemming

Modified Paths:
--------------
    csw/mgar/pkg/rbgems/sqlite3-ruby/trunk/Makefile

Modified: csw/mgar/pkg/rbgems/sqlite3-ruby/trunk/Makefile
===================================================================
--- csw/mgar/pkg/rbgems/sqlite3-ruby/trunk/Makefile	2010-07-29 14:13:08 UTC (rev 10665)
+++ csw/mgar/pkg/rbgems/sqlite3-ruby/trunk/Makefile	2010-07-29 14:26:59 UTC (rev 10666)
@@ -12,7 +12,7 @@
 PACKAGES = CSWgem-sqlite3ruby
 CATALOGNAME = gem_sqlite3ruby
 
-BUILD_DEP_PKGS = CSWsqlite3devel
+BUILD_DEP_PKGS = CSWsqlite3devel CSWgem-hoe
 RUNTIME_DEP_PKGS = CSWsqlite3rt
 
 LICENSE = LICENSE
@@ -32,7 +32,13 @@
 	@$(MAKECOOKIE)
 
 install-ruby-setup:
-	cd $(WORKSRC) && ruby setup.rb install \
-		--prefix=$(DESTDIR)
+	#cd $(WORKSRC) && ruby setup.rb install --prefix=$(DESTDIR)
+	cd $(WORKSRC) && rake gem && \
+        gem install \
+		--ignore-dependencies \
+		--local \
+		--no-test \
+		--install-dir $(DESTDIR)$(GEMDIR) \
+		pkg/$(GEMFILE)
 	@$(MAKECOOKIE)
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From dmichelsen at users.sourceforge.net  Thu Jul 29 16:32:28 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 29 Jul 2010 14:32:28 +0000
Subject: [csw-devel] SF.net SVN: gar:[10667] csw/mgar/pkg/rbgems
Message-ID: <E1OeU9s-0005FK-CU@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 10667
          http://gar.svn.sourceforge.net/gar/?rev=10667&view=rev
Author:   dmichelsen
Date:     2010-07-29 14:32:28 +0000 (Thu, 29 Jul 2010)

Log Message:
-----------
rbgems/rdoc-data: Initial commit

Added Paths:
-----------
    csw/mgar/pkg/rbgems/rdoc-data/
    csw/mgar/pkg/rbgems/rdoc-data/branches/
    csw/mgar/pkg/rbgems/rdoc-data/tags/
    csw/mgar/pkg/rbgems/rdoc-data/trunk/
    csw/mgar/pkg/rbgems/rdoc-data/trunk/Makefile
    csw/mgar/pkg/rbgems/rdoc-data/trunk/checksums
    csw/mgar/pkg/rbgems/rdoc-data/trunk/files/


Property changes on: csw/mgar/pkg/rbgems/rdoc-data/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/rbgems/rdoc-data/trunk/Makefile
===================================================================
--- csw/mgar/pkg/rbgems/rdoc-data/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/rbgems/rdoc-data/trunk/Makefile	2010-07-29 14:32:28 UTC (rev 10667)
@@ -0,0 +1,30 @@
+GARNAME = rdoc-data
+GARVERSION = 2.5.3
+CATEGORIES = rbgems
+
+DESCRIPTION = Core ri data for use with RDoc
+define BLURB
+  Core ri data for use with RDoc 2.5 Includes data for 1.8.6, 1.8.7, 1.9.1
+endef
+
+PACKAGES = CSWgem-rdocdata
+CATALOGNAME = gem_rdocdata
+
+LICENSE = README.txt
+
+ARCHALL = 1
+
+include gar/category.mk
+
+
+post-install-modulated:
+	cd $(DESTDIR); find . -type d -name "* *" | \
+	while read F; do \
+		N=`echo $$F | tr ' =' '_-'`; \
+		mv "$$F" $$N; \
+	done;
+	cd $(DESTDIR); find . -type f -name "* *" | \
+	while read F; do \
+		N=`echo $$F | tr ' =' '_-'`; \
+		mv "$$F" $$N; \
+	done;

Added: csw/mgar/pkg/rbgems/rdoc-data/trunk/checksums
===================================================================
--- csw/mgar/pkg/rbgems/rdoc-data/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/rbgems/rdoc-data/trunk/checksums	2010-07-29 14:32:28 UTC (rev 10667)
@@ -0,0 +1 @@
+cb2fac574957315da9459c72fb6ce251  rdoc-data-2.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  Thu Jul 29 17:27:54 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 29 Jul 2010 15:27:54 +0000
Subject: [csw-devel] SF.net SVN: gar:[10668] csw/mgar/pkg/rbgems
Message-ID: <E1OeV1W-0008LP-UU@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 10668
          http://gar.svn.sourceforge.net/gar/?rev=10668&view=rev
Author:   dmichelsen
Date:     2010-07-29 15:27:54 +0000 (Thu, 29 Jul 2010)

Log Message:
-----------
rbgems/enumerated_attribute: Initial commit

Added Paths:
-----------
    csw/mgar/pkg/rbgems/enumerated_attribute/
    csw/mgar/pkg/rbgems/enumerated_attribute/branches/
    csw/mgar/pkg/rbgems/enumerated_attribute/tags/
    csw/mgar/pkg/rbgems/enumerated_attribute/trunk/
    csw/mgar/pkg/rbgems/enumerated_attribute/trunk/Makefile
    csw/mgar/pkg/rbgems/enumerated_attribute/trunk/checksums
    csw/mgar/pkg/rbgems/enumerated_attribute/trunk/files/


Property changes on: csw/mgar/pkg/rbgems/enumerated_attribute/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/rbgems/enumerated_attribute/trunk/Makefile
===================================================================
--- csw/mgar/pkg/rbgems/enumerated_attribute/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/rbgems/enumerated_attribute/trunk/Makefile	2010-07-29 15:27:54 UTC (rev 10668)
@@ -0,0 +1,19 @@
+GARNAME = enumerated_attribute
+GARVERSION = 0.2.13
+CATEGORIES = rbgems
+
+DESCRIPTION = Enumerated model attributes and view helpers
+define BLURB
+  Enumerated model attributes and view helpers.
+endef
+
+PACKAGES = CSWgem-enumattr
+CATALOGNAME = gem_enumattr
+
+LICENSE = LICENSE
+
+GEM_DEPS = CSWgem-metaprogr
+
+ARCHALL = 1
+
+include gar/category.mk

Added: csw/mgar/pkg/rbgems/enumerated_attribute/trunk/checksums
===================================================================
--- csw/mgar/pkg/rbgems/enumerated_attribute/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/rbgems/enumerated_attribute/trunk/checksums	2010-07-29 15:27:54 UTC (rev 10668)
@@ -0,0 +1 @@
+7ebbd5693ef98fb3bbe764accd82233a  enumerated_attribute-0.2.13.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 Jul 29 18:12:34 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 29 Jul 2010 16:12:34 +0000
Subject: [csw-devel] SF.net SVN: gar:[10669] csw/mgar/pkg/rbgems
Message-ID: <E1OeVik-00043m-PX@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 10669
          http://gar.svn.sourceforge.net/gar/?rev=10669&view=rev
Author:   dmichelsen
Date:     2010-07-29 16:12:34 +0000 (Thu, 29 Jul 2010)

Log Message:
-----------
rbgems/pg: Initial commit

Modified Paths:
--------------
    csw/mgar/pkg/rbgems/pg/trunk/Makefile
    csw/mgar/pkg/rbgems/pg/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/rbgems/pg/
    csw/mgar/pkg/rbgems/pg/trunk/files/0001-Remove-gcc-specific-Wall.patch
    csw/mgar/pkg/rbgems/pg/trunk/files/0002-Add-DESTDIR-support.patch

Removed Paths:
-------------
    csw/mgar/pkg/rbgems/pg/trunk/files/0001-Remove-gcc-specific-flags.patch

Modified: csw/mgar/pkg/rbgems/pg/trunk/Makefile
===================================================================
--- csw/mgar/pkg/rbgems/sqlite3-ruby/trunk/Makefile	2010-07-28 13:16:16 UTC (rev 10634)
+++ csw/mgar/pkg/rbgems/pg/trunk/Makefile	2010-07-29 16:12:34 UTC (rev 10669)
@@ -1,24 +1,29 @@
-GARNAME = sqlite3-ruby
-GARVERSION = 1.3.1
+GARNAME = pg
+GARVERSION = 0.9.0
 CATEGORIES = rbgems
 
-DESCRIPTION = Ruby interface to SQLite3
+DESCRIPTION = Access a PostgreSQL database from Ruby
 define BLURB
-  This module allows Ruby programs to interface with the SQLite3 database engine (http://www.sqlite.org). You must have the SQLite engine installed in order to build this module. Note that this module is NOT compatible with SQLite 2.x.
+  This is the extension library to access a PostgreSQL database from Ruby. This library works with PostgreSQL 7.4 and later.
 endef
 
-PATCHFILES = 0001-Remove-gcc-specific-flags.patch
+PATCHFILES  = 0001-Remove-gcc-specific-Wall.patch
+PATCHFILES += 0002-Add-DESTDIR-support.patch
 
-PACKAGES = CSWgem-sqlite3ruby
-CATALOGNAME = gem_sqlite3ruby
+PACKAGES = CSWgem-pg
+CATALOGNAME = gem_pg
 
-BUILD_DEP_PKGS = CSWsqlite3devel
-RUNTIME_DEP_PKGS = CSWsqlite3rt
+BUILD_DEP_PKGS = CSWpostgresql CSWgem-rakecompiler
+RUNTIME_DEP_PKGS = CSWlibpq
 
 LICENSE = LICENSE
 
-CONFIGURE_SCRIPTS = ruby-setup
-BUILD_SCRIPTS = ruby-setup
+# This must go into the runpath
+NOISALIST = 1
+EXTRA_LIB = /opt/csw/postgresql/lib
+
+#CONFIGURE_SCRIPTS = ruby-setup
+#BUILD_SCRIPTS = ruby-setup
 INSTALL_SCRIPTS = ruby-setup
 
 include gar/category.mk
@@ -31,8 +36,19 @@
 	cd $(WORKSRC) && ruby setup.rb setup
 	@$(MAKECOOKIE)
 
+install-ruby-setup: GEM_BUILD_FLAGS=--with-pg-config=/opt/csw/postgresql/bin/pg_config32
 install-ruby-setup:
-	cd $(WORKSRC) && ruby setup.rb install \
-		--prefix=$(DESTDIR)
+	# cd $(WORKSRC) && ruby setup.rb install \
+	#	--prefix=$(DESTDIR)
+	cd $(WORKSRC) && rake gem
+	#cd $(WORKSRC) && DESTDIR=$(DESTDIR) rake install -- --with-pg-config=/opt/csw/postgresql/bin/pg_config32
+	LD_OPTIONS="$(LD_OPTIONS)" gem install \
+		--ignore-dependencies \
+		--local \
+		--no-test \
+		--install-dir $(DESTDIR)$(GEMDIR) \
+		$(EXTRA_GEM_INSTALL_ARGS) \
+		$(WORKSRC)/pkg/$(GEMFILE) \
+		$(if $(GEM_BUILD_FLAGS),-- --build-flags $(GEM_BUILD_FLAGS))
 	@$(MAKECOOKIE)
 

Modified: csw/mgar/pkg/rbgems/pg/trunk/checksums
===================================================================
--- csw/mgar/pkg/rbgems/sqlite3-ruby/trunk/checksums	2010-07-28 13:16:16 UTC (rev 10634)
+++ csw/mgar/pkg/rbgems/pg/trunk/checksums	2010-07-29 16:12:34 UTC (rev 10669)
@@ -1,2 +1,3 @@
-ac9fdaa9cac52ac85f9010dc23000edd  0001-Remove-gcc-specific-flags.patch
-4b79bb5feeb652a522f6fe5071a84ff9  sqlite3-ruby-1.3.1.gem
+ecef2abc5d9e924913fa7ef6c434e46b  0001-Remove-gcc-specific-Wall.patch
+7e0928edce56bfe7ec4e3b17157e0004  0002-Add-DESTDIR-support.patch
+fa129ab6d009cf32502cfda2bf1614b5  pg-0.9.0.gem

Added: csw/mgar/pkg/rbgems/pg/trunk/files/0001-Remove-gcc-specific-Wall.patch
===================================================================
--- csw/mgar/pkg/rbgems/pg/trunk/files/0001-Remove-gcc-specific-Wall.patch	                        (rev 0)
+++ csw/mgar/pkg/rbgems/pg/trunk/files/0001-Remove-gcc-specific-Wall.patch	2010-07-29 16:12:34 UTC (rev 10669)
@@ -0,0 +1,25 @@
+From 078997843bef14704571421c3b7c0c2d62ca62d4 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Thu, 29 Jul 2010 17:55:35 +0200
+Subject: [PATCH] Remove gcc specific Wall
+
+---
+ ext/extconf.rb |    2 --
+ 1 files changed, 0 insertions(+), 2 deletions(-)
+
+diff --git a/ext/extconf.rb b/ext/extconf.rb
+index 40a4be4..eed6f93 100644
+--- a/ext/extconf.rb
++++ b/ext/extconf.rb
+@@ -119,8 +119,6 @@ have_func 'PQsetClientEncoding'
+ # unistd.h confilicts with ruby/win32.h when cross compiling for win32 and ruby 1.9.1
+ have_header 'unistd.h' unless enable_config("static-build")
+ 
+-$CFLAGS << ' -Wall'
+-
+ create_header()
+ create_makefile( "pg_ext" )
+ 
+-- 
+1.7.1
+

Deleted: csw/mgar/pkg/rbgems/pg/trunk/files/0001-Remove-gcc-specific-flags.patch
===================================================================
--- csw/mgar/pkg/rbgems/sqlite3-ruby/trunk/files/0001-Remove-gcc-specific-flags.patch	2010-07-28 13:16:16 UTC (rev 10634)
+++ csw/mgar/pkg/rbgems/pg/trunk/files/0001-Remove-gcc-specific-flags.patch	2010-07-29 16:12:34 UTC (rev 10669)
@@ -1,32 +0,0 @@
-From be44bd9b7a143ec7fd737c1d67fdee19a2c17592 Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Wed, 28 Jul 2010 14:40:01 +0200
-Subject: [PATCH] Remove gcc specific flags
-
----
- ext/sqlite3/extconf.rb |    5 ++---
- 1 files changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/ext/sqlite3/extconf.rb b/ext/sqlite3/extconf.rb
-index 5898927..88bfc6c 100644
---- a/ext/sqlite3/extconf.rb
-+++ b/ext/sqlite3/extconf.rb
-@@ -6,13 +6,12 @@ require 'mkmf'
- 
- RbConfig::MAKEFILE_CONFIG['CC'] = ENV['CC'] if ENV['CC']
- 
--sqlite = dir_config('sqlite3', ['/usr/local', '/opt/local', '/usr'])
-+sqlite = dir_config('sqlite3', ['/opt/csw'])
- 
- if RUBY_PLATFORM =~ /mswin/
-   $CFLAGS << ' -W3'
- else
--  $CFLAGS << ' -O3 -Wall -Wcast-qual -Wwrite-strings -Wconversion' <<
--             ' -Wmissing-noreturn -Winline'
-+  $CFLAGS << ''
- end
- 
- def asplode missing
--- 
-1.7.1
-

Added: csw/mgar/pkg/rbgems/pg/trunk/files/0002-Add-DESTDIR-support.patch
===================================================================
--- csw/mgar/pkg/rbgems/pg/trunk/files/0002-Add-DESTDIR-support.patch	                        (rev 0)
+++ csw/mgar/pkg/rbgems/pg/trunk/files/0002-Add-DESTDIR-support.patch	2010-07-29 16:12:34 UTC (rev 10669)
@@ -0,0 +1,25 @@
+From a0e0003f3d81635f4f57427d60caa5bff2286f80 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Thu, 29 Jul 2010 15:29:29 +0200
+Subject: [PATCH] Add DESTDIR support
+
+---
+ rake/packaging.rb |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/rake/packaging.rb b/rake/packaging.rb
+index da8354d..5801946 100644
+--- a/rake/packaging.rb
++++ b/rake/packaging.rb
+@@ -43,7 +43,7 @@ task :install => "spec:quiet" do
+ 	Dir.chdir( LIBDIR ) do
+ 		LIB_FILES.collect {|path| Pathname(path) }.each do |libfile|
+ 			relpath = libfile.relative_path_from( LIBDIR )
+-			target = sitelib + relpath
++			target = Pathname.new( ENV['DESTDIR'] + sitelib + relpath )
+ 			FileUtils.mkpath target.dirname,
+ 				:mode => 0755, :verbose => true, :noop => $dryrun unless target.dirname.directory?
+ 			FileUtils.install relpath, target,
+-- 
+1.7.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  Thu Jul 29 18:27:39 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 29 Jul 2010 16:27:39 +0000
Subject: [csw-devel] SF.net SVN: gar:[10670]
	csw/mgar/pkg/rbgems/pg/trunk/Makefile
Message-ID: <E1OeVxL-0004KD-CS@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 10670
          http://gar.svn.sourceforge.net/gar/?rev=10670&view=rev
Author:   dmichelsen
Date:     2010-07-29 16:27:39 +0000 (Thu, 29 Jul 2010)

Log Message:
-----------
rbgems/pg: Use arch-specific pgconfig (what a crappy postgres package)

Modified Paths:
--------------
    csw/mgar/pkg/rbgems/pg/trunk/Makefile

Modified: csw/mgar/pkg/rbgems/pg/trunk/Makefile
===================================================================
--- csw/mgar/pkg/rbgems/pg/trunk/Makefile	2010-07-29 16:12:34 UTC (rev 10669)
+++ csw/mgar/pkg/rbgems/pg/trunk/Makefile	2010-07-29 16:27:39 UTC (rev 10670)
@@ -13,7 +13,7 @@
 PACKAGES = CSWgem-pg
 CATALOGNAME = gem_pg
 
-BUILD_DEP_PKGS = CSWpostgresql CSWgem-rakecompiler
+BUILD_DEP_PKGS = CSWpostgresql CSWgem-rakecompiler CSWgem-rdoc
 RUNTIME_DEP_PKGS = CSWlibpq
 
 LICENSE = LICENSE
@@ -36,7 +36,10 @@
 	cd $(WORKSRC) && ruby setup.rb setup
 	@$(MAKECOOKIE)
 
-install-ruby-setup: GEM_BUILD_FLAGS=--with-pg-config=/opt/csw/postgresql/bin/pg_config32
+PGCONFIG-sparc = pg_config32
+PGCONFIG-i386 = pg_config
+
+install-ruby-setup: GEM_BUILD_FLAGS=--with-pg-config=/opt/csw/postgresql/bin/$(PGCONFIG-$(GARCH))
 install-ruby-setup:
 	# cd $(WORKSRC) && ruby setup.rb install \
 	#	--prefix=$(DESTDIR)


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 Jul 29 18:35:11 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 29 Jul 2010 16:35:11 +0000
Subject: [csw-devel] SF.net SVN: gar:[10671] csw/mgar/pkg/rbgems
Message-ID: <E1OeW4d-0004SS-OI@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 10671
          http://gar.svn.sourceforge.net/gar/?rev=10671&view=rev
Author:   dmichelsen
Date:     2010-07-29 16:35:11 +0000 (Thu, 29 Jul 2010)

Log Message:
-----------
rbgems/cgi_multipart_eof_fix: Initial commit

Added Paths:
-----------
    csw/mgar/pkg/rbgems/cgi_multipart_eof_fix/
    csw/mgar/pkg/rbgems/cgi_multipart_eof_fix/branches/
    csw/mgar/pkg/rbgems/cgi_multipart_eof_fix/tags/
    csw/mgar/pkg/rbgems/cgi_multipart_eof_fix/trunk/
    csw/mgar/pkg/rbgems/cgi_multipart_eof_fix/trunk/Makefile
    csw/mgar/pkg/rbgems/cgi_multipart_eof_fix/trunk/checksums
    csw/mgar/pkg/rbgems/cgi_multipart_eof_fix/trunk/files/


Property changes on: csw/mgar/pkg/rbgems/cgi_multipart_eof_fix/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/rbgems/cgi_multipart_eof_fix/trunk/Makefile
===================================================================
--- csw/mgar/pkg/rbgems/cgi_multipart_eof_fix/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/rbgems/cgi_multipart_eof_fix/trunk/Makefile	2010-07-29 16:35:11 UTC (rev 10671)
@@ -0,0 +1,17 @@
+GARNAME = cgi_multipart_eof_fix
+GARVERSION = 2.5.0
+CATEGORIES = rbgems
+
+DESCRIPTION = Fix an exploitable bug in CGI multipart parsing
+define BLURB
+  Fix an exploitable bug in CGI multipart parsing.
+endef
+
+PACKAGES = CSWgem-cgimultipfix
+CATALOGNAME = gem_cgimultipfix
+
+LICENSE = LICENSE
+
+ARCHALL = 1
+
+include gar/category.mk

Added: csw/mgar/pkg/rbgems/cgi_multipart_eof_fix/trunk/checksums
===================================================================
--- csw/mgar/pkg/rbgems/cgi_multipart_eof_fix/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/rbgems/cgi_multipart_eof_fix/trunk/checksums	2010-07-29 16:35:11 UTC (rev 10671)
@@ -0,0 +1 @@
+4f8d588e53755d5c86b0b61187e6d996  cgi_multipart_eof_fix-2.5.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  Thu Jul 29 18:35:33 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 29 Jul 2010 16:35:33 +0000
Subject: [csw-devel] SF.net SVN: gar:[10672] csw/mgar/pkg/rbgems
Message-ID: <E1OeW4z-0004Sn-0B@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 10672
          http://gar.svn.sourceforge.net/gar/?rev=10672&view=rev
Author:   dmichelsen
Date:     2010-07-29 16:35:32 +0000 (Thu, 29 Jul 2010)

Log Message:
-----------
rbgems/gem_plugin: Initial commit

Added Paths:
-----------
    csw/mgar/pkg/rbgems/gem_plugin/
    csw/mgar/pkg/rbgems/gem_plugin/branches/
    csw/mgar/pkg/rbgems/gem_plugin/tags/
    csw/mgar/pkg/rbgems/gem_plugin/trunk/
    csw/mgar/pkg/rbgems/gem_plugin/trunk/Makefile
    csw/mgar/pkg/rbgems/gem_plugin/trunk/checksums
    csw/mgar/pkg/rbgems/gem_plugin/trunk/files/


Property changes on: csw/mgar/pkg/rbgems/gem_plugin/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/rbgems/gem_plugin/trunk/Makefile
===================================================================
--- csw/mgar/pkg/rbgems/gem_plugin/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/rbgems/gem_plugin/trunk/Makefile	2010-07-29 16:35:32 UTC (rev 10672)
@@ -0,0 +1,17 @@
+GARNAME = gem_plugin
+GARVERSION = 0.2.3
+CATEGORIES = rbgems
+
+DESCRIPTION = A plugin system based on rubygems that uses dependencies only
+define BLURB
+  A plugin system based on rubygems that uses dependencies only
+endef
+
+PACKAGES = CSWgem-gemplugin
+CATALOGNAME = gem_gemplugin
+
+LICENSE = LICENSE
+
+ARCHALL = 1
+
+include gar/category.mk

Added: csw/mgar/pkg/rbgems/gem_plugin/trunk/checksums
===================================================================
--- csw/mgar/pkg/rbgems/gem_plugin/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/rbgems/gem_plugin/trunk/checksums	2010-07-29 16:35:32 UTC (rev 10672)
@@ -0,0 +1 @@
+1736ce8ce007058c4703abe2fd209aa5  gem_plugin-0.2.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  Thu Jul 29 18:53:33 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 29 Jul 2010 16:53:33 +0000
Subject: [csw-devel] SF.net SVN: gar:[10673] csw/mgar/pkg/rbgems
Message-ID: <E1OeWMP-0004o6-E0@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 10673
          http://gar.svn.sourceforge.net/gar/?rev=10673&view=rev
Author:   dmichelsen
Date:     2010-07-29 16:53:33 +0000 (Thu, 29 Jul 2010)

Log Message:
-----------
rbgems/mongrel: Initial commit

Added Paths:
-----------
    csw/mgar/pkg/rbgems/mongrel/
    csw/mgar/pkg/rbgems/mongrel/branches/
    csw/mgar/pkg/rbgems/mongrel/tags/
    csw/mgar/pkg/rbgems/mongrel/trunk/
    csw/mgar/pkg/rbgems/mongrel/trunk/Makefile
    csw/mgar/pkg/rbgems/mongrel/trunk/checksums
    csw/mgar/pkg/rbgems/mongrel/trunk/files/


Property changes on: csw/mgar/pkg/rbgems/mongrel/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/rbgems/mongrel/trunk/Makefile
===================================================================
--- csw/mgar/pkg/rbgems/mongrel/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/rbgems/mongrel/trunk/Makefile	2010-07-29 16:53:33 UTC (rev 10673)
@@ -0,0 +1,18 @@
+GARNAME = mongrel
+GARVERSION = 1.1.5
+CATEGORIES = rbgems
+
+DESCRIPTION = A small fast HTTP library and server that runs Rails, Camping, Nitro and Iowa apps
+define BLURB
+  A small fast HTTP library and server that runs Rails, Camping, Nitro and Iowa apps.
+endef
+
+PACKAGES = CSWgem-mongrel
+CATALOGNAME = gem_mongrel
+
+LICENSE = LICENSE
+
+GEM_DEPS = CSWgem-gemplugin CSWgem-daemons CSWgem-fastthread CSWgem-cgimultipfix
+DEP_PKGS = $(GEM_DEPS)
+
+include gar/category.mk

Added: csw/mgar/pkg/rbgems/mongrel/trunk/checksums
===================================================================
--- csw/mgar/pkg/rbgems/mongrel/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/rbgems/mongrel/trunk/checksums	2010-07-29 16:53:33 UTC (rev 10673)
@@ -0,0 +1 @@
+a37617eb48f0932cc32143b2d76c0d12  mongrel-1.1.5.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 Jul 29 19:13:28 2010
From: dmichelsen at users.sourceforge.net (dmichelsen at users.sourceforge.net)
Date: Thu, 29 Jul 2010 17:13:28 +0000
Subject: [csw-devel] SF.net SVN: gar:[10674] csw/mgar/pkg/rbgems
Message-ID: <E1OeWfg-0005BX-6X@sfp-svn-6.v30.ch3.sourceforge.com>

Revision: 10674
          http://gar.svn.sourceforge.net/gar/?rev=10674&view=rev
Author:   dmichelsen
Date:     2010-07-29 17:13:27 +0000 (Thu, 29 Jul 2010)

Log Message:
-----------
rbgems/mongrel_cluster: Initial commit

Added Paths:
-----------
    csw/mgar/pkg/rbgems/mongrel_cluster/
    csw/mgar/pkg/rbgems/mongrel_cluster/branches/
    csw/mgar/pkg/rbgems/mongrel_cluster/tags/
    csw/mgar/pkg/rbgems/mongrel_cluster/trunk/
    csw/mgar/pkg/rbgems/mongrel_cluster/trunk/Makefile
    csw/mgar/pkg/rbgems/mongrel_cluster/trunk/checksums
    csw/mgar/pkg/rbgems/mongrel_cluster/trunk/files/


Property changes on: csw/mgar/pkg/rbgems/mongrel_cluster/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/rbgems/mongrel_cluster/trunk/Makefile
===================================================================
--- csw/mgar/pkg/rbgems/mongrel_cluster/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/rbgems/mongrel_cluster/trunk/Makefile	2010-07-29 17:13:27 UTC (rev 10674)
@@ -0,0 +1,19 @@
+GARNAME = mongrel_cluster
+GARVERSION = 1.0.5
+CATEGORIES = rbgems
+
+DESCRIPTION = Mongrel plugin for managing multiple Mongrel processes
+define BLURB
+  Mongrel plugin that provides commands and Capistrano tasks for managing multiple Mongrel processes
+endef
+
+PACKAGES = CSWgem-mongrelclust
+CATALOGNAME = gem_mongrelclust
+
+LICENSE = LICENSE
+
+DEP_PKGS = CSWgem-gemplugin CSWgem-mongrel
+
+ARCHALL = 1
+
+include gar/category.mk

Added: csw/mgar/pkg/rbgems/mongrel_cluster/trunk/checksums
===================================================================
--- csw/mgar/pkg/rbgems/mongrel_cluster/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/rbgems/mongrel_cluster/trunk/checksums	2010-07-29 17:13:27 UTC (rev 10674)
@@ -0,0 +1 @@
+7ff77538842c97b363137c471903f7e3  mongrel_cluster-1.0.5.gem


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From skayser at users.sourceforge.net  Fri Jul 30 01:29:40 2010
From: skayser at users.sourceforge.net (skayser at users.sourceforge.net)
Date: Thu, 29 Jul 2010 23:29:40 +0000
Subject: [csw-devel] SF.net SVN: gar:[10675]
	csw/mgar/pkg/nano/trunk/files/changelog.CSW
Message-ID: <E1OecXk-0008Q8-2u@sfp-svn-2.v30.ch3.sourceforge.com>

Revision: 10675
          http://gar.svn.sourceforge.net/gar/?rev=10675&view=rev
Author:   skayser
Date:     2010-07-29 23:29:39 +0000 (Thu, 29 Jul 2010)

Log Message:
-----------
nano: recompile nano with current build setup

Modified Paths:
--------------
    csw/mgar/pkg/nano/trunk/files/changelog.CSW

Modified: csw/mgar/pkg/nano/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/nano/trunk/files/changelog.CSW	2010-07-29 17:13:27 UTC (rev 10674)
+++ csw/mgar/pkg/nano/trunk/files/changelog.CSW	2010-07-29 23:29:39 UTC (rev 10675)
@@ -1,8 +1,8 @@
-nano (2.2.4,REV=2010.05.05)
+nano (2.2.4,REV=2010.07.30)
 
   * Version bump to 2.2.4.
 
- -- Sebastian Kayser <skayser at opencsw.org>  Wed,  5 May 2010 00:59:30 +0200
+ -- Sebastian Kayser <skayser at opencsw.org>  Fri, 30 Jul 2010 01:28:45 +0200
 
 nano (2.0.9,REV=2009.07.05)
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From theferret at users.sourceforge.net  Fri Jul 30 02:03:03 2010
From: theferret at users.sourceforge.net (theferret at users.sourceforge.net)
Date: Fri, 30 Jul 2010 00:03:03 +0000
Subject: [csw-devel] SF.net SVN: gar:[10676] csw/mgar/pkg/gawk/trunk
Message-ID: <E1Oed43-0007oC-Kt@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 10676
          http://gar.svn.sourceforge.net/gar/?rev=10676&view=rev
Author:   theferret
Date:     2010-07-30 00:03:03 +0000 (Fri, 30 Jul 2010)

Log Message:
-----------
updates for recompile

Modified Paths:
--------------
    csw/mgar/pkg/gawk/trunk/Makefile
    csw/mgar/pkg/gawk/trunk/pkginfo

Property Changed:
----------------
    csw/mgar/pkg/gawk/trunk/


Property changes on: csw/mgar/pkg/gawk/trunk
___________________________________________________________________
Added: ignore
   + build


Modified: csw/mgar/pkg/gawk/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gawk/trunk/Makefile	2010-07-29 23:29:39 UTC (rev 10675)
+++ csw/mgar/pkg/gawk/trunk/Makefile	2010-07-30 00:03:03 UTC (rev 10676)
@@ -25,7 +25,7 @@
 # DO NOT specify the arch-64 stuff such as -m64 here.
 # the individual targets will do that.
 
-CFLAGS_COMMON   ?= -mt -xnorunpath -fast
+CFLAGS_COMMON   ?= -mt -xnorunpath -fast -xstrconst
 CXXFLAGS_COMMON ?= -mt -norunpath  -fast
 CFLAGS_sparc    ?= -xarch=v8
 CFLAGS_i386     ?= -xarch=386

Modified: csw/mgar/pkg/gawk/trunk/pkginfo
===================================================================
--- csw/mgar/pkg/gawk/trunk/pkginfo	2010-07-29 23:29:39 UTC (rev 10675)
+++ csw/mgar/pkg/gawk/trunk/pkginfo	2010-07-30 00:03:03 UTC (rev 10676)
@@ -1,6 +1,6 @@
 PKG=CSWgawk
 NAME=gawk - GNU AWK
-VERSION=3.1.8,REV=2010.06.25
+VERSION=3.1.8,REV=YYYY.MM.DD
 ARCH=i386
 CATEGORY=system
 VENDOR=http://ftp.gnu.org/pub/gnu/gawk packaged for CSW by Philip Brown


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From idogan23 at users.sourceforge.net  Fri Jul 30 11:59:38 2010
From: idogan23 at users.sourceforge.net (idogan23 at users.sourceforge.net)
Date: Fri, 30 Jul 2010 09:59:38 +0000
Subject: [csw-devel] SF.net SVN: gar:[10677]
	csw/mgar/pkg/powerdns/trunk/Makefile
Message-ID: <E1OemNO-0002Ls-Ox@sfp-svn-5.v30.ch3.sourceforge.com>

Revision: 10677
          http://gar.svn.sourceforge.net/gar/?rev=10677&view=rev
Author:   idogan23
Date:     2010-07-30 09:59:38 +0000 (Fri, 30 Jul 2010)

Log Message:
-----------
powerdns: removed packaging platfrom solaris 10

Modified Paths:
--------------
    csw/mgar/pkg/powerdns/trunk/Makefile

Modified: csw/mgar/pkg/powerdns/trunk/Makefile
===================================================================
--- csw/mgar/pkg/powerdns/trunk/Makefile	2010-07-30 00:03:03 UTC (rev 10676)
+++ csw/mgar/pkg/powerdns/trunk/Makefile	2010-07-30 09:59:38 UTC (rev 10677)
@@ -27,7 +27,6 @@
 
 GARCOMPILER = GCC3
 PACKAGING_PLATFORMS +=  solaris9-sparc solaris9-i386
-PACKAGING_PLATFORMS +=  solaris10-sparc solaris10-i386
 SKIPTEST = 1
 EXTRA_LD_OPTIONS = -R/opt/csw/mysql5/lib/mysql
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

From skayser at users.sourceforge.net  Fri Jul 30 16:17:01 2010
From: skayser at users.sourceforge.net (skayser at users.sourceforge.net)
Date: Fri, 30 Jul 2010 14:17:01 +0000
Subject: [csw-devel] SF.net SVN: gar:[10678] csw/mgar/pkg/postfix/branches
Message-ID: <E1OeqOT-00067Z-1a@sfp-svn-3.v30.ch3.sourceforge.com>

Revision: 10678
          http://gar.svn.sourceforge.net/gar/?rev=10678&view=rev
Author:   skayser
Date:     2010-07-30 14:17:00 +0000 (Fri, 30 Jul 2010)

Log Message:
-----------
postfix: work towards 2.7

Modified Paths:
--------------
    csw/mgar/pkg/postfix/branches/postfix-2.7/files/cswpostfix

Added Paths:
-----------
    csw/mgar/pkg/postfix/branches/postfix-2.7/
    csw/mgar/pkg/postfix/branches/postfix-2.7/Makefile
    csw/mgar/pkg/postfix/branches/postfix-2.7/checksums
    csw/mgar/pkg/postfix/branches/postfix-2.7/files/README.CSW
    csw/mgar/pkg/postfix/branches/postfix-2.7/files/README.upgradefrom.24
    csw/mgar/pkg/postfix/branches/postfix-2.7/files/changelog.CSW
    csw/mgar/pkg/postfix/branches/postfix-2.7/files/cswusergroup
    csw/mgar/pkg/postfix/branches/postfix-2.7/files/migrate-queuefiles.sh

Removed Paths:
-------------
    csw/mgar/pkg/postfix/branches/postfix-2.7/Makefile
    csw/mgar/pkg/postfix/branches/postfix-2.7/checksums
    csw/mgar/pkg/postfix/branches/postfix-2.7/files/README.CSW
    csw/mgar/pkg/postfix/branches/postfix-2.7/files/README.upgradefrom.24
    csw/mgar/pkg/postfix/branches/postfix-2.7/files/changelog.CSW
    csw/mgar/pkg/postfix/branches/postfix-2.7/files/cswusergroup
    csw/mgar/pkg/postfix/branches/postfix-2.7/files/migrate-queuefiles.sh

Deleted: csw/mgar/pkg/postfix/branches/postfix-2.7/Makefile
===================================================================
--- csw/mgar/pkg/postfix/branches/postfix-2.6/Makefile	2010-04-30 22:45:13 UTC (rev 9798)
+++ csw/mgar/pkg/postfix/branches/postfix-2.7/Makefile	2010-07-30 14:17:00 UTC (rev 10678)
@@ -1,282 +0,0 @@
-# TODO (release-critical prefixed with !, non release-critical with *)
-# ! Build, install and test package (works? spool permissions ok?)
-#   WRT to permissions, run "postfix set-permissions" and compare
-# * Ship simple default configuration
-#
-# NICE TO KNOW
-# - 2.4.6,REV=2008.05.28 preserves modified configuration files via
-#   package-shipped CAS class csw_conf.
-#
-GARNAME = postfix
-GARVERSION = 2.6.5
-CATEGORIES = server
-
-DESCRIPTION = A high-performance mail transport agent
-define BLURB
-  What is Postfix? It is Wietse Venema's mailer that started life as an
-  alternative to the widely-used Sendmail program. 
-  
-  Postfix attempts to be fast, easy to administer, and secure, while at
-  the same time being sendmail compatible enough to not upset existing
-  users. Thus, the outside has a sendmail-ish flavor, but the inside is
-  completely different.
-endef
-
-VENDOR_URL   = http://www.postfix.org
-MASTER_SITES = ftp://ftp.porcupine.org/mirrors/postfix-release/official/
-DISTFILES    = $(GARNAME)-$(GARVERSION).tar.gz
-UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
-LICENSE      = LICENSE TLS_LICENSE
-
-# Tag configuration files for handling via cswclassutils
-CONFIG_BASE  := /etc/opt/csw/postfix/
-CONFIG_FILES := access 
-CONFIG_FILES += aliases
-CONFIG_FILES += canonical
-CONFIG_FILES += generic
-CONFIG_FILES += header_checks
-CONFIG_FILES += main.cf
-CONFIG_FILES += master.cf
-CONFIG_FILES += relocated
-CONFIG_FILES += transport
-CONFIG_FILES += virtual
-SAMPLECONF   := $(addprefix $(CONFIG_BASE), $(CONFIG_FILES))
-
-sysconfdir  = /etc/opt/csw
-INITSMF     = $(sysconfdir)/init.d/csw$(GARNAME)
-USERGROUP   = $(sysconfdir)/pkg/CSW$(GARNAME)/cswusergroup
-
-# For the sake of simplicity and user choice we dropped the automatic
-# replacement of the /usr/{lib,bin} sendmail binaries. Ref.
-# http://article.gmane.org/gmane.os.solaris.opencsw.maintainers/5313
-POSTMSG     = $(DOCDIR)/$(GARNAME)/README.upgradefrom.24
-
-# For file permissions reference and verification purposes, postfix ships
-# /opt/csw/libexec/postfix/postfix-files which contains a list of the
-# desired settings. "postfix check" can be used to verify the permissions,
-# "postfix set-permissions" can be used to adjust them (which shouldn't
-# be necessary from a user standpoint, it's our job to ship the right perms).
-
-# Make postdrop setgid so that it can deliver to $(DEF_QUEUE_DIR)/maildrop
-PROTOTYPE_MODIFIERS = makesgid
-PROTOTYPE_FILES_makesgid = $(sbindir)/post(drop|queue)
-PROTOTYPE_GROUP_makesgid = postdrop
-PROTOTYPE_PERMS_makesgid = 2755
-
-# Make $(DEF_QUEUE_DIR) subdirs accessible/writable to postfix only
-PROTOTYPE_MODIFIERS += spooldir
-PROTOTYPE_FILES_spooldir = $(DEF_QUEUE_DIR)/.*
-PROTOTYPE_USER_spooldir  = postfix
-PROTOTYPE_PERMS_spooldir = 0700
-PROTOTYPE_CLASS_spooldir = ugfiles
-
-# Make $(DEF_QUEUE_DIR)/maildrop accessible by postdrop group
-PROTOTYPE_MODIFIERS += maildrop
-PROTOTYPE_FILES_maildrop = $(DEF_QUEUE_DIR)/maildrop
-PROTOTYPE_GROUP_maildrop = postdrop
-PROTOTYPE_PERMS_maildrop = 0730
-PROTOTYPE_CLASS_maildrop = ugfiles
-
-# Make $(DEF_QUEUE_DIR)/public accessible by postdrop group, likely
-# used for IPC with other processes (public contains sockets).
-PROTOTYPE_MODIFIERS += public
-PROTOTYPE_FILES_public = $(DEF_QUEUE_DIR)/public
-PROTOTYPE_GROUP_public = postdrop
-PROTOTYPE_PERMS_public = 2710
-PROTOTYPE_CLASS_public = ugfiles
-
-# IMPORTANT! Make $(DEF_QUEUE_DIR)/pid accessible by root only
-# http://www.openwall.com/lists/oss-security/2009/09/18/6
-PROTOTYPE_MODIFIERS += pid
-PROTOTYPE_FILES_pid = $(DEF_QUEUE_DIR)/pid
-PROTOTYPE_USER_pid  = root
-PROTOTYPE_GROUP_pid = bin
-PROTOTYPE_PERMS_pid = 0755
-PROTOTYPE_CLASS_pid = ugfiles
-
-EXTRA_MERGE_EXCLUDE_FILES  = /etc/opt/csw/postfix/LICENSE
-EXTRA_MERGE_EXCLUDE_FILES += /etc/opt/csw/postfix/TLS_LICENSE
-EXTRA_MERGE_EXCLUDE_FILES += /etc/opt/csw/postfix/makedefs.out
-
-STRIP_DIRS = $(DESTDIR)$(libexecdir)/postfix
-
-CONFIGURE_SCRIPTS = custom
-TEST_SCRIPTS      =
-INSTALL_SCRIPTS   = custom
-
-# Supporting documentation for building postfix
-# - Postfix Installation From Source Code 
-#   http://www.postfix.org/INSTALL.html
-# - Guidelines for Package Builders
-#   http://www.postfix.org/PACKAGE_README.html
-
-DEF_COMMAND_DIR    = /opt/csw/sbin
-DEF_CONFIG_DIR     = /etc/opt/csw/postfix
-DEF_DAEMON_DIR     = /opt/csw/libexec/postfix
-DEF_MAILQ_PATH     = /opt/csw/bin/mailq
-DEF_HTML_DIR       = /opt/csw/share/doc/postfix/html
-DEF_MANPAGE_DIR    = /opt/csw/share/man
-DEF_NEWALIAS_PATH  = /opt/csw/bin/newaliases
-DEF_QUEUE_DIR      = /var/opt/csw/spool/postfix
-DEF_DATA_DIR       = /var/opt/csw/lib/postfix
-DEF_README_DIR     = /opt/csw/share/doc/postfix/README_FILES
-
-DEFAULTS=\
-	-DDEF_MANPAGE_DIR=\"$(DEF_MANPAGE_DIR)\" \
-	-DDEF_COMMAND_DIR=\"$(DEF_COMMAND_DIR)\" \
-	-DDEF_CONFIG_DIR=\"$(DEF_CONFIG_DIR)\" \
-	-DDEF_DAEMON_DIR=\"$(DEF_DAEMON_DIR)\" \
-	-DDEF_MAILQ_PATH=\"$(DEF_MAILQ_PATH)\" \
-	-DDEF_HTML_DIR=\"$(DEF_HTML_DIR)\" \
-	-DDEF_NEWALIAS_PATH=\"$(DEF_NEWALIAS_PATH)\" \
-	-DDEF_QUEUE_DIR=\"$(DEF_QUEUE_DIR)\" \
-	-DDEF_DATA_DIR=\"$(DEF_DATA_DIR)\" \
-	-DDEF_README_DIR=\"$(DEF_README_DIR)\"
-
-# By setting BUILDTYPE=simple on the command line you can produce a
-# bare-bones postfix package without any dependencies to other CSW pkgs.
-# This is currently for on demand personal use, as Phil insists on the
-# possibility of "pkg-get -i all" and two postfix's would clash.
-# Eventually it might be nice two have a bare-bones postfix in the catalog
-# as not everyone might want to pull in all the extra deps from CSWpostfix.
-ifeq ($(BUILDTYPE),simple)
-PACKAGES = CSW$(GARNAME)-simple
-CATALOGNAME = $(GARNAME)_simple
-else
-# Make sure libraries in the default location can be found
-AUXLIBS = $(LDFLAGS)
-
-# Activate support for PCRE
-# http://www.postfix.org/PCRE_README.html
-FEATURES += -DHAS_PCRE
-AUXLIBS  += -lpcre
-BUILD_DEP_PKGS += CSWpcre
-RUNTIME_DEP_PKGS += CSWpcrert
-
-# Activate support for hash and btree lookup tables
-# http://www.postfix.org/DB_README.html
-FEATURES += -DHAS_DB
-INCLUDES += -I/opt/csw/bdb42/include 
-AUXLIBS  += -L/opt/csw/bdb42/lib -R/opt/csw/bdb42/lib -ldb-4.2
-BUILD_DEP_PKGS += CSWbdb42devel
-RUNTIME_DEP_PKGS += CSWbdb42
-
-# Activate support for SSL/TLS
-# http://www.postfix.org/TLS_README.html
-FEATURES += -DUSE_TLS
-AUXLIBS  += -lssl -lcrypto
-BUILD_DEP_PKGS += CSWossldevel
-RUNTIME_DEP_PKGS += CSWosslrt
-
-# Activate support for Cyrus SASL (dovecot is incl. automatically)
-# http://www.postfix.org/SASL_README.html
-FEATURES += -DUSE_SASL_AUTH -DUSE_CYRUS_SASL
-INCLUDES += -I/opt/csw/include/sasl/
-AUXLIBS  += -lsasl2
-BUILD_DEP_PKGS += CSWsasl
-RUNTIME_DEP_PKGS += CSWsasl
-
-# Activate support for OpenLDAP
-# http://www.postfix.org/LDAP_README.html
-FEATURES += -DHAS_LDAP
-AUXLIBS  += -lldap -llber
-BUILD_DEP_PKGS += CSWoldapdevel
-RUNTIME_DEP_PKGS += CSWoldaprt
-
-# Activate support for MySQL
-# http://www.postfix.org/MYSQL_README.html
-FEATURES += -DHAS_MYSQL
-INCLUDES += -I/opt/csw/mysql5/include/mysql
-AUXLIBS  += -L/opt/csw/mysql5/lib/mysql -R/opt/csw/mysql5/lib/mysql
-AUXLIBS  += -lmysqlclient
-BUILD_DEP_PKGS += CSWmysql5devel
-RUNTIME_DEP_PKGS += CSWmysql5rt
-
-# Activate support for PostgreSQL
-# http://www.postfix.org/PGSQL_README.html
-FEATURES += -DHAS_PGSQL
-INCLUDES += -I/opt/csw/postgresql/include/
-AUXLIBS  += -L/opt/csw/postgresql/lib/ -R/opt/csw/postgresql/lib/
-AUXLIBS  += -lpq
-BUILD_DEP_PKGS += CSWlibpq
-RUNTIME_DEP_PKGS += CSWlibpq
-endif
-
-include gar/category.mk
-
-# Postfix's build system relies on CCARGS, populate it with the defaults from
-# GAR. For the bare-bones build don't leak anything located in */csw/* to the
-# build (we want to rely on as little additional CSW pkgs as possible).
-ifeq ($(BUILDTYPE),simple)
-LD_OPTIONS  =
-CCARGS      = $(CFLAGS)
-CCARGS     += $(filter-out -I/opt/csw/include,$(CPPFLAGS))
-CCARGS     += $(filter-out -I/opt/csw/%,$(INCLUDES))
-CCARGS     += -DNO_PCRE         # on by default, would trigger our pcre-config
-CCARGS     += $(DEFAULTS)
-else
-CCARGS=$(CFLAGS) $(CPPFLAGS) $(INCLUDES) $(FEATURES) $(DEFAULTS)
-endif
-
-# Postfix doesn't use autoconf, but it's own tool called makedefs. It's
-# triggered by "gmake makefiles" in the source root and expects it's options
-# via environment variables CC CCARGS AUXLIBS DEBUG OPT. For us there is no
-# need to use DEBUG and OPT. The relevant flags are (amongst others) contained
-# in GAR's CFLAGS which we already pushed into CCARGS (see above).
-configure-custom:
-	echo $(MAKE) -C $(WORKSRC) makefiles CC=$(CC) CCARGS='$(CCARGS)'
-	$(MAKE) -C $(WORKSRC) makefiles \
-		CC=$(CC) \
-		CCARGS='$(CCARGS)' \
-		AUXLIBS='$(AUXLIBS)' \
-		DEBUG= \
-		OPT=
-	@$(MAKECOOIE)
-
-install-custom:
-	$(MAKE) -C $(WORKSRC) non-interactive-package install_root=$(DESTDIR) \
-		config_directory=$(DEF_CONFIG_DIR) \
-		daemon_directory=$(DEF_DAEMON_DIR) \
-		command_directory=$(DEF_COMMAND_DIR) \
-		queue_directory=$(DEF_QUEUE_DIR) \
-		sendmail_path=$(DEF_COMMAND_DIR)/sendmail \
-		newaliases_path=$(DEF_NEWALIAS_PATH) \
-		mailq_path=$(DEF_MAILQ_PATH) \
-		manpage_directory=$(DEF_MANPAGE_DIR) \
-		setgid_group=postdrop \
-		sample_directory=/opt/csw/share/doc/postfix/samples \
-		readme_directory=$(DEF_README_DIR) \
-		html_directory=$(DEF_HTML_DIR)
-
-	# Files for cswinitsmf and cswusergroup
-	ginstall -Dm 755 $(FILEDIR)/cswpostfix  \
-		$(DESTDIR)/etc/opt/csw/init.d/cswpostfix
-	ginstall -D $(FILEDIR)/cswusergroup \
-		$(DESTDIR)$(sysconfdir)/pkg/CSWpostfix/cswusergroup
-
-    # Helper script for spool location migration (2.4.x -> 2.6.x)
-	ginstall -Dm 755 $(FILEDIR)/migrate-queuefiles.sh \
-		$(DESTDIR)$(docdir)/$(GARNAME)/scripts/migrate-queuefiles.sh
-	@$(MAKECOOKIE)
-
-# Fails. A subsequent manual verify-config run is successfull,
-# seems as if there might be some delay required.
-#post-merge-modulated: verify-config
-
-# Warn if there are any files in $(sysconfdir)/postfix which are not
-# covered by cswsampleconf. This is a safety net in case new config file
-# get introduced by more recent postfix versions. I know this runs for
-# most bloated awkwardness. Feel free to trim it down.
-#verify-config: SHIPPED_CFGFILES  = $(wildcard $(PKGROOT)$(CONFIG_BASE)*)
-#verify-config: SHIPPED_CFGFILES := $(subst $(PKGROOT),,$(SHIPPED_CFGFILES))
-#verify-config: IGNORE_FILES += /etc/opt/csw/postfix/bounce.cf.default
-#verify-config: IGNORE_FILES += /etc/opt/csw/postfix/main.cf.default
-#verify-config: IGNORE_FILES += $(addsuffix .CSW, $(SAMPLECONF))
-#verify-config: SHELL=/bin/bash
-#verify-config:
-#	@echo "Checking for files in $(CONFIG_BASE) not covered by cswsampleconf"
-#	@gdiff \
-#		<( echo $(IGNORE_FILES) | tr " " "\n" | sort) \
-#		<( echo $(SHIPPED_CFGFILES) | tr " " "\n" | sort )
-#	@echo "OK"
-#	@$(MAKECOOKIE)	

Copied: csw/mgar/pkg/postfix/branches/postfix-2.7/Makefile (from rev 8544, csw/mgar/pkg/postfix/branches/postfix-2.6/Makefile)
===================================================================
--- csw/mgar/pkg/postfix/branches/postfix-2.7/Makefile	                        (rev 0)
+++ csw/mgar/pkg/postfix/branches/postfix-2.7/Makefile	2010-07-30 14:17:00 UTC (rev 10678)
@@ -0,0 +1,285 @@
+# TODO (release-critical prefixed with !, non release-critical with *)
+# ! Build, install and test package (works? spool permissions ok?)
+#   WRT to permissions, run "postfix set-permissions" and compare
+# * Ship simple default configuration
+#
+# NICE TO KNOW
+# - 2.4.6,REV=2008.05.28 preserves modified configuration files via
+#   package-shipped CAS class csw_conf.
+#
+GARNAME = postfix
+GARVERSION = 2.7.1
+CATEGORIES = server
+
+DESCRIPTION = A high-performance mail transport agent
+define BLURB
+  What is Postfix? It is Wietse Venema's mailer that started life as an
+  alternative to the widely-used Sendmail program. 
+  
+  Postfix attempts to be fast, easy to administer, and secure, while at
+  the same time being sendmail compatible enough to not upset existing
+  users. Thus, the outside has a sendmail-ish flavor, but the inside is
+  completely different.
+endef
+
+VENDOR_URL   = http://www.postfix.org
+MASTER_SITES = ftp://ftp.porcupine.org/mirrors/postfix-release/official/
+DISTFILES    = $(GARNAME)-$(GARVERSION).tar.gz
+UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
+LICENSE      = LICENSE TLS_LICENSE
+
+# Tag configuration files for handling via cswclassutils
+CONFIG_BASE  := /etc/opt/csw/postfix/
+CONFIG_FILES := access 
+CONFIG_FILES += aliases
+CONFIG_FILES += canonical
+CONFIG_FILES += generic
+CONFIG_FILES += header_checks
+CONFIG_FILES += main.cf
+CONFIG_FILES += master.cf
+CONFIG_FILES += relocated
+CONFIG_FILES += transport
+CONFIG_FILES += virtual
+SAMPLECONF   := $(addprefix $(CONFIG_BASE), $(CONFIG_FILES))
+
+sysconfdir  = /etc/opt/csw
+INITSMF     = $(sysconfdir)/init.d/csw$(GARNAME)
+USERGROUP   = $(sysconfdir)/pkg/CSW$(GARNAME)/cswusergroup
+
+# For the sake of simplicity and user choice we dropped the automatic
+# replacement of the /usr/{lib,bin} sendmail binaries. Ref.
+# http://article.gmane.org/gmane.os.solaris.opencsw.maintainers/5313
+POSTMSG     = $(DOCDIR)/$(GARNAME)/README.upgradefrom.24
+
+# For file permissions reference and verification purposes, postfix ships
+# /opt/csw/libexec/postfix/postfix-files which contains a list of the
+# desired settings. "postfix check" can be used to verify the permissions,
+# "postfix set-permissions" can be used to adjust them (which shouldn't
+# be necessary from a user standpoint, it's our job to ship the right perms).
+
+# Make postdrop setgid so that it can deliver to $(DEF_QUEUE_DIR)/maildrop
+PROTOTYPE_MODIFIERS = makesgid
+PROTOTYPE_FILES_makesgid = $(sbindir)/post(drop|queue)
+PROTOTYPE_GROUP_makesgid = postdrop
+PROTOTYPE_PERMS_makesgid = 2755
+
+# Make $(DEF_QUEUE_DIR) subdirs accessible/writable to postfix only
+PROTOTYPE_MODIFIERS += spooldir
+PROTOTYPE_FILES_spooldir = $(DEF_QUEUE_DIR)/.*
+PROTOTYPE_USER_spooldir  = postfix
+PROTOTYPE_PERMS_spooldir = 0700
+PROTOTYPE_CLASS_spooldir = ugfiles
+
+# Make $(DEF_QUEUE_DIR)/maildrop accessible by postdrop group
+PROTOTYPE_MODIFIERS += maildrop
+PROTOTYPE_FILES_maildrop = $(DEF_QUEUE_DIR)/maildrop
+PROTOTYPE_GROUP_maildrop = postdrop
+PROTOTYPE_PERMS_maildrop = 0730
+PROTOTYPE_CLASS_maildrop = ugfiles
+
+# Make $(DEF_QUEUE_DIR)/public accessible by postdrop group, likely
+# used for IPC with other processes (public contains sockets).
+PROTOTYPE_MODIFIERS += public
+PROTOTYPE_FILES_public = $(DEF_QUEUE_DIR)/public
+PROTOTYPE_GROUP_public = postdrop
+PROTOTYPE_PERMS_public = 2710
+PROTOTYPE_CLASS_public = ugfiles
+
+# IMPORTANT! Make $(DEF_QUEUE_DIR)/pid accessible by root only
+# http://www.openwall.com/lists/oss-security/2009/09/18/6
+PROTOTYPE_MODIFIERS += pid
+PROTOTYPE_FILES_pid = $(DEF_QUEUE_DIR)/pid
+PROTOTYPE_USER_pid  = root
+PROTOTYPE_GROUP_pid = bin
+PROTOTYPE_PERMS_pid = 0755
+PROTOTYPE_CLASS_pid = ugfiles
+
+EXTRA_MERGE_EXCLUDE_FILES  = /etc/opt/csw/postfix/LICENSE
+EXTRA_MERGE_EXCLUDE_FILES += /etc/opt/csw/postfix/TLS_LICENSE
+EXTRA_MERGE_EXCLUDE_FILES += /etc/opt/csw/postfix/makedefs.out
+
+STRIP_DIRS = $(DESTDIR)$(libexecdir)/postfix
+
+CONFIGURE_SCRIPTS = custom
+TEST_SCRIPTS      =
+INSTALL_SCRIPTS   = custom
+
+# Supporting documentation for building postfix
+# - Postfix Installation From Source Code 
+#   http://www.postfix.org/INSTALL.html
+# - Guidelines for Package Builders
+#   http://www.postfix.org/PACKAGE_README.html
+
+DEF_COMMAND_DIR    = /opt/csw/sbin
+DEF_CONFIG_DIR     = /etc/opt/csw/postfix
+DEF_DAEMON_DIR     = /opt/csw/libexec/postfix
+DEF_MAILQ_PATH     = /opt/csw/bin/mailq
+DEF_HTML_DIR       = /opt/csw/share/doc/postfix/html
+DEF_MANPAGE_DIR    = /opt/csw/share/man
+DEF_NEWALIAS_PATH  = /opt/csw/bin/newaliases
+DEF_QUEUE_DIR      = /var/opt/csw/spool/postfix
+DEF_DATA_DIR       = /var/opt/csw/lib/postfix
+DEF_README_DIR     = /opt/csw/share/doc/postfix/README_FILES
+
+DEFAULTS=\
+	-DDEF_MANPAGE_DIR=\"$(DEF_MANPAGE_DIR)\" \
+	-DDEF_COMMAND_DIR=\"$(DEF_COMMAND_DIR)\" \
+	-DDEF_CONFIG_DIR=\"$(DEF_CONFIG_DIR)\" \
+	-DDEF_DAEMON_DIR=\"$(DEF_DAEMON_DIR)\" \
+	-DDEF_MAILQ_PATH=\"$(DEF_MAILQ_PATH)\" \
+	-DDEF_HTML_DIR=\"$(DEF_HTML_DIR)\" \
+	-DDEF_NEWALIAS_PATH=\"$(DEF_NEWALIAS_PATH)\" \
+	-DDEF_QUEUE_DIR=\"$(DEF_QUEUE_DIR)\" \
+	-DDEF_DATA_DIR=\"$(DEF_DATA_DIR)\" \
+	-DDEF_README_DIR=\"$(DEF_README_DIR)\"
+
+# By setting BUILDTYPE=simple on the command line you can produce a
+# bare-bones postfix package without any dependencies to other CSW pkgs.
+# This is currently for on demand personal use, as Phil insists on the
+# possibility of "pkg-get -i all" and two postfix's would clash.
+# Eventually it might be nice two have a bare-bones postfix in the catalog
+# as not everyone might want to pull in all the extra deps from CSWpostfix.
+ifeq ($(BUILDTYPE),simple)
+PACKAGES = CSW$(GARNAME)-simple
+CATALOGNAME = $(GARNAME)_simple
+else
+# Make sure libraries in the default location can be found
+AUXLIBS = $(LDFLAGS)
+
+# Activate support for PCRE
+# http://www.postfix.org/PCRE_README.html
+FEATURES += -DHAS_PCRE
+AUXLIBS  += -lpcre
+BUILD_DEP_PKGS += CSWpcre
+RUNTIME_DEP_PKGS += CSWpcrert
+
+# Activate support for hash and btree lookup tables
+# http://www.postfix.org/DB_README.html
+FEATURES += -DHAS_DB
+INCLUDES += -I/opt/csw/bdb42/include 
+AUXLIBS  += -L/opt/csw/bdb42/lib -R/opt/csw/bdb42/lib -ldb-4.2
+BUILD_DEP_PKGS += CSWbdb42devel
+RUNTIME_DEP_PKGS += CSWbdb42
+
+# Activate support for SSL/TLS
+# http://www.postfix.org/TLS_README.html
+FEATURES += -DUSE_TLS
+AUXLIBS  += -lssl -lcrypto
+BUILD_DEP_PKGS += CSWossldevel
+RUNTIME_DEP_PKGS += CSWosslrt
+
+# Activate support for Cyrus SASL (dovecot is incl. automatically)
+# http://www.postfix.org/SASL_README.html
+FEATURES += -DUSE_SASL_AUTH -DUSE_CYRUS_SASL
+INCLUDES += -I/opt/csw/include/sasl/
+AUXLIBS  += -lsasl2
+BUILD_DEP_PKGS += CSWsasl
+RUNTIME_DEP_PKGS += CSWsasl
+
+# Activate support for OpenLDAP
+# http://www.postfix.org/LDAP_README.html
+FEATURES += -DHAS_LDAP
+AUXLIBS  += -lldap -llber
+BUILD_DEP_PKGS += CSWoldapdevel
+RUNTIME_DEP_PKGS += CSWoldaprt
+
+# Activate support for MySQL
+# http://www.postfix.org/MYSQL_README.html
+FEATURES += -DHAS_MYSQL
+INCLUDES += -I/opt/csw/mysql5/include/mysql
+AUXLIBS  += -L/opt/csw/mysql5/lib/mysql -R/opt/csw/mysql5/lib/mysql
+AUXLIBS  += -lmysqlclient
+BUILD_DEP_PKGS += CSWmysql5devel
+RUNTIME_DEP_PKGS += CSWmysql5rt
+
+# Activate support for PostgreSQL
+# http://www.postfix.org/PGSQL_README.html
+FEATURES += -DHAS_PGSQL
+INCLUDES += -I/opt/csw/postgresql/include/
+AUXLIBS  += -L/opt/csw/postgresql/lib/ -R/opt/csw/postgresql/lib/
+AUXLIBS  += -lpq
+BUILD_DEP_PKGS += CSWlibpq
+RUNTIME_DEP_PKGS += CSWlibpq
+endif
+
+# Postgres package outdated, libs aren't located below /opt/csw/lib/
+CHECKPKG_OVERRIDES_CSWpostfix += bad-rpath-entry
+
+include gar/category.mk
+
+# Postfix's build system relies on CCARGS, populate it with the defaults from
+# GAR. For the bare-bones build don't leak anything located in */csw/* to the
+# build (we want to rely on as little additional CSW pkgs as possible).
+ifeq ($(BUILDTYPE),simple)
+LD_OPTIONS  =
+CCARGS      = $(CFLAGS)
+CCARGS     += $(filter-out -I/opt/csw/include,$(CPPFLAGS))
+CCARGS     += $(filter-out -I/opt/csw/%,$(INCLUDES))
+CCARGS     += -DNO_PCRE         # on by default, would trigger our pcre-config
+CCARGS     += $(DEFAULTS)
+else
+CCARGS=$(CFLAGS) $(CPPFLAGS) $(INCLUDES) $(FEATURES) $(DEFAULTS)
+endif
+
+# Postfix doesn't use autoconf, but it's own tool called makedefs. It's
+# triggered by "gmake makefiles" in the source root and expects it's options
+# via environment variables CC CCARGS AUXLIBS DEBUG OPT. For us there is no
+# need to use DEBUG and OPT. The relevant flags are (amongst others) contained
+# in GAR's CFLAGS which we already pushed into CCARGS (see above).
+configure-custom:
+	echo $(MAKE) -C $(WORKSRC) makefiles CC=$(CC) CCARGS='$(CCARGS)'
+	$(MAKE) -C $(WORKSRC) makefiles \
+		CC=$(CC) \
+		CCARGS='$(CCARGS)' \
+		AUXLIBS='$(AUXLIBS)' \
+		DEBUG= \
+		OPT=
+	@$(MAKECOOIE)
+
+install-custom:
+	$(MAKE) -C $(WORKSRC) non-interactive-package install_root=$(DESTDIR) \
+		config_directory=$(DEF_CONFIG_DIR) \
+		daemon_directory=$(DEF_DAEMON_DIR) \
+		command_directory=$(DEF_COMMAND_DIR) \
+		queue_directory=$(DEF_QUEUE_DIR) \
+		sendmail_path=$(DEF_COMMAND_DIR)/sendmail \
+		newaliases_path=$(DEF_NEWALIAS_PATH) \
+		mailq_path=$(DEF_MAILQ_PATH) \
+		manpage_directory=$(DEF_MANPAGE_DIR) \
+		setgid_group=postdrop \
+		sample_directory=/opt/csw/share/doc/postfix/samples \
+		readme_directory=$(DEF_README_DIR) \
+		html_directory=$(DEF_HTML_DIR)
+
+	# Files for cswinitsmf and cswusergroup
+	ginstall -Dm 755 $(FILEDIR)/cswpostfix  \
+		$(DESTDIR)/etc/opt/csw/init.d/cswpostfix
+	ginstall -D $(FILEDIR)/cswusergroup \
+		$(DESTDIR)$(sysconfdir)/pkg/CSWpostfix/cswusergroup
+
+    # Helper script for spool location migration (2.4.x -> 2.6.x)
+	ginstall -Dm 755 $(FILEDIR)/migrate-queuefiles.sh \
+		$(DESTDIR)$(docdir)/$(GARNAME)/scripts/migrate-queuefiles.sh
+	@$(MAKECOOKIE)
+
+# Fails. A subsequent manual verify-config run is successfull,
+# seems as if there might be some delay required.
+#post-merge-modulated: verify-config
+
+# Warn if there are any files in $(sysconfdir)/postfix which are not
+# covered by cswsampleconf. This is a safety net in case new config file
+# get introduced by more recent postfix versions. I know this runs for
+# most bloated awkwardness. Feel free to trim it down.
+#verify-config: SHIPPED_CFGFILES  = $(wildcard $(PKGROOT)$(CONFIG_BASE)*)
+#verify-config: SHIPPED_CFGFILES := $(subst $(PKGROOT),,$(SHIPPED_CFGFILES))
+#verify-config: IGNORE_FILES += /etc/opt/csw/postfix/bounce.cf.default
+#verify-config: IGNORE_FILES += /etc/opt/csw/postfix/main.cf.default
+#verify-config: IGNORE_FILES += $(addsuffix .CSW, $(SAMPLECONF))
+#verify-config: SHELL=/bin/bash
+#verify-config:
+#	@echo "Checking for files in $(CONFIG_BASE) not covered by cswsampleconf"
+#	@gdiff \
+#		<( echo $(IGNORE_FILES) | tr " " "\n" | sort) \
+#		<( echo $(SHIPPED_CFGFILES) | tr " " "\n" | sort )
+#	@echo "OK"
+#	@$(MAKECOOKIE)	

Deleted: csw/mgar/pkg/postfix/branches/postfix-2.7/checksums
===================================================================
--- csw/mgar/pkg/postfix/branches/postfix-2.6/checksums	2010-04-30 22:45:13 UTC (rev 9798)
+++ csw/mgar/pkg/postfix/branches/postfix-2.7/checksums	2010-07-30 14:17:00 UTC (rev 10678)
@@ -1 +0,0 @@
-6b954cfb3eb6141dac1e773281211717  postfix-2.6.5.tar.gz

Copied: csw/mgar/pkg/postfix/branches/postfix-2.7/checksums (from rev 8528, csw/mgar/pkg/postfix/branches/postfix-2.6/checksums)
===================================================================
--- csw/mgar/pkg/postfix/branches/postfix-2.7/checksums	                        (rev 0)
+++ csw/mgar/pkg/postfix/branches/postfix-2.7/checksums	2010-07-30 14:17:00 UTC (rev 10678)
@@ -0,0 +1 @@
+b7a5c3ccd309156a65d6f8d2683d4fa1  postfix-2.7.1.tar.gz

Deleted: csw/mgar/pkg/postfix/branches/postfix-2.7/files/README.CSW
===================================================================
--- csw/mgar/pkg/postfix/branches/postfix-2.6/files/README.CSW	2010-04-30 22:45:13 UTC (rev 9798)
+++ csw/mgar/pkg/postfix/branches/postfix-2.7/files/README.CSW	2010-07-30 14:17:00 UTC (rev 10678)
@@ -1,75 +0,0 @@
-Replacing the system sendmail binaries
---------------------------------------
-This package will not automatically substitute the common sendmail binaries
-with links to the postfix binaries. Thus, the following files will be untouched
-and possibly belong to the system sendmail installation.
-
-  /usr/lib/sendmail
-  /usr/bin/mailq
-  /usr/bin/newaliases
-
-This makes the package installation less troublesome for shared zones and
-leaves the choice of fully replacing your system sendmail up to you. If you
-intend to replace those binaries above with the ones from this postfix package,
-there are two approaches (both currently _not_ supported in in shared zones):
-
-#1: For testing purposes - allows for quick rollback, possibly harmful
-
-This approach temporarily moves away the system sendmail binaries and replaces
-them with links to the postfix binaries. This lets you test this postfix
-package and easily roll back to the system sendmail in case you need to. It is
-_not_ suited for long term operations as system sendmail patches will possibly
-break those symlinks or worse, overwrite your postfix binaries with patched
-sendmail versions.
-
-Put in place:
-
-  mv /usr/lib/sendmail /usr/lib/sendmail.SYSTEM
-  mv /usr/bin/mailq /usr/bin/mailq.SYSTEM
-  mv /usr/bin/newaliases /usr/bin/newaliases.SYSTEM
-  
-  ln -s /opt/csw/sbin/sendmail /usr/lib/sendmail
-  ln -s /opt/csw/bin/newaliases /usr/bin/newaliases
-  ln -s /opt/csw/bin/mailq /usr/bin/mailq
-
-Roll back:
-
-  rm /usr/lib/sendmail /usr/bin/newaliases /usr/bin/mailq
-  mv /usr/lib/sendmail.SYSTEM /usr/lib/sendmail
-  mv /usr/bin/mailq.SYSTEM /usr/bin/mailq
-  mv /usr/bin/newaliases.SYSTEM /usr/bin/newaliases
-
-#2: Recommended for production systems and long term operations
-
-This approach fully removes the system sendmail packages and replaces the
-binaries with links to the postfix binaries. Patches for the system sendmail
-will be skipped and won't harm your setup. Keep your Solaris media available
-in case you want to re-install the system sendmail packages.
-
-Remove system sendmail:
-
-  echo "rdepend=nocheck" > ~/admin-postfix
-  echo "action=nocheck" >> ~/admin-postfix
-  pkgrm -na ~/admin-postfix SUNWsndmr SUNWsndmu
-  rm ~/admin-postfix
-
-Depending on the speed of your system the pkgrm might take a while.
-
-Put in place:
-
-  ln -s /opt/csw/sbin/sendmail /usr/lib/sendmail
-  ln -s /opt/csw/bin/newaliases /usr/bin/newaliases
-  ln -s /opt/csw/bin/mailq /usr/bin/mailq
-
-Roll back:
-
-  echo "idepend=nocheck" > ~/admin-postfix
-  echo "action=nocheck" >> ~/admin-postfix
-  rm /usr/lib/sendmail /usr/bin/newaliases /usr/bin/mailq
-  pkgadd -na ~/admin-postfix \
-         -d <path_to_solaris_media>/Solaris_X/Products/ SUNWsndmr SUNWsndmu
-  rm ~/admin-postfix
-
-You might want to apply additional system sendmail patches that have been
-released since the Solaris release from which you install those sendmail
-packages.

Copied: csw/mgar/pkg/postfix/branches/postfix-2.7/files/README.CSW (from rev 8528, csw/mgar/pkg/postfix/branches/postfix-2.6/files/README.CSW)
===================================================================
--- csw/mgar/pkg/postfix/branches/postfix-2.7/files/README.CSW	                        (rev 0)
+++ csw/mgar/pkg/postfix/branches/postfix-2.7/files/README.CSW	2010-07-30 14:17:00 UTC (rev 10678)
@@ -0,0 +1,75 @@
+Replacing the system sendmail binaries
+--------------------------------------
+This package will not automatically substitute the common sendmail binaries
+with links to the postfix binaries. Thus, the following files will be untouched
+and possibly belong to the system sendmail installation.
+
+  /usr/lib/sendmail
+  /usr/bin/mailq
+  /usr/bin/newaliases
+
+This makes the package installation less troublesome for shared zones and
+leaves the choice of fully replacing your system sendmail up to you. If you
+intend to replace those binaries above with the ones from this postfix package,
+there are two approaches (both currently _not_ supported in in shared zones):
+
+#1: For testing purposes - allows for quick rollback, possibly harmful
+
+This approach temporarily moves away the system sendmail binaries and replaces
+them with links to the postfix binaries. This lets you test this postfix
+package and easily roll back to the system sendmail in case you need to. It is
+_not_ suited for long term operations as system sendmail patches will possibly
+break those symlinks or worse, overwrite your postfix binaries with patched
+sendmail versions.
+
+Put in place:
+
+  mv /usr/lib/sendmail /usr/lib/sendmail.SYSTEM
+  mv /usr/bin/mailq /usr/bin/mailq.SYSTEM
+  mv /usr/bin/newaliases /usr/bin/newaliases.SYSTEM
+  
+  ln -s /opt/csw/sbin/sendmail /usr/lib/sendmail
+  ln -s /opt/csw/bin/newaliases /usr/bin/newaliases
+  ln -s /opt/csw/bin/mailq /usr/bin/mailq
+
+Roll back:
+
+  rm /usr/lib/sendmail /usr/bin/newaliases /usr/bin/mailq
+  mv /usr/lib/sendmail.SYSTEM /usr/lib/sendmail
+  mv /usr/bin/mailq.SYSTEM /usr/bin/mailq
+  mv /usr/bin/newaliases.SYSTEM /usr/bin/newaliases
+
+#2: Recommended for production systems and long term operations
+
+This approach fully removes the system sendmail packages and replaces the
+binaries with links to the postfix binaries. Patches for the system sendmail
+will be skipped and won't harm your setup. Keep your Solaris media available
+in case you want to re-install the system sendmail packages.
+
+Remove system sendmail:
+
+  echo "rdepend=nocheck" > ~/admin-postfix
+  echo "action=nocheck" >> ~/admin-postfix
+  pkgrm -na ~/admin-postfix SUNWsndmr SUNWsndmu
+  rm ~/admin-postfix
+
+Depending on the speed of your system the pkgrm might take a while.
+
+Put in place:
+
+  ln -s /opt/csw/sbin/sendmail /usr/lib/sendmail
+  ln -s /opt/csw/bin/newaliases /usr/bin/newaliases
+  ln -s /opt/csw/bin/mailq /usr/bin/mailq
+
+Roll back:
+
+  echo "idepend=nocheck" > ~/admin-postfix
+  echo "action=nocheck" >> ~/admin-postfix
+  rm /usr/lib/sendmail /usr/bin/newaliases /usr/bin/mailq
+  pkgadd -na ~/admin-postfix \
+         -d <path_to_solaris_media>/Solaris_X/Products/ SUNWsndmr SUNWsndmu
+  rm ~/admin-postfix
+
+You might want to apply additional system sendmail patches that have been
+released since the Solaris release from which you install those sendmail
+packages.

Deleted: csw/mgar/pkg/postfix/branches/postfix-2.7/files/README.upgradefrom.24
===================================================================
--- csw/mgar/pkg/postfix/branches/postfix-2.6/files/README.upgradefrom.24	2010-04-30 22:45:13 UTC (rev 9798)
+++ csw/mgar/pkg/postfix/branches/postfix-2.7/files/README.upgradefrom.24	2010-07-30 14:17:00 UTC (rev 10678)
@@ -1,27 +0,0 @@
-Note for users upgrading from postfix 2.4.6 and previous
---------------------------------------------------------
-
-- Starting with postfix 2.6.x the spool location has changed from 
-
-    /opt/csw/var/spool/postfix to
-    /var/opt/csw/spool/postfix
-
-  If you have any pending email in the old spool location, please move
-  it to the new spool location and run "postsuper" before starting
-  postfix. An example script on how this can be done is shipped with the
-  package (migrate-queuefiles.sh). Make sure to understand what you are
-  doing.
-
-- Starting with postfix 2.6.x this package will _not_ automatically
-  substitute the common sendmail binaries with links to the postfix
-  binaries any more. Thus, the following files will be untouched and
-  possibly belong to the system sendmail installation.
-  
-    /usr/lib/sendmail
-    /usr/bin/mailq
-    /usr/bin/newaliases
-  
-  This makes the package installation less troublesome for shared zones
-  and leaves the choice of fully replacing your system sendmail up to you.
-  If you intend to replace those binaries above with the ones from this
-  postfix package, please see README.CSW.

Copied: csw/mgar/pkg/postfix/branches/postfix-2.7/files/README.upgradefrom.24 (from rev 8528, csw/mgar/pkg/postfix/branches/postfix-2.6/files/README.upgradefrom.24)
===================================================================
--- csw/mgar/pkg/postfix/branches/postfix-2.7/files/README.upgradefrom.24	                        (rev 0)
+++ csw/mgar/pkg/postfix/branches/postfix-2.7/files/README.upgradefrom.24	2010-07-30 14:17:00 UTC (rev 10678)
@@ -0,0 +1,27 @@
+Note for users upgrading from postfix 2.4.6 and previous
+--------------------------------------------------------
+
+- Starting with postfix 2.6.x the spool location has changed from 
+
+    /opt/csw/var/spool/postfix to
+    /var/opt/csw/spool/postfix
+
+  If you have any pending email in the old spool location, please move
+  it to the new spool location and run "postsuper" before starting
+  postfix. An example script on how this can be done is shipped with the
+  package (migrate-queuefiles.sh). Make sure to understand what you are
+  doing.
+
+- Starting with postfix 2.6.x this package will _not_ automatically
+  substitute the common sendmail binaries with links to the postfix
+  binaries any more. Thus, the following files will be untouched and
+  possibly belong to the system sendmail installation.
+  
+    /usr/lib/sendmail
+    /usr/bin/mailq
+    /usr/bin/newaliases
+  
+  This makes the package installation less troublesome for shared zones
+  and leaves the choice of fully replacing your system sendmail up to you.
+  If you intend to replace those binaries above with the ones from this
+  postfix package, please see README.CSW.

Deleted: csw/mgar/pkg/postfix/branches/postfix-2.7/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/postfix/branches/postfix-2.6/files/changelog.CSW	2010-04-30 22:45:13 UTC (rev 9798)
+++ csw/mgar/pkg/postfix/branches/postfix-2.7/files/changelog.CSW	2010-07-30 14:17:00 UTC (rev 10678)
@@ -1,13 +0,0 @@
-postfix (2.6.5,REV=2010.02.15)
-
-  * Adopted and updated to 2.6.5. (Closes #3580, #3700, #3970)
-  * Moved spool directory to /var/opt/csw/spool/postfix. (Closes #3946)
-  * Added Cyrus SASL support. (Closes #2843)
-  * Added hash table support via bdb. (Closes #2097)
-  * Init / SMF handling now done with cswclassutils. (Closes #3946)
-  * Now depends on pcre_rt instead of pcre. (Closes #3017)
-  * Binaries in /opt/csw/libexec/postfix are now stripped. (Closes #3063)
-  * Doesn't automatically substitute system sendmail binaries any more.
-    Please refer to README.CSW instead. (Closes #1943, #2964, #3060) 
-
- -- Sebastian Kayser <skayser at opencsw.org>  Mon, 15 Feb 2010 00:23:59 +0100

Copied: csw/mgar/pkg/postfix/branches/postfix-2.7/files/changelog.CSW (from rev 8545, csw/mgar/pkg/postfix/branches/postfix-2.6/files/changelog.CSW)
===================================================================
--- csw/mgar/pkg/postfix/branches/postfix-2.7/files/changelog.CSW	                        (rev 0)
+++ csw/mgar/pkg/postfix/branches/postfix-2.7/files/changelog.CSW	2010-07-30 14:17:00 UTC (rev 10678)
@@ -0,0 +1,13 @@
+postfix (2.7.1,REV=2010.07.30)
+
+  * Adopted and updated to 2.7.1. (Closes #3580, #3700, #3970)
+  * Moved spool directory to /var/opt/csw/spool/postfix. (Closes #3946)
+  * Added Cyrus SASL support. (Closes #2843)
+  * Added hash table support via bdb. (Closes #2097)
+  * Init / SMF handling now done with cswclassutils. (Closes #3946)
+  * Now depends on pcre_rt instead of pcre. (Closes #3017)
+  * Binaries in /opt/csw/libexec/postfix are now stripped. (Closes #3063)
+  * Doesn't automatically substitute system sendmail binaries any more.
+    Please refer to README.CSW instead. (Closes #1943, #2964, #3060) 
+
+ -- Sebastian Kayser <skayser at opencsw.org>  Fri, 30 Jul 2010 15:10:26 +0200

Modified: csw/mgar/pkg/postfix/branches/postfix-2.7/files/cswpostfix
===================================================================
--- csw/mgar/pkg/postfix/branches/postfix-2.6/files/cswpostfix	2010-04-30 22:45:13 UTC (rev 9798)
+++ csw/mgar/pkg/postfix/branches/postfix-2.7/files/cswpostfix	2010-07-30 14:17:00 UTC (rev 10678)
@@ -80,7 +80,7 @@
     ;;
 
     *)
-        echo "Usage: /etc/init.d/postfix {start|stop|restart|reload|flush|check|status|force-reload}"
+        echo "Usage: cswpostfix {start|stop|restart|reload|flush|check|status|force-reload}"
         exit 1
     ;;
 esac

Deleted: csw/mgar/pkg/postfix/branches/postfix-2.7/files/cswusergroup
===================================================================
--- csw/mgar/pkg/postfix/branches/postfix-2.6/files/cswusergroup	2010-04-30 22:45:13 UTC (rev 9798)
+++ csw/mgar/pkg/postfix/branches/postfix-2.7/files/cswusergroup	2010-07-30 14:17:00 UTC (rev 10678)
@@ -1,2 +0,0 @@
-:postdrop:::::
-postfix:postfix:Postfix daemon user:/var/opt/csw/spool/postfix:/usr/bin/pfsh::

Copied: csw/mgar/pkg/postfix/branches/postfix-2.7/files/cswusergroup (from rev 8528, csw/mgar/pkg/postfix/branches/postfix-2.6/files/cswusergroup)
===================================================================
--- csw/mgar/pkg/postfix/branches/postfix-2.7/files/cswusergroup	                        (rev 0)
+++ csw/mgar/pkg/postfix/branches/postfix-2.7/files/cswusergroup	2010-07-30 14:17:00 UTC (rev 10678)
@@ -0,0 +1,2 @@
+:postdrop:::::
+postfix:postfix:Postfix daemon user:/var/opt/csw/spool/postfix:/usr/bin/pfsh::

Deleted: csw/mgar/pkg/postfix/branches/postfix-2.7/files/migrate-queuefiles.sh
===================================================================
--- csw/mgar/pkg/postfix/branches/postfix-2.6/files/migrate-queuefiles.sh	2010-04-30 22:45:13 UTC (rev 9798)
+++ csw/mgar/pkg/postfix/branches/postfix-2.7/files/migrate-queuefiles.sh	2010-07-30 14:17:00 UTC (rev 10678)
@@ -1,27 +0,0 @@
-#!/bin/bash
-#
-# move-spool.sh:
-#  helper script to move possible queue files from the CSWpostfix 2.4.x
-#  spool location to the CSWpostfix >= 2.6.x spool location.
-#
-# $Id$
-
-
-SPOOL_OLD=/opt/csw/var/spool/postfix
-SPOOL_NEW=/var/opt/csw/spool/postfix
-QDIRS="incoming active deferred corrupt hold bounce defer trace"
-
-[ -x /usr/bin/zonename ] && ZONEOPT="-z `/usr/bin/zonename`"
-if pgrep $ZONEOPT master; then
-   echo "Make sure postfix is not running! Exiting."
-   exit 1
-fi
-
-for qdir in $QDIRS; do
-    [ -d ${SPOOL_OLD}/$qdir ] || continue
-	echo "Moving from ${SPOOL_OLD}/$qdir to ${SPOOL_NEW}/$qdir"
-	cd ${SPOOLDIR_NEW}/$qdir && \
-		find ${SPOOLDIR_OLD}/$qdir -type f -exec mv '{}' . +
-done
-
-echo "No errors so far? Then please run postsuper now."

Copied: csw/mgar/pkg/postfix/branches/postfix-2.7/files/migrate-queuefiles.sh (from rev 8528, csw/mgar/pkg/postfix/branches/postfix-2.6/files/migrate-queuefiles.sh)
===================================================================
--- csw/mgar/pkg/postfix/branches/postfix-2.7/files/migrate-queuefiles.sh	                        (rev 0)
+++ csw/mgar/pkg/postfix/branches/postfix-2.7/files/migrate-queuefiles.sh	2010-07-30 14:17:00 UTC (rev 10678)
@@ -0,0 +1,27 @@
+#!/bin/bash
+#
+# move-spool.sh:
+#  helper script to move possible queue files from the CSWpostfix 2.4.x
+#  spool location to the CSWpostfix >= 2.6.x spool location.
+#
+# $Id$
+
+
+SPOOL_OLD=/opt/csw/var/spool/postfix
+SPOOL_NEW=/var/opt/csw/spool/postfix
+QDIRS="incoming active deferred corrupt hold bounce defer trace"
+
+[ -x /usr/bin/zonename ] && ZONEOPT="-z `/usr/bin/zonename`"
+if pgrep $ZONEOPT -lf /opt/csw/libexec/postfix/master; then
+   echo "Make sure postfix is not running! Exiting."
+   exit 1
+fi
+
+for qdir in $QDIRS; do
+    [ -d ${SPOOL_OLD}/$qdir ] || continue
+	echo "Moving from ${SPOOL_OLD}/$qdir to ${SPOOL_NEW}/$qdir"
+	cd ${SPOOLDIR_NEW}/$qdir && \
+		find ${SPOOLDIR_OLD}/$qdir -type f -exec mv '{}' . +
+done
+
+echo "No errors so far? Then please run postsuper now."


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 Jul 28 05:04:15 2010
From: bdwalton at users.sourceforge.net (bdwalton at users.sourceforge.net)
Date: Wed, 28 Jul 2010 03:04:15 +0000
Subject: [csw-devel] SF.net SVN: gar:[10615] csw/mgar/pkg
Message-ID: <E1OdwwJ-0001QU-JS@sfp-svn-1.v30.ch3.sourceforge.com>

Revision: 10615
          http://gar.svn.sourceforge.net/gar/?rev=10615&view=rev
Author:   bdwalton
Date:     2010-07-28 03:04:15 +0000 (Wed, 28 Jul 2010)

Log Message:
-----------
gem-rake: more preliminary gem packaging work

Added Paths:
-----------
    csw/mgar/pkg/gem-rake/
    csw/mgar/pkg/gem-rake/branches/
    csw/mgar/pkg/gem-rake/tags/
    csw/mgar/pkg/gem-rake/trunk/
    csw/mgar/pkg/gem-rake/trunk/Makefile
    csw/mgar/pkg/gem-rake/trunk/checksums
    csw/mgar/pkg/gem-rake/trunk/files/


Property changes on: csw/mgar/pkg/gem-rake/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/gem-rake/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gem-rake/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/gem-rake/trunk/Makefile	2010-07-28 03:04:15 UTC (rev 10615)
@@ -0,0 +1,9 @@
+GARNAME = rake
+GARVERSION = 0.8.3
+CATEGORIES = rbgems
+
+DESCRIPTION = Rake is make for ruby
+
+ARCHALL = 1
+
+include gar/category.mk

Added: csw/mgar/pkg/gem-rake/trunk/checksums
===================================================================
--- csw/mgar/pkg/gem-rake/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/gem-rake/trunk/checksums	2010-07-28 03:04:15 UTC (rev 10615)
@@ -0,0 +1 @@
+2765845a465d89c46d01b4b5bba94ca7  rake-0.8.3.gem


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.